Browse Source

web 门户调整

nanMing 2 years ago
parent
commit
054ee76ecf

+ 359 - 372
ruoyi-web/src/components/CareHomeSel/index.vue

@@ -1,402 +1,389 @@
-<template >
-  <el-button  type="danger" @click="dialogVisible = true"
-  >{{title}}</el-button
-  >
-  <el-dialog
-      v-model="dialogVisible"
-      title="养老机构选择"
-      width="90%"
-      center
-      align-center
-      :before-close="handleClose"
-  >
-    <template >
-      <el-dialog
-          v-model="subdialogVisible"
-          width="30%"
-          align-center
-          center
-          title="提示"
-          append-to-body>
-        没有选择记录!
-        </el-dialog>
-    </template>
-    <div class="echarts-box">
-      <div class="ssqh">
-        <p class="sxzd">行政区划</p>
-
-      <el-scrollbar wrapClass="scroll-wrap">
-      <el-tree
-          node-key="code"
-          :props="defaultProps"
-          :default-expanded-keys="expands"
-          :expand-on-click-node="false"
-          lazy
-          :load="loadNode"
-          ref="tree"
-          :check-strictly="true"
-          show-checkbox
-          highlight-current
-          @check="checkGroupNode"
-      />
-    </el-scrollbar>
-      </div>
-      <div class="jgxz">
-        <el-from :model="formLabelAlign" ref="queryRef">
-          <div class="flex">
-            <el-form-item label="机构名称" prop="jgmc">
-              <el-input v-model="formLabelAlign.jgmc" clearable placeholder="请输入机构名称" />
-            </el-form-item>
-            <el-form-item label="机构类型" prop="status">
-              <el-select v-model="formLabelAlign.status" clearable placeholder="请选择机构类型">
-                <el-option v-for="item in DictS.XZ093" :label="item.label" :value="item.value" />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="有无空余床位" prop="cwzs">
-              <el-select v-model="formLabelAlign.cwzs" clearable placeholder="请选择有无空余床位">
-                <el-option v-for="item in DictS.CZ035" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="danger" @click="handleQuery">搜索</el-button>
-              <el-button @click="resetQuery()">重置</el-button>
-            </el-form-item>
-          </div>
-
-        </el-from>
-
-        <el-table stripe :row-height="15" :data="jgList.slice((currentPage-1)*pagesize,currentPage*pagesize)"  @selection-change="handleSelectionChange"   >
-          <el-table-column v-if="seltype === 'select'" :key="indexMethod" label="选择" width="100px" height="20px" type="selection" align="center"/>
-          <el-table-column label="序号" :width="'90px'" height="20px" type="index" :index="indexMethod" align="center"/>
-          <el-table-column label="机构名称" align="center" prop="jgmc">
-          <template #default="scope">
-            <span v-if="seltype === 'select'">{{scope.row["jgmc"]}}</span>
-            <el-button style="height: 20px" v-if="seltype === 'index'" type="text"  @click="handlesel(scope.row)">{{scope.row["jgmc"]}}</el-button>
-          </template>
-          </el-table-column>
-          <!--el-table-column label="建立日期" align="center" prop="jlrq"/>
-          <el-table-column label="床位数" align="center" prop="cwzs"/-->
-          <el-table-column label="通信地址" align="center" prop="txdz">
-            <template #default="scope">
-              <span v-if="seltype === 'select'">{{scope.row["txdz"]}}</span>
-              <el-button style="height: 20px" v-if="seltype === 'index'" type="text"  @click="handlesel(scope.row)">{{scope.row["txdz"]}}</el-button>
-            </template>
-          </el-table-column>
-          <el-table-column label="联系方式" align="center" prop="frlxfs">
-            <template #default="scope">
-              <span v-if="seltype === 'select'">{{scope.row["frlxfs"]}}</span>
-              <el-button style="height: 20px" v-if="seltype === 'index'" type="text"  @click="handlesel(scope.row)">{{scope.row["frlxfs"]}}</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <pagination
-            v-show="totalcount > 0"
-            :total="totalcount"
-            v-model:page="formLabelAlign.pageNum"
-            v-model:limit="formLabelAlign.pageSize"
-            @pagination="handleQuery"
-        />
-      </div>
-    </div>
-    <template #footer>
-      <span class="dialog-footer">
-         <el-button style=" margin-top :10px;margin-bottom :10px;" v-if="seltype === 'select'" type="primary" @click="handlesels">确 定</el-button>
-        <el-button :type="seltype == 'select'?'':'primary'" @click="dialogVisible = false">关闭</el-button>
-      </span>
-    </template>
-  </el-dialog>
+<template>
+	<el-button type="danger" @click="dialogInit">{{ title }}</el-button>
+	<el-dialog
+		v-model="dialogVisible"
+		title="养老机构选择"
+		width="80%"
+		top="6vh"
+		append-to-body
+		:before-close="handleClose"
+	>
+		<template>
+			<el-dialog
+				v-model="subdialogVisible"
+				width="30%"
+				align-center
+				center
+				title="提示"
+				append-to-body>
+				没有选择记录!
+			</el-dialog>
+		</template>
+		<div class="echarts-box">
+			<div class="ssqh">
+				<p class="sxzd">行政区划</p>
+				<el-scrollbar wrap-class="scroll-wrap">
+					<el-tree
+						node-key="code"
+						:props="defaultProps"
+						:default-expanded-keys="expands"
+						:expand-on-click-node="false"
+						lazy
+						:load="loadNode"
+						ref="tree"
+						:check-strictly="true"
+						show-checkbox
+						highlight-current
+						@check="checkGroupNode"
+					/>
+				</el-scrollbar>
+			</div>
+			<div class="jgxz">
+				<el-form :inline="true" ref="queryRef" :model="formLabelAlign" label-width="100px">
+					<el-form-item label="机构名称">
+						<el-input v-model="formLabelAlign.jgmc" placeholder="请输入机构名称" />
+					</el-form-item>
+					<el-form-item label="机构类型">
+						<el-select v-model="formLabelAlign.status" placeholder="请选择机构类型" clearable>
+							<el-option v-for="item in DictS.XZ093" :label="item.label" :value="item.value" />
+						</el-select>
+					</el-form-item>
+					<el-form-item label="有无空余床位">
+						<el-select v-model="formLabelAlign.cwzs" placeholder="请选择有无空余床位" clearable>
+							<el-option v-for="item in DictS.CZ035" :key="item.value" :label="item.label" :value="item.value" />
+						</el-select>
+					</el-form-item>
+					<el-form-item>
+						<el-button type="danger" @click="handleQuery">搜索</el-button>
+						<el-button @click="resetQuery()">重置</el-button>
+					</el-form-item>
+				</el-form>
+				<el-table stripe :row-height="15" :data="jgList.slice((currentPage-1)*pagesize,currentPage*pagesize)"
+					@selection-change="handleSelectionChange">
+					<el-table-column v-if="seltype === 'select'" :key="indexMethod" label="选择" width="100px" height="20px" type="selection"
+						align="center" />
+					<el-table-column label="序号" :width="'90px'" height="20px" type="index" :index="indexMethod" align="center" />
+					<el-table-column label="机构名称" align="center" prop="jgmc">
+						<template #default="scope">
+							<span v-if="seltype === 'select'">{{ scope.row['jgmc'] }}</span>
+							<el-button style="height: 20px" v-if="seltype === 'index'" type="text" @click="handlesel(scope.row)">{{ scope.row['jgmc'] }}
+							</el-button>
+						</template>
+					</el-table-column>
+					<!--el-table-column label="建立日期" align="center" prop="jlrq"/>
+					<el-table-column label="床位数" align="center" prop="cwzs"/-->
+					<el-table-column label="通信地址" align="center" prop="txdz">
+						<template #default="scope">
+							<span v-if="seltype === 'select'">{{ scope.row['txdz'] }}</span>
+							<el-button style="height: 20px" v-if="seltype === 'index'" type="text" @click="handlesel(scope.row)">{{ scope.row['txdz'] }}
+							</el-button>
+						</template>
+					</el-table-column>
+					<el-table-column label="联系方式" align="center" prop="frlxfs">
+						<template #default="scope">
+							<span v-if="seltype === 'select'">{{ scope.row['frlxfs'] }}</span>
+							<el-button style="height: 20px" v-if="seltype === 'index'" type="text" @click="handlesel(scope.row)">
+								{{ scope.row['frlxfs'] }}
+							</el-button>
+						</template>
+					</el-table-column>
+				</el-table>
+				<pagination
+					v-show="totalcount > 0"
+					:total="totalcount"
+					v-model:page="formLabelAlign.pageNum"
+					v-model:limit="formLabelAlign.pageSize"
+					@pagination="handleQuery"
+				/>
+			</div>
+		</div>
+	</el-dialog>
 </template>
 </template>
 <script>
 <script>
-import {defineComponent,getCurrentInstance,reactive} from "vue";
-import { ElMessageBox } from 'element-plus'
-import {gettreedata,jcxxList} from "@/api/home";
-import {mapState} from 'vuex';
-import {encrypt_ECB,decrypt_ECB,encrypt_CBC,decrypt_CBC,encrypt_ECBA} from "@/api/tool/sm4";
+import { defineComponent, getCurrentInstance, reactive } from 'vue';
+import { ElMessageBox } from 'element-plus';
+import { gettreedata, jcxxList } from '@/api/home';
+import { mapState } from 'vuex';
+import { encrypt_ECB, decrypt_ECB, encrypt_CBC, decrypt_CBC, encrypt_ECBA } from '@/api/tool/sm4';
 
 
-let MyDict= {};
+let MyDict = {};
 export default {
 export default {
-  setup() {
-    const { proxy } = getCurrentInstance();
-    MyDict = proxy.useDict("XZ093", "CZ035", "CZ015");
-  },
-  created() {
-  },
-  mounted(){
-    this.DictS=MyDict;
-  },
-  props:{
-        title:{
-          type:String,
-          default:"qubau",
-        },
-        isJl:{
-          type:Boolean,
-          default:true,
-        },
-        isLoad:{
-          type:Boolean,
-          default:true,
-        },
-    seltype:{
-      type:String,
-      default:"index",
-    },
-      },
-      data(){
-        return{
-          dialogVisible:false,
-          subdialogVisible:false,
-          defaultProps: {
-            childre: 'children',
-            label: 'label',
-            isLeaf: 'leaf',
-          },
-          formLabelAlign: {
-            pageNum: 1,
-            pageSize: 10,
-            jgmc: "",
-            szxzqh: "",
-            status: "",
-            isChxddjg: "",
-            pddj: "",
-            cwzs: ""
-          },
-          expands:['220000000000'],
-          treenode:[],
-          resolve:{},
-          DictS:{},
-          totalcount:0,
-          pagesize:10,
-          currentPage:1,
-          headerlist: ["a","b","c"],
-          fieldwidths:["100","100","100"],
-          jgList:[],
-          single: false,
-          multiple: false,
-          ids: [],
-          items: [],
-        }
-      },
-      computed: {
-        ...mapState(['user']),
-      },
-
-      methods:{
-        handlesels(row, index) {
-          if (this.ids.length<=0)
-          {
-            this.subdialogVisible=true;
-            //alert("没有选择记录!");
-          }
-          else
-          {
-            var ret=[];
-            for (var i = 0; i < this.ids.length; i++) {
-              var ids=this.ids[i];
-              for (let j = 0; j <this.jgList.length; j++) {
-                if (this.jgList[j].id=ids)
-                {
-                  ret.push(this.jgList[j])
-                }
-              }
-
-
-
-            }
-            this.$emit('handleNodeClick',ret);
-            this.dialogVisible = false;
-          }
-        },
-        handlesel(row)
-        {
-          this.$emit('handleNodeClick',row);
-          this.dialogVisible = false;
-        },
-        indexMethod(index)
-        {
-          let curpage=this.currentPage;
-          let limitpage=this.pagesize;
-          return index+1+(curpage-1)*limitpage;
-        },
-        rowClass({row,rowIndex})
-        {
-          return 'background:#c0cefa';
-        },
-        cellClass({row,column,rowIndex,columnIndex})
-        {
-          return 'border-left-color: #40c9c6;border-left-width:20px;';
-        },
-        current_change:function(currentPage){
-          this.currentPage = currentPage;
-        },
-        handleSelectionChange(selection) {
-          this.ids = selection.map(item => item.id);
-          this.items = selection.map((item, index) => {
-            return {...item, index: this.jgList.map(ite => ite.id).indexOf(item.id)}
-          });
-          this.single = selection.length !== 1
-          this.multiple = !selection.length
-        },
-        handleOnclick(idx){
-          const ids = idx;
-          var ret={};
-          for(var j=0;j<this.fields.length;j++) {
-            ret[this.fields[j]]=this.oldtrainingList[ids][j];
-          }
-          this.success(ret);
-          this.close();
-        },
-        updatetree()
-        {
-          if (this.treenode) {
-            this.treenode.childNodes = [] // 清空子节点
-            this.loadNode(this.treenode, this.resolve) // 再次执行 load 的方法
-          }
-        },
-        treeClear(){
-          console.log('重置了');
-          this.$refs.tree.setCheckedKeys([]);
-        },
-        check (data, checked, indeterminate) {
-          this.$refs.tree.setCheckedKeys([data.code])
-        },
-        handleNodeClick(data,node,root) {
-          let retdata=[];
-          retdata.push(node.data);
-          let pp=node.parent;
-          while (pp)
-          {
-            retdata.push(pp.data);
-            pp=pp.parent;
-          }
-          this.$emit('handleNodeClick',retdata);
-          //this.dialogVisible = false;
-        },
-        checkGroupNode(a, b){
-          if (b.checkedKeys.length > 0) {
-            this.$refs.tree.setCheckedKeys([a.code]);
-            this.formLabelAlign.szxzqh=a.code;
-           // this.$emit('handleNodeClick',a)
-          }else {
-            this.formLabelAlign.szxzqh="";
-            //this.$emit('handleNodeClick',{code:null})
-          }
-         this.handleQuery();
-        },
-        async getdata(level, cs2, cs3, resolve) {
-
-          var para = {};
-          para.dictType = "xzqh";
-          para.outType = '0';
-          para.para1 = level;
-          para.para2 = cs2;
-          para.para3 = cs3;
-          let data = await gettreedata(para);
-          var treedata = [];
-          if (data.code == 200) {
-            for (let i = 0; i < data.data[0].recordCount; i++) {
-              treedata[i] = {};
-              for (let j = 0; j < data.data[0].columnLabelList.length; j++) {
-                treedata[i][data.data[0].columnLabelList[j].toLowerCase()] = data.data[0].rowList[i][j];
-              }
-            }
-            ;
-            treedata.forEach((item) => {
-              item.isleaf == '0' ? (item.leaf = false) : (item.leaf = true)
-            })
-            resolve(treedata);
+	setup() {
+		const { proxy } = getCurrentInstance();
+		MyDict = proxy.useDict('XZ093', 'CZ035', 'CZ015');
+	},
+	created() {
+	},
+	mounted() {
+		this.DictS = MyDict;
+	},
+	props: {
+		title: {
+			type: String,
+			default: 'qubau',
+		},
+		isJl: {
+			type: Boolean,
+			default: true,
+		},
+		isLoad: {
+			type: Boolean,
+			default: true,
+		},
+		seltype: {
+			type: String,
+			default: 'index',
+		},
+	},
+	data() {
+		return {
+			dialogVisible: false,
+			subdialogVisible: false,
+			defaultProps: {
+				childre: 'children',
+				label: 'label',
+				isLeaf: 'leaf',
+			},
+			formLabelAlign: {
+				pageNum: 1,
+				pageSize: 10,
+				jgmc: '',
+				szxzqh: '',
+				status: '',
+				isChxddjg: '',
+				pddj: '',
+				cwzs: ''
+			},
+			expands: ['220000000000'],
+			treenode: [],
+			resolve: {},
+			DictS: {},
+			totalcount: 0,
+			pagesize: 10,
+			currentPage: 1,
+			headerlist: ['a', 'b', 'c'],
+			fieldwidths: ['100', '100', '100'],
+			jgList: [],
+			single: false,
+			multiple: false,
+			ids: [],
+			items: [],
+		};
+	},
+	computed: {
+		...mapState(['user']),
+	},
 
 
-          }
-        },
-        async loadNode(node, resolve) {
+	methods: {
+		handlesels(row, index) {
+			if (this.ids.length <= 0) {
+				this.subdialogVisible = true;
+				//alert("没有选择记录!");
+			} else {
+				var ret = [];
+				for (var i = 0; i < this.ids.length; i++) {
+					var ids = this.ids[i];
+					for (let j = 0; j < this.jgList.length; j++) {
+						if (this.jgList[j].id = ids) {
+							ret.push(this.jgList[j]);
+						}
+					}
 
 
-          if (node.level === 0) {
-            this.treenode=node;
-            this.resolve=resolve;
-            // if (this.isLoad==false) return ;
-            return this.getdata(node.level, 'sj', '', resolve);
-          } else if (node.level >= 1) {
-            //  if (this.isLoad==false) return ;
-            return this.getdata(node.level, node.data.nextlevel, node.data.id, resolve);
-          }
-        },
-        // handleNodeClick(data) {
-        //   this.$emit('handleNodeClick',data)
-        // },
-         handleQuery() {
-           this.getList();
-        },
-        resetQuery() {
-          this.formLabelAlign.jgmc = '';
-          this.formLabelAlign.szxzqh = '';
-          this.formLabelAlign.status = '';
-          this.getList();
-         }
-         ,
-        getList(querd) {
+				}
+				this.$emit('handleNodeClick', ret);
+				this.dialogVisible = false;
+			}
+		},
+		dialogInit() {
+			this.dialogVisible = true;
+			this.getList();
+		},
+		handlesel(row) {
+			this.$emit('handleNodeClick', row);
+			this.dialogVisible = false;
+		},
+		indexMethod(index) {
+			let curpage = this.currentPage;
+			let limitpage = this.pagesize;
+			return index + 1 + (curpage - 1) * limitpage;
+		},
+		rowClass({ row, rowIndex }) {
+			return 'background:#c0cefa';
+		},
+		cellClass({ row, column, rowIndex, columnIndex }) {
+			return 'border-left-color: #40c9c6;border-left-width:20px;';
+		},
+		current_change: function (currentPage) {
+			this.currentPage = currentPage;
+		},
+		handleSelectionChange(selection) {
+			this.ids = selection.map(item => item.id);
+			this.items = selection.map((item, index) => {
+				return { ...item, index: this.jgList.map(ite => ite.id).indexOf(item.id) };
+			});
+			this.single = selection.length !== 1;
+			this.multiple = !selection.length;
+		},
+		handleOnclick(idx) {
+			const ids = idx;
+			var ret = {};
+			for (var j = 0; j < this.fields.length; j++) {
+				ret[this.fields[j]] = this.oldtrainingList[ids][j];
+			}
+			this.success(ret);
+			this.close();
+		},
+		updatetree() {
+			if (this.treenode) {
+				this.treenode.childNodes = []; // 清空子节点
+				this.loadNode(this.treenode, this.resolve); // 再次执行 load 的方法
+			}
+		},
+		treeClear() {
+			console.log('重置了');
+			this.$refs.tree.setCheckedKeys([]);
+		},
+		check(data, checked, indeterminate) {
+			this.$refs.tree.setCheckedKeys([data.code]);
+		},
+		handleNodeClick(data, node, root) {
+			let retdata = [];
+			retdata.push(node.data);
+			let pp = node.parent;
+			while (pp) {
+				retdata.push(pp.data);
+				pp = pp.parent;
+			}
+			this.$emit('handleNodeClick', retdata);
+			//this.dialogVisible = false;
+		},
+		checkGroupNode(a, b) {
+			if (b.checkedKeys.length > 0) {
+				this.$refs.tree.setCheckedKeys([a.code]);
+				this.formLabelAlign.szxzqh = a.code;
+				// this.$emit('handleNodeClick',a)
+			} else {
+				this.formLabelAlign.szxzqh = '';
+				//this.$emit('handleNodeClick',{code:null})
+			}
+			this.handleQuery();
+		},
+		async getdata(level, cs2, cs3, resolve) {
 
 
-          let quer = {}
-          if (querd) {
-            quer = querd
-          } else {
-         quer = {
-          ...this.formLabelAlign,
-           szxzqh: this.formLabelAlign.szxzqh
-          }
-        }
+			var para = {};
+			para.dictType = 'xzqh';
+			para.outType = '0';
+			para.para1 = level;
+			para.para2 = cs2;
+			para.para3 = cs3;
+			let data = await gettreedata(para);
+			var treedata = [];
+			if (data.code == 200) {
+				for (let i = 0; i < data.data[0].recordCount; i++) {
+					treedata[i] = {};
+					for (let j = 0; j < data.data[0].columnLabelList.length; j++) {
+						treedata[i][data.data[0].columnLabelList[j].toLowerCase()] = data.data[0].rowList[i][j];
+					}
+				}
+				;
+				treedata.forEach((item) => {
+					item.isleaf == '0' ? (item.leaf = false) : (item.leaf = true);
+				});
+				resolve(treedata);
 
 
+			}
+		},
+		async loadNode(node, resolve) {
 
 
+			if (node.level === 0) {
+				this.treenode = node;
+				this.resolve = resolve;
+				// if (this.isLoad==false) return ;
+				return this.getdata(node.level, 'sj', '', resolve);
+			} else if (node.level >= 1) {
+				//  if (this.isLoad==false) return ;
+				return this.getdata(node.level, node.data.nextlevel, node.data.id, resolve);
+			}
+		},
+		// handleNodeClick(data) {
+		//   this.$emit('handleNodeClick',data)
+		// },
+		handleQuery() {
+			this.getList();
+		},
+		resetQuery() {
+			this.formLabelAlign.jgmc = '';
+			this.formLabelAlign.cwzs = '';
+			this.formLabelAlign.status = '';
+			this.getList();
+		},
+		getList(querd) {
+			let quer = {};
+			if (querd) {
+				quer = querd;
+			} else {
+				quer = {
+					...this.formLabelAlign,
+					szxzqh: this.formLabelAlign.szxzqh
+				};
+			}
 
 
-          jcxxList(quer).then(response => {
-            this.jgList = response.rows;
-            for (let i = 0; i <this.jgList.length ; i++) {
-              this.jgList[i].txdz= decrypt_ECB( this.jgList[i].txdz);
-              this.jgList[i].frlxfs= decrypt_ECB( this.jgList[i].frlxfs);
-            }
-            this.totalcount=response.total;
-          });
-          },
-      },
-      watch: {
-        isLoad(newVal) {
-          this.updatetree();
-        },
-      }
-      ,
+			jcxxList(quer).then(response => {
+				this.jgList = response.rows;
+				for (let i = 0; i < this.jgList.length; i++) {
+					this.jgList[i].txdz = decrypt_ECB(this.jgList[i].txdz);
+					this.jgList[i].frlxfs = decrypt_ECB(this.jgList[i].frlxfs);
+				}
+				this.totalcount = response.total;
+			});
+		},
+	},
+	watch: {
+		isLoad(newVal) {
+			this.updatetree();
+		},
+	}
+	,
 
 
-    }
+};
 
 
 </script>
 </script>
 
 
 <style scoped>
 <style scoped>
 .flex {
 .flex {
-  display: flex;
-  margin-top: 24px;
+	display: flex;
 }
 }
-.fy{
-  text-align:center;
-  margin-top:10px;
+
+.fy {
+	text-align: center;
+	margin-top: 10px;
 }
 }
+
 .echarts-box {
 .echarts-box {
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
+	width: 100%;
+	display: flex;
+	justify-content: space-between;
 }
 }
+
 .ssqh {
 .ssqh {
-  width: 20%;
+	width: 20%;
 }
 }
+
 .jgxz {
 .jgxz {
-  width: 80%;
+	width: 80%;
 }
 }
+
 .sxzd {
 .sxzd {
-  font-weight: 600;
-  margin: 10px 15px;
+	font-weight: 600;
+	margin: 10px 15px;
 }
 }
+
 .dialog-footer button:first-child {
 .dialog-footer button:first-child {
-  margin-right: 10px;
+	margin-right: 10px;
 }
 }
-:deep(.scroll-wrap){
-  height: 62vh;
-  padding-right: 10px;
+
+:deep(.scroll-wrap) {
+	height: 65vh;
+	padding-right: 10px;
 }
 }
 </style>
 </style>

+ 2 - 2
ruoyi-web/src/components/Pagination/index.vue

@@ -100,7 +100,7 @@ function handleCurrentChange(val) {
 <style scoped>
 <style scoped>
 .pagination-container {
 .pagination-container {
   background: #fff;
   background: #fff;
-  padding: 32px 16px;
+  padding: 20px 16px 0;
   display: flex;
   display: flex;
   justify-content: center;
   justify-content: center;
 }
 }
@@ -133,4 +133,4 @@ function handleCurrentChange(val) {
   color: #B80100;
   color: #B80100;
 }
 }
 
 
-</style>
+</style>

+ 24 - 3
ruoyi-web/src/views/home/index.vue

@@ -61,7 +61,6 @@
     </div>
     </div>
   </div>
   </div>
   <!--热点专题-->
   <!--热点专题-->
-  <!--养老政策-->
   <div class="main2">
   <div class="main2">
     <div class="flex rd_box">
     <div class="flex rd_box">
       <div class="center_box flex_column mg_right24">
       <div class="center_box flex_column mg_right24">
@@ -87,6 +86,7 @@
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>
+	    <!--养老政策-->
       <div class="center_box flex_column">
       <div class="center_box flex_column">
         <div class="rd_top">
         <div class="rd_top">
           <div class="rd_title">养老政策</div>
           <div class="rd_title">养老政策</div>
@@ -129,7 +129,6 @@
     </div>
     </div>
   </div>
   </div>
   <!--机构查询-->
   <!--机构查询-->
-  <!--办事指南-->
   <div class="main2">
   <div class="main2">
     <div class="flex rd_box">
     <div class="flex rd_box">
       <div class="center_box flex_column mg_right24">
       <div class="center_box flex_column mg_right24">
@@ -144,6 +143,7 @@
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>
+	    <!--办事指南-->
       <div class="center_box flex_column">
       <div class="center_box flex_column">
         <div class="rd_top">
         <div class="rd_top">
           <div class="rd_title">办事指南</div>
           <div class="rd_title">办事指南</div>
@@ -227,7 +227,7 @@
             <div class="left">
             <div class="left">
               <div class="scroll">
               <div class="scroll">
                 <p :class="{active:isActive === item.value}" v-for="(item, index) in XZ107" :key="index"
                 <p :class="{active:isActive === item.value}" v-for="(item, index) in XZ107" :key="index"
-                  @click="getWlList(item.value)" :title="item.label">{{item.label}}</p>
+                  @mouseover="getWlList(item.value)" :title="item.label">{{item.label}}</p>
               </div>
               </div>
             </div>
             </div>
             <div class="right">
             <div class="right">
@@ -600,11 +600,19 @@ onMounted(() => {
   font-weight: 800;
   font-weight: 800;
   color: #444b55;
   color: #444b55;
   cursor: pointer;
   cursor: pointer;
+	&:hover{
+		color: #bf242a;
+		transition: color .5s;
+	}
 }
 }
 
 
 .zl_lh {
 .zl_lh {
   line-height: 60px;
   line-height: 60px;
   cursor: pointer;
   cursor: pointer;
+	&:hover{
+		color: #bf242a;
+		transition: color .5s;
+	}
 }
 }
 
 
 .bs_box {
 .bs_box {
@@ -640,6 +648,10 @@ onMounted(() => {
 .xw_box {
 .xw_box {
   height: 10%;
   height: 10%;
   border-bottom: 1px dashed #dfe6ec;
   border-bottom: 1px dashed #dfe6ec;
+	&:hover{
+		border-bottom: 1px solid #bf242a;
+		transition: border-bottom .5s;
+	}
 }
 }
 
 
 .title_overflow {
 .title_overflow {
@@ -744,6 +756,10 @@ onMounted(() => {
   line-height: 40px;
   line-height: 40px;
   margin-right: 20px;
   margin-right: 20px;
   cursor: pointer;
   cursor: pointer;
+	&:hover{
+		color: #bf242a;
+		transition: color .5s;
+	}
 }
 }
 
 
 .rd_center {
 .rd_center {
@@ -835,6 +851,11 @@ onMounted(() => {
 .bor_bt {
 .bor_bt {
   border-bottom: 1px dashed rgb(223, 230, 236);
   border-bottom: 1px dashed rgb(223, 230, 236);
   cursor: pointer;
   cursor: pointer;
+	&:hover{
+		.bs_box1{
+			color: #bf242a;
+		}
+	}
 }
 }
 
 
 .title_type {
 .title_type {

+ 4 - 1
ruoyi-web/src/views/rzyljgsq/sqzltx/index.vue

@@ -301,10 +301,13 @@ onBeforeUnmount(() => {
     :deep(.el-cascader--large) {
     :deep(.el-cascader--large) {
       width: 100%;
       width: 100%;
     }
     }
+	  :deep(.el-date-editor.el-input){
+		  width: 100%;
+	  }
 
 
     .yljg-ipt {
     .yljg-ipt {
       width: 71%;
       width: 71%;
-      margin-right: 6%;
+      margin-right: 7.8%;
     }
     }
 
 
     .submitBtn {
     .submitBtn {