style:上报详情

 {
 {
   "TITLE": "汉中市数据上报系统",
   "TITLE": "汉中市数据上报系统",
-  "THEME": "jg"
+  "THEME": "sb",
+  "SERVERAPI": "/bdcsjsb",
+  "MANAGEMENTAPI": "http: //192.168.2.236/management"
 }
 }

 /*
 /*
  * @Description: 统计率
  * @Description: 统计率
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-03-01 15:37:49
+ * @LastEditTime: 2023-03-21 16:25:26
  */
  */
 /* 引入请求文件 */
 /* 引入请求文件 */
 import request from '@/utils/request'
 import request from '@/utils/request'
 /* 引入配置文件 */
 /* 引入配置文件 */
-import SERVER from './config'
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 class business {
 class business {
   /**
   /**
    * @description: 成功率统计
    * @description: 成功率统计

 /*
 /*
  * @Description: 这个是所有api的前缀配置文件
  * @Description: 这个是所有api的前缀配置文件
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-03-16 13:37:11
+ * @LastEditTime: 2023-03-21 16:26:55
  */
  */
 export default {
 export default {
   SERVERAPI: '/bdcsjsb', //赵千
   SERVERAPI: '/bdcsjsb', //赵千
   MANAGEMENTAPI: 'http://192.168.2.236/management'
   MANAGEMENTAPI: 'http://192.168.2.236/management'
-}
-// 汉中
-// export default {
-//   // SERVERAPI: '/service-bdcsjsb-th', //线上
-//   SERVERAPI: '/bdcsjsb', //赵千
-//   MANAGEMENTAPI: 'http://172.16.56.32:8877/management'
-// }
+}
\ No newline at end of file

 /*
 /*
  * @Description: 数据上报模块api文件
  * @Description: 数据上报模块api文件
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-03-03 14:38:57
+ * @LastEditTime: 2023-03-21 16:21:31
  */
  */
 /* 引入axios请求文件 */
 /* 引入axios请求文件 */
 import request from '@/utils/request'
 import request from '@/utils/request'
 /* 引入配置 */
 /* 引入配置 */
-import SERVER from './config'
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 const urlHeader = SERVER.SERVERAPI + '/rest/sjsb/DataReport/'
 const urlHeader = SERVER.SERVERAPI + '/rest/sjsb/DataReport/'
 
 
 /**
 /**

 import request from '@/utils/request'
 import request from '@/utils/request'
-import SERVER from './config'
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 /* 
 /* 
 获取全部字典数据
 获取全部字典数据
 */
 */

 import request from '@/utils/request'
 import request from '@/utils/request'
-import SERVER from './config'
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 
 
 class djfDjSf {
 class djfDjSf {
   // 登记收费信息
   // 登记收费信息

 import request from '@/utils/request'
 import request from '@/utils/request'
-import SERVER from './config'
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 
 
 class fjF100 {
 class fjF100 {
   // 非结构化文档
   // 非结构化文档

 import request from '@/utils/request'
 import request from '@/utils/request'
-import SERVER from './config'
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 
 
 class ktfQtDzdzw {
 class ktfQtDzdzw {
   // 点状定着物信息
   // 点状定着物信息

 import request from '@/utils/request'
 import request from '@/utils/request'
-import SERVER from './config'
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 
 
 class ktfQtMzdzw {
 class ktfQtMzdzw {
   // 面状定着物
   // 面状定着物

 import request from '@/utils/request'
 import request from '@/utils/request'
-import SERVER from './config'
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 
 
 class ktfQtXzdzw {
 class ktfQtXzdzw {
   // 线状定着物
   // 线状定着物

 import request from '@/utils/request'
 import request from '@/utils/request'
-import SERVER from './config'
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 
 
 class ktfZdbhqk {
 class ktfZdbhqk {
   //宗地变化情况
   //宗地变化情况

 import request from '@/utils/request'
 import request from '@/utils/request'
-import SERVER from './config'
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 
 
 class ktfZhYhydzb {
 class ktfZhYhydzb {
   // 用海,用岛坐标
   // 用海,用岛坐标

 import request from '@/utils/request'
 import request from '@/utils/request'
-import SERVER from './config'
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 
 
 class ktfZhYhzk {
 class ktfZhYhzk {
   //用海状况
   //用海状况

 import request from '@/utils/request'
 import request from '@/utils/request'
-import SERVER from './config'
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 
 
 class kttFwZrz {
 class kttFwZrz {
   // 自然幢信息
   // 自然幢信息

 import request from '@/utils/request'
 import request from '@/utils/request'
-import SERVER from './config'
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 
 
 class kttGyJzd {
 class kttGyJzd {
   //界址点
   //界址点

 import request from '@/utils/request'
 import request from '@/utils/request'
-import SERVER from './config'
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 
 
 class kttGyJzx {
 class kttGyJzx {
   //界址线信息
   //界址线信息

 import request from '@/utils/request'
 import request from '@/utils/request'
-import SERVER from './config'
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 
 
 class kttGzw {
 class kttGzw {
   //构筑物
   //构筑物

 import request from '@/utils/request'
 import request from '@/utils/request'
-import SERVER from './config'
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 
 
 class kttZdjbxx {
 class kttZdjbxx {
   // 宗地基本信息
   // 宗地基本信息

 import request from '@/utils/request'
 import request from '@/utils/request'
-import SERVER from './config'
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 
 
 class kttZhjbxx {
 class kttZhjbxx {
   //宗海基本信息
   //宗海基本信息

 import request from '@/utils/request'
 import request from '@/utils/request'
-import SERVER from './config'
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 
 
 /*
 /*
     更新排序
     更新排序
     record-排序整条数据
     record-排序整条数据
     operate-BOTTOM（置底）, DOWN（向下）, TOP（置顶）, UP（向上）
     operate-BOTTOM（置底）, DOWN（向下）, TOP（置顶）, UP（向上）
  */
  */
-export function updateOrder(url, record, operate, swapId) {
+export function updateOrder (url, record, operate, swapId) {
   return request({
   return request({
     url: SERVER.MANAGEMENTAPI + url + "/" + record.id + "/orders",
     url: SERVER.MANAGEMENTAPI + url + "/" + record.id + "/orders",
     method: "put",
     method: "put",

@@ -2,7 +2,7 @@
  * @Author: xiaomiao 1158771342@qq.com
  * @Author: xiaomiao 1158771342@qq.com
  * @Date: 2023-03-09 15:24:53
  * @Date: 2023-03-09 15:24:53
  * @LastEditors: xiaomiao 1158771342@qq.com
  * @LastEditors: xiaomiao 1158771342@qq.com
- * @LastEditTime: 2023-03-20 09:21:04
+ * @LastEditTime: 2023-03-21 14:59:20
  * @FilePath: \上报\bdcjg-web\src\api\personnelManage.js
  * @FilePath: \上报\bdcjg-web\src\api\personnelManage.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
  */
@@ -25,36 +25,20 @@ export const getUserList = (params) => {
 }
 }
 export const getUserLists = (queryParam) => {
 export const getUserLists = (queryParam) => {
   const conditionGroup = {
   const conditionGroup = {
-    conditions: [{
-      property: 'code',
-      value: queryParam.code ? queryParam.code : null,
-      operator: 'LIKE'
-    },
-    {
-      property: 'name',
-      value: queryParam.name ? queryParam.name : null,
-      operator: 'LIKE'
-    }
-      ,
-    {
-      property: 'loginName',
-      value: queryParam.loginName ? queryParam.loginName : null,
-      operator: 'LIKE'
-    },
-    {
-      property: 'organizationId',
-      value: queryParam.organizationId,
-      operator: 'IN'
-    }
-      ,
-    {
-      property: 'departmentId',
-      value: queryParam.departmentId,
-      operator: 'IN'
-    }
-    ],
+    conditions: [],
     queryRelation: 'AND',
     queryRelation: 'AND',
   }
   }
+  console.log("queryParam", queryParam);
+  for (let key in queryParam) {
+    if (queryParam[key]) {
+      conditionGroup.conditions.push({
+        property: key,
+        value: queryParam[key],
+        operator: 'LIKE'
+      })
+    }
+
+  }
   const params = getParams(conditionGroup)
   const params = getParams(conditionGroup)
   return getAction(api.users, params)
   return getAction(api.users, params)
 }
 }

 import request from '@/utils/request'
 import request from '@/utils/request'
-import SERVER from './config'
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 
 
 class qlfFwFdcqDzXm {
 class qlfFwFdcqDzXm {
   // 房地产权_项目内多幢房屋项目属性
   // 房地产权_项目内多幢房屋项目属性

 import request from '@/utils/request'
 import request from '@/utils/request'
-import SERVER from './config'
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 
 
 class qlfQlGzdj {
 class qlfQlGzdj {
   // 更正登记信息
   // 更正登记信息

 import request from '@/utils/request'
 import request from '@/utils/request'
-import SERVER from './config'
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 
 
 class qlfQlQtxgql {
 class qlfQlQtxgql {
   // 其他相关权利
   // 其他相关权利

@@ -6,7 +6,7 @@
 /* 引入请求文件 */
 /* 引入请求文件 */
 import request from '@/utils/request'
 import request from '@/utils/request'
 /* 引入配置文件 */
 /* 引入配置文件 */
-import SERVER from './config'
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 const urlHeader = SERVER.SERVERAPI + '/rest/sjsb/RecordLog/'
 const urlHeader = SERVER.SERVERAPI + '/rest/sjsb/RecordLog/'
 /**
 /**
  * @description: 登簿日志分页
  * @description: 登簿日志分页

 import request from '@/utils/request'
 import request from '@/utils/request'
-import SERVER from './config'
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 class ruleConfig {
 class ruleConfig {
   // 列表查询
   // 列表查询
   async getSysYwsjbList (data) {
   async getSysYwsjbList (data) {
     return request({
     return request({
-      url:  SERVER.SERVERAPI +'/rest/SysYwsjb/getSysYwsjbList',
+      url: SERVER.SERVERAPI + '/rest/SysYwsjb/getSysYwsjbList',
       method: 'post',
       method: 'post',
       data
       data
     })
     })
@@ -12,7 +12,7 @@ class ruleConfig {
   // 编辑界面列表查询
   // 编辑界面列表查询
   async eidtConfigRule (id) {
   async eidtConfigRule (id) {
     return request({
     return request({
-      url:  SERVER.SERVERAPI +'/rest/SysYwsjb/getSysYwsjbWithSysYwsjbFieldByBsmYwsjb',
+      url: SERVER.SERVERAPI + '/rest/SysYwsjb/getSysYwsjbWithSysYwsjbFieldByBsmYwsjb',
       method: 'get',
       method: 'get',
       params: {
       params: {
         bsmYwsjb: id
         bsmYwsjb: id
@@ -22,7 +22,7 @@ class ruleConfig {
   // 编辑
   // 编辑
   async editSysYwsjbWithSysYwsjbField (data) {
   async editSysYwsjbWithSysYwsjbField (data) {
     return request({
     return request({
-      url:  SERVER.SERVERAPI +'/rest/SysYwsjb/editSysYwsjbWithSysYwsjbField',
+      url: SERVER.SERVERAPI + '/rest/SysYwsjb/editSysYwsjbWithSysYwsjbField',
       method: 'post',
       method: 'post',
       data
       data
     })
     })
@@ -30,7 +30,7 @@ class ruleConfig {
   // 编辑
   // 编辑
   async deleteSysYwsjbWithSysYwsjbFieldByBsmYwsjb (id) {
   async deleteSysYwsjbWithSysYwsjbFieldByBsmYwsjb (id) {
     return request({
     return request({
-      url:  SERVER.SERVERAPI +'/rest/SysYwsjb/deleteSysYwsjbWithSysYwsjbFieldByBsmYwsjb',
+      url: SERVER.SERVERAPI + '/rest/SysYwsjb/deleteSysYwsjbWithSysYwsjbFieldByBsmYwsjb',
       method: 'delete',
       method: 'delete',
       params: {
       params: {
         bsmYwsjb: id
         bsmYwsjb: id
@@ -40,7 +40,7 @@ class ruleConfig {
   // 编辑界面列表查询----根据数据表名查询
   // 编辑界面列表查询----根据数据表名查询
   async getRuleList (bsmYwsjb) {
   async getRuleList (bsmYwsjb) {
     return request({
     return request({
-      url:  SERVER.SERVERAPI +'/rest/sjsb/DataReport/getTableColumn',
+      url: SERVER.SERVERAPI + '/rest/sjsb/DataReport/getTableColumn',
       method: 'get',
       method: 'get',
       params: {
       params: {
         bsmYwsjb: bsmYwsjb
         bsmYwsjb: bsmYwsjb

 import request from '@/utils/request'
 import request from '@/utils/request'
-import SERVER from './config'
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 
 
 class sjsbFunctionOper {
 class sjsbFunctionOper {
   // 数据上报表头相关接口
   // 数据上报表头相关接口
@@ -13,7 +13,7 @@ class sjsbFunctionOper {
     })
     })
   }
   }
   // xml
   // xml
-  async queryXML(id) {
+  async queryXML (id) {
     return request({
     return request({
       url: SERVER.SERVERAPI + '/rest/reg/sjsbFunctionOper/queryXML',
       url: SERVER.SERVERAPI + '/rest/reg/sjsbFunctionOper/queryXML',
       method: 'get',
       method: 'get',

 import request from '@/utils/request'
 import request from '@/utils/request'
-import SERVER from './config'
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 
 
 class sjsbTask {
 class sjsbTask {
   // 定时任务
   // 定时任务

@@ -9,7 +9,7 @@
  * Copyright (c) 2023 by ${git_name_email}, All Rights Reserved. 
  * Copyright (c) 2023 by ${git_name_email}, All Rights Reserved. 
  */
  */
 import request from '@/utils/request'
 import request from '@/utils/request'
-import SERVER from './config'
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 const url = SERVER.SERVERAPI + '/rest/statistics/Efficient/'
 const url = SERVER.SERVERAPI + '/rest/statistics/Efficient/'
 /**
 /**
  * dataReceiveQuality
  * dataReceiveQuality
@@ -19,7 +19,7 @@ const url = SERVER.SERVERAPI + '/rest/statistics/Efficient/'
  */
  */
 export function dataReceiveQuality (startDate, endDate) {
 export function dataReceiveQuality (startDate, endDate) {
   return request({
   return request({
-    url: url + 'dataReceiveQuality?startDate='+startDate+'&endDate='+endDate,
+    url: url + 'dataReceiveQuality?startDate=' + startDate + '&endDate=' + endDate,
     method: 'post'
     method: 'post'
   })
   })
 }
 }
@@ -32,7 +32,7 @@ export function dataReceiveQuality (startDate, endDate) {
  */
  */
 export function nonNullSta (startDate, endDate) {
 export function nonNullSta (startDate, endDate) {
   return request({
   return request({
-    url: url + 'nonNullSta?startDate='+startDate+'&endDate='+endDate,
+    url: url + 'nonNullSta?startDate=' + startDate + '&endDate=' + endDate,
     method: 'post'
     method: 'post'
   })
   })
 }
 }
@@ -45,7 +45,7 @@ export function nonNullSta (startDate, endDate) {
  */
  */
 export function registerBookQuality (startDate, endDate) {
 export function registerBookQuality (startDate, endDate) {
   return request({
   return request({
-    url: url + 'registerBookQuality?startDate='+startDate+'&endDate='+endDate,
+    url: url + 'registerBookQuality?startDate=' + startDate + '&endDate=' + endDate,
     method: 'post'
     method: 'post'
   })
   })
 }
 }

-import Vue from 'vue'
 import request from '@/utils/request'
 import request from '@/utils/request'
-console.log(Vue.prototype, Vue.prototype.BASE_API);
-import SERVER from './config'
+// let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 // 获取用户信息
 // 获取用户信息
 export function getUserInfo () {
 export function getUserInfo () {
   return request({
   return request({

 import request from '@/utils/request'
 import request from '@/utils/request'
-import SERVER from './config'
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 
 
 class work {
 class work {
   // 登记类型总量
   // 登记类型总量
@@ -36,8 +36,8 @@ class work {
       }
       }
     })
     })
   }
   }
-   // 数据趋势
-   async dataTrend (code) {
+  // 数据趋势
+  async dataTrend (code) {
     return request({
     return request({
       url: SERVER.SERVERAPI + '/rest/reg/work/dataTrend',
       url: SERVER.SERVERAPI + '/rest/reg/work/dataTrend',
       method: 'get',
       method: 'get',
@@ -46,8 +46,8 @@ class work {
       }
       }
     })
     })
   }
   }
-   // 新建国有房屋信息
-   async addhousetotal (code) {
+  // 新建国有房屋信息
+  async addhousetotal (code) {
     return request({
     return request({
       url: SERVER.SERVERAPI + '/rest/reg/work/addhousetotal',
       url: SERVER.SERVERAPI + '/rest/reg/work/addhousetotal',
       method: 'get',
       method: 'get',

 import request from '@/utils/request'
 import request from '@/utils/request'
-import SERVER from './config'
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 
 
 class zdK103 {
 class zdK103 {
   //宗地空间属性
   //宗地空间属性

 import request from '@/utils/request'
 import request from '@/utils/request'
-import SERVER from './config'
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 
 
 class zhK105 {
 class zhK105 {
   // 宗海空间属性
   // 宗海空间属性

@@ -113,8 +113,8 @@ export default {
 }
 }
 </script>
 </script>
 <style rel="stylesheet/scss" lang="scss" >
 <style rel="stylesheet/scss" lang="scss" >
-@import "~@/styles/mixin.scss";
-@import "~@/styles/dialogBox.scss";
+// @import "~@/styles/mixin.scss";
+// @import "~@/styles/dialogBox.scss";
 </style>
 </style>
 <style rel="stylesheet/scss" scoped lang="scss" >
 <style rel="stylesheet/scss" scoped lang="scss" >
 /deep/.is-fullscreen {
 /deep/.is-fullscreen {
@@ -123,4 +123,4 @@ export default {
   left: 50% !important;
   left: 50% !important;
   transform: translate(-50%, -50%) !important;
   transform: translate(-50%, -50%) !important;
 }
 }
-</style>
\ No newline at end of file
+</style>

 <template>
 <template>
   <transition name="msgbox-fade" v-if="myShow">
   <transition name="msgbox-fade" v-if="myShow">
     <div class="ls-mask" v-loading="loading">
     <div class="ls-mask" v-loading="loading">
-      <div class="ls-mask-window dialogBox" :style="{ 'width': width }">
+      <div class="ls-mask-window" :style="{ 'width': width }">
         <div class="ls-head">
         <div class="ls-head">
           <div class="ls-title" :style="{ 'text-align': titleStyle }">
           <div class="ls-title" :style="{ 'text-align': titleStyle }">
             <svg-icon v-if="iconClass != ''" :icon-class='iconClass' />
             <svg-icon v-if="iconClass != ''" :icon-class='iconClass' />
@@ -21,172 +21,172 @@
   </transition>
   </transition>
 </template>
 </template>
 <script>
 <script>
-import Popup1 from './index'
-export default {
-  name: 'index',
-  data () {
-    return {
-      title: '标题',
-      editItem: "",
-      formData: undefined,//父组件传递的参数 负责传给子组件
-      btnShow: false,
-      cancel: function () { },
-      confirm: function () { },
-      cancelText: '取消',
-      confirmText: '确认',
-      isSync: false,
-      isShow: false,
-      myShow: false,
-      titleStyle: 'center',
-      width: "75%",
-      height: "auto",
-      contentHeight: "",
-      iconClass: "",
-      key: 0
-    }
-  },
-  props: {
-    loading: { type: Boolean, default: false },
-  },
-  watch: {
-    isShow (newValue) {
-      this.editItem = this.loadViewFn(this.editItem)
-      document.body.appendChild(this.$el);
-      this.myShow = newValue
-    }
-  },
-  mounted () {
-    //  计算滚动条高度
-    setTimeout(() => {
-      if (this.btnShow) {
-        if (this.height == 'auto') {
-          this.contentHeight = (this.$refs.contentRef.offsetHeight) + 'px'
+  import Popup1 from './index'
+  export default {
+    name: 'index',
+    data () {
+      return {
+        title: '标题',
+        editItem: "",
+        formData: undefined,//父组件传递的参数 负责传给子组件
+        btnShow: false,
+        cancel: function () { },
+        confirm: function () { },
+        cancelText: '取消',
+        confirmText: '确认',
+        isSync: false,
+        isShow: false,
+        myShow: false,
+        titleStyle: 'center',
+        width: "75%",
+        height: "auto",
+        contentHeight: "",
+        iconClass: "",
+        key: 0
+      }
+    },
+    props: {
+      loading: { type: Boolean, default: false },
+    },
+    watch: {
+      isShow (newValue) {
+        this.editItem = this.loadViewFn(this.editItem)
+        document.body.appendChild(this.$el);
+        this.myShow = newValue
+      }
+    },
+    mounted () {
+      //  计算滚动条高度
+      setTimeout(() => {
+        if (this.btnShow) {
+          if (this.height == 'auto') {
+            this.contentHeight = (this.$refs.contentRef.offsetHeight) + 'px'
+          } else {
+            this.contentHeight = this.height
+          }
         } else {
         } else {
-          this.contentHeight = this.height
+          if (this.height == 'auto') {
+            this.contentHeight = (this.$refs.contentRef.offsetHeight) + 'px'
+          } else {
+            this.contentHeight = this.height
+          }
         }
         }
-      } else {
-        if (this.height == 'auto') {
-          this.contentHeight = (this.$refs.contentRef.offsetHeight) + 'px'
-        } else {
-          this.contentHeight = this.height
+      }, 300)
+    },
+    methods: {
+      onCancel () {
+        Popup1().close()
+      },
+      onConfirm () {
+        this.loading = true
+        let res = new Promise((resolve, reject) => {
+          this.confirm()
+          resolve(true)
+        })
+        if (res) {
+          this.isShow = false
         }
         }
+      },
+      loadingFn (e) { //加载状态
+        this.loading = e
+      },
+      loadViewFn (view) {
+        return (r) =>
+          require.ensure([], () =>
+            r(require(`@/${view}.vue`))
+          )
       }
       }
-    }, 300)
-  },
-  methods: {
-    onCancel () {
-      Popup1().close()
     },
     },
-    onConfirm () {
-      this.loading = true
-      let res = new Promise((resolve, reject) => {
-        this.confirm()
-        resolve(true)
-      })
-      if (res) {
-        this.isShow = false
+    destroyed () {
+      if (this.appendToBody && this.$el && this.$el.parentNode) {
+        this.$el.parentNode.removeChild(this.$el);
       }
       }
-    },
-    loadingFn (e) { //加载状态
-      this.loading = e
-    },
-    loadViewFn (view) {
-      return (r) =>
-        require.ensure([], () =>
-          r(require(`@/${view}.vue`))
-        )
-    }
-  },
-  destroyed () {
-    if (this.appendToBody && this.$el && this.$el.parentNode) {
-      this.$el.parentNode.removeChild(this.$el);
     }
     }
   }
   }
-}
 </script>
 </script>
 <style scoped lang="scss" >
 <style scoped lang="scss" >
-@import "~@/styles/mixin.scss";
-@import "~@/styles/dialogBox.scss";
-
-.ls-mask {
-  width: 100%;
-  height: 100%;
-  z-index: 2000;
-  position: fixed;
-  left: 0;
-  top: 0;
-  background: rgba(0, 0, 0, 0.3);
-
-}
-
-.ls-mask-window {
-  background: white;
-  position: relative;
-  left: 50%;
-  top: 50%;
-  min-height: 200px;
-  transform: translate(-50%, -50%);
-  border-radius: 5px;
-  overflow: hidden;
-}
+  .ls-mask {
+    width: 100%;
+    height: 100%;
+    z-index: 2000;
+    position: fixed;
+    left: 0;
+    top: 0;
+    background: rgba(0, 0, 0, 0.3);
+  }
 
 
-.ls-mask-window b {
-  padding-left: 5px;
-}
+  .ls-mask-window {
+    background: white;
+    position: relative;
+    left: 50%;
+    top: 50%;
+    min-height: 200px;
+    transform: translate(-50%, -50%);
+    border-radius: 5px;
+    overflow: hidden;
+  }
 
 
-/deep/.closeStyle {
-  top: 7px !important;
-}
+  .ls-mask-window b {
+    padding-left: 5px;
+  }
 
 
-.ls-title {
-  padding: 10px;
-  color: #ffffff;
-  // background: linear-gradient(90deg, #1D66DC 0%, #081B56 100%);
-  font-size: 16px;
-}
+  /deep/.closeStyle {
+    top: 7px !important;
+  }
+  .ls-title {
+    padding: 10px;
+    color: #ffffff;
+    font-size: 16px;
+  }
 
 
-.ls-title .svg-icon {
-  font-size: 18px;
-}
+  .ls-title {
+    padding: 10px;
+    color: #ffffff;
+    // background: linear-gradient(90deg, #1D66DC 0%, #081B56 100%);
+    font-size: 16px;
+  }
 
 
-.mask-content {
-  padding: 15px;
-  width: 100%;
-  min-height: 20%;
-  max-height: 95%;
-  // overflow-y: scroll;
-}
+  .ls-title .svg-icon {
+    font-size: 18px;
+  }
 
 
-.ls-mask-footer {
-  height: 50px;
-  display: flex;
-  justify-content: center;
-  width: 100%;
-  position: absolute;
-  border-top: 1px solid $borderColor;
-  bottom: 0;
-  background: #ffffff;
-  border-bottom-left-radius: 5px;
-  border-bottom-right-radius: 5px;
-  overflow: hidden;
-}
+  .mask-content {
+    padding: 15px;
+    width: 100%;
+    min-height: 20%;
+    max-height: 95%;
+    // overflow-y: scroll;
+  }
 
 
+  .ls-mask-footer {
+    height: 50px;
+    display: flex;
+    justify-content: center;
+    width: 100%;
+    position: absolute;
+    border-top: 1px solid $borderColor;
+    bottom: 0;
+    background: #ffffff;
+    border-bottom-left-radius: 5px;
+    border-bottom-right-radius: 5px;
+    overflow: hidden;
+  }
 
 
-/deep/.closeStyle {
-  position: absolute;
-  top: 13px;
-  right: 26px;
-  font-size: 24px;
-  cursor: pointer;
-  color: #409EFF;
-}
+  /deep/.closeStyle {
+    position: absolute;
+    top: 13px;
+    right: 26px;
+    font-size: 24px;
+    cursor: pointer;
+    color: #409eff;
+  }
 
 
-/deep/.el-loading-mask {
-  background: none;
-}
+  /deep/.el-loading-mask {
+    background: none;
+  }
 
 
-/deep/.el-button {
-  margin: 8px 10px;
-  width: 75px;
-}
+  /deep/.el-button {
+    margin: 8px 10px;
+    width: 75px;
+  }
 </style>
 </style>

-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1673321301365" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3462" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M910.617673 211.45497c-29.726022-40.739866-65.373916-76.582189-105.953124-106.533338-31.447223-23.211654-65.346287-42.500976-101.132328-57.574277-17.797341-7.496741-38.217417 1.723248-44.400233 20.018939l0 0c-5.586229 16.531512 2.569522 34.533514 18.648732 41.309848 30.91408 13.027711 60.204174 29.700439 87.38421 49.761334 35.128055 25.927509 65.986877 56.9562 91.719958 92.223425 53.42477 73.218582 81.662905 159.989831 81.662905 250.935146 0 57.551764-11.264555 113.364931-33.480532 165.888168-21.464871 50.748824-52.199872 96.333022-91.352591 135.484717-39.152718 39.153742-84.736916 69.888743-135.484717 91.352591-52.523237 22.215978-108.336404 33.480532-165.888168 33.480532-57.552787 0-113.364931-11.264555-165.889191-33.480532-50.748824-21.464871-96.331999-52.199872-135.484717-91.352591-39.152718-39.152718-69.888743-84.736916-91.353614-135.484717-22.214954-52.523237-33.479509-108.336404-33.479509-165.888168 0-90.842984 28.180829-177.536462 81.495082-250.706949 25.681916-35.244712 56.481386-66.265216 91.545996-92.199888 27.118638-20.056801 56.344263-36.737716 87.192851-49.78794 16.072047-6.798846 24.204262-24.812105 18.594497-41.336454l0 0c-6.207375-18.285458-26.638707-27.478841-44.424792-19.958564-35.712363 15.098883-69.537749 34.399461-100.915387 57.607022-40.505529 29.958312-76.084862 65.791425-105.750509 106.506732C52.210106 296.342312 19.618826 396.581294 19.618826 501.596046c0 66.5016 13.031804 131.033335 38.734186 191.800327 24.818245 58.677401 60.340273 111.367437 105.58064 156.606781 45.240367 45.240367 97.930403 80.763418 156.607804 105.581664 60.766992 25.701358 125.297704 38.734186 191.800327 38.734186 66.502623 0 131.033335-13.031804 191.800327-38.734186 58.677401-24.818245 111.366414-60.341297 156.606781-105.581664 45.240367-45.239344 80.762395-97.92938 105.581664-156.606781 25.701358-60.766992 38.734186-125.297704 38.734186-191.800327C1005.062695 396.463614 972.403878 296.133557 910.617673 211.45497z" fill="#ffffff" p-id="3463"></path><path d="M509.270842 388.009058 509.270842 388.009058c20.261463 0 36.839023-16.57756 36.839023-36.839023L546.109866 75.454506c0-20.261463-16.57756-36.839023-36.839023-36.839023l0 0c-20.261463 0-36.839023 16.57756-36.839023 36.839023l0 275.715529C472.431819 371.431497 489.00938 388.009058 509.270842 388.009058z" fill="#ffffff" p-id="3464"></path></svg>
\ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1673321301365" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3462" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M910.617673 211.45497c-29.726022-40.739866-65.373916-76.582189-105.953124-106.533338-31.447223-23.211654-65.346287-42.500976-101.132328-57.574277-17.797341-7.496741-38.217417 1.723248-44.400233 20.018939l0 0c-5.586229 16.531512 2.569522 34.533514 18.648732 41.309848 30.91408 13.027711 60.204174 29.700439 87.38421 49.761334 35.128055 25.927509 65.986877 56.9562 91.719958 92.223425 53.42477 73.218582 81.662905 159.989831 81.662905 250.935146 0 57.551764-11.264555 113.364931-33.480532 165.888168-21.464871 50.748824-52.199872 96.333022-91.352591 135.484717-39.152718 39.153742-84.736916 69.888743-135.484717 91.352591-52.523237 22.215978-108.336404 33.480532-165.888168 33.480532-57.552787 0-113.364931-11.264555-165.889191-33.480532-50.748824-21.464871-96.331999-52.199872-135.484717-91.352591-39.152718-39.152718-69.888743-84.736916-91.353614-135.484717-22.214954-52.523237-33.479509-108.336404-33.479509-165.888168 0-90.842984 28.180829-177.536462 81.495082-250.706949 25.681916-35.244712 56.481386-66.265216 91.545996-92.199888 27.118638-20.056801 56.344263-36.737716 87.192851-49.78794 16.072047-6.798846 24.204262-24.812105 18.594497-41.336454l0 0c-6.207375-18.285458-26.638707-27.478841-44.424792-19.958564-35.712363 15.098883-69.537749 34.399461-100.915387 57.607022-40.505529 29.958312-76.084862 65.791425-105.750509 106.506732C52.210106 296.342312 19.618826 396.581294 19.618826 501.596046c0 66.5016 13.031804 131.033335 38.734186 191.800327 24.818245 58.677401 60.340273 111.367437 105.58064 156.606781 45.240367 45.240367 97.930403 80.763418 156.607804 105.581664 60.766992 25.701358 125.297704 38.734186 191.800327 38.734186 66.502623 0 131.033335-13.031804 191.800327-38.734186 58.677401-24.818245 111.366414-60.341297 156.606781-105.581664 45.240367-45.239344 80.762395-97.92938 105.581664-156.606781 25.701358-60.766992 38.734186-125.297704 38.734186-191.800327C1005.062695 396.463614 972.403878 296.133557 910.617673 211.45497z" fill="#ffffff" p-id="3463"></path><path d="M509.270842 388.009058 509.270842 388.009058c20.261463 0 36.839023-16.57756 36.839023-36.839023L546.109866 75.454506c0-20.261463-16.57756-36.839023-36.839023-36.839023l0 0c-20.261463 0-36.839023 16.57756-36.839023 36.839023l0 275.715529C472.431819 371.431497 489.00938 388.009058 509.270842 388.009058z" p-id="3464"></path></svg>
\ No newline at end of file

 <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660118828860" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2768" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
 <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660118828860" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2768" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
-</style></defs><path d="M889.898667 98.730667c16.170667 0 29.269333 13.098667 29.269333 29.269333v719.232a114.602667 114.602667 0 0 1-114.602667 114.602667H128a71.936 71.936 0 0 1-71.936-71.936V213.333333A114.602667 114.602667 0 0 1 170.666667 98.730667z m-29.269334 58.496H170.666667c-30.976 0-56.064 25.173333-56.064 56.106666v676.565334c0 7.424 5.973333 13.397333 13.397333 13.397333h676.565333c30.976 0 56.064-25.088 56.064-56.064V157.226667zM597.333333 457.173333a146.304 146.304 0 0 1 134.826667 203.093334l68.693333 68.778666a29.269333 29.269333 0 0 1-37.717333 44.458667l-3.626667-3.114667-61.184-61.141333A146.304 146.304 0 1 1 597.333333 457.130667z m-219.434666 244.992a29.269333 29.269333 0 0 1 4.309333 58.197334l-4.266667 0.341333h-146.346666a29.269333 29.269333 0 0 1-4.266667-58.197333l4.266667-0.341334h146.346666zM597.333333 515.669333a87.765333 87.765333 0 1 0 0 175.530667 87.765333 87.765333 0 0 0 0-175.530667z m-219.434666 3.626667a29.269333 29.269333 0 0 1 4.309333 58.197333l-4.266667 0.341334h-146.346666a29.269333 29.269333 0 0 1-4.266667-58.197334l4.266667-0.341333h146.346666zM743.68 299.946667a29.269333 29.269333 0 0 1 4.266667 58.197333l-4.266667 0.298667h-512a29.269333 29.269333 0 0 1-4.352-58.197334l4.352-0.298666h512z" fill="#ffffff" p-id="2769"></path></svg>
\ No newline at end of file
+</style></defs><path d="M889.898667 98.730667c16.170667 0 29.269333 13.098667 29.269333 29.269333v719.232a114.602667 114.602667 0 0 1-114.602667 114.602667H128a71.936 71.936 0 0 1-71.936-71.936V213.333333A114.602667 114.602667 0 0 1 170.666667 98.730667z m-29.269334 58.496H170.666667c-30.976 0-56.064 25.173333-56.064 56.106666v676.565334c0 7.424 5.973333 13.397333 13.397333 13.397333h676.565333c30.976 0 56.064-25.088 56.064-56.064V157.226667zM597.333333 457.173333a146.304 146.304 0 0 1 134.826667 203.093334l68.693333 68.778666a29.269333 29.269333 0 0 1-37.717333 44.458667l-3.626667-3.114667-61.184-61.141333A146.304 146.304 0 1 1 597.333333 457.130667z m-219.434666 244.992a29.269333 29.269333 0 0 1 4.309333 58.197334l-4.266667 0.341333h-146.346666a29.269333 29.269333 0 0 1-4.266667-58.197333l4.266667-0.341334h146.346666zM597.333333 515.669333a87.765333 87.765333 0 1 0 0 175.530667 87.765333 87.765333 0 0 0 0-175.530667z m-219.434666 3.626667a29.269333 29.269333 0 0 1 4.309333 58.197333l-4.266667 0.341334h-146.346666a29.269333 29.269333 0 0 1-4.266667-58.197334l4.266667-0.341333h146.346666zM743.68 299.946667a29.269333 29.269333 0 0 1 4.266667 58.197333l-4.266667 0.298667h-512a29.269333 29.269333 0 0 1-4.352-58.197334l4.352-0.298666h512z" p-id="2769"></path></svg>
\ No newline at end of file

 <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660118877999" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2952" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
 <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660118877999" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2952" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
-</style></defs><path d="M779.008 56.064c14.72 0 26.88 10.837333 28.970667 24.96l0.298666 4.309333v692.181334c0 14.72-10.837333 26.88-24.917333 28.970666l-4.352 0.298667H229.632a29.269333 29.269333 0 0 1-4.352-58.197333l4.352-0.298667 520.106667-0.042667V114.56H170.666667c-29.013333 0-52.906667 22.101333-55.808 50.346667L114.602667 170.666667l-0.042667 689.962666H810.666667c29.013333 0 52.906667-22.058667 55.808-50.346666l0.256-5.717334V262.528a29.269333 29.269333 0 0 1 58.197333-4.309333l0.341333 4.309333v542.037333a114.602667 114.602667 0 0 1-107.349333 114.346667l-7.253333 0.256H85.333333a29.269333 29.269333 0 0 1-28.928-24.96l-0.341333-4.266667V170.666667A114.602667 114.602667 0 0 1 163.413333 56.32L170.666667 56.064h608.341333z m-236.544 219.434667c10.112 0 19.456 5.205333 24.832 13.738666l91.434667 146.304a29.269333 29.269333 0 0 1 0 31.018667l-91.434667 146.261333a29.269333 29.269333 0 0 1-24.832 13.781334H359.68a29.269333 29.269333 0 0 1-24.832-13.781334l-91.434667-146.261333a29.269333 29.269333 0 0 1 0-31.018667l91.434667-146.304a29.269333 29.269333 0 0 1 24.832-13.738666z m-16.213333 58.496H375.893333l-73.173333 117.034666 73.173333 117.034667h150.357334l73.173333-117.034667-73.173333-117.034666z" fill="#ffffff" p-id="2953"></path></svg>
\ No newline at end of file
+</style></defs><path d="M779.008 56.064c14.72 0 26.88 10.837333 28.970667 24.96l0.298666 4.309333v692.181334c0 14.72-10.837333 26.88-24.917333 28.970666l-4.352 0.298667H229.632a29.269333 29.269333 0 0 1-4.352-58.197333l4.352-0.298667 520.106667-0.042667V114.56H170.666667c-29.013333 0-52.906667 22.101333-55.808 50.346667L114.602667 170.666667l-0.042667 689.962666H810.666667c29.013333 0 52.906667-22.058667 55.808-50.346666l0.256-5.717334V262.528a29.269333 29.269333 0 0 1 58.197333-4.309333l0.341333 4.309333v542.037333a114.602667 114.602667 0 0 1-107.349333 114.346667l-7.253333 0.256H85.333333a29.269333 29.269333 0 0 1-28.928-24.96l-0.341333-4.266667V170.666667A114.602667 114.602667 0 0 1 163.413333 56.32L170.666667 56.064h608.341333z m-236.544 219.434667c10.112 0 19.456 5.205333 24.832 13.738666l91.434667 146.304a29.269333 29.269333 0 0 1 0 31.018667l-91.434667 146.261333a29.269333 29.269333 0 0 1-24.832 13.781334H359.68a29.269333 29.269333 0 0 1-24.832-13.781334l-91.434667-146.261333a29.269333 29.269333 0 0 1 0-31.018667l91.434667-146.304a29.269333 29.269333 0 0 1 24.832-13.738666z m-16.213333 58.496H375.893333l-73.173333 117.034666 73.173333 117.034667h150.357334l73.173333-117.034667-73.173333-117.034666z" p-id="2953"></path></svg>
\ No newline at end of file

@@ -45,6 +45,7 @@ export default {
         .then((res) => {
         .then((res) => {
           sessionStorage.removeItem("token");
           sessionStorage.removeItem("token");
           this.$store.dispatch("user/resetState");
           this.$store.dispatch("user/resetState");
+          this.$store.dispatch("permission/resetRoutes");
           this.$router.replace({
           this.$router.replace({
             path: "/jg",
             path: "/jg",
             query: {
             query: {
@@ -54,17 +55,12 @@ export default {
         })
         })
         .catch((error) => {
         .catch((error) => {
           // console.dir(error);
           // console.dir(error);
-        });
-    },
-  },
+        })
+    }
+  }
 };
 };
 </script>
 </script>
 <style lang="scss" scoped>
 <style lang="scss" scoped>
-/deep/.el-menu--horizontal {
-  display: flex;
-  align-items: center;
-}
-
 .menubg {
 .menubg {
   height: 34px;
   height: 34px;
   width: 130px !important;
   width: 130px !important;
@@ -101,6 +97,7 @@ export default {
   display: flex;
   display: flex;
   justify-content: space-between;
   justify-content: space-between;
   width: 100%;
   width: 100%;
+  background: transparent !important;
 }
 }
 
 
 /deep/.el-menu-item {
 /deep/.el-menu-item {

@@ -36,10 +36,4 @@ export default {
     }
     }
   }
   }
 }
 }
-</script>
-<style scoped lang="scss">
-.el-menu--horizontal {
-  display: flex;
-  background: none !important;
-}
-</style>
+</script>
\ No newline at end of file

 <!--
 <!--
  * @Author: xiaomiao 1158771342@qq.com
  * @Author: xiaomiao 1158771342@qq.com
  * @Date: 2023-01-10 09:03:06
  * @Date: 2023-01-10 09:03:06
- * @LastEditors: xiaomiao 1158771342@qq.com
- * @LastEditTime: 2023-03-08 10:45:43
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2023-03-22 10:43:26
  * @FilePath: \监管系统\js-web-jianguan\src\layout\components\Sidebar\sidebarRight.vue
  * @FilePath: \监管系统\js-web-jianguan\src\layout\components\Sidebar\sidebarRight.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 -->
@@ -17,59 +17,29 @@
 </template>
 </template>
 
 
 <script>
 <script>
-  import { mapGetters } from 'vuex'
-  import Logo from './Logo'
-  import SidebarItem from './SidebarItem'
-  import variables from '@/styles/variables.scss'
-  import { asyncRoutes } from '@/router'
-  export default {
-    components: { SidebarItem, Logo },
-    computed: {
-      ...mapGetters(['permission_routes', 'sidebar']),
-      activeMenu () {
-        const route = this.$route
-        const { meta, path } = route
-        if (meta.activeMenu) {
-          return meta.activeMenu
-        }
-        return path
-      },
-      variables () {
-        return variables
-      },
-      asyncRoutes () {
-        return asyncRoutes.slice(3, 6)
+import { mapGetters } from 'vuex'
+import Logo from './Logo'
+import SidebarItem from './SidebarItem'
+import variables from '@/styles/variables.scss'
+import { asyncRoutes } from '@/router'
+export default {
+  components: { SidebarItem, Logo },
+  computed: {
+    ...mapGetters(['permission_routes', 'sidebar']),
+    activeMenu () {
+      const route = this.$route
+      const { meta, path } = route
+      if (meta.activeMenu) {
+        return meta.activeMenu
       }
       }
+      return path
+    },
+    variables () {
+      return variables
+    },
+    asyncRoutes () {
+      return asyncRoutes.slice(3, 6)
     }
     }
   }
   }
+}
 </script>
 </script>
-<style scoped lang="scss">
-  .el-menu--horizontal {
-    display: flex;
-    background: none !important;
-  }
-
-  /deep/.el-menu-item:hover {
-    background: none;
-    font-weight: 700;
-    color: #fff !important;
-  }
-
-  /deep/.el-submenu__title {
-    color: #fff;
-    font-size: 18px;
-  }
-
-  /deep/.el-submenu__title:hover {
-    background: none;
-    font-weight: 700;
-    font-size: 20px;
-  }
-
-  /deep/.el-menu--horizontal .el-menu-item:not(.is-disabled):focus {
-    background: none;
-    color: #fff;
-    font-size: 20px;
-    font-weight: 700 !important;
-  }
-</style>

 <!--
 <!--
  * @Description: 
  * @Description: 
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-03-20 16:35:09
+ * @LastEditTime: 2023-03-22 10:23:46
 -->
 -->
 <template>
 <template>
-  <section class="app-main">
+  <section>
     <transition name="fade-transform" mode="out-in">
     <transition name="fade-transform" mode="out-in">
       <router-view />
       <router-view />
     </transition>
     </transition>
@@ -20,14 +20,3 @@ export default {
   }
   }
 }
 }
 </script>
 </script>
-<style lang="scss" scoped>
-.app-main {
-  height: calc(100vh - 74px);
-  overflow-x: hidden;
-  box-sizing: border-box;
-  flex: 1;
-  width: 100%;
-  background: #EFF0F4;
-  padding: 15px;
-}
-</style>

@@ -7,14 +7,12 @@
       </div>
       </div>
       <div class="right-menu">
       <div class="right-menu">
         <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover" @command="handleCommand">
         <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover" @command="handleCommand">
-          <div class="avatar-wrapper">
-            <span style="padding-right:10px">{{ name }}</span>
-            <img :src="avatar + '?imageView2/1/w/80/h/80'" class="user-avatar" />
+          <div class="user">
+            {{ userName }}
+            <span @click="onCancel">
+              <i class="el-icon-switch-button"></i>
+            </span>
           </div>
           </div>
-          <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="a">个人中心</el-dropdown-item>
-            <el-dropdown-item command="b">退出</el-dropdown-item>
-          </el-dropdown-menu>
         </el-dropdown>
         </el-dropdown>
       </div>
       </div>
     </div>
     </div>
@@ -23,17 +21,15 @@
 <script>
 <script>
 import { mapGetters } from 'vuex'
 import { mapGetters } from 'vuex'
 import Breadcrumb from './Breadcrumb'
 import Breadcrumb from './Breadcrumb'
-import defaultSettings from '@/settings'
+import { logout } from "@/api/login.js";
 export default {
 export default {
   components: {
   components: {
     Breadcrumb
     Breadcrumb
   },
   },
   computed: {
   computed: {
-    ...mapGetters(['sidebar', 'avatar', 'name'])
-  },
-  data () {
-    return {
-      title: defaultSettings.title
+    ...mapGetters(["sidebar", "dicData", "userInfo"]),
+    userName () {
+      return this.userInfo ? this.userInfo.name : ""
     }
     }
   },
   },
   methods: {
   methods: {
@@ -44,11 +40,22 @@ export default {
     themeChange (val) {
     themeChange (val) {
       this.$store.dispatch('app/updateTheme', val)
       this.$store.dispatch('app/updateTheme', val)
     },
     },
-    handleCommand (command) {
-      if (command == 'a') {
-      } else {
-
-      }
+    onCancel () {
+      logout()
+        .then((res) => {
+          sessionStorage.removeItem("token");
+          this.$store.dispatch("user/resetState");
+          this.$store.dispatch("permission/resetRoutes");
+          this.$router.replace({
+            path: "/sb",
+            query: {
+              redirect: this.$route.fullPath,
+            },
+          });
+        })
+        .catch((error) => {
+          // console.dir(error);
+        })
     }
     }
   }
   }
 }
 }
@@ -64,6 +71,7 @@ export default {
     font-size: 26px;
     font-size: 26px;
     font-weight: 700;
     font-weight: 700;
     display: flex;
     display: flex;
+    margin-left: 15px;
 
 
     img {
     img {
       width: 47px;
       width: 47px;
@@ -78,50 +86,11 @@ export default {
   }
   }
 }
 }
 
 
-.NoticeBar {
-  position: absolute;
-  bottom: 0;
-}
-
-.el-dropdown-menu {
-  padding: 0 !important;
-  border: 1px solid #ebeef5;
-  box-shadow: 0 2px 10px 0 rgba(0, 0, 0, 0.12);
-  border-radius: 4px 0 0 4px 4px;
-
-  .el-dropdown-menu__item {
-    text-align: center;
-    margin-top: 0 !important;
-    font-size: 14px;
-    font-weight: 400;
-    color: #4a4a4a;
-    width: 140px;
-    height: 36px;
-    line-height: 36px;
-  }
-
-  .el-dropdown-menu__item:nth-child(6) {
-    border-top: 1px solid #ebeef5;
-  }
-
-  .popper__arrow {
-    top: -11px !important;
-    left: 110px !important;
-    transform: rotate(0deg) scale(2);
-  }
-
-  .el-dropdown-menu__item:not(.is-disabled):hover,
-  .el-dropdown-menu__item:focus {
-    background: #f6f7f9;
-    color: #4a4a4a;
-  }
-}
-
 .navbar {
 .navbar {
   height: $headerHeight;
   height: $headerHeight;
   overflow: hidden;
   overflow: hidden;
   position: relative;
   position: relative;
-  @include background_color("navbg");
+  @include background("navbg");
 
 
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
@@ -132,117 +101,12 @@ export default {
     width: 300px;
     width: 300px;
   }
   }
 
 
-  .backdrop {
-    flex: 1;
-    width: 60%;
-    background-size: 100% 100%;
-    height: $headerHeight;
-    display: flex;
-    align-items: center;
-  }
-
-  .hamburger-container {
-    line-height: 43px;
-    height: 100%;
-    float: left;
-    cursor: pointer;
-    transition: background 0.3s;
-    -webkit-tap-highlight-color: transparent;
-
-    &:hover {
-      background: rgba(0, 0, 0, 0.025);
-    }
-  }
-
-  .breadcrumb-container {
-    float: left;
-  }
-
-  .right-menu {
-    float: right;
-    height: 100%;
-    line-height: 50px;
-    display: flex;
-    align-items: center;
-
-    .function {
-      margin: 0 15px;
-      cursor: pointer;
-    }
-
-    .shutdown {
-      font-size: 20px;
-      margin-left: 15px;
-      cursor: pointer;
-    }
-
-    .organization-item {
-      margin-right: 40px;
-      margin-top: -40px !important;
-    }
-
-    .item {
-      margin-right: 40px;
-      margin-top: -20px;
-      line-height: 18.4px;
+  .right-menu-item {
+    &.hover-effect {
       cursor: pointer;
       cursor: pointer;
-      position: relative;
-
-      .item-box {
-        position: absolute;
-        top: -5px;
-        left: 3px;
-        width: 100%;
-        min-width: 25px;
-        height: 25px;
-        cursor: pointer;
-        z-index: 100;
-      }
-    }
-
-    &:focus {
-      outline: none;
-    }
-
-    .right-menu-item {
-      display: inline-block;
-      height: 100%;
-      font-size: 18px;
-      color: #fff;
-      vertical-align: text-bottom;
-
-      &.hover-effect {
-        cursor: pointer;
-        transition: background 0.3s;
-        display: flex;
-        align-items: center;
-
-        &:hover {
-          background: rgba(0, 0, 0, 0.025);
-        }
-      }
-    }
-
-    .avatar-wrapper {
-      position: relative;
+      transition: background 0.3s;
       display: flex;
       display: flex;
-      height: 40px;
       align-items: center;
       align-items: center;
-
-      .user-avatar {
-        cursor: pointer;
-        width: 35px;
-        height: 35px;
-        border-radius: 50%;
-      }
-
-      .el-icon-caret-bottom {
-        cursor: pointer;
-        position: absolute;
-        right: -15px;
-        top: 17px;
-        font-size: 12px;
-      }
     }
     }
   }
   }
 }
 }

+<!--
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-03-22 11:19:04
+-->
 <script>
 <script>
 export default {
 export default {
   name: 'MenuItem',
   name: 'MenuItem',
@@ -31,11 +36,3 @@ export default {
   }
   }
 }
 }
 </script>
 </script>
-
-<style scoped>
-.sub-el-icon {
-  color: currentColor;
-  width: 1em;
-  height: 1em;
-}
-</style>

@@ -35,7 +35,7 @@ export default {
   },
   },
   computed: {
   computed: {
     visitedViews () {
     visitedViews () {
-      return this.$store.state.tagsView.visitedViews
+      return this.$store.state.tagsView.visitedViews.slice(1)
     },
     },
     routes () {
     routes () {
       return this.$store.state.permission.routes
       return this.$store.state.permission.routes
@@ -199,7 +199,7 @@ export default {
   box-sizing: border-box;
   box-sizing: border-box;
   padding-top: 3px;
   padding-top: 3px;
   box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
   box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
-
+  margin-bottom: 5px;
   .tags-view-wrapper {
   .tags-view-wrapper {
     .tags-view-item {
     .tags-view-item {
       display: inline-block;
       display: inline-block;

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-03-20 16:05:15
+ * @LastEditTime: 2023-03-23 09:21:00
 -->
 -->
 <template>
 <template>
   <div class="app-wrapper">
   <div class="app-wrapper">
     <navbar />
     <navbar />
     <div class="main-container">
     <div class="main-container">
       <sidebar class="sidebar-container" />
       <sidebar class="sidebar-container" />
-      <app-main />
+      <div class="app-main">
+        <tags-view v-if="needTagsView" />
+        <app-main />
+      </div>
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>
@@ -37,6 +40,17 @@ export default {
   }
   }
 }
 }
 </script>
 </script>
+<style lang="scss" scoped>
+.app-main {
+  height: calc(100vh - 74px);
+  overflow-x: hidden;
+  box-sizing: border-box;
+  flex: 1;
+  width: 100%;
+  background: #EAEBF0;
+  padding: 10px;
+}
+</style>
 <style lang="scss">
 <style lang="scss">
 @import "~@/styles/mixin.scss";
 @import "~@/styles/mixin.scss";
 @import "~@/styles/sbSidebar.scss";
 @import "~@/styles/sbSidebar.scss";
@@ -69,9 +83,4 @@ export default {
   width: 100%;
   width: 100%;
   transition: width 0.28s;
   transition: width 0.28s;
 }
 }
-
-.el-dropdown-menu--small {
-  padding: 0;
-  width: 5px;
-}
 </style>
 </style>

@@ -2,7 +2,7 @@
  * @Author: yangwei
  * @Author: yangwei
  * @Date: 2023-01-16 09:10:12
  * @Date: 2023-01-16 09:10:12
  * @LastEditors: Please set LastEditors
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2023-03-21 14:15:40
+ * @LastEditTime: 2023-03-21 15:00:04
  * @FilePath: \bdcjg-web\src\main.js
  * @FilePath: \bdcjg-web\src\main.js
  * @Description: 
  * @Description: 
  * 
  * 
@@ -51,7 +51,7 @@ Vue.directive('fo', {
 import './image/icons' // icon
 import './image/icons' // icon
 import store from './store'
 import store from './store'
 import router from './router'
 import router from './router'
-import _, { set } from 'lodash'
+import _ from 'lodash'
 Vue.use(Element, { size: 'small', zIndex: 1000 })
 Vue.use(Element, { size: 'small', zIndex: 1000 })
 Vue.use(Base)
 Vue.use(Base)
 Vue.component('icon', Icon);
 Vue.component('icon', Icon);
@@ -60,16 +60,12 @@ Vue.use(dataV)
 axios.get("./config.json")
 axios.get("./config.json")
     .then((res) => {
     .then((res) => {
         Vue.prototype.BASE_API = res.data
         Vue.prototype.BASE_API = res.data
+        localStorage.setItem('ApiUrl', JSON.stringify(res.data));
         require('./permission')
         require('./permission')
-
-        setTimeout(() => {
-            new Vue({
-                el: '#app',
-                router,
-                store,
-                render: h => h(App)
-            })
-        }, 20)
-
-    })
-
+        new Vue({
+            el: '#app',
+            router,
+            store,
+            render: h => h(App)
+        })
+    })
\ No newline at end of file

@@ -16,7 +16,7 @@ let mixin = {
   computed: {
   computed: {
     ...mapGetters(['dicData'])
     ...mapGetters(['dicData'])
   },
   },
-  created () {
+  mounted () {
     this.handleSearch()
     this.handleSearch()
   },
   },
   methods: {
   methods: {

@@ -33,7 +33,7 @@ export const constantRoutes = [
   {
   {
     path: '/',
     path: '/',
     component: Layout,
     component: Layout,
-    redirect: '/home',
+    redirect: '/jg',
     meta: { title: '首页' },
     meta: { title: '首页' },
     children: [
     children: [
       {
       {
@@ -59,7 +59,7 @@ export const asyncRoutes = [
         path: 'index',
         path: 'index',
         component: () => import('@/views/jsbwcx/index'),
         component: () => import('@/views/jsbwcx/index'),
         name: 'jsbwcx',
         name: 'jsbwcx',
-        meta: { title: '接收报文查询', icon: 'zsgl' }
+        meta: { title: '区县接入', icon: 'zsgl' }
       }
       }
     ]
     ]
   },
   },

@@ -2,13 +2,13 @@
  * @Author: xiaomiao 1158771342@qq.com
  * @Author: xiaomiao 1158771342@qq.com
  * @Date: 2023-03-09 15:24:53
  * @Date: 2023-03-09 15:24:53
  * @LastEditors: Please set LastEditors
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2023-03-21 14:05:43
+ * @LastEditTime: 2023-03-23 10:19:35
  * @FilePath: \上报\bdcjg-web\src\store\modules\permission.js
  * @FilePath: \上报\bdcjg-web\src\store\modules\permission.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
  */
 import Vue from 'vue'
 import Vue from 'vue'
 import { constantRoutes } from '@/router'
 import { constantRoutes } from '@/router'
-import asyncRouter from '@/utils/asyncRouter.js'
+// import asyncRouter from '@/utils/asyncRouter.js'
 const state = {
 const state = {
   routes: [],
   routes: [],
   addRoutes: false,
   addRoutes: false,
@@ -26,6 +26,39 @@ const mutations = {
 const actions = {
 const actions = {
   // 添加全部菜单
   // 添加全部菜单
   generateRoutes ({ commit }, getMenuInfo) {
   generateRoutes ({ commit }, getMenuInfo) {
+    let Layout;
+    if (Vue.prototype.BASE_API.THEME == 'sb') {
+      Layout = r => require.ensure([], () => r(require(`@/layout1`)))
+    } else {
+      Layout = r => require.ensure([], () => r(require(`@/layout`)))
+    }
+    function asyncRouter (routers) {
+      routers.forEach(item => {
+        if (!item.children) {
+          delete item.children
+        } else {
+          item.children = asyncRouter(item.children)
+        }
+        item.path = JSON.parse(item.metadata)?.path || '/'
+        item.affix = JSON.parse(item.metadata)?.affix || false
+        if (!item.parentId) {
+          item.component = Layout
+        } else {
+          item.component = loadView(item.uri)
+        }
+        item.meta = {
+          title: item.name,
+          icon: item.icon,
+          affix: item.affix
+        }
+      })
+      return routers
+    }
+    function loadView (view) {
+      return r => require.ensure([], () => r(require(`@/views${view}.vue`)))
+    }
+
+
     return new Promise(resolve => {
     return new Promise(resolve => {
       // 将权限菜单数组转成路由树数据结构
       // 将权限菜单数组转成路由树数据结构
       let permission_tree = asyncRouter(getMenuInfo)
       let permission_tree = asyncRouter(getMenuInfo)

 $themes: (blue: ( //背景
 $themes: (blue: ( //背景
-    navbg: #3D59C4,
-    menuBg: #121F41,
-    menuActive: linear-gradient(90deg, rgba(61,90,198,0.7) 0%, rgba(61,90,198,0) 100%),
-     //字体
-     menuText: #A1A7C2,
-     menuActiveText: #FFFFFF
-    ),
+    navbg: linear-gradient(270deg, #EBF1FF 0%, #3D59C4 100%),
+    menuBg: #F0F3FC,
+    menuActive: #DFE7F7,
+    //字体
+    menuText: #6D7278,
+    menuActiveText: #4162D8,
+    // 没有子集
+    submenuBg: #3D59C4,
+    submenuColor: #FFFFFF
+  ),
 
 
   green: (
   green: (
     navbg: #0F8B80,
     navbg: #0F8B80,
     menuBg:#121A2E,
     menuBg:#121A2E,
     menuActive: linear-gradient(90deg, rgba(61,90,198,0.7) 0%, rgba(61,90,198,0) 100%),
     menuActive: linear-gradient(90deg, rgba(61,90,198,0.7) 0%, rgba(61,90,198,0) 100%),
-     //字体
-     menuText: #A1A7C2,
-     menuActiveText: #FFFFFF
+    //字体
+    menuText: #A1A7C2,
+    menuActiveText: #FFFFFF
   )
   )
 )
 )
\ No newline at end of file

-.dialogBox {
-  overflow: hidden;
-  background: url("~@/image/dialogBg.png") no-repeat !important;
-  background-size: 100% 100% !important;
-  // min-height: 90vh;
 
 
-  .dialog_title {
-    display: flex;
-    position: relative;
-    font-size: 22px;
-    top: -10px;
-    width: 38%;
-    height: 40px;
-    margin-left: 28px;
-    justify-content: center;
-    white-space: nowrap;
-
-    b {
-      font-weight: 200;
-      display: inline-block;
-      position: relative;
-      font-size: 24px;
-      top: -11px;
-      width: 38%;
-      height: 40px;
-      margin-left: 28px;
-      // @include flex-center;
-      display: flex;
-      justify-content: center;
-    }
-  }
-
-  .dialog_full {
-    position: absolute;
-    top: 0;
-    right: 30px;
-  }
-
-  .el-dialog__body {
-    max-height: 88vh;
-    overflow-x: hidden;
-    overflow-y: hidden;
-  }
-
-  .dialog_footer {
-    margin-bottom: 8px;
-    @include flex-center;
-  }
-
-  .dialogBox-content {
-    height: auto
-  }
-
-  .editDialogBox-box {
-    background: #031A46;
-    box-shadow: inset 0px 0px 12px 0px #02D9FD;
-    border-radius: 2px;
-    border: 1px solid #6BC1FC;
-    margin: 0 18px 10px 18px;
-  }
-}
-
-.item-content-input {
-  /deep/.el-input__inner {
-    border: none !important;
-    text-align: right;
-  }
-}
-
-.regularHeight {
-  display: flex;
-  flex-direction: column;
-  height: 87vh;
-
-  .editDialogBox-con,
-  .JsonEditor {
-    flex: 1;
-    height: 100%;
-  }
-}
-
-.dialog-from {
-  padding: 13px;
-  border-radius: 2px;
-  box-sizing: border-box;
-
-  .el-row {
-    display: flex;
-    flex-wrap: nowrap;
-  }
-
-  .el-col {
-    line-height: 18px;
-    display: flex;
-    align-items: center;
-    margin-bottom: 3px;
-    color: #B5D6DC;
-    border-radius: 2px;
-    border: 1px solid #224C7C;
-
-    span {
-      display: inline-block;
-      padding: 3px;
-      border-radius: 3px;
-      overflow: hidden;
-      white-space: nowrap;
-      text-align: left;
-      color: #02D9FD;
-    }
-
-    p {
-      flex: 1;
-      width: 100%;
-      padding-left: 5px;
-      line-height: 20px;
-      color: #c0c4cc;
-      cursor: not-allowed;
-      white-space: nowrap;
-      margin-right: 5px;
-      text-align: right;
-    }
-  }
-}
-
-/deep/.el-textarea__inner {
-  border: 1px solid #224C7C;
-  margin: 0 0 10px 0 !important;
-  width: 100% !important;
-  color: #dadde3 !important;
-  background: transparent !important;
-}
-
-/deep/.el-input__inner {
-  border: 1px solid #224C7C !important;
-  margin: 0 !important;
-  width: 100% !important;
-  color: #dadde3 !important;
-  background: transparent !important;
-}
-
-.dialog_title {
-  @include flex;
-  justify-content: space-between;
-  width: 100%;
-}
-
-.el-dialog__header {
-  color: #FFFFFF;
-  height: 46px !important;
-  width: 97%;
-  margin: 0 auto;
-  margin-top: 2px;
-}
-
-.el-dialog__body {
-  padding-top: 0;
-  padding-bottom: 0;
-  // height: 95vh;
-}
-
-.el-dialog__headerbtn {
-  width: 42px;
-  height: 20px;
-  background: url("~@/image/closebg.png") no-repeat;
-  background-size: 100% 100%;
-  right: 40px;
-  top: 33px;
-
-  &:hover {
-    box-shadow: inset 0px 0px 12px 0px #02D9FD;
-  }
-}
-
-.el-dialog__close {
-  font-size: 0;
-}
-
-.el-form-item {
-  @include flex;
-  width: 100%;
-}
-
-.el-dialog__wrapper {
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-}
-
-.contentCenter {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(calc(-50% + 85px), -50%);
-}
-
-.mainCenter {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-
-  // 展开收起按钮位置
-  .el-input__suffix {
-    right: 10px;
-  }
-}
\ No newline at end of file

 @import '~@/styles/jgElement-ui.scss';
 @import '~@/styles/jgElement-ui.scss';
 
 
+.el-menu--horizontal {
+  display: flex;
+  background: none !important;
+}
+
 .tableClass {
 .tableClass {
   .el-table {
   .el-table {
     border: none !important;
     border: none !important;
@@ -79,6 +84,15 @@
     }
     }
   }
   }
 
 
+  .el-dialog__close {
+    font-size: 0;
+  }
+
+  .el-form-item {
+    display: flex;
+    width: 100%;
+  }
+
   .advanced-search {
   .advanced-search {
     display: flex;
     display: flex;
     font-size: 12px;
     font-size: 12px;
@@ -240,12 +254,6 @@
     color: #fff;
     color: #fff;
   }
   }
 
 
-  .el-dialog__headerbtn {
-    position: absolute;
-    top: 22px;
-    right: 30px;
-  }
-
   .el-dialog__header {
   .el-dialog__header {
     text-align: center;
     text-align: center;
     margin-bottom: 10px;
     margin-bottom: 10px;
@@ -424,6 +432,7 @@
       width: 100%;
       width: 100%;
       border-bottom: 1px solid #ccc;
       border-bottom: 1px solid #ccc;
     }
     }
+
   }
   }
 
 
   .el-dialog__wrapper {
   .el-dialog__wrapper {
@@ -552,3 +561,203 @@
   background-size: cover;
   background-size: cover;
   color: white;
   color: white;
 }
 }
+
+// 监管弹框样式
+.dialogBox {
+  overflow: hidden;
+  background: url("~@/image/dialogBg.png") no-repeat !important;
+  background-size: 100% 100% !important;
+  // min-height: 90vh;
+
+  .dialog_title {
+    display: flex;
+    position: relative;
+    font-size: 22px;
+    top: -10px;
+    width: 38%;
+    height: 40px;
+    margin-left: 28px;
+    justify-content: center;
+    white-space: nowrap;
+
+    b {
+      font-weight: 200;
+      display: inline-block;
+      position: relative;
+      font-size: 24px;
+      top: -11px;
+      width: 38%;
+      height: 40px;
+      margin-left: 28px;
+      // @include flex-center;
+      display: flex;
+      justify-content: center;
+    }
+  }
+
+  .dialog_full {
+    position: absolute;
+    top: 0;
+    right: 30px;
+  }
+
+  .el-dialog__body {
+    max-height: 88vh;
+    overflow-x: hidden;
+    overflow-y: hidden;
+  }
+
+  .dialog_footer {
+    margin-bottom: 8px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .dialogBox-content {
+    height: auto
+  }
+
+  .editDialogBox-box {
+    background: #031A46;
+    box-shadow: inset 0px 0px 12px 0px #02D9FD;
+    border-radius: 2px;
+    border: 1px solid #6BC1FC;
+    margin: 0 18px 10px 18px;
+  }
+
+  .item-content-input {
+    /deep/.el-input__inner {
+      border: none !important;
+      text-align: right;
+    }
+  }
+
+  .regularHeight {
+    display: flex;
+    flex-direction: column;
+    height: 87vh;
+
+    .editDialogBox-con,
+    .JsonEditor {
+      flex: 1;
+      height: 100%;
+    }
+  }
+
+  .dialog-from {
+    padding: 13px;
+    border-radius: 2px;
+    box-sizing: border-box;
+
+    .el-row {
+      display: flex;
+      flex-wrap: nowrap;
+    }
+
+    .el-col {
+      line-height: 18px;
+      display: flex;
+      align-items: center;
+      margin-bottom: 3px;
+      color: #B5D6DC;
+      border-radius: 2px;
+      border: 1px solid #224C7C;
+
+      span {
+        display: inline-block;
+        padding: 3px;
+        border-radius: 3px;
+        overflow: hidden;
+        white-space: nowrap;
+        text-align: left;
+        color: #02D9FD;
+      }
+
+      p {
+        flex: 1;
+        width: 100%;
+        padding-left: 5px;
+        line-height: 20px;
+        color: #c0c4cc;
+        cursor: not-allowed;
+        white-space: nowrap;
+        margin-right: 5px;
+        text-align: right;
+      }
+    }
+
+  }
+
+  .el-textarea__inner {
+    border: 1px solid #224C7C;
+    margin: 0 0 10px 0 !important;
+    width: 100% !important;
+    color: #dadde3 !important;
+    background: transparent !important;
+  }
+
+  .el-input__inner {
+    border: 1px solid #224C7C !important;
+    margin: 0 !important;
+    width: 100% !important;
+    color: #dadde3 !important;
+    background: transparent !important;
+  }
+
+  .el-dialog__header {
+    color: #FFFFFF;
+    height: 46px !important;
+    width: 97%;
+    margin: 0 auto;
+    margin-top: 2px;
+  }
+
+  .el-dialog__body {
+    padding-top: 0;
+    padding-bottom: 0;
+    // height: 95vh;
+  }
+
+  .el-dialog__headerbtn {
+    width: 42px;
+    height: 20px;
+    background: url("~@/image/closebg.png") no-repeat;
+    background-size: 100% 100%;
+    right: 40px;
+    top: 33px;
+
+    &:hover {
+      box-shadow: inset 0px 0px 12px 0px #02D9FD;
+    }
+  }
+
+  .el-dialog__close {
+    font-size: 0;
+  }
+
+  .el-form-item {
+    display: flex;
+    width: 100%;
+  }
+
+}
+.contentCenter {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(calc(-50% + 85px), -50%);
+}
+
+.mainCenter {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+
+  // 展开收起按钮位置
+  .el-input__suffix {
+    right: 10px;
+  }
+}
+

@@ -198,10 +198,3 @@ input[type="number"] {
 .el-form-item__content {
 .el-form-item__content {
   flex: 1;
   flex: 1;
 }
 }
-
-.el-submenu__title {
-  .svg-icon {
-    position: relative;
-    top: 2px;
-  }
-}
\ No newline at end of file

@@ -6,11 +6,10 @@
   min-width: 1280px;
   min-width: 1280px;
   box-sizing: border-box;
   box-sizing: border-box;
   overflow-x: hidden;
   overflow-x: hidden;
-  padding: 2px;
 
 
   &-header {
   &-header {
     width: 100%;
     width: 100%;
-    padding: 5px 30px 20px 24px;
+    padding: 15px;
     box-sizing: border-box;
     box-sizing: border-box;
     background-size: 100% 100%;
     background-size: 100% 100%;
     background: #FFFFFF;
     background: #FFFFFF;
@@ -20,14 +19,21 @@
   &-content {
   &-content {
     width: 100%;
     width: 100%;
     box-sizing: border-box;
     box-sizing: border-box;
-    margin-top: 15px;
+    margin-top: 10px;
     background: #FFFFFF;
     background: #FFFFFF;
     border-radius: 4px;
     border-radius: 4px;
     background-size: 100% 100%;
     background-size: 100% 100%;
-    padding: 22px 42px 20px;
+    padding: 15px;
   }
   }
 
 
+  .el-dialog__close {
+    font-size: 0;
+  }
 
 
+  .el-form-item {
+    display: flex;
+    width: 100%;
+  }
 
 
   .el-form--inline .el-form-item {
   .el-form--inline .el-form-item {
     width: auto;
     width: auto;
@@ -135,4 +141,4 @@
   background-color: white;
   background-color: white;
   ;
   ;
   background-size: cover;
   background-size: cover;
-}
+}
\ No newline at end of file

@@ -8,7 +8,7 @@
 }
 }
 
 
 .el-form-item__content {
 .el-form-item__content {
-  margin-left: 0!important;
+  margin-left: 0 !important;
 }
 }
 
 
 .sidebar-container {
 .sidebar-container {
@@ -21,7 +21,9 @@
     transition: 0s width ease-in-out, 0s padding-left ease-in-out,
     transition: 0s width ease-in-out, 0s padding-left ease-in-out,
       0s padding-right ease-in-out;
       0s padding-right ease-in-out;
   }
   }
-
+  .el-scrollbar {
+    height: 100%;
+  }
   .scrollbar-wrapper {
   .scrollbar-wrapper {
     overflow-x: hidden !important;
     overflow-x: hidden !important;
     margin-right: 0 !important;
     margin-right: 0 !important;
@@ -49,6 +51,7 @@
   .el-menu {
   .el-menu {
     background-color: transparent !important;
     background-color: transparent !important;
     border: none;
     border: none;
+    @include font_color("menuText");
     height: 100%;
     height: 100%;
     width: 100% !important;
     width: 100% !important;
   }
   }
@@ -63,18 +66,17 @@
   .el-submenu__title {
   .el-submenu__title {
     padding-left: 10px !important;
     padding-left: 10px !important;
     @include font_color("menuText");
     @include font_color("menuText");
-    height: 42px;
-    background: linear-gradient(90deg, #013874 0%, #081B56 100%);
-    margin-bottom: 8px;
+    background-color: transparent !important;
 
 
     &:hover {
     &:hover {
       color: $subMenuActiveText !important;
       color: $subMenuActiveText !important;
-      background: linear-gradient(90deg, #1D66DC 0%, #081B56 100%);
+      @include font_color("submenuColor");
+      @include background_color("submenuBg");
 
 
       .svg-icon,
       .svg-icon,
       i,
       i,
       span {
       span {
-        color: $subMenuActiveText !important;
+        @include font_color("submenuColor");
       }
       }
     }
     }
   }
   }
@@ -83,11 +85,12 @@
   .submenu-title-noDropdown {
   .submenu-title-noDropdown {
     @include font_color("menuText");
     @include font_color("menuText");
     padding-left: 20px;
     padding-left: 20px;
-    margin-bottom: 8px;
+    height: 56px;
+    background-color: transparent !important;
 
 
     &:hover {
     &:hover {
-      @include font_color("menuActiveText");
-      @include background("menuActive");
+      @include font_color("submenuColor");
+      @include background_color("submenuBg");
 
 
       .svg-icon {
       .svg-icon {
         color: #1ea6f8 !important;
         color: #1ea6f8 !important;
@@ -101,8 +104,8 @@
 
 
   .submenu-title-noDropdown.is-active,
   .submenu-title-noDropdown.is-active,
   .el-submenu__title.is-active {
   .el-submenu__title.is-active {
-    @include background("menuActive");
-    @include font_color("menuActiveText");
+    @include background_color("submenuBg");
+    @include font_color("submenuColor");
 
 
     .svg-icon {
     .svg-icon {
       color: #1ea6f8 !important;
       color: #1ea6f8 !important;
@@ -118,7 +121,6 @@
     font-weight: 600;
     font-weight: 600;
     font-size: $sideBarFontSize;
     font-size: $sideBarFontSize;
 
 
-    // margin: 0 10px;
     >i {
     >i {
       color: $subMenuActiveText !important;
       color: $subMenuActiveText !important;
       transform: rotate(90deg);
       transform: rotate(90deg);
@@ -131,7 +133,7 @@
 
 
     .svg-icon {
     .svg-icon {
       font-size: 18px;
       font-size: 18px;
-      margin-top: -5px;
+      color: #6D7278 !important;
     }
     }
   }
   }
 
 
@@ -143,28 +145,25 @@
     -o-transform: rotateZ(0deg) !important;
     -o-transform: rotateZ(0deg) !important;
   }
   }
 
 
-  .is-active>.el-submenu__title {
-    color: #fff !important;
-  }
-
   & .nest-menu .el-submenu>.el-submenu__title,
   & .nest-menu .el-submenu>.el-submenu__title,
   & .el-submenu .el-menu-item {
   & .el-submenu .el-menu-item {
+
     &.is-active {
     &.is-active {
-      background-color: $subMenuHover !important;
-      color: $menuActiveText !important;
+      @include background_color("menuActive");
+      @include font_color("menuActiveText");
     }
     }
 
 
     &:hover {
     &:hover {
-      background-color: $subMenuHover !important;
+      @include background_color("menuActive");
+      @include font_color("menuActiveText");
       color: $menuActiveText !important;
       color: $menuActiveText !important;
     }
     }
 
 
     min-width: 130px !important;
     min-width: 130px !important;
     background-color: transparent !important;
     background-color: transparent !important;
     font-weight: 600;
     font-weight: 600;
+    @include font_color("menuText");
     font-size: $sideBarFontSize;
     font-size: $sideBarFontSize;
-    margin: 0 10px;
-    // border-radius: 6px;
   }
   }
 }
 }
 
 
@@ -278,12 +277,10 @@
     font-weight: 600 !important;
     font-weight: 600 !important;
     font-size: 15px !important;
     font-size: 15px !important;
     @include background("menuActive");
     @include background("menuActive");
-    // background-color: $menuHover !important;
-    color: $menuText !important;
+    @include font_color("menuText");
 
 
     &:hover {
     &:hover {
       @include background("menuActive");
       @include background("menuActive");
-      // background-color: $menuHover !important;
       opacity: .9;
       opacity: .9;
 
 
       .svg-icon,
       .svg-icon,
@@ -319,6 +316,19 @@
   }
   }
 }
 }
 
 
+.el-submenu.is-active .el-submenu__title {
+  @include background_color("submenuBg");
+  @include font_color("submenuColor");
+}
+
+.el-submenu.is-active .el-submenu__title:hover {
+  @include font_color("submenuColor");
+}
+
+.el-submenu.is-active .el-submenu__title .svg-icon {
+  @include font_color("submenuColor");
+}
+
 .el-submenu__title {
 .el-submenu__title {
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;

@@ -24,7 +24,7 @@ $menuHover: #1D66DC;
 $subMenuBg:#0D1230;
 $subMenuBg:#0D1230;
 $subMenuHover:#1D66DC;
 $subMenuHover:#1D66DC;
 
 
-$sideBarWidth: 210px;
+$sideBarWidth: 250px;
 $sideBarFontSize:15px;
 $sideBarFontSize:15px;
 
 
 // border颜色
 // border颜色

-/*
- * @Description: 
- * @Autor: renchao
- * @LastEditTime: 2023-03-21 14:27:07
- */
-import Vue from 'vue'
-import Layout from '@/layout1'
-const config = require('/public/config.json')
-console.log(config, 'Vue.2222222222222.BASE_API');
+
+var Layout;
+let ApiUrl = localStorage.getItem('ApiUrl')
+if (ApiUrl.THEME == 'sb') {
+  Layout = r => require.ensure([], () => r(require(`@/layout1`)))
+} else {
+  Layout = r => require.ensure([], () => r(require(`@/layout`)))
+}
+
 export default function filterAsyncRouter (routers) {
 export default function filterAsyncRouter (routers) {
   routers.forEach(item => {
   routers.forEach(item => {
     if (!item.children) {
     if (!item.children) {
@@ -19,6 +19,7 @@ export default function filterAsyncRouter (routers) {
       item.component = Layout
       item.component = Layout
     } else {
     } else {
       item.component = loadView(item.uri)
       item.component = loadView(item.uri)
+      console.log(item.component, 'item.componentitem.component');
     }
     }
     item.meta = {
     item.meta = {
       title: item.name,
       title: item.name,

 /*
 /*
- * @Description: 
+ * @Description: 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-03-21 13:46:56
- */
-/**
- * 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器
+ * @LastEditTime: 2023-03-21 15:03:37
  */
  */
 import axios from "axios";
 import axios from "axios";
 import { Message } from "element-ui";
 import { Message } from "element-ui";
@@ -17,6 +14,7 @@ const service = axios.create({
   headers: {
   headers: {
     "Content-Type": "application/json; charset=utf-8",
     "Content-Type": "application/json; charset=utf-8",
   },
   },
+
   timeout: 15000,
   timeout: 15000,
 });
 });
 
 

 <template>
 <template>
   <div class="Cfdj from-clues">
   <div class="Cfdj from-clues">
     <div class="from-clues-header">
     <div class="from-clues-header">
-      <el-form ref="form" :model="form" label-width="130px">
+      <el-form ref="form" :model="form" label-width="80px">
         <el-form-item>
         <el-form-item>
           <Breadcrumb />
           <Breadcrumb />
         </el-form-item>
         </el-form-item>
-        <el-row class="mb-5">
+        <el-row>
           <el-col :span="5">
           <el-col :span="5">
-            <el-form-item label="行政区" label-width="80px">
-              <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
+            <el-form-item label="行政区">
+              <el-select
+                v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM"
+                class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
@@ -23,30 +25,29 @@
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="5">
           <el-col :span="5">
-            <el-form-item label="权利人" label-width="80px">
+            <el-form-item label="权利人">
               <el-input v-model="form.QLR" clearable placeholder="权利人"></el-input>
               <el-input v-model="form.QLR" clearable placeholder="权利人"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="5">
           <el-col :span="5">
-            <el-form-item label="不动产单元号">
+            <el-form-item label="不动产单元号" label-width="103px">
               <el-input v-model="form.BDCDYH" clearable placeholder="不动产单元号"></el-input>
               <el-input v-model="form.BDCDYH" clearable placeholder="不动产单元号"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-
-        </el-row>
-        <el-row class="mt-10">
-          <el-col :span="5">
-            <el-form-item label="查封机关" label-width="80px">
+          <el-col :span="4">
+            <el-form-item label="查封机关">
               <el-input v-model="form.CFJG" clearable placeholder="查封机关"></el-input>
               <el-input v-model="form.CFJG" clearable placeholder="查封机关"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
+        </el-row>
+        <el-row class="mt-10">
           <el-col :span="5">
           <el-col :span="5">
             <el-form-item label="查封文号">
             <el-form-item label="查封文号">
               <el-input v-model="form.CFWH" clearable placeholder="查封文号"></el-input>
               <el-input v-model="form.CFWH" clearable placeholder="查封文号"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="5">
           <el-col :span="5">
-            <el-form-item label="解封机关" label-width="80px">
+            <el-form-item label="解封机关">
               <el-input v-model="form.JFJG" clearable placeholder="解封机关"></el-input>
               <el-input v-model="form.JFJG" clearable placeholder="解封机关"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
@@ -55,7 +56,11 @@
               <el-input v-model="form.JFWH" clearable placeholder="解封文号"></el-input>
               <el-input v-model="form.JFWH" clearable placeholder="解封文号"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-
+          <el-col :span="5">
+            <el-form-item label="证件号" label-width="103px">
+              <el-input v-model="form.ZJH" clearable placeholder="证件号"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="4" class="btnColRight">
           <el-col :span="4" class="btnColRight">
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
@@ -94,6 +99,7 @@ export default {
         JFWH: '',
         JFWH: '',
         CFJG: '',
         CFJG: '',
         CFWH: '',
         CFWH: '',
+        ZJH: '',
         currentPage: 1
         currentPage: 1
       },
       },
       tableData: {
       tableData: {
@@ -149,4 +155,4 @@ export default {
     }
     }
   }
   }
 }
 }
-</script>
\ No newline at end of file
+</script>

@@ -7,8 +7,10 @@
         </el-form-item>
         </el-form-item>
         <el-row class="mb-5">
         <el-row class="mb-5">
           <el-col :span="6">
           <el-col :span="6">
-            <el-form-item label="行政区" label-width="80px">
-              <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
+            <el-form-item label="行政区">
+              <el-select
+                v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM"
+                class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
@@ -28,7 +30,7 @@
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="6">
           <el-col :span="6">
-            <el-form-item label="抵押人" label-width="80px">
+            <el-form-item label="抵押人">
               <el-input v-model="form.dyr" clearable placeholder="抵押人"></el-input>
               <el-input v-model="form.dyr" clearable placeholder="抵押人"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
@@ -55,8 +57,15 @@
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="证件号">
+              <el-input v-model="form.ZJH" clearable placeholder="证件号"></el-input>
+            </el-form-item>
+          </el-col>
 
 
-          <el-col :span="6" class="btnColRight">
+        </el-row>
+        <el-row class="mt-10">
+          <el-col :span="24" class="btnColRight">
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
           </el-col>
           </el-col>
@@ -97,6 +106,7 @@ export default {
         BDCDYH: '',
         BDCDYH: '',
         dybdclx: '',
         dybdclx: '',
         DJLX: '',
         DJLX: '',
+        ZJH: '',
         currentPage: 1
         currentPage: 1
       },
       },
       tableData: {
       tableData: {

@@ -5,10 +5,12 @@
         <el-form-item>
         <el-form-item>
           <Breadcrumb />
           <Breadcrumb />
         </el-form-item>
         </el-form-item>
-        <el-row class="mb-5">
+        <el-row>
           <el-col :span="5">
           <el-col :span="5">
-            <el-form-item label="行政区" label-width="80px">
-              <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
+            <el-form-item label="行政区" label-width="100px">
+              <el-select
+                v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM"
+                class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
@@ -34,16 +36,16 @@
               <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
               <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-
-        </el-row>
-        <el-row class="mt-10">
-          <el-col :span="5">
+          <el-col :span="4">
             <el-form-item label="权利人" label-width="80px">
             <el-form-item label="权利人" label-width="80px">
               <el-input v-model="form.QLR" clearable placeholder="权利人"></el-input>
               <el-input v-model="form.QLR" clearable placeholder="权利人"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
+        </el-row>
+        <el-row class="mt-10">
+
           <el-col :span="5">
           <el-col :span="5">
-            <el-form-item label="不动产单元号">
+            <el-form-item label="不动产单元号" label-width="100px">
               <el-input v-model="form.BDCDYH" clearable placeholder="不动产单元号"></el-input>
               <el-input v-model="form.BDCDYH" clearable placeholder="不动产单元号"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
@@ -59,7 +61,11 @@
               <el-input v-model="form.XYDBDCDYH" clearable placeholder="需役地不动产单元号"></el-input>
               <el-input v-model="form.XYDBDCDYH" clearable placeholder="需役地不动产单元号"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-
+          <el-col :span="5">
+            <el-form-item label="证件号">
+              <el-input v-model="form.ZJH" clearable placeholder="证件号"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="4" class="btnColRight">
           <el-col :span="4" class="btnColRight">
             <el-form-item>
             <el-form-item>
               <btn nativeType="cz" @click="resetForm">重置</btn>
               <btn nativeType="cz" @click="resetForm">重置</btn>
@@ -81,81 +87,82 @@
 </template>
 </template>
 
 
 <script>
 <script>
-  // 地役权登记
-  import data from "./data"
-  import qlfQlDyiq from '@/api/qlfQlDyiq'
-  import tableMixin from '@/mixins/tableMixin.js'
-  import treeSelect from '@/components/TreeSelect.vue'
-  export default {
-    name: "dyiq",
-    mixins: [tableMixin],
-    components: {
-      treeSelect
-    },
-    data () {
-      return {
-        form: {
-          XZQDM: '',
-          QSZT: '',
-          ZL: '',
-          BDCQZH: '',
-          QLR: '',
-          BDCDYH: '',
-          // 供役地不动产单元号
-          GYDBDCDYH: '',
-          // 需役地不动产单元号
-          XYDBDCDYH: '',
-          currentPage: 1
-        },
-        tableData: {
-          columns: [{
-            label: '序号',
-            type: 'index',
-            width: '50',
-            index: this.indexMethod,
-          }].concat(data.columns()).concat([
-            {
-              label: "操作",
-              width: 80,
-              render: (h, scope) => {
-                return (
-                  <div>
-                    <el-button
-                      type="text"
-                      class='btnColor'
-                      onClick={() => { this.handleEdit(scope.row) }}
-                    >
-                      详情
-                    </el-button>
-                  </div>
-                )
-              }
+// 地役权登记
+import data from "./data"
+import qlfQlDyiq from '@/api/qlfQlDyiq'
+import tableMixin from '@/mixins/tableMixin.js'
+import treeSelect from '@/components/TreeSelect.vue'
+export default {
+  name: "dyiq",
+  mixins: [tableMixin],
+  components: {
+    treeSelect
+  },
+  data () {
+    return {
+      form: {
+        XZQDM: '',
+        QSZT: '',
+        ZL: '',
+        BDCQZH: '',
+        QLR: '',
+        BDCDYH: '',
+        // 供役地不动产单元号
+        GYDBDCDYH: '',
+        // 需役地不动产单元号
+        XYDBDCDYH: '',
+        ZJH: '',
+        currentPage: 1
+      },
+      tableData: {
+        columns: [{
+          label: '序号',
+          type: 'index',
+          width: '50',
+          index: this.indexMethod,
+        }].concat(data.columns()).concat([
+          {
+            label: "操作",
+            width: 80,
+            render: (h, scope) => {
+              return (
+                <div>
+                  <el-button
+                    type="text"
+                    class='btnColor'
+                    onClick={() => { this.handleEdit(scope.row) }}
+                  >
+                    详情
+                  </el-button>
+                </div>
+              )
             }
             }
-          ]),
-          data: []
-        },
-        pageData: {
-          total: 0,
-          pageSize: 15,
-          current: 1,
-        }
-      }
-    },
-    methods: {
-      async featchData () {
-        try {
-          this.form = Object.assign(this.form, this.formData)
-          let { result: { list, total, pages: pageSize, pageNum: current }
-          } = await qlfQlDyiq.getQlfQlDyiqList(this.form)
-          this.tableData.data = list
-          this.pageData = {
-            pageSize,
-            current,
-            total
           }
           }
-        } catch (error) {
+        ]),
+        data: []
+      },
+      pageData: {
+        total: 0,
+        pageSize: 15,
+        current: 1,
+      }
+    }
+  },
+  methods: {
+    async featchData () {
+      try {
+        this.form = Object.assign(this.form, this.formData)
+        let { result: { list, total, pages: pageSize, pageNum: current }
+        } = await qlfQlDyiq.getQlfQlDyiqList(this.form)
+        this.tableData.data = list
+        this.pageData = {
+          pageSize,
+          current,
+          total
         }
         }
+      } catch (error) {
       }
       }
     }
     }
   }
   }
-</script>
\ No newline at end of file
+}
+</script>

@@ -8,7 +8,9 @@
         <el-row class="mb-5">
         <el-row class="mb-5">
           <el-col :span="6">
           <el-col :span="6">
             <el-form-item label="行政区">
             <el-form-item label="行政区">
-              <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
+              <el-select
+                v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM"
+                class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
@@ -53,7 +55,14 @@
               <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
               <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <el-col :span="6" class="btnColRight">
+          <el-col :span="6">
+            <el-form-item label="证件号" label-width="80px">
+              <el-input v-model="form.ZJH" clearable placeholder="证件号"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row class="mt-10">
+          <el-col :span="24" class="btnColRight">
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
           </el-col>
           </el-col>
@@ -93,6 +102,7 @@ export default {
         DJLX: '',
         DJLX: '',
         BDCQZH: '',
         BDCQZH: '',
         BDCDYH: '',
         BDCDYH: '',
+        ZJH: '',
         currentPage: 1
         currentPage: 1
       },
       },
       tableData: {
       tableData: {

@@ -13,8 +13,8 @@
           </el-col>
           </el-col>
           <el-col :span="5">
           <el-col :span="5">
             <el-form-item label="权利类型">
             <el-form-item label="权利类型">
-              <el-select v-model="form.QLLX" ref="selectshareQL" @visible-change="isShowSelectOptions" clearable
-                placeholder="权利类型">
+              <el-select v-model="form.QLLX" ref="selectshareQL" class="width100" @visible-change="isShowSelectOptions"
+                clearable placeholder="权利类型">
                 <el-option v-for="item in dicData['A8']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 <el-option v-for="item in dicData['A8']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
@@ -25,7 +25,12 @@
               <el-input v-model="form.BDCDYH" clearable placeholder="不动产单元号"></el-input>
               <el-input v-model="form.BDCDYH" clearable placeholder="不动产单元号"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <el-col :span="9" class="btnColRight">
+          <el-col :span="5">
+            <el-form-item label="证件号" label-width="80px">
+              <el-input v-model="form.ZJH" clearable placeholder="证件号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" class="btnColRight">
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
           </el-col>
           </el-col>
@@ -61,6 +66,7 @@ export default {
         YWH: '',
         YWH: '',
         QLLX: '',
         QLLX: '',
         BDCDYH: '',
         BDCDYH: '',
+        ZJH: '',
         currentPage: 1
         currentPage: 1
       },
       },
       tableData: {
       tableData: {

@@ -8,7 +8,9 @@
         <el-row class="mb-5">
         <el-row class="mb-5">
           <el-col :span="6">
           <el-col :span="6">
             <el-form-item label="行政区">
             <el-form-item label="行政区">
-              <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
+              <el-select
+                v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM"
+                class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
@@ -53,7 +55,14 @@
               <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
               <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <el-col :span="6" class="btnColRight">
+          <el-col :span="6">
+            <el-form-item label="证件号" label-width="80px">
+              <el-input v-model="form.ZJH" clearable placeholder="证件号"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row class="mt-10">
+          <el-col :span="24" class="btnColRight">
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
           </el-col>
           </el-col>
@@ -93,6 +102,7 @@ export default {
         DJLX: '',
         DJLX: '',
         BDCQZH: '',
         BDCQZH: '',
         BDCDYH: '',
         BDCDYH: '',
+        ZJH: '',
         currentPage: 1
         currentPage: 1
       },
       },
       tableData: {
       tableData: {

@@ -5,10 +5,12 @@
         <el-form-item>
         <el-form-item>
           <Breadcrumb />
           <Breadcrumb />
         </el-form-item>
         </el-form-item>
-        <el-row class="mb-5">
+        <el-row>
           <el-col :span="6">
           <el-col :span="6">
             <el-form-item label="行政区">
             <el-form-item label="行政区">
-              <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
+              <el-select
+                v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM"
+                class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
@@ -50,7 +52,12 @@
               <el-input v-model="form.JZWMC" clearable placeholder="建筑名称"></el-input>
               <el-input v-model="form.JZWMC" clearable placeholder="建筑名称"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <el-col :span="6" class="btnColRight mt-10">
+          <el-col :span="6" class="mt-10">
+            <el-form-item label="证件号">
+              <el-input v-model="form.ZJH" clearable placeholder="证件号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="btnColRight mt-10">
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
           </el-col>
           </el-col>
@@ -89,6 +96,7 @@ export default {
         QLR: '',
         QLR: '',
         DJLX: '',
         DJLX: '',
         JZWMC: '',
         JZWMC: '',
+        ZJH: '',
         currentPage: 1
         currentPage: 1
       },
       },
       tableData: {
       tableData: {

@@ -6,9 +6,11 @@
           <Breadcrumb />
           <Breadcrumb />
         </el-form-item>
         </el-form-item>
         <el-row>
         <el-row>
-          <el-col :span="6" class="mb-5">
+          <el-col :span="6">
             <el-form-item label="行政区">
             <el-form-item label="行政区">
-              <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
+              <el-select
+                v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM"
+                class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
@@ -32,12 +34,14 @@
               <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
               <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <el-col :span="6" class="mt-10">
+        </el-row>
+        <el-row class="mt-10">
+          <el-col :span="6">
             <el-form-item label="权利人">
             <el-form-item label="权利人">
               <el-input v-model="form.QLR" clearable placeholder="权利人"></el-input>
               <el-input v-model="form.QLR" clearable placeholder="权利人"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <el-col :span="6" class="mt-10">
+          <el-col :span="6">
             <el-form-item label="登记类型">
             <el-form-item label="登记类型">
               <el-select v-model="form.DJLX" class="width100" clearable placeholder="登记类型">
               <el-select v-model="form.DJLX" class="width100" clearable placeholder="登记类型">
                 <el-option v-for="item in dicData['A21']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 <el-option v-for="item in dicData['A21']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
@@ -45,12 +49,19 @@
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <el-col :span="6" class="mt-10">
+          <el-col :span="6">
             <el-form-item label="海岛名称">
             <el-form-item label="海岛名称">
               <el-input v-model="form.HDMC" clearable placeholder="海岛名称"></el-input>
               <el-input v-model="form.HDMC" clearable placeholder="海岛名称"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <el-col :span="6" class="btnColRight mt-10">
+          <el-col :span="6">
+            <el-form-item label="证件号">
+              <el-input v-model="form.ZJH" clearable placeholder="证件号"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24" class="btnColRight mt-10">
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
           </el-col>
           </el-col>
@@ -90,6 +101,7 @@ export default {
         QLR: '',
         QLR: '',
         DJLX: '',
         DJLX: '',
         HDMC: '',
         HDMC: '',
+        ZJH: '',
         currentPage: 1
         currentPage: 1
       },
       },
       tableData: {
       tableData: {

@@ -8,7 +8,9 @@
         <el-row class="mb-5">
         <el-row class="mb-5">
           <el-col :span="6">
           <el-col :span="6">
             <el-form-item label="行政区">
             <el-form-item label="行政区">
-              <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
+              <el-select
+                v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM"
+                class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
@@ -48,7 +50,12 @@
               <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
               <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <el-col :span="12" class="btnColRight">
+          <el-col :span="6">
+            <el-form-item label="证件号">
+              <el-input v-model="form.ZJH" clearable placeholder="证件号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" class="btnColRight">
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
           </el-col>
           </el-col>
@@ -87,6 +94,7 @@ export default {
         QLR: '',
         QLR: '',
         DJLX: '',
         DJLX: '',
         BDCQZH: '',
         BDCQZH: '',
+        ZJH: '',
         currentPage: 1
         currentPage: 1
       },
       },
       tableData: {
       tableData: {

@@ -6,9 +6,11 @@
           <Breadcrumb />
           <Breadcrumb />
         </el-form-item>
         </el-form-item>
         <el-row>
         <el-row>
-          <el-col :span="6" class="mb-5">
+          <el-col :span="6">
             <el-form-item label="行政区">
             <el-form-item label="行政区">
-              <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
+              <el-select
+                v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM"
+                class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
@@ -45,12 +47,16 @@
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <el-col :span="12" class="btnColRight mt-10">
+          <el-col :span="6">
+            <el-form-item label="证件号" class="mt-10">
+              <el-input v-model="form.ZJH" clearable placeholder="证件号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" class="btnColRight mt-10">
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
-
       </el-form>
       </el-form>
     </div>
     </div>
     <div class="from-clues-content">
     <div class="from-clues-content">
@@ -84,6 +90,7 @@ export default {
         BDCDYH: '',
         BDCDYH: '',
         QLR: '',
         QLR: '',
         DJLX: '',
         DJLX: '',
+        ZJH: '',
         currentPage: 1
         currentPage: 1
       },
       },
       tableData: {
       tableData: {

@@ -5,10 +5,12 @@
         <el-form-item>
         <el-form-item>
           <Breadcrumb />
           <Breadcrumb />
         </el-form-item>
         </el-form-item>
-        <el-row class="mb-5">
+        <el-row>
           <el-col :span="6">
           <el-col :span="6">
             <el-form-item label="行政区">
             <el-form-item label="行政区">
-              <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
+              <el-select
+                v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM"
+                class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
@@ -50,7 +52,12 @@
               <el-input v-model="form.xxx" clearable placeholder="地籍号"></el-input>
               <el-input v-model="form.xxx" clearable placeholder="地籍号"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <el-col :span="6" class="btnColRight mt-10">
+          <el-col :span="6">
+            <el-form-item label="证件号" class="mt-10">
+              <el-input v-model="form.ZJH" clearable placeholder="证件号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="btnColRight mt-10">
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
           </el-col>
           </el-col>
@@ -89,6 +96,7 @@ export default {
         QLR: '',
         QLR: '',
         QLLX: '',
         QLLX: '',
         xxx: '',
         xxx: '',
+        ZJH: '',
         currentPage: 1
         currentPage: 1
       },
       },
       tableData: {
       tableData: {

@@ -8,7 +8,9 @@
         <el-row class="mb-5">
         <el-row class="mb-5">
           <el-col :span="6">
           <el-col :span="6">
             <el-form-item label="行政区">
             <el-form-item label="行政区">
-              <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
+              <el-select
+                v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM"
+                class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
@@ -43,11 +45,16 @@
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="6">
           <el-col :span="6">
-            <el-form-item label="不动产权证号" label-width="120px">
+            <el-form-item label="不动产权证号">
               <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
               <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <el-col :span="12" class="btnColRight">
+          <el-col :span="6">
+            <el-form-item label="证件号">
+              <el-input v-model="form.ZJH" clearable placeholder="证件号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" class="btnColRight">
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
           </el-col>
           </el-col>
@@ -85,6 +92,7 @@ export default {
         QLR: '',
         QLR: '',
         DJLX: '',
         DJLX: '',
         BDCQZH: '',
         BDCQZH: '',
+        ZJH: '',
         currentPage: 1
         currentPage: 1
       },
       },
       tableData: {
       tableData: {

@@ -8,20 +8,14 @@
         <el-row class="mb-5">
         <el-row class="mb-5">
           <el-col :span="6">
           <el-col :span="6">
             <el-form-item label="行政区" label-width="106px">
             <el-form-item label="行政区" label-width="106px">
-              <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
+              <el-select
+                v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM"
+                class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <!-- <el-col :span="6">
-            <el-form-item label="权属状态">
-              <el-select v-model="form.QSZT" class="width100" clearable placeholder="权属状态">
-                <el-option v-for="item in dicData['A22']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
           <el-col :span="6">
           <el-col :span="6">
             <el-form-item label="不动产权证号">
             <el-form-item label="不动产权证号">
               <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
               <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
@@ -32,8 +26,6 @@
               <el-input v-model="form.YWH" clearable placeholder="业务号"></el-input>
               <el-input v-model="form.YWH" clearable placeholder="业务号"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-        </el-row>
-        <el-row class="mt-10">
           <el-col :span="6">
           <el-col :span="6">
             <el-form-item label="预告登记种类" label-width="106px">
             <el-form-item label="预告登记种类" label-width="106px">
               <el-select v-model="form.YGDJZL" clearable ref="selectnoticeRegQL" class="width100"
               <el-select v-model="form.YGDJZL" clearable ref="selectnoticeRegQL" class="width100"
@@ -43,6 +35,8 @@
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
+        </el-row>
+        <el-row class="mt-10">
           <el-col :span="6">
           <el-col :span="6">
             <el-form-item label="登记类型">
             <el-form-item label="登记类型">
               <el-select v-model="form.DJLX" clearable class="width100" placeholder="登记类型">
               <el-select v-model="form.DJLX" clearable class="width100" placeholder="登记类型">
@@ -56,6 +50,11 @@
               <el-input v-model="form.BDCDYH" clearable placeholder="不动产单元号"></el-input>
               <el-input v-model="form.BDCDYH" clearable placeholder="不动产单元号"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="证件号">
+              <el-input v-model="form.ZJH" clearable placeholder="证件号"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="6" class="btnColRight">
           <el-col :span="6" class="btnColRight">
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
@@ -97,6 +96,7 @@ export default {
         YGDJZL: '',
         YGDJZL: '',
         DJLX: '',
         DJLX: '',
         BDCDYH: '',
         BDCDYH: '',
+        ZJH: '',
         currentPage: 1
         currentPage: 1
       },
       },
       tableData: {
       tableData: {

@@ -6,9 +6,11 @@
           <Breadcrumb />
           <Breadcrumb />
         </el-form-item>
         </el-form-item>
         <el-row>
         <el-row>
-          <el-col :span="5" class="mb-5">
+          <el-col :span="5">
             <el-form-item label="行政区" label-width="80px">
             <el-form-item label="行政区" label-width="80px">
-              <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
+              <el-select
+                v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM"
+                class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
@@ -46,7 +48,12 @@
               <el-input v-model="form.QLR" clearable placeholder="权利人"></el-input>
               <el-input v-model="form.QLR" clearable placeholder="权利人"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <el-col :span="19" class="btnColRight">
+          <el-col :span="5">
+            <el-form-item label="证件号">
+              <el-input v-model="form.ZJH" clearable placeholder="证件号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="14" class="btnColRight">
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
           </el-col>
           </el-col>
@@ -85,6 +92,7 @@ export default {
         BDCQZH: '',
         BDCQZH: '',
         QLR: '',
         QLR: '',
         BDCDYH: '',
         BDCDYH: '',
+        ZJH: '',
         currentPage: 1
         currentPage: 1
       },
       },
       tableData: {
       tableData: {

@@ -5,28 +5,17 @@
         <el-form-item>
         <el-form-item>
           <Breadcrumb />
           <Breadcrumb />
         </el-form-item>
         </el-form-item>
-        <el-row class="mb-5">
+        <el-row>
           <el-col :span="6">
           <el-col :span="6">
             <el-form-item label="行政区">
             <el-form-item label="行政区">
-              <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
+              <el-select
+                v-model="$store.state.user.userInfo.grade === 'county' ? form.XZQDM = $store.state.user.userInfo.areaCode : form.XZQDM"
+                class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <!-- <el-col :span="6">
-            <el-form-item label="权属状态" label-width="105px">
-              <el-select v-model="form.QSZT" class="width100" clearable placeholder="权属状态">
-                <el-option v-for="item in dicData['A22']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
-          <!-- <el-col :span="6">
-            <el-form-item label="坐落">
-              <el-input v-model="form.ZL" placeholder="坐落"></el-input>
-            </el-form-item>
-          </el-col> -->
           <el-col :span="6">
           <el-col :span="6">
             <el-form-item label="不动产权证号" label-width="105px">
             <el-form-item label="不动产权证号" label-width="105px">
               <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
               <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
@@ -50,7 +39,12 @@
               <el-input v-model="form.BDCDYH" clearable placeholder="不动产单元号"></el-input>
               <el-input v-model="form.BDCDYH" clearable placeholder="不动产单元号"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <el-col :span="18" class="btnColRight mt-10">
+          <el-col :span="6" class="mt-10">
+            <el-form-item label="证件号">
+              <el-input v-model="form.ZJH" clearable placeholder="证件号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="btnColRight mt-10">
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
           </el-col>
           </el-col>
@@ -86,6 +80,7 @@ export default {
         QLR: '',
         QLR: '',
         QLLX: '',
         QLLX: '',
         BDCDYH: '',
         BDCDYH: '',
+        ZJH: '',
         currentPage: 1
         currentPage: 1
       },
       },
       tableData: {
       tableData: {

@@ -4,13 +4,15 @@
     <!-- 头部搜索 -->
     <!-- 头部搜索 -->
     <div class="from-clues-header">
     <div class="from-clues-header">
       <el-form ref="ruleForm" :model="form" label-width="100px">
       <el-form ref="ruleForm" :model="form" label-width="100px">
-        <el-form-item>
+        <el-form-item v-if="BASE_API.THEME=='jg'">
           <Breadcrumb />
           <Breadcrumb />
         </el-form-item>
         </el-form-item>
         <el-row class="mb-5">
         <el-row class="mb-5">
           <el-col :span="6">
           <el-col :span="6">
             <el-form-item label="行政区" prop="qxdm">
             <el-form-item label="行政区" prop="qxdm">
-              <el-select v-model="form.qxdm" class="width100" clearable placeholder="行政区">
+              <el-select
+                v-model="$store.state.user.userInfo.grade === 'county' ? form.qxdm = $store.state.user.userInfo.areaCode : form.qxdm"
+                class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
@@ -99,6 +101,7 @@
 </template>
 </template>
 
 
 <script>
 <script>
+import Vue from 'vue'
 // 接收报文查询
 // 接收报文查询
 // 引入表格头部数据
 // 引入表格头部数据
 import data from "./data";
 import data from "./data";

@@ -10,8 +10,8 @@
         <el-row>
         <el-row>
           <el-col :span="6">
           <el-col :span="6">
             <el-form-item label="行政区">
             <el-form-item label="行政区">
-              <el-select v-model="form.areacode" class="width100" clearable placeholder="行政区">
-                <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
+              <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.areacode = $store.state.user.userInfo.areaCode : form.areacode" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
+              <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>

@@ -10,8 +10,8 @@
         <el-row class="mb-5">
         <el-row class="mb-5">
           <el-col :span="6">
           <el-col :span="6">
             <el-form-item label="行政区" prop="qxdm">
             <el-form-item label="行政区" prop="qxdm">
-              <el-select v-model="form.qxdm" class="width100" clearable placeholder="行政区">
-                <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
+              <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.qxdm = $store.state.user.userInfo.areaCode : form.qxdm" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
+              <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>

@@ -9,6 +9,11 @@
               <el-input v-model="form.name" placeholder="请输入菜单名称" />
               <el-input v-model="form.name" placeholder="请输入菜单名称" />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="图标:" label-width="54px">
+              <el-input v-model="form.icon" placeholder="请选择图标" :prefix-icon="form.icon" clearable @focus="getIconList" />
+            </el-form-item>
+          </el-col>
         </el-row>
         </el-row>
         <el-row :gutter="24">
         <el-row :gutter="24">
           <el-col :span="12">
           <el-col :span="12">
@@ -51,202 +56,215 @@
           </el-col>
           </el-col>
         </el-row>
         </el-row>
       </el-form>
       </el-form>
+      <!-- 图标列表 -->
+      <IconList ref="iconList" @iconName="getIconName" />
     </div>
     </div>
   </dialogBox>
   </dialogBox>
 </template>
 </template>
 
 
 <script>
 <script>
-  import { getParentMenuListAction } from '@/api/authorityManage'
-  import JsonEditor from '@/components/JsonEditors'
-  import { validateCode } from '@/utils/validate';
-  import { api, httpAction } from '@/api/manageApi'
-  export default {
-    name: 'MenuModal',
-    components: {
-      JsonEditor,
-    },
-    props: {
-      value: { type: Boolean, default: false },
-      productId: {
-        type: String,
-        default: ''
+import { getParentMenuListAction } from '@/api/authorityManage'
+import IconList from '../../../components/IconList'
+import JsonEditor from '@/components/JsonEditors'
+import { validateCode } from '@/utils/validate';
+import { api, httpAction } from '@/api/manageApi'
+export default {
+  name: 'MenuModal',
+  components: {
+    JsonEditor,
+    IconList,
+  },
+  props: {
+    value: { type: Boolean, default: false },
+    productId: {
+      type: String,
+      default: ''
+    }
+  },
+  data () {
+    return {
+      myValue: this.value,
+      form: {
+        icon: '',
+        code: ''
+      },
+      rules: {
+        name: [{ required: true, message: '请输入菜单名称', trigger: 'blur' }],
+        code: [
+          { required: true, message: '必填', trigger: 'blur' },
+          { validator: validateCode, trigger: 'blur' }
+        ]
+      },
+      title: '',
+      type: '',
+      visible: false,
+      parentMenuList: [],
+      menuKey: 0,
+      jumpModeList: [
+        { name: '在当前页面显示', value: 1 },
+        { name: '跳转到新页面', value: 2 }
+      ],
+      setProps: {
+        value: 'id',
+        label: 'name',
+        children: 'children',
+        expandTrigger: 'hover',
+        checkStrictly: true, // 可取消关联，选择任意一级选项
+        emitPath: false
+      },
+      dataUrl: api.menus
+    }
+  },
+  computed: {
+    codeComputed: {
+      get: function () {
+        return this.form.code
+      },
+      set: function (val) {
+        this.form.code = val.toUpperCase()
       }
       }
+    }
+  },
+  watch: {
+    value (val) {
+      this.myValue = val
+    }
+  },
+  methods: {
+    // 获取父级菜单
+    getParentMenuList (id) {
+
+      getParentMenuListAction(id).then((res) => {
+        if (res.status === 1) {
+          const list = this.$dealArrChildren(res.content)
+          if (id) {
+            this.parentMenuList = this.$dealArrDisabled(
+              this.$deepCopy(list),
+              id
+            )
+            this.menuKey++
+          } else {
+            this.parentMenuList = list
+          }
+        } else {
+          this.$message.error({ message: res.message, showClose: true })
+        }
+      })
     },
     },
-    data () {
-      return {
-        myValue: this.value,
-        form: {
-          icon: '',
-          code: ''
-        },
-        rules: {
-          name: [{ required: true, message: '请输入菜单名称', trigger: 'blur' }],
-          code: [
-            { required: true, message: '必填', trigger: 'blur' },
-            { validator: validateCode, trigger: 'blur' }
-          ]
-        },
-        title: '',
-        type: '',
-        visible: false,
-        parentMenuList: [],
-        menuKey: 0,
-        jumpModeList: [
-          { name: '在当前页面显示', value: 1 },
-          { name: '跳转到新页面', value: 2 }
-        ],
-        setProps: {
-          value: 'id',
-          label: 'name',
-          children: 'children',
-          expandTrigger: 'hover',
-          checkStrictly: true, // 可取消关联，选择任意一级选项
-          emitPath: false
-        },
-        dataUrl: api.menus
-      }
+    // 选择图标
+    getIconName (data) {
+      this.form.icon = data;
     },
     },
-    computed: {
-      codeComputed: {
-        get: function () {
-          return this.form.code
-        },
-        set: function (val) {
-          this.form.code = val.toUpperCase()
-        }
-      }
+    getIconList () {
+      this.$refs.iconList.show(true)
+    },
+    getIconName (data) {
+      this.form.icon = data
+    },
+    // 配置参数
+    getJsonString (data) {
+      this.form.metadata = data
     },
     },
-    watch: {
-      value (val) {
-        this.myValue = val
+    // 新增菜单
+    add () {
+      this.getParentMenuList(this.productId)
+      this.type = 0
+      this.form.jumpMode = 1
+    },
+    // 编辑菜单
+    edit (record) {
+      this.type = 1
+      // 若有id为编辑
+      if (record.id) {
+        this.$nextTick(() => {
+          this.form = Object.assign({}, record)
+          this.getParentMenuList(this.productId)
+        })
       }
       }
     },
     },
-    methods: {
-      // 获取父级菜单
-      getParentMenuList (id) {
-
-        getParentMenuListAction(id).then((res) => {
-          if (res.status === 1) {
-            const list = this.$dealArrChildren(res.content)
-            if (id) {
-              this.parentMenuList = this.$dealArrDisabled(
-                this.$deepCopy(list),
-                id
-              )
-              this.menuKey++
-            } else {
-              this.parentMenuList = list
-            }
+    // 选择上级菜单
+    handleChange (value) {
+      this.form.parentId = value
+    },
+    // 保存
+    submitForm (submitType) {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          let method = ''
+          let url = ''
+          const formData = this.form
+          formData.productId = this.productId
+          if (!formData.id) {
+            method = 'post'
+            url = this.dataUrl
           } else {
           } else {
-            this.$message.error({ message: res.message, showClose: true })
+            method = 'put'
+            url = `${this.dataUrl}/${formData.id}`
           }
           }
-        })
-      },
-      getIconList () {
-        this.$refs.iconList.show(true)
-      },
-      getIconName (data) {
-        this.form.icon = data
-      },
-      // 配置参数
-      getJsonString (data) {
-        this.form.metadata = data
-      },
-      // 新增菜单
-      add () {
-        this.getParentMenuList(this.productId)
-        this.type = 0
-        this.form.jumpMode = 1
-      },
-      // 编辑菜单
-      edit (record) {
-        this.type = 1
-        // 若有id为编辑
-        if (record.id) {
-          this.$nextTick(() => {
-            this.form = Object.assign({}, record)
-            this.getParentMenuList(this.productId)
-          })
-        }
-      },
-      // 选择上级菜单
-      handleChange (value) {
-        this.form.parentId = value
-      },
-      // 保存
-      submitForm (submitType) {
-        this.$refs.form.validate((valid) => {
-          if (valid) {
-            let method = ''
-            let url = ''
-            const formData = this.form
-            formData.productId = this.productId
-            if (!formData.id) {
-              method = 'post'
-              url = this.dataUrl
-            } else {
-              method = 'put'
-              url = `${this.dataUrl}/${formData.id}`
-            }
-            debugger
-            httpAction(url, formData, method)
-              .then((res) => {
-                if (res.status === 1) {
-                  this.$message.success({
-                    message: res.message,
-                    showClose: true
-                  })
+          httpAction(url, formData, method)
+            .then((res) => {
+              if (res.status === 1) {
+                this.$message.success({
+                  message: res.message,
+                  showClose: true
+                })
 
 
-                  this.resetForm()
-                  this.$emit('ok')
-                } else {
-                  this.$message.error({ message: res.message, showClose: true })
-                }
-              })
-              .catch((err) => {
-                console.log(err)
-              })
-          }
-        })
-      },
-      resetForm () {
-        this.$refs.form.resetFields()
-        this.form = {
-          icon: '',
-          code: ''
+                this.resetForm()
+                this.$emit('ok')
+              } else {
+                this.$message.error({ message: res.message, showClose: true })
+              }
+            })
+            .catch((err) => {
+              console.log(err)
+            })
         }
         }
-      },
-      close () {
-        this.resetForm()
-        this.$emit('input', false)
+      })
+    },
+    resetForm () {
+      this.$refs.form.resetFields()
+      this.form = {
+        icon: '',
+        code: ''
       }
       }
+    },
+    close () {
+      this.resetForm()
+      this.$emit('input', false)
     }
     }
   }
   }
+}
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
-  .modifydialog {
-    &-con {
-      background: #031a46;
-    }
-    /deep/.el-dialog__header {
-      .dialog_title {
-        display: -webkit-box;
-        display: -ms-flexbox;
-        display: flex;
-        position: relative;
-        top: -8px;
-        width: 28%;
-        height: 40px;
-        margin-left: 28px;
-        -webkit-box-pack: center;
-        -ms-flex-pack: center;
-        justify-content: center;
-        white-space: nowrap;
-        b {
-          font-size: 16px;
-          font-weight: 600;
-        }
+.modifydialog {
+  &-con {
+    background: #031a46;
+  }
+
+  /deep/.el-dialog__header {
+    .dialog_title {
+      display: -webkit-box;
+      display: -ms-flexbox;
+      display: flex;
+      position: relative;
+      top: -8px;
+      width: 28%;
+      height: 40px;
+      margin-left: 28px;
+      -webkit-box-pack: center;
+      -ms-flex-pack: center;
+      justify-content: center;
+      white-space: nowrap;
+
+      b {
+        font-size: 16px;
       }
       }
     }
     }
+
+    .el-dialog__headerbtn {
+      right: 20px !important;
+      top: 23px !important;
+    }
   }
   }
+}
 </style>
 </style>

@@ -177,9 +177,12 @@
         white-space: nowrap;
         white-space: nowrap;
         b {
         b {
           font-size: 16px;
           font-size: 16px;
-           font-weight: 600;
         }
         }
       }
       }
+      .el-dialog__headerbtn {
+        right: 20px !important;
+        top: 23px !important;
+      }
     }
     }
   }
   }
 </style>
 </style>

@@ -412,6 +412,6 @@
   };
   };
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
-  @import "~@/styles/mixin.scss";
-  @import "~@/styles/dialogBox.scss";
+  // @import "~@/styles/mixin.scss";
+  // @import "~@/styles/dialogBox.scss";
 </style>
 </style>

 /*
 /*
  * @Author: xiaomiao 1158771342@qq.com
  * @Author: xiaomiao 1158771342@qq.com
  * @Date: 2023-01-30 17:59:51
  * @Date: 2023-01-30 17:59:51
- * @LastEditors: xiaomiao 1158771342@qq.com
- * @LastEditTime: 2023-03-08 15:09:15
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2023-03-23 09:34:50
  * @FilePath: \监管系统\js-web-jianguan\src\views\system\users\data\index.js
  * @FilePath: \监管系统\js-web-jianguan\src\views\system\users\data\index.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
  */
@@ -29,16 +29,17 @@ class data extends filter {
       },
       },
       {
       {
         prop: "departmentName",
         prop: "departmentName",
-        label: "所属部门"
-      },
-      {
-        prop: "job_group",
-        label: "职位"
+        label: "组织机构",
+        minWidth: 130
       },
       },
       {
       {
         prop: "telephone",
         prop: "telephone",
         label: "电话"
         label: "电话"
-      }
+      },
+      {
+        prop: "jobLevel",
+        label: "职位"
+      },
     ]
     ]
   }
   }
 }
 }

@@ -61,6 +61,15 @@
         </el-row>
         </el-row>
         <el-row :gutter="24">
         <el-row :gutter="24">
           <el-col :span="24">
           <el-col :span="24">
+            <el-form-item label="组织机构:" label-width="100px" prop="departmentId">
+              <el-select class="selbig" v-model="form.departmentId" placeholder="组织机构">
+                <el-option v-for="item in districtAreaList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="24">
             <el-form-item label="办公地点:" label-width="100px" class="form-item-mb0">
             <el-form-item label="办公地点:" label-width="100px" class="form-item-mb0">
               <el-input v-model="form.address" placeholder="办公地点" />
               <el-input v-model="form.address" placeholder="办公地点" />
             </el-form-item>
             </el-form-item>
@@ -72,7 +81,7 @@
 </template>
 </template>
 
 
 <script>
 <script>
-  import { api, httpAction } from '@/api/manageApi'
+  import { api, httpAction, getAction } from '@/api/manageApi'
   export default {
   export default {
     name: "",
     name: "",
     props: {
     props: {
@@ -81,12 +90,15 @@
     data () {
     data () {
       return {
       return {
         myValue: this.value,
         myValue: this.value,
+        districtAreaList: [],
         form: {
         form: {
           sex: "0",
           sex: "0",
+          departmentId: '',
         },
         },
         rules: {
         rules: {
           name: [{ required: true, message: "请输入姓名", trigger: "blur" }],
           name: [{ required: true, message: "请输入姓名", trigger: "blur" }],
           code: [{ required: true, message: "请输入工号", trigger: "blur" }],
           code: [{ required: true, message: "请输入工号", trigger: "blur" }],
+          departmentId: [{ required: true, message: "请选择组织机构", trigger: 'change' }],
           mobilePhone: [{ validator: "sddd", trigger: "blur" }],
           mobilePhone: [{ validator: "sddd", trigger: "blur" }],
           loginName: [
           loginName: [
             { required: true, message: "请输入用户名", trigger: "blur" },
             { required: true, message: "请输入用户名", trigger: "blur" },
@@ -99,17 +111,25 @@
         dataUrl: api.users
         dataUrl: api.users
       };
       };
     },
     },
-    computed: {
-      departmentid () {
-        return this.$store.state.user.userInfo;
-      },
-    },
     watch: {
     watch: {
       value (val) {
       value (val) {
         this.myValue = val
         this.myValue = val
       }
       }
     },
     },
+    created () {
+      this.getdistricts()
+    },
     methods: {
     methods: {
+      getdistricts () {
+        getAction(api.departments, {
+          queryOptions: { orderBys: [{ property: "sort", direction: "desc" }] },
+        }).then((res) => {
+          this.districtAreaList = res.content;
+
+        });
+
+
+      },
       // 添加人员
       // 添加人员
       adds () {
       adds () {
         this.showLoginName = false
         this.showLoginName = false
@@ -124,17 +144,17 @@
           })
           })
         }
         }
       },
       },
-      handleChange (value) {
-        this.form.departmentId = value;
-      },
       // 保存
       // 保存
       submitForm () {
       submitForm () {
+        this.districtAreaList.forEach((item) => {
+          if (this.form.departmentId == item.id) {
+            this.form.organizationId = item.organizationId
+          }
+        })
         this.$refs.form.validate((valid) => {
         this.$refs.form.validate((valid) => {
           if (valid) {
           if (valid) {
             let method = ''
             let method = ''
             let url = ''
             let url = ''
-            this.form.organizationId = this.departmentid.organizationId;
-            this.form.departmentId = this.departmentid.departmentId;
             const formData = this.form
             const formData = this.form
             if (!formData.id) {
             if (!formData.id) {
               method = 'post'
               method = 'post'
@@ -143,7 +163,6 @@
               method = 'put'
               method = 'put'
               url = `${this.dataUrl}/${formData.id}`
               url = `${this.dataUrl}/${formData.id}`
             }
             }
-
             httpAction(url, formData, method).then((res) => {
             httpAction(url, formData, method).then((res) => {
               if (res.status === 1) {
               if (res.status === 1) {
                 this.$message.success({ message: res.message, showClose: true })
                 this.$message.success({ message: res.message, showClose: true })
@@ -191,9 +210,15 @@
         white-space: nowrap;
         white-space: nowrap;
         b {
         b {
           font-size: 16px;
           font-size: 16px;
-          font-weight: 600;
         }
         }
       }
       }
+      .el-dialog__headerbtn {
+        right: 20px !important;
+        top: 23px !important;
+      }
+    }
+    .selbig {
+      width: 500px;
     }
     }
   }
   }
 </style>
 </style>

@@ -23,7 +23,7 @@
           </el-col>
           </el-col>
           <!-- 操作按钮 -->
           <!-- 操作按钮 -->
           <el-col :span="3" class="btnColRight">
           <el-col :span="3" class="btnColRight">
-            <btn nativeType="cx" @click="searchQuery">查询</btn>
+            <btn nativeType="cx" @click="getTableList">查询</btn>
             <btn nativeType="cx" @click="handleAdd">添加人员</btn>
             <btn nativeType="cx" @click="handleAdd">添加人员</btn>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
@@ -49,7 +49,7 @@
     resetPassword,
     resetPassword,
     getUserList, getUserLists
     getUserList, getUserLists
   } from "@/api/personnelManage";
   } from "@/api/personnelManage";
-  import { api, deleteAction } from '@/api/manageApi'
+  import { api, deleteAction, getAction } from '@/api/manageApi'
   import data from "./data";
   import data from "./data";
   import { deleteDomStr } from '@/utils/proDomStr'
   import { deleteDomStr } from '@/utils/proDomStr'
   import tableMixin from "@/mixins/tableMixin.js";
   import tableMixin from "@/mixins/tableMixin.js";
@@ -111,6 +111,15 @@
             .concat(data.columns())
             .concat(data.columns())
             .concat([
             .concat([
               {
               {
+                label: "职位",
+                render: (h, scope) => {
+                  return (
+                    <div v-show={scope.row.jobLevel !== null}>{scope.row.jobLevel ? "干事" : "经理"}</div>
+                  )
+
+                }
+              },
+              {
                 label: "负责人",
                 label: "负责人",
                 render: (h, scope) => {
                 render: (h, scope) => {
                   return (
                   return (
@@ -229,41 +238,75 @@
         this.$refs.dialogForm.title = "添加";
         this.$refs.dialogForm.title = "添加";
       },
       },
       // 查询
       // 查询
-      searchQuery () {
-        console.log(" console.log(this.form);", this.form);
+      getTableList () {
         this.queryParam = {
         this.queryParam = {
-          organizationId: this.departmentid.organizationId,
-          departmentId: this.departmentid.departmentId,
           name: this.form.name,
           name: this.form.name,
           code: this.form.code,
           code: this.form.code,
           loginName: this.form.loginName,
           loginName: this.form.loginName,
         };
         };
-        console.log("this.queryParam", this.queryParam);
         getUserLists(this.queryParam).then((res) => {
         getUserLists(this.queryParam).then((res) => {
           if (res.status === 1) {
           if (res.status === 1) {
             this.loading = false;
             this.loading = false;
             this.tableData.data = res.content;
             this.tableData.data = res.content;
             this.tableData.data = judgeSort(this.tableData.data);
             this.tableData.data = judgeSort(this.tableData.data);
-            console.log("this.tableData.data111111111111111", this.tableData.data);
+            let arr = []
+            this.tableData.data.forEach((item) => {
+              arr.push(item.departmentId)
+            })
+            this.getDepts(arr)
           } else {
           } else {
             this.$message.error({ message: res.message, showClose: true })
             this.$message.error({ message: res.message, showClose: true })
           }
           }
         })
         })
       },
       },
-      getTableList () {
-        this.loading = true;
+      // 获取组织机构
+      getDepts (deptIdArr) {
+        let params = {
+          queryOptions: {
+            conditionGroup: {
+              conditions: [
+                {
+                  property: "id",
+                  value: deptIdArr,
+                  operator: "IN",
+                },
+              ],
+              queryRelation: "AND",
+            },
+            orderBys: [],
+          },
+        };
+        getAction(api.departments, params).then(
+          (res) => {
+            let deptsList = res.content;
+            deptsList.forEach((ele) => {
+              this.tableData.data.forEach((item) => {
+                if (ele.id == item.departmentId) {
+                  item.departmentName = ele.name
+                }
+              })
+            })
 
 
-        getUserList().then((res) => {
-          if (res.status === 1) {
-            console.log("res人员列表", res);
-            this.loading = false;
-            this.tableData.data = res.content;
-            this.tableData.data = judgeSort(this.tableData.data);
-          } else {
-            this.$message.error({ message: res.message, showClose: true });
+          },
+          (err) => {
+            console.log("err :", err);
           }
           }
-        });
+        );
       },
       },
+      // getTableList () {
+      //   this.loading = true;
+
+      //   getUserList().then((res) => {
+      //     if (res.status === 1) {
+      //       console.log("res人员列表", res);
+      //       this.loading = false;
+      //       this.tableData.data = res.content;
+      //       this.tableData.data = judgeSort(this.tableData.data);
+      //     } else {
+      //       this.$message.error({ message: res.message, showClose: true });
+      //     }
+      //   });
+      // },
 
 
       // 重置用户密码
       // 重置用户密码
       resetPassword (data) {
       resetPassword (data) {
@@ -328,34 +371,10 @@
           }
           }
         })
         })
       },
       },
-      getDepts (deptIdArr) {
-        let params = {
-          queryOptions: {
-            conditionGroup: {
-              conditions: [
-                {
-                  property: "id",
-                  value: deptIdArr,
-                  operator: "IN",
-                },
-              ],
-              queryRelation: "AND",
-            },
-            orderBys: [],
-          },
-        };
-        getAction(api.departments, params).then(
-          (res) => {
-            let deptsList = res.content;
-            console.log(deptsList);
-          },
-          (err) => {
-            console.log("err :", err);
-          }
-        );
-      },
+
       // 修改人员信息
       // 修改人员信息
       handleEdit (row) {
       handleEdit (row) {
+        console.log("rowwwww", row);
         this.isDialog = true
         this.isDialog = true
         this.$refs.dialogForm.edit(row);
         this.$refs.dialogForm.edit(row);
         this.$refs.dialogForm.title = "修改";
         this.$refs.dialogForm.title = "修改";