Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

 {
   "TITLE": "汉中市数据上报系统",
   "THEME": "sb",
+  "CODE": "BDCSBPT",
   "SERVERAPI": "/bdcsjsb",
-  "MANAGEMENTAPI": "http: //192.168.2.236/management"
+  "MANAGEMENTAPI": "http://192.168.2.38:8090/management"
 }
\ No newline at end of file

+<!--
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-03-24 15:07:01
+-->
 <template>
   <div id="app">
     <router-view />
   </div>
-</template>
\ No newline at end of file
+</template>

 /*
  * @Description: 这个是所有api的前缀配置文件
  * @Autor: renchao
- * @LastEditTime: 2023-03-21 16:26:55
+ * @LastEditTime: 2023-03-24 16:51:18
  */
 export default {
   SERVERAPI: '/bdcsjsb', //赵千
-  MANAGEMENTAPI: 'http://192.168.2.236/management'
+  MANAGEMENTAPI: 'http://192.168.2.38:8090/management'
 }
\ No newline at end of file

+/*
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-03-23 17:19:52
+ */
 import request from "@/utils/request";
-import SERVER from "./config";
+// import SERVER from "./config";
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
+// console.log(SERVER, 'SERVERSERVER');
 
-export function loginIn(username, password) {
+export function loginIn (username, password) {
   return request({
     url: `${SERVER.MANAGEMENTAPI}/login?username=${username}&password=${password}`,
     method: "post",
   });
 }
-export function logout() {
+export function logout () {
   return request({
     url: `${SERVER.MANAGEMENTAPI}/logout`,
     method: "post",

 import request from '@/utils/request'
-import SERVER from "./config";
+// import SERVER from "./config";
+let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 const workflow = '/workflow'
 const log = '/log'
 const crud = '/crud'

+/*
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-03-24 09:28:25
+ */
 import request from '@/utils/request'
 // let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
 let SERVER = JSON.parse(localStorage.getItem('ApiUrl'))
@@ -9,14 +14,6 @@ export function getUserInfo () {
   })
 }
 
-// // 获取菜单信息
-// export function getMenuInfo () {
-//   return request({
-//     url: SERVER.SERVERAPI + '/rest/user/getUserAuthorizationMenus',
-//     method: 'get',
-//   })
-// }
-
 // 获取菜单信息
 export function getMenuInfo (data) {
   return request({

-<?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

@@ -29,7 +29,7 @@ export default {
     sidebarRight,
   },
   computed: {
-    ...mapGetters(["sidebar", "dicData", "userInfo"]),
+    ...mapGetters(["sidebar", "dicData", , "permission_routes", "userInfo"]),
     logoName () {
       return this.dicData['sysCode'] && this.dicData['sysCode'].filter(item =>
         item.DCODE == "systemTitle"
@@ -55,9 +55,9 @@ export default {
         })
         .catch((error) => {
           // console.dir(error);
-        });
-    },
-  },
+        })
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>

+<!--
+ * @Description: log
+ * @Autor: renchao
+ * @LastEditTime: 2023-03-23 16:29:12
+-->
 <template>
   <el-menu router :default-active="activeMenu" mode="horizontal">
     <!-- 权限菜单 -->
-    <sidebar-item v-for="route in permission_routes.slice(3, 6)" :key="route.path" :item="route"
+    <sidebar-item v-for="route in permission_routes.slice(4, 7)" :key="route.path" :item="route"
       :base-path="route.path" />
     <!-- 菜单全部展示 -->
     <!-- <sidebar-item v-for="route in asyncRoutes" :key="route.path" :item="route" :base-path="route.path" /> -->

@@ -2,14 +2,14 @@
  * @Author: xiaomiao 1158771342@qq.com
  * @Date: 2023-01-10 09:03:06
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2023-03-22 10:43:26
+ * @LastEditTime: 2023-03-23 16:29:24
  * @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
 -->
 <template>
   <el-menu router :default-active="activeMenu" mode="horizontal">
     <!-- 权限菜单 -->
-    <sidebar-item v-for="route in permission_routes.slice(6, 9)" :key="route.path" :item="route"
+    <sidebar-item v-for="route in permission_routes.slice(7, 10)" :key="route.path" :item="route"
       :base-path="route.path" />
     <!-- 菜单全部展示 -->
     <!-- <sidebar-item v-for="route in asyncRoutes" :key="route.path" :item="route" :base-path="route.path" /> -->

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-03-20 14:22:35
+ * @LastEditTime: 2023-03-23 15:17:24
 -->
 <template>
   <div class="app-wrapper jgWrapper">
@@ -12,61 +12,60 @@
   </div>
 </template>
 <script>
-  import { AppMain, Navbar, Sidebar, TagsView } from './components'
-  import ResizeMixin from './mixin/ResizeHandler'
-  import { mapState } from 'vuex'
-  export default {
-    name: 'Layout',
-    components: {
-      AppMain,
-      Navbar,
-      Sidebar,
-      TagsView
-    },
-    created () {
-      console.log("hhh");
-      this.$store.dispatch("products/setData", "BDCJGPT");
-    },
-    mixins: [ResizeMixin],
-    computed: {
-      ...mapState({
-        sidebar: state => state.app.sidebar,
-        needTagsView: state => state.settings.tagsView,
-        fixedHeader: state => state.settings.fixedHeader
-      })
-    }
+import { AppMain, Navbar, Sidebar, TagsView } from './components'
+import ResizeMixin from './mixin/ResizeHandler'
+import { mapState } from 'vuex'
+export default {
+  name: 'Layout',
+  components: {
+    AppMain,
+    Navbar,
+    Sidebar,
+    TagsView
+  },
+  created () {
+    this.$store.dispatch("products/setData", "BDCJGPT");
+  },
+  mixins: [ResizeMixin],
+  computed: {
+    ...mapState({
+      sidebar: state => state.app.sidebar,
+      needTagsView: state => state.settings.tagsView,
+      fixedHeader: state => state.settings.fixedHeader
+    })
   }
+}
 </script>
 <style lang="scss">
-  @import "~@/styles/jgSidebar.scss";
+@import "~@/styles/jgSidebar.scss";
 </style>
 <style lang="scss" scoped>
-  @import "~@/styles/mixin.scss";
+@import "~@/styles/mixin.scss";
 
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-    min-width: 1280px;
-    background: url("~@/image/bg.png") no-repeat;
-    background-size: 100% 100%;
-    padding: 12px;
-    box-sizing: border-box;
+.app-wrapper {
+  @include clearfix;
+  position: relative;
+  height: 100%;
+  width: 100%;
+  min-width: 1280px;
+  background: url("~@/image/bg.png") no-repeat;
+  background-size: 100% 100%;
+  padding: 12px;
+  box-sizing: border-box;
 
-    &.mobile.openSidebar {
-      position: fixed;
-      top: 0;
-    }
+  &.mobile.openSidebar {
+    position: fixed;
+    top: 0;
   }
+}
 
-  .appMain {
-    // min-width: 1280px;
-    height: calc(100vh - 101px) !important;
-    box-sizing: border-box;
+.appMain {
+  // min-width: 1280px;
+  height: calc(100vh - 101px) !important;
+  box-sizing: border-box;
 
-    .app-main {
-      height: 100%;
-    }
+  .app-main {
+    height: 100%;
   }
+}
 </style>

@@ -4,7 +4,7 @@
  * @LastEditTime: 2023-03-22 10:23:46
 -->
 <template>
-  <section class="app-main">
+  <section>
     <transition name="fade-transform" mode="out-in">
       <router-view />
     </transition>
@@ -20,14 +20,3 @@ export default {
   }
 }
 </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: 15px;
-}
-</style>

@@ -6,15 +6,13 @@
         <h4>不动产登记上报系统</h4>
       </div>
       <div class="right-menu">
-        <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" />
+        <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover">
+          <div class="user">
+            {{ userName }}
+            <span @click="onCancel">
+              <i class="el-icon-switch-button"></i>
+            </span>
           </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>
       </div>
     </div>
@@ -23,17 +21,15 @@
 <script>
 import { mapGetters } from 'vuex'
 import Breadcrumb from './Breadcrumb'
-import defaultSettings from '@/settings'
+import { logout } from "@/api/login.js";
 export default {
   components: {
     Breadcrumb
   },
   computed: {
-    ...mapGetters(['sidebar', 'avatar', 'name'])
-  },
-  data () {
-    return {
-      title: defaultSettings.title
+    ...mapGetters(["sidebar", "dicData", "userInfo"]),
+    userName () {
+      return this.userInfo ? this.userInfo.name : ""
     }
   },
   methods: {
@@ -44,11 +40,22 @@ export default {
     themeChange (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);
+        })
     }
   }
 }
@@ -79,45 +86,6 @@ 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 {
   height: $headerHeight;
   overflow: hidden;
@@ -133,117 +101,12 @@ export default {
     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;
-      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;
-      height: 40px;
       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-24 17:10:02
+-->
 <template>
   <div v-if="!item.hidden">
     <template
@@ -65,9 +70,9 @@ export default {
       })
 
       // When there is only one child router, the child router is displayed by default
-      if (showingChildren.length === 1) {
-        return true
-      }
+      // if (showingChildren.length === 1) {
+      //   return true
+      // }
 
       // Show parent if there are no child router to display
       if (showingChildren.length === 0) {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-03-06 16:18:21
+ * @LastEditTime: 2023-03-24 17:10:32
 -->
 <template>
   <div>
@@ -9,7 +9,7 @@
       <el-menu router :default-active="activeMenu" :background-color="variables.menuBg" :text-color="variables.menuText"
         :unique-opened="true" :active-text-color="variables.menuActiveText" :collapse-transition="false" mode="vertical">
         <!-- 权限菜单 -->
-        <sidebar-item v-for="route in permission_routes.slice(4)" :key="route.path" :item="route"
+        <sidebar-item v-for="route in permission_routes.slice(5)" :key="route.path" :item="route"
           :base-path="route.path" />
         <!-- 菜单全部展示 -->
         <!-- <sidebar-item v-for="route in asyncRoutes" :key="route.path" :item="route" :base-path="route.path" /> -->
@@ -19,41 +19,38 @@
 </template>
 
 <script>
-  import { mapGetters } from 'vuex'
-  import Logo from './Logo'
-  import defaultSettings from '@/settings'
-  import SidebarItem from './SidebarItem'
-  import variables from '@/styles/variables.scss'
-  import { asyncRoutes } from '@/router'
-  export default {
-    components: { SidebarItem, Logo },
-    data () {
-      return {
-        title: defaultSettings.title
+import { mapGetters } from 'vuex'
+import Logo from './Logo'
+import defaultSettings from '@/settings'
+import SidebarItem from './SidebarItem'
+import variables from '@/styles/variables.scss'
+import { asyncRoutes } from '@/router'
+export default {
+  components: { SidebarItem, Logo },
+  data () {
+    return {
+      title: defaultSettings.title
+    }
+  },
+  computed: {
+    ...mapGetters(['permission_routes', 'sidebar']),
+    activeMenu () {
+      const route = this.$route
+      const { meta, path } = route
+      if (meta.activeMenu) {
+        return meta.activeMenu
       }
+      return path
     },
-    created () {
-      console.log(this.permission_routes);
-    },
-    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
-      }
+    variables () {
+      return variables
     },
-    mounted () {
-
+    asyncRoutes () {
+      return asyncRoutes
     }
+  },
+  mounted () {
+    console.log(this.permission_routes.slice(5), 'permission_routes');
   }
+}
 </script>

 <template>
   <div id="tags-view-container" class="tags-view-container">
     <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
-      <router-link v-for="tag in visitedViews" ref="tag" :key="tag.path" :class="isActive(tag)?'active':''"
+      <router-link v-for="tag in visitedViews" ref="tag" :key="tag.path" :class="isActive(tag) ? 'active' : ''"
         :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }" tag="span" class="tags-view-item"
-        @click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''"
-        @contextmenu.prevent.native="openMenu(tag,$event)">
+        @click.middle.native="!isAffix(tag) ? closeSelectedTag(tag) : ''" @contextmenu.prevent.native="openMenu(tag, $event)">
         {{ tag.title }}
         <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
-    <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
+    <ul v-show="visible" :style="{ left: left + 'px', top: top + 'px' }" class="contextmenu">
       <li @click="refreshSelectedTag(selectedTag)">Refresh</li>
       <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">Close</li>
       <li @click="closeOthersTags">Close Others</li>
@@ -35,7 +34,7 @@ export default {
   },
   computed: {
     visitedViews () {
-      return this.$store.state.tagsView.visitedViews
+      return this.$store.state.tagsView.visitedViews.slice(1)
     },
     routes () {
       return this.$store.state.permission.routes
@@ -199,6 +198,7 @@ export default {
   box-sizing: border-box;
   padding-top: 3px;
   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-item {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-03-20 16:05:15
+ * @LastEditTime: 2023-03-23 09:21:00
 -->
 <template>
   <div class="app-wrapper">
     <navbar />
     <div class="main-container">
       <sidebar class="sidebar-container" />
-      <app-main />
+      <div class="app-main">
+        <tags-view v-if="needTagsView" />
+        <app-main />
+      </div>
     </div>
   </div>
 </template>
@@ -37,6 +40,17 @@ export default {
   }
 }
 </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">
 @import "~@/styles/mixin.scss";
 @import "~@/styles/sbSidebar.scss";
@@ -69,9 +83,4 @@ export default {
   width: 100%;
   transition: width 0.28s;
 }
-
-.el-dropdown-menu--small {
-  padding: 0;
-  width: 5px;
-}
 </style>

@@ -2,7 +2,7 @@
  * @Author: yangwei
  * @Date: 2023-01-16 09:10:12
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2023-03-21 15:00:04
+ * @LastEditTime: 2023-03-23 15:15:02
  * @FilePath: \bdcjg-web\src\main.js
  * @Description: 
  * 

+/*
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-03-23 14:47:38
+ */
+let mixin = {
+
+  methods: {
+
+  }
+}
+export default mixin
\ No newline at end of file

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-03-21 13:52:58
+ * @LastEditTime: 2023-03-24 17:24:52
  */
+import Vue from 'vue'
 import router from "./router";
 import store from "./store";
 import { getMenuInfo } from "@/api/user";
@@ -14,7 +15,6 @@ import Cookies from "js-cookie";
 NProgress.configure({ showSpinner: false });
 router.beforeEach(async (to, from, next) => {
   getTheme()
-
   NProgress.start();
   window.document.documentElement.setAttribute("data-theme", 'blue');
   document.title = getPageTitle(to.meta.title);
@@ -23,18 +23,17 @@ router.beforeEach(async (to, from, next) => {
   let hasAddRoute = store.state.permission.addRoutes;
   if (to.path == "/sb" || to.path == "/jg") {
     localStorage.removeItem("token");
-    sessionStorage.setItem("psth", to.path)
     next();
   } else {
-    let code = sessionStorage.getItem("psth") == "/sb" ? "BDCSBPT" : "BDCJGPT"
+    let code = Vue.prototype.BASE_API.CODE
     //判断token是否存在
     const hasToken = localStorage.getItem("token");
     if (hasToken) {
       //请求用户信息
       if (!hasUser) {
         store.dispatch("user/getUserInfo");
-        // import("@/styles/public.scss");
       }
+      debugger
       if (hasAddRoute) {
         next();
       } else {
@@ -52,19 +51,20 @@ router.beforeEach(async (to, from, next) => {
         if (!hasAddDict) {
           await store.dispatch("dict/generateDic");
         }
-        if (routeTo && routeTo !== "/") {
+        if (routeTo && routeTo !== "/" && routeTo !== "/sb" && routeTo !== "/jg") {
           next({ ...to, replace: true });
         } else {
-          next("/home");
+          next();
         }
       }
-    } else if (sessionStorage.getItem("psth")) {
-      next(sessionStorage.getItem("psth"));
     } else {
-      next("/jg");
+      if (code == 'BDCSBPT') {
+        next('/sb');
+      } else {
+        next('/jg');
+      }
     }
   }
-
   NProgress.done();
 });
 router.afterEach((to) => {

@@ -29,15 +29,20 @@ export const constantRoutes = [
     name: "loginsb",
     component: () => import("@/views/loginsb/index.vue"),
   },
-  // 监管首页
   {
     path: '/',
+    redirect: to => {
+      return { path: `/${Vue.prototype.BASE_API.THEME}` }
+    },
+  },
+  // 监管首页
+  {
+    path: '/home',
     component: Layout,
-    redirect: '/home',
     meta: { title: '首页' },
     children: [
       {
-        path: 'home',
+        path: '',
         component: () => import('@/views/home/index'),
         name: 'home',
         meta: { title: '工作台', icon: 'workbench', affix: true }
@@ -59,7 +64,7 @@ export const asyncRoutes = [
         path: 'index',
         component: () => import('@/views/jsbwcx/index'),
         name: 'jsbwcx',
-        meta: { title: '接收报文查询', icon: 'zsgl' }
+        meta: { title: '区县接入', icon: 'zsgl' }
       }
     ]
   },

@@ -2,7 +2,7 @@
  * @Author: xiaomiao 1158771342@qq.com
  * @Date: 2023-03-09 15:24:53
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2023-03-21 16:05:39
+ * @LastEditTime: 2023-03-23 10:19:35
  * @FilePath: \上报\bdcjg-web\src\store\modules\permission.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -25,7 +25,7 @@ const mutations = {
 }
 const actions = {
   // 添加全部菜单
-  generateRoutes ({ commit }, getMenuInfo) {  
+  generateRoutes ({ commit }, getMenuInfo) {
     let Layout;
     if (Vue.prototype.BASE_API.THEME == 'sb') {
       Layout = r => require.ensure([], () => r(require(`@/layout1`)))
@@ -40,6 +40,7 @@ const actions = {
           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 {
@@ -47,7 +48,8 @@ const actions = {
         }
         item.meta = {
           title: item.name,
-          icon: item.icon
+          icon: item.icon,
+          affix: item.affix
         }
       })
       return routers

 const state = {
-    visitedViews: [{
-        'fullPath': "/home",
-        'meta': {
-            affix: true
-        },
-        'name': "Dashboard",
-        'path': "/home",
-        'title': "工作台"
-    }]
+    visitedViews: []
 }
-
 const mutations = {
     ADD_VISITED_VIEW: (state, view) => {
         if (state.visitedViews.some(v => v.path === view.path)) return

@@ -6,7 +6,6 @@
   min-width: 1280px;
   box-sizing: border-box;
   overflow-x: hidden;
-  padding: 2px;
 
   &-header {
     width: 100%;
@@ -20,7 +19,7 @@
   &-content {
     width: 100%;
     box-sizing: border-box;
-    margin-top: 15px;
+    margin-top: 10px;
     background: #FFFFFF;
     border-radius: 4px;
     background-size: 100% 100%;
@@ -142,4 +141,4 @@
   background-color: white;
   ;
   background-size: cover;
-}
+}
\ No newline at end of file

+/*
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-03-23 15:26:37
+ */
 
 var Layout;
 let ApiUrl = localStorage.getItem('ApiUrl')
@@ -19,7 +24,6 @@ export default function filterAsyncRouter (routers) {
       item.component = Layout
     } else {
       item.component = loadView(item.uri)
-      console.log(item.component, 'item.componentitem.component');
     }
     item.meta = {
       title: item.name,

 /*
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-03-21 13:42:13
+ * @LastEditTime: 2023-03-24 16:44:54
  */
 import Vue from 'vue'
 export default function getTheme (theme = Vue.prototype.BASE_API.THEME) {
   const resultMap = {
     'jg': function () {
-      import("@/styles/jgPublic.scss")
+      return import("@/styles/jgPublic.scss");
     },
     'sb': function () {
-      import("@/styles/sbPublic.scss")
+      return import("@/styles/sbPublic.scss");
     },
-    default: function () {
+    'default': function () {
+      throw new Error(`Unsupported theme: ${theme}`);
     },
+  };
+  const result = resultMap[theme]();
+  if (result instanceof Promise) {
+    return result;
+  } else {
+    return resultMap.default();
   }
-  return resultMap[theme]() || resultMap.default()
-}
+}
\ No newline at end of file

 <template>
   <div class="Cfdj from-clues">
     <div class="from-clues-header">
-      <el-form ref="form" :model="form" label-width="130px">
-        <el-form-item>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item v-if="BASE_API.THEME=='jg'">
           <Breadcrumb />
         </el-form-item>
-        <el-row class="mb-5">
+        <el-row>
           <el-col :span="5">
-            <el-form-item label="行政区" label-width="80px">
-              <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-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>
               </el-select>
@@ -23,30 +25,29 @@
             </el-form-item>
           </el-col>
           <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-form-item>
           </el-col>
           <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-form-item>
           </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-form-item>
           </el-col>
+        </el-row>
+        <el-row class="mt-10">
           <el-col :span="5">
             <el-form-item label="查封文号">
               <el-input v-model="form.CFWH" clearable placeholder="查封文号"></el-input>
             </el-form-item>
           </el-col>
           <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-form-item>
           </el-col>
@@ -55,7 +56,11 @@
               <el-input v-model="form.JFWH" clearable placeholder="解封文号"></el-input>
             </el-form-item>
           </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">
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
@@ -94,6 +99,7 @@ export default {
         JFWH: '',
         CFJG: '',
         CFWH: '',
+        ZJH: '',
         currentPage: 1
       },
       tableData: {

@@ -2,13 +2,16 @@
   <div class="dyaq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="120px">
-        <el-form-item>
+        <el-form-item v-if="BASE_API.THEME=='jg'">
+          
           <Breadcrumb />
         </el-form-item>
         <el-row class="mb-5">
           <el-col :span="6">
-            <el-form-item label="行政区" label-width="80px">
-              <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-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>
               </el-select>
@@ -28,7 +31,7 @@
             </el-form-item>
           </el-col>
           <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-form-item>
           </el-col>
@@ -55,8 +58,15 @@
               </el-select>
             </el-form-item>
           </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="cx" @click="handleSearch">查询</btn>
           </el-col>
@@ -97,6 +107,7 @@ export default {
         BDCDYH: '',
         dybdclx: '',
         DJLX: '',
+        ZJH: '',
         currentPage: 1
       },
       tableData: {

@@ -2,13 +2,15 @@
   <div class="from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="150px">
-        <el-form-item>
+        <el-form-item v-if="BASE_API.THEME=='jg'">
           <Breadcrumb />
         </el-form-item>
-        <el-row class="mb-5">
+        <el-row>
           <el-col :span="5">
-            <el-form-item label="行政区" label-width="80px">
-              <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-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>
               </el-select>
@@ -34,16 +36,16 @@
               <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
             </el-form-item>
           </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-input v-model="form.QLR" clearable placeholder="权利人"></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row class="mt-10">
+
           <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-form-item>
           </el-col>
@@ -59,7 +61,11 @@
               <el-input v-model="form.XYDBDCDYH" clearable placeholder="需役地不动产单元号"></el-input>
             </el-form-item>
           </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-form-item>
               <btn nativeType="cz" @click="resetForm">重置</btn>
@@ -81,81 +87,82 @@
 </template>
 
 <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>

@@ -2,13 +2,15 @@
   <div class="fdcqdz from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="120px">
-        <el-form-item>
+        <el-form-item v-if="BASE_API.THEME=='jg'">
           <Breadcrumb />
         </el-form-item>
         <el-row class="mb-5">
           <el-col :span="6">
             <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-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>
               </el-select>
@@ -53,7 +55,14 @@
               <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
             </el-form-item>
           </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="cx" @click="handleSearch">查询</btn>
           </el-col>
@@ -93,6 +102,7 @@ export default {
         DJLX: '',
         BDCQZH: '',
         BDCDYH: '',
+        ZJH: '',
         currentPage: 1
       },
       tableData: {

@@ -2,7 +2,7 @@
   <div class="fdcqqfsyq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="80px">
-        <el-form-item>
+        <el-form-item v-if="BASE_API.THEME=='jg'">
           <Breadcrumb />
         </el-form-item>
         <el-row class="mb-5">
@@ -13,8 +13,8 @@
           </el-col>
           <el-col :span="5">
             <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>
               </el-select>
@@ -25,7 +25,12 @@
               <el-input v-model="form.BDCDYH" clearable placeholder="不动产单元号"></el-input>
             </el-form-item>
           </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="cx" @click="handleSearch">查询</btn>
           </el-col>
@@ -61,6 +66,7 @@ export default {
         YWH: '',
         QLLX: '',
         BDCDYH: '',
+        ZJH: '',
         currentPage: 1
       },
       tableData: {

@@ -2,13 +2,15 @@
   <div class="fdcqyz from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="120px">
-        <el-form-item>
+        <el-form-item v-if="BASE_API.THEME=='jg'">
           <Breadcrumb />
         </el-form-item>
         <el-row class="mb-5">
           <el-col :span="6">
             <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-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>
               </el-select>
@@ -53,7 +55,14 @@
               <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
             </el-form-item>
           </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="cx" @click="handleSearch">查询</btn>
           </el-col>
@@ -93,6 +102,7 @@ export default {
         DJLX: '',
         BDCQZH: '',
         BDCDYH: '',
+        ZJH: '',
         currentPage: 1
       },
       tableData: {

@@ -2,13 +2,15 @@
   <div class="gzwsyq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="105px">
-        <el-form-item>
+        <el-form-item v-if="BASE_API.THEME=='jg'">
           <Breadcrumb />
         </el-form-item>
-        <el-row class="mb-5">
+        <el-row>
           <el-col :span="6">
             <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-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>
               </el-select>
@@ -50,7 +52,12 @@
               <el-input v-model="form.JZWMC" clearable placeholder="建筑名称"></el-input>
             </el-form-item>
           </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="cx" @click="handleSearch">查询</btn>
           </el-col>
@@ -89,6 +96,7 @@ export default {
         QLR: '',
         DJLX: '',
         JZWMC: '',
+        ZJH: '',
         currentPage: 1
       },
       tableData: {

@@ -2,13 +2,15 @@
   <div class="hysyq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="105px">
-        <el-form-item>
+        <el-form-item v-if="BASE_API.THEME=='jg'">
           <Breadcrumb />
         </el-form-item>
         <el-row>
-          <el-col :span="6" class="mb-5">
+          <el-col :span="6">
             <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-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>
               </el-select>
@@ -32,12 +34,14 @@
               <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
             </el-form-item>
           </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-input v-model="form.QLR" clearable placeholder="权利人"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6" class="mt-10">
+          <el-col :span="6">
             <el-form-item label="登记类型">
               <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">
@@ -45,12 +49,19 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6" class="mt-10">
+          <el-col :span="6">
             <el-form-item label="海岛名称">
               <el-input v-model="form.HDMC" clearable placeholder="海岛名称"></el-input>
             </el-form-item>
           </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="cx" @click="handleSearch">查询</btn>
           </el-col>
@@ -90,6 +101,7 @@ export default {
         QLR: '',
         DJLX: '',
         HDMC: '',
+        ZJH: '',
         currentPage: 1
       },
       tableData: {

@@ -2,13 +2,15 @@
   <div class="jsydzjdsyq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="120px">
-        <el-form-item>
+        <el-form-item v-if="BASE_API.THEME=='jg'">
           <Breadcrumb />
         </el-form-item>
         <el-row class="mb-5">
           <el-col :span="6">
             <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-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>
               </el-select>
@@ -48,7 +50,12 @@
               <el-input v-model="form.BDCQZH" clearable placeholder="不动产权证号"></el-input>
             </el-form-item>
           </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="cx" @click="handleSearch">查询</btn>
           </el-col>
@@ -87,6 +94,7 @@ export default {
         QLR: '',
         DJLX: '',
         BDCQZH: '',
+        ZJH: '',
         currentPage: 1
       },
       tableData: {

@@ -2,13 +2,15 @@
   <div class="lq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="105px">
-        <el-form-item>
+        <el-form-item v-if="BASE_API.THEME=='jg'">
           <Breadcrumb />
         </el-form-item>
         <el-row>
-          <el-col :span="6" class="mb-5">
+          <el-col :span="6">
             <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-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>
               </el-select>
@@ -45,12 +47,16 @@
               </el-select>
             </el-form-item>
           </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="cx" @click="handleSearch">查询</btn>
           </el-col>
         </el-row>
-
       </el-form>
     </div>
     <div class="from-clues-content">
@@ -84,6 +90,7 @@ export default {
         BDCDYH: '',
         QLR: '',
         DJLX: '',
+        ZJH: '',
         currentPage: 1
       },
       tableData: {

@@ -2,13 +2,15 @@
   <div class="from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="105px">
-        <el-form-item>
+        <el-form-item v-if="BASE_API.THEME=='jg'">
           <Breadcrumb />
         </el-form-item>
-        <el-row class="mb-5">
+        <el-row>
           <el-col :span="6">
             <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-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>
               </el-select>
@@ -50,7 +52,12 @@
               <el-input v-model="form.xxx" clearable placeholder="地籍号"></el-input>
             </el-form-item>
           </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="cx" @click="handleSearch">查询</btn>
           </el-col>
@@ -89,6 +96,7 @@ export default {
         QLR: '',
         QLLX: '',
         xxx: '',
+        ZJH: '',
         currentPage: 1
       },
       tableData: {

@@ -2,13 +2,15 @@
   <div class="tdsyq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="120px">
-        <el-form-item>
+        <el-form-item v-if="BASE_API.THEME=='jg'">
           <Breadcrumb />
         </el-form-item>
         <el-row class="mb-5">
           <el-col :span="6">
             <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-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>
               </el-select>
@@ -43,11 +45,16 @@
             </el-form-item>
           </el-col>
           <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-form-item>
           </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="cx" @click="handleSearch">查询</btn>
           </el-col>
@@ -85,6 +92,7 @@ export default {
         QLR: '',
         DJLX: '',
         BDCQZH: '',
+        ZJH: '',
         currentPage: 1
       },
       tableData: {

@@ -2,26 +2,20 @@
   <div class="from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="110px">
-        <el-form-item>
+        <el-form-item v-if="BASE_API.THEME=='jg'">
           <Breadcrumb />
         </el-form-item>
         <el-row class="mb-5">
           <el-col :span="6">
             <el-form-item label="行政区" label-width="106px">
-              <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-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>
               </el-select>
             </el-form-item>
           </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-form-item label="不动产权证号">
               <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-form-item>
           </el-col>
-        </el-row>
-        <el-row class="mt-10">
           <el-col :span="6">
             <el-form-item label="预告登记种类" label-width="106px">
               <el-select v-model="form.YGDJZL" clearable ref="selectnoticeRegQL" class="width100"
@@ -43,6 +35,8 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row class="mt-10">
           <el-col :span="6">
             <el-form-item label="登记类型">
               <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-form-item>
           </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">
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cx" @click="handleSearch">查询</btn>
@@ -97,6 +96,7 @@ export default {
         YGDJZL: '',
         DJLX: '',
         BDCDYH: '',
+        ZJH: '',
         currentPage: 1
       },
       tableData: {

@@ -2,13 +2,15 @@
   <div class="from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="105px">
-        <el-form-item>
+        <el-form-item v-if="BASE_API.THEME=='jg'">
           <Breadcrumb />
         </el-form-item>
         <el-row>
-          <el-col :span="5" class="mb-5">
+          <el-col :span="5">
             <el-form-item label="行政区" label-width="80px">
-              <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-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>
               </el-select>
@@ -46,7 +48,12 @@
               <el-input v-model="form.QLR" clearable placeholder="权利人"></el-input>
             </el-form-item>
           </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="cx" @click="handleSearch">查询</btn>
           </el-col>
@@ -85,6 +92,7 @@ export default {
         BDCQZH: '',
         QLR: '',
         BDCDYH: '',
+        ZJH: '',
         currentPage: 1
       },
       tableData: {

@@ -2,31 +2,20 @@
   <div class="cancellationReg from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="105px">
-        <el-form-item>
+        <el-form-item v-if="BASE_API.THEME=='jg'">
           <Breadcrumb />
         </el-form-item>
-        <el-row class="mb-5">
+        <el-row>
           <el-col :span="6">
             <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-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>
               </el-select>
             </el-form-item>
           </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-form-item label="不动产权证号" label-width="105px">
               <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-form-item>
           </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="cx" @click="handleSearch">查询</btn>
           </el-col>
@@ -86,6 +80,7 @@ export default {
         QLR: '',
         QLLX: '',
         BDCDYH: '',
+        ZJH: '',
         currentPage: 1
       },
       tableData: {

@@ -4,13 +4,15 @@
     <!-- 头部搜索 -->
     <div class="from-clues-header">
       <el-form ref="ruleForm" :model="form" label-width="100px">
-        <el-form-item>
+        <el-form-item v-if="BASE_API.THEME=='jg'">
           <Breadcrumb />
         </el-form-item>
         <el-row class="mb-5">
           <el-col :span="6">
             <el-form-item label="行政区" prop="qxdm">
-              <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-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-select>
@@ -99,6 +101,7 @@
 </template>
 
 <script>
+import Vue from 'vue'
 // 接收报文查询
 // 引入表格头部数据
 import data from "./data";

@@ -2,7 +2,7 @@
   <div class="bg">
     <div class="login-logo"></div>
     <div class="login-inner-bg login">
-      <h2>{{ productName }}</h2>
+      <h2>{{ BASE_API.TITLE }}</h2>
       <div class="user_style">
         <h3>欢迎登录</h3>
         <el-form :model="user" :rules="rules" ref="user" id="loginform" class="demo-ruleForm">
@@ -21,244 +21,203 @@
     </div>
   </div>
 </template>
-
 <script>
-  import { loginIn } from "@/api/login.js";
-  import { api, getAction } from "@/api/manageApi";
-  export default {
-    name: "Login",
-    data () {
-      return {
-        user: {
-          account: "",
-          password: "",
-          checkStatus: false,
-        },
-        productName: "",
-        rules: {
-          account: [{ required: true, message: "请填写帐号", trigger: "blur" }],
-          password: [{ required: true, message: "请填写密码", trigger: "blur" }],
-        },
-      };
-    },
-    created () {
-      const params = {};
-      const queryOptions = {
-        conditionGroup: {
-          conditions: [
-            {
-              property: "code",
-              value: "BDCJGPT",
-              operator: "EQ",
-            },
-          ],
-          queryRelation: "AND",
-        },
-      };
-      params.queryOptions = JSON.stringify(queryOptions);
-      //根据子系统code获取子系统详细信息
-      getAction(api.subsystem, params).then((res) => {
-        if (res.status === 1) {
-          this.productName = res.content[0].name;
-          this.$store.dispatch("products/setData", res.content[0].code);
-          sessionStorage.setItem("products", res.content[0].code)
+import { loginIn } from "@/api/login.js";
+export default {
+  name: "jgLogin",
+  data () {
+    return {
+      user: {
+        account: "",
+        password: "",
+        checkStatus: false,
+      },
+      rules: {
+        account: [{ required: true, message: "请填写帐号", trigger: "blur" }],
+        password: [{ required: true, message: "请填写密码", trigger: "blur" }],
+      }
+    }
+  },
+  methods: {
+    //记住用户名
+    checkUserName: function (flag) {
+      this.user.checkStatus = flag;
+      if (this.user.checkStatus) {
+        localStorage.setItem("accountId", this.user.account);
+        let name = localStorage.getItem("accountId");
+        if (name === "") {
+          return;
         } else {
-          this.$message.error({ message: res.message, showClose: true });
+          this.user.account = name;
         }
-      });
-    },
-    mounted () {
-      // this.checkUserName();
+      } else {
+        this.user.account = localStorage.getItem("accountId");
+      }
     },
-    methods: {
-      //记住用户名
-      checkUserName: function (flag) {
-        this.user.checkStatus = flag;
-        if (this.user.checkStatus) {
-          localStorage.setItem("accountId", this.user.account);
-          let name = localStorage.getItem("accountId");
-          if (name === "") {
-            return;
-          } else {
-            this.user.account = name;
+    login (user) {
+      var self = this
+      this.$refs[user].validate(async (valid) => {
+        if (valid) {
+          let res = await loginIn(self.user.account, self.user.password)
+          if (res.status == 1) {
+            localStorage.setItem("token", `Bearer ${res.content}`);
+            //登录成功后需判断有无重定向，没有重定向则跳转首页
+            this.$router.replace(this.$route.query.redirect || "/home");
           }
-        } else {
-          this.user.account = localStorage.getItem("accountId");
         }
-      },
-      login (user) {
-        var self = this;
-        this.$refs[user].validate((valid) => {
-          if (valid) {
-            loginIn(self.user.account, self.user.password)
-              .then((res) => {
-                if (res.status === 1) {
-                  //存储token
-                  localStorage.setItem("token", `Bearer ${res.content}`);
-                  //登录成功后需判断有无重定向，没有重定向则跳转首页
-                  this.$router.replace(this.$route.query.redirect || "/");
-                } else {
-                  //错误处理
-                }
-              })
-              .catch((error) => {
-                // console.dir(error);
-              });
-          }
-        });
-      },
-    },
-    components: {},
-  };
-</script>
-<style scoped lang="scss">
-  .username,
-  .password {
-    position: relative;
-
-    &:before {
-      content: "";
-      display: block;
-      width: 16px;
-      height: 16px;
-      position: absolute;
-      left: 10px;
-      top: 7px;
-      background-size: 100% 100%;
-    }
-
-    /deep/ .el-input__inner {
-      text-indent: 24px;
-      border: 1px solid rgba(11, 161, 248, 0.4);
-      background-color: rgba(6, 135, 205, 0.3) !important;
+      })
     }
   }
-
-  .username::before {
-    background-image: url(../../image/username.png);
+}
+</script>
+<style scoped lang="scss">
+.username,
+.password {
+  position: relative;
+
+  &:before {
+    content: "";
+    display: block;
+    width: 16px;
+    height: 16px;
+    position: absolute;
+    left: 10px;
+    top: 7px;
+    background-size: 100% 100%;
   }
 
-  .password::before {
-    background-image: url(../../image/password.png);
+  /deep/ .el-input__inner {
+    text-indent: 24px;
+    border: 1px solid rgba(11, 161, 248, 0.4);
+    background-color: rgba(6, 135, 205, 0.3) !important;
   }
-
-  .bg {
-    width: 100%;
-    height: 100%;
-    min-width: 1440px;
-    min-height: 560px;
-    background: url(../../image/loginBoxBg.png) no-repeat;
+}
+
+.username::before {
+  background-image: url(../../image/username.png);
+}
+
+.password::before {
+  background-image: url(../../image/password.png);
+}
+
+.bg {
+  width: 100%;
+  height: 100%;
+  min-width: 1440px;
+  min-height: 560px;
+  background: url(../../image/loginBoxBg.png) no-repeat;
+  background-size: 100% 100%;
+  overflow: hidden;
+  position: relative;
+
+  .login-logo {
+    background: url(../../image/loginLogo.png) no-repeat;
     background-size: 100% 100%;
-    overflow: hidden;
-    position: relative;
-    .login-logo {
-      background: url(../../image/loginLogo.png) no-repeat;
-      background-size: 100% 100%;
-      width: 580px;
-      height: 540px;
-      position: absolute;
-      top: 25%;
-      left: 19%;
-    }
+    width: 580px;
+    height: 540px;
+    position: absolute;
+    top: 25%;
+    left: 19%;
   }
-
-  .login-inner-bg {
-    background: url(../../image/loginBg.png) no-repeat;
-    width: 20.6%;
-    height: 43%;
-    min-width: 360px;
-    min-height: 380px;
-    top: 30%;
-    right: 18%;
+}
+
+.login-inner-bg {
+  background: url(../../image/loginBg.png) no-repeat;
+  width: 20.6%;
+  height: 43%;
+  min-width: 360px;
+  min-height: 380px;
+  top: 30%;
+  right: 18%;
+  position: absolute;
+  background-size: 100% 100%;
+  box-sizing: border-box;
+  padding: 56px;
+
+  h2 {
+    width: 100%;
+    font-size: 36px;
+    font-weight: 700;
+    color: #fff;
+    text-align: center;
+    white-space: nowrap;
     position: absolute;
-    background-size: 100% 100%;
-    box-sizing: border-box;
-    padding: 56px;
-
-    h2 {
-      width: 100%;
-      font-size: 36px;
-      font-weight: 700;
-      color: #fff;
-      text-align: center;
-      white-space: nowrap;
-      position: absolute;
-      right: 0;
-      top: -70px;
-      background-image: linear-gradient(
-        180deg,
+    right: 0;
+    top: -70px;
+    background-image: linear-gradient(180deg,
         rgba(99, 163, 255, 1) 0,
         rgba(99, 163, 255, 1) 0,
         rgba(182, 220, 255, 1) 49.731445%,
         rgba(114, 190, 255, 1) 100%,
-        rgba(114, 190, 255, 1) 100%
-      );
-      overflow-wrap: break-word;
-      color: rgba(255, 255, 255, 1);
-      font-size: 36px;
-      font-family: AlimamaShuHeiTi-Bold;
-      -webkit-background-clip: text;
-      -webkit-text-fill-color: transparent;
-    }
+        rgba(114, 190, 255, 1) 100%);
+    overflow-wrap: break-word;
+    color: rgba(255, 255, 255, 1);
+    font-size: 36px;
+    font-family: AlimamaShuHeiTi-Bold;
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
   }
+}
 
-  .login {
-    .user_style {
-      h3 {
-        color: #fff;
-        font-size: 22px;
-        font-weight: normal;
-        text-align: center;
-        margin: 16px auto 34px;
-        font-weight: 400;
-      }
-    }
-
-    .btn {
-      width: 100%;
-      height: 6vh;
-      background-color: #00c2de;
-      border-radius: 5px;
-      font-size: 1.4vw;
-      color: #ffffff;
-    }
-
-    .btn:hover {
-      cursor: pointer;
-      background-color: #2d8cf0;
+.login {
+  .user_style {
+    h3 {
+      color: #fff;
+      font-size: 22px;
+      font-weight: normal;
+      text-align: center;
+      margin: 16px auto 34px;
+      font-weight: 400;
     }
   }
 
-  .login #loginform {
-    .el-form-item {
-      margin-bottom: 24px !important;
-    }
+  .btn {
+    width: 100%;
+    height: 6vh;
+    background-color: #00c2de;
+    border-radius: 5px;
+    font-size: 1.4vw;
+    color: #ffffff;
+  }
 
-    .login-btn {
-      margin-top: 40px !important;
-    }
+  .btn:hover {
+    cursor: pointer;
+    background-color: #2d8cf0;
+  }
+}
 
-    .el-button {
-      font-size: 18px;
-      background: #0d8cc0 !important;
-      color: #ffffff !important;
-      cursor: pointer !important;
-    }
+.login #loginform {
+  .el-form-item {
+    margin-bottom: 24px !important;
+  }
 
-    .el-input__inner {
-      width: 100% !important;
-    }
+  .login-btn {
+    margin-top: 40px !important;
+  }
 
-    .el-checkbox__label {
-      color: #fff;
-    }
+  .el-button {
+    font-size: 18px;
+    background: #0d8cc0 !important;
+    color: #ffffff !important;
+    cursor: pointer !important;
   }
 
-  .inputUser .ivu-input {
-    padding: 6px 24px !important;
-    border: 1px solid #9f9f9f !important;
+  .el-input__inner {
+    width: 100% !important;
   }
-  tr.hover-row > td.el-table__cell {
-    background-color: transparent !important;
+
+  .el-checkbox__label {
+    color: #fff;
   }
+}
+
+.inputUser .ivu-input {
+  padding: 6px 24px !important;
+  border: 1px solid #9f9f9f !important;
+}
+
+tr.hover-row>td.el-table__cell {
+  background-color: transparent !important;
+}
 </style>

@@ -2,7 +2,7 @@
   <div class="bg">
     <div class="title">
       <img src="../../image/bdclogo.png" alt="">
-      <h2>{{ productName }}</h2>
+      <h2>{{ BASE_API.TITLE }}</h2>
     </div>
     <div class="login-inner-bg login">
       <div class="user_style">
@@ -12,19 +12,21 @@
             <el-input class="username" v-model="user.account" placeholder="请输入用户名"></el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input type="password" class="password" @keyup.native="login('user')" v-model="user.password"
-              placeholder="请输入密码" show-password></el-input>
+            <el-input type="password" class="password" v-model="user.password" placeholder="请输入密码"
+              show-password></el-input>
           </el-form-item>
-          <el-form-item prop="yz">
+          <!-- <el-form-item prop="yz">
             <div class="flex-container">
               <div class="flex-input">
                 <el-input class="yz" @keyup.native="login('user')" v-model="user.yz" placeholder="请输入验证码"></el-input>
-              </div> 
+              </div>
               <div class="flex-line"></div>
               <div class="flex-img"><canvas id="s-canvas" ref="s-canvas"></canvas></div>
-              <div class="flex-renovate"><font id="renovate" @click="verification">换一批</font></div>
+              <div class="flex-renovate">
+                <font id="renovate" @click="verification">换一批</font>
+              </div>
             </div>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item class="login-btn">
             <el-button type="primary" style="width: 100%" @click="login('user')">登录</el-button>
           </el-form-item>
@@ -35,308 +37,283 @@
 </template>
 
 <script>
-  import { loginIn } from "@/api/login.js";
-  import { api, getAction } from "@/api/manageApi";
-  export default {
-    name: "Login",
-    data () {
-      return {
-        user: {
-          account: "",
-          password: "",
-          yz: "",
-          checkStatus: false,
-        },
-        productName: "",
-        rules: {
-          account: [{ required: true, message: "请填写帐号", trigger: "blur" }],
-          password: [{ required: true, message: "请填写密码", trigger: "blur" }],
-        },
-      };
+import { getMenuInfo } from "@/api/user";
+import { loginIn } from "@/api/login.js";
+export default {
+  name: "sbLogin",
+  data () {
+    return {
+      user: {
+        account: "",
+        password: "",
+        yz: "",
+        checkStatus: false,
+      },
+      productName: "",
+      rules: {
+        account: [{ required: true, message: "请填写帐号", trigger: "blur" }],
+        password: [{ required: true, message: "请填写密码", trigger: "blur" }],
+      },
+    };
+  },
+  methods: {
+    verification () {
+      let str = '1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ', code = '', i = 0;
+      for (; i++ < 4;) code += str[Math.floor(Math.random() * (str.length - 0) + 0)];
+      setTimeout(() => {
+        let canvas = document.getElementById("s-canvas"), ctx = canvas.getContext("2d");
+        canvas.width = 80;
+        canvas.height = 28;
+        ctx.fillStyle = '#ffffff';
+        ctx.fillRect(0, 0, 80, 28);
+        for (i = 0; i < code.length; i++) { this.drawText(ctx, code[i], i); }
+      }, 0);
     },
-    created () { 
-      this.verification(); 
-      const params = {};
-      const queryOptions = {
-        conditionGroup: {
-          conditions: [
-            {
-              property: "code",
-              value: "BDCSBPT",
-              operator: "EQ",
-            },
-          ],
-          queryRelation: "AND",
-        },
-      };
-      params.queryOptions = JSON.stringify(queryOptions);
-      //根据子系统code获取子系统详细信息
-      getAction(api.subsystem, params).then((res) => {
-        if (res.status === 1) {
-          this.productName = res.content[0].name;
-          this.$store.dispatch("products/setData", res.content[0].code);
-
-          sessionStorage.setItem("products", res.content[0].code)
-        } else {
-          this.$message.error({ message: res.message, showClose: true });
-        }
-      });
+    drawText (ctx, txt, i) {
+      ctx.fillStyle = this.randomColor(50, 160);
+      ctx.font = "18px SimHei";
+      let x = (i + 1) * (80 / (4 + 1)), y = this.randomNum(18, 28 - 5);
+      ctx.translate(x, y);
+      ctx.fillText(txt, 0, 0);
+      ctx.rotate((-0 * Math.PI) / 180);
+      ctx.translate(-x, -y);
     },
-    mounted () {
-      // this.checkUserName();
+    randomColor (min, max) {
+      let r = this.randomNum(min, max);
+      let g = this.randomNum(min, max);
+      let b = this.randomNum(min, max);
+      return "rgb(" + r + "," + g + "," + b + ")";
     },
-    methods: { 
-      verification() { 
-        let str = '1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ', code = '', i = 0; 
-        for( ; i++ < 4 ; ) code += str[ Math.floor( Math.random() * ( str.length - 0 ) + 0 ) ]; 
-        setTimeout( () => { 
-          let canvas = document.getElementById("s-canvas"), ctx = canvas.getContext("2d"); 
-          canvas.width = 80; 
-          canvas.height = 28; 
-          ctx.fillStyle = '#ffffff'; 
-          ctx.fillRect( 0, 0, 80, 28 ); 
-          for ( i = 0; i < code.length; i++ ) { this.drawText( ctx, code[i], i ); }
-        }, 0 ); 
-      }, 
-      drawText(ctx, txt, i) {
-        ctx.fillStyle = this.randomColor(50, 160); 
-        ctx.font = "18px SimHei"; 
-        let x = (i + 1) * (80 / (4 + 1)), y = this.randomNum( 18, 28 - 5 );
-        ctx.translate(x, y);
-        ctx.fillText(txt, 0, 0);
-        ctx.rotate((-0 * Math.PI) / 180);
-        ctx.translate(-x, -y);
-      }, 
-      randomColor(min, max) {
-        let r = this.randomNum(min, max);
-        let g = this.randomNum(min, max);
-        let b = this.randomNum(min, max);
-        return "rgb(" + r + "," + g + "," + b + ")";
-      }, 
-      randomNum(min, max) {
-        return Math.floor(Math.random() * (max - min) + min);
-      }, 
-      //记住用户名
-      checkUserName: function (flag) {
-        this.user.checkStatus = flag;
-        if (this.user.checkStatus) {
-          localStorage.setItem("accountId", this.user.account);
-          let name = localStorage.getItem("accountId");
-          if (name === "") {
-            return;
-          } else {
-            this.user.account = name;
-          }
+    randomNum (min, max) {
+      return Math.floor(Math.random() * (max - min) + min);
+    },
+    //记住用户名
+    checkUserName: function (flag) {
+      this.user.checkStatus = flag;
+      if (this.user.checkStatus) {
+        localStorage.setItem("accountId", this.user.account);
+        let name = localStorage.getItem("accountId");
+        if (name === "") {
+          return;
         } else {
-          this.user.account = localStorage.getItem("accountId");
+          this.user.account = name;
         }
-      },
-      login (user) {
-        var self = this;
-        this.$refs[user].validate((valid) => {
-          if (valid) {
-            loginIn(self.user.account, self.user.password)
-              .then((res) => {
-                if (res.status === 1) {
-                  this.$store.dispatch('business/setInitRules', "layout1")
-                  //存储token
-                  localStorage.setItem("token", `Bearer ${res.content}`);
-                  this.$store.dispatch("products/setData", res.content[0].code);
-                  sessionStorage.setItem("products", res.content[0].code)
-                  //登录成功后需判断有无重定向，没有重定向则跳转首页
-                  this.$router.replace(this.$route.query.redirect || "/");
-                } else {
-                  console.log(res);
-                  this.$message.error({ message: res.message })
-                }
-              })
-              .catch((error) => {
-                // console.dir(error);
-              });
-          }
-        });
-      },
+      } else {
+        this.user.account = localStorage.getItem("accountId");
+      }
     },
-    components: {},
-  };
-</script>
-<style scoped lang="scss">
-  .username,
-  .password,
-  .yz {
-    position: relative;
-    &:before {
-      content: "";
-      display: block;
-      width: 16px;
-      height: 16px;
-      position: absolute;
-      left: 10px;
-      top: 7px;
-      background-size: 100% 100%;
-    }
-
-    /deep/ .el-input__inner {
-      color: #000 !important;
-      text-indent: 24px;
-      // border: 1px solid rgba(11, 161, 248, 0.4);
-      // background-color: rgba(6, 135, 205, 0.3) !important;
+    login (user) {
+      var self = this
+      this.$refs[user].validate(async (valid) => {
+        if (valid) {
+          let res = await loginIn(self.user.account, self.user.password)
+          if (res.status == 1) {
+            let code = this.BASE_API.CODE;
+            localStorage.setItem("token", `Bearer ${res.content}`);
+            const { result: getMenuData } = (await getMenuInfo(code)) || [];
+            let path1 = JSON.parse(getMenuData[1].metadata)?.path + '/' + JSON.parse(getMenuData[1].children[0].metadata)?.path
+            //登录成功后需判断有无重定向，没有重定向则跳转首页
+            const accessRoutes = await this.$store.dispatch(
+              "permission/generateRoutes",
+              getMenuData
+            );
+            this.$router.addRoutes([
+              ...accessRoutes,
+              { path: "*", redirect: "/404", hidden: true },
+            ]);
+            this.$router.replace(this.$route.query.redirect || path1);
+          }
+        }
+      })
     }
   }
+}
+</script>
+<style scoped lang="scss">
+.username,
+.password,
+.yz {
+  position: relative;
 
-  .flex-container { 
-    position: relative; 
-    display: -webkit-flex;
-    display: flex;
-  } 
-
-  .flex-input {
-    width: 100%;
-  } 
-  .flex-line { 
-    position: absolute;
-    width: 1px; 
-    height: 64%; 
-    margin: 5px;
-    right: 36%;
-    background-color: #CCCCCC;
-  }
-  .flex-img { 
+  &:before {
+    content: "";
+    display: block;
+    width: 16px;
+    height: 16px;
     position: absolute;
-    margin: 2px; 
-    right: 16%;
-  } 
-  .flex-renovate { 
-    position: absolute;
-    margin: 1px; 
-    right: 3%;
-  } 
-  #renovate { 
-    color: #3F8FEA; 
-    font-size: 16px; 
-    font-weight: 700; 
-    cursor: pointer;
+    left: 10px;
+    top: 7px;
+    background-size: 100% 100%;
   }
 
-  .username::before {
-    background-image: url(../../image/userlogo.png);
+  /deep/ .el-input__inner {
+    color: #000 !important;
+    text-indent: 24px;
   }
+}
 
-  .password::before {
-    background-image: url(../../image/passlogo.png);
-  }
-  .yz::before {
-    background-image: url(../../image/yzlogo.png);
-  }
+.flex-container {
+  position: relative;
+  display: -webkit-flex;
+  display: flex;
+}
 
-  .bg {
-    width: 100%;
-    height: 100%;
-    min-width: 1440px;
-    min-height: 560px;
-    background: url(../../image/loginBoxsb.png) no-repeat;
-    background-size: 100% 100%;
-    overflow: hidden;
-    position: relative;
-  }
-  .title {
-    width: 24%;
-    height: 6%;
-    top: 20%;
-    right: 38%;
+.flex-input {
+  width: 100%;
+}
+
+.flex-line {
+  position: absolute;
+  width: 1px;
+  height: 64%;
+  margin: 5px;
+  right: 36%;
+  background-color: #CCCCCC;
+}
+
+.flex-img {
+  position: absolute;
+  margin: 2px;
+  right: 16%;
+}
+
+.flex-renovate {
+  position: absolute;
+  margin: 1px;
+  right: 3%;
+}
+
+#renovate {
+  color: #3F8FEA;
+  font-size: 16px;
+  font-weight: 700;
+  cursor: pointer;
+}
+
+.username::before {
+  background-image: url(../../image/userlogo.png);
+}
+
+.password::before {
+  background-image: url(../../image/passlogo.png);
+}
+
+.yz::before {
+  background-image: url(../../image/yzlogo.png);
+}
+
+.bg {
+  width: 100%;
+  height: 100%;
+  min-width: 1440px;
+  min-height: 560px;
+  background: url(../../image/loginBoxsb.png) no-repeat;
+  background-size: 100% 100%;
+  overflow: hidden;
+  position: relative;
+}
+
+.title {
+  width: 24%;
+  height: 6%;
+  top: 20%;
+  right: 38%;
+  position: absolute;
+
+  img {
+    width: 60px;
+    height: 60px;
+    top: 0%;
+    left: 2%;
     position: absolute;
-    img {
-      width: 60px;
-      height: 60px;
-      top: 0%;
-      left: 2%;
-      position: absolute;
-    }
-    h2 {
-      top: 25%;
-      left: 22%;
-      position: absolute;
-      width: 383px;
-      height: 42px;
-      font-size: 28px;
-      font-weight: 600;
-      color: #ffffff;
-      text-shadow: 0px 4px 4px #002c95;
-    }
   }
-  .login-inner-bg {
-    background: white;
-    width: 24.6%;
-    height: 47%;
-    min-width: 360px;
-    min-height: 380px;
-    top: 30%;
-    right: 38%;
+
+  h2 {
+    top: 25%;
+    left: 22%;
     position: absolute;
-    background-size: 100% 100%;
-    box-sizing: border-box;
-    padding: 56px;
+    width: 383px;
+    height: 42px;
+    font-size: 28px;
+    font-weight: 600;
+    color: #ffffff;
+    text-shadow: 0px 4px 4px #002c95;
   }
+}
 
-  .login {
-    .user_style {
-      h3 {
-        font-weight: normal;
-        text-align: center;
-        margin: -10px auto 28px;
-        font-weight: 400;
-        width: 125px;
-        height: 29px;
-        font-size: 20px;
-        font-family: Source Han Sans CN;
-        font-weight: 400;
-        color: #333333;
-      }
-    }
+.login-inner-bg {
+  background: white;
+  width: 24.6%;
+  height: 47%;
+  min-width: 360px;
+  min-height: 380px;
+  top: 30%;
+  right: 38%;
+  position: absolute;
+  background-size: 100% 100%;
+  box-sizing: border-box;
+  padding: 56px;
+}
 
-    .btn {
-      width: 100%;
-      height: 6vh;
-      background-color: #00c2de;
-      border-radius: 5px;
-      font-size: 1.4vw;
-      color: #000;
+.login {
+  .user_style {
+    h3 {
+      font-weight: normal;
+      text-align: center;
+      margin: -10px auto 28px;
+      font-weight: 400;
+      width: 125px;
+      height: 29px;
+      font-size: 20px;
+      font-family: Source Han Sans CN;
+      font-weight: 400;
+      color: #333333;
     }
+  }
 
-    .btn:hover {
-      cursor: pointer;
-      background-color: #2d8cf0;
-    }
+  .btn {
+    width: 100%;
+    height: 6vh;
+    background-color: #00c2de;
+    border-radius: 5px;
+    font-size: 1.4vw;
+    color: #000;
   }
 
-  .login #loginform {
-    .el-form-item {
-      margin-bottom: 24px !important;
-    }
+  .btn:hover {
+    cursor: pointer;
+    background-color: #2d8cf0;
+  }
+}
 
-    .login-btn {
-      margin-top: 30px !important;
-    }
+.login #loginform {
+  .el-form-item {
+    margin-bottom: 24px !important;
+  }
 
-    .el-button {
-      font-size: 18px;
-      border-radius: 0;
-      background: #4162d8 !important;
-      color: #ffffff !important;
-      cursor: pointer !important;
-    }
+  .login-btn {
+    margin-top: 30px !important;
+  }
 
-    .el-input__inner {
-      width: 100% !important;
-    }
+  .el-button {
+    font-size: 18px;
+    border-radius: 0;
+    background: #4162d8 !important;
+    color: #ffffff !important;
+    cursor: pointer !important;
+  }
 
-    .el-checkbox__label {
-      color: #fff;
-    }
+  .el-input__inner {
+    width: 100% !important;
   }
 
-  .inputUser .ivu-input {
-    padding: 6px 24px !important;
-    border: 1px solid #9f9f9f !important;
+  .el-checkbox__label {
+    color: #fff;
   }
+}
+
+.inputUser .ivu-input {
+  padding: 6px 24px !important;
+  border: 1px solid #9f9f9f !important;
+}
 </style>

@@ -4,7 +4,7 @@
     <!-- 头部搜索 -->
     <div class="from-clues-header">
       <el-form ref="ruleForm" :model="form" label-width="80px">
-        <el-form-item>
+        <el-form-item v-if="BASE_API.THEME=='jg'">
           <Breadcrumb />
         </el-form-item>
         <el-row>

@@ -4,7 +4,7 @@
     <!-- 头部搜索 -->
     <div class="from-clues-header">
       <el-form ref="ruleForm" :model="form" label-width="100px">
-        <el-form-item>
+        <el-form-item v-if="BASE_API.THEME=='jg'">
           <Breadcrumb />
         </el-form-item>
         <el-row class="mb-5">

@@ -11,12 +11,7 @@
           </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-input v-model="form.icon" placeholder="请选择图标" :prefix-icon="form.icon" clearable @focus="getIconList" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -206,7 +201,6 @@
               method = 'put'
               url = `${this.dataUrl}/${formData.id}`
             }
-            debugger
             httpAction(url, formData, method)
               .then((res) => {
                 if (res.status === 1) {
@@ -242,4 +236,35 @@
   }
 </script>
 <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;
+  //       }
+  //     }
+
+  //     .el-dialog__headerbtn {
+  //       right: 20px !important;
+  //       top: 23px !important;
+  //     }
+  //   }
+  // }
 </style>

@@ -29,181 +29,181 @@
   </div>
 </template>
 <script>
-  // 定时任务
-  import data from "./data";
-  import { deleteAction, getAction, api } from "@/api/manageApi";
-  import EditDialog from "./edit-dialog.vue";
-  import { mapGetters } from "vuex";
-  import { getMenuInfo } from "@/api/user";
-  import {
-    getUuid,
-    judgeSort,
-    realMove,
-    findParents,
-    removeTreeListItem,
-  } from "@/utils/operation";
-  export default {
-    name: "menus",
-    components: {
-      EditDialog,
-    },
-    data () {
-      return {
-        isDialog: false,
-        tablelistData: [],
-        listData: [],
-        resourceCategoryId: "",
-        taskData: null,
-        form: {
-          menuName: "",
-        },
-        title: "",
-        queryParam: {},
-        selectType: "0",
-        queryName: "",
-        organizationId: "", // 组织机构ID
-        departmentId: "", // 部门ID
-        departmentList: [], // 部门列表
-        levelList: [], // 职务级别
-        sexList: [],
+// 定时任务
+import data from "./data";
+import { deleteAction, getAction, api } from "@/api/manageApi";
+import EditDialog from "./edit-dialog.vue";
+import { mapGetters } from "vuex";
+import { getMenuInfo } from "@/api/user";
+import {
+  getUuid,
+  judgeSort,
+  realMove,
+  findParents,
+  removeTreeListItem,
+} from "@/utils/operation";
+export default {
+  name: "menus",
+  components: {
+    EditDialog,
+  },
+  data () {
+    return {
+      isDialog: false,
+      tablelistData: [],
+      listData: [],
+      resourceCategoryId: "",
+      taskData: null,
+      form: {
+        menuName: "",
+      },
+      title: "",
+      queryParam: {},
+      selectType: "0",
+      queryName: "",
+      organizationId: "", // 组织机构ID
+      departmentId: "", // 部门ID
+      departmentList: [], // 部门列表
+      levelList: [], // 职务级别
+      sexList: [],
 
-        selectionList: [],
-        tableData: {
-          columns: [].concat(data.columns()).concat([
-            {
-              label: "操作",
-              width: 380,
-              render: (h, scope) => {
-                return (
-                  <div>
-                    <el-button
-                      type="text"
-                      class='successColor'
-                      onClick={() => {
-                        this.handleEdit(scope.row);
-                      }}
-                    >
-                      修改
-                    </el-button>
+      selectionList: [],
+      tableData: {
+        columns: [].concat(data.columns()).concat([
+          {
+            label: "操作",
+            width: 380,
+            render: (h, scope) => {
+              return (
+                <div>
+                  <el-button
+                    type="text"
+                    class='successColor'
+                    onClick={() => {
+                      this.handleEdit(scope.row);
+                    }}
+                  >
+                    修改
+                  </el-button>
 
-                    <el-button
-                      type="text"
-                      class='delColor'
-                      onClick={() => {
-                        this.handleDelete(scope.row.id, scope.row.name);
-                      }}
-                    >
-                      删除
-                    </el-button>
-                  </div>
-                );
-              },
+                  <el-button
+                    type="text"
+                    class='delColor'
+                    onClick={() => {
+                      this.handleDelete(scope.row.id, scope.row.name);
+                    }}
+                  >
+                    删除
+                  </el-button>
+                </div>
+              );
             },
-          ]),
-          data: [],
-        },
-        tableUrl: api.menus, // 菜单接口地址
-        meumurlid: api.subsystem,// 项目id接口地址
-        productId: ""//项目id
-      };
-    },
-    created () {
-      this.getTableList();
-    },
-    computed: {
-      ...mapGetters(["products"])
-    },
-    methods: {
-      //查询
-      searchQuery () {
-        if (this.form.menuName) {
-          this.tablelistData = this.childrenFn(this.listData, this.form.menuName);
-        } else {
-          this.getTableList()
-        }
+          },
+        ]),
+        data: [],
       },
-      childrenFn (arr, key) {
-        const that = this;
-        let searchTree = [];
-        arr.forEach((item, index) => {
-          if (item.children != undefined && item.children.length != 0) {
-            let leaf = that.childrenFn(item.children, key);
-            if (leaf != undefined) {
-              let { name, code, resourceCategoryId, id, iproductId, operations, metadata } = item;
-              let parentObj = {
-                code, name, resourceCategoryId, id, iproductId, operations, metadata, children: leaf
-              };
-              searchTree.push(parentObj);
-            } else {
-              if (item.name.indexOf(key) != -1) {
-                searchTree.push(item);
-              }
-            }
+      tableUrl: api.menus, // 菜单接口地址
+      meumurlid: api.subsystem,// 项目id接口地址
+      productId: ""//项目id
+    };
+  },
+  created () {
+    this.getTableList();
+  },
+  computed: {
+    ...mapGetters(["products"])
+  },
+  methods: {
+    //查询
+    searchQuery () {
+      if (this.form.menuName) {
+        this.tablelistData = this.childrenFn(this.listData, this.form.menuName);
+      } else {
+        this.getTableList()
+      }
+    },
+    childrenFn (arr, key) {
+      const that = this;
+      let searchTree = [];
+      arr.forEach((item, index) => {
+        if (item.children != undefined && item.children.length != 0) {
+          let leaf = that.childrenFn(item.children, key);
+          if (leaf != undefined) {
+            let { name, code, resourceCategoryId, id, iproductId, operations, metadata } = item;
+            let parentObj = {
+              code, name, resourceCategoryId, id, iproductId, operations, metadata, children: leaf
+            };
+            searchTree.push(parentObj);
           } else {
             if (item.name.indexOf(key) != -1) {
-
               searchTree.push(item);
             }
           }
-        });
-        if (searchTree != undefined && searchTree.length != 0) {
-          return searchTree;
-        }
-      },
-      // 加载表格数据
-      getTableList () {
-        getMenuInfo(sessionStorage.getItem("products")).then((res) => {
-          if (res.code === 200) {
-            this.tablelistData = judgeSort(res.result)
-            this.listData = this.tablelistData
-          } else {
-            this.$message.error({ message: res.message, showClose: true })
+        } else {
+          if (item.name.indexOf(key) != -1) {
+
+            searchTree.push(item);
           }
-        })
-        const queryOptionsid = {
-          conditionGroup: {
-            queryRelation: "AND",
-            conditions: [
-              {
-                property: "code",
-                value: sessionStorage.getItem("products"),
-                operator: "EQ",
-              },
-            ],
-          },
-        };
-        const params = {
-          queryOptions: queryOptionsid,
-        };
-        // 获取系统id
-        getAction(this.meumurlid, params)
-          .then((res) => {
-            this.productId = res.content[0].id;
-            this.getAuthorityList(res.content[0].id, res.content[0].code)
-            this.selectedSubsystemCode = res.content[0].code
+        }
+      });
+      if (searchTree != undefined && searchTree.length != 0) {
+        return searchTree;
+      }
+    },
+    // 加载表格数据
+    getTableList () {
+      getMenuInfo(this.BASE_API.CODE).then((res) => {
+        if (res.code === 200) {
+          this.tablelistData = judgeSort(res.result)
+          this.listData = this.tablelistData
+        } else {
+          this.$message.error({ message: res.message, showClose: true })
+        }
+      })
+      const queryOptionsid = {
+        conditionGroup: {
+          queryRelation: "AND",
+          conditions: [
+            {
+              property: "code",
+              value: sessionStorage.getItem("products"),
+              operator: "EQ",
+            },
+          ],
+        },
+      };
+      const params = {
+        queryOptions: queryOptionsid,
+      };
+      // 获取系统id
+      getAction(this.meumurlid, params)
+        .then((res) => {
+          this.productId = res.content[0].id;
+          this.getAuthorityList(res.content[0].id, res.content[0].code)
+          this.selectedSubsystemCode = res.content[0].code
 
-          })
-          .catch((error) => {
-            console.log("er", error);
-          })
-      },
-      // 新增菜单
-      handleAdd () {
-        this.isDialog = true
-        this.$refs.dialogForm.add();
-        this.$refs.dialogForm.title = "新增";
-      },
+        })
+        .catch((error) => {
+          console.log("er", error);
+        })
+    },
+    // 新增菜单
+    handleAdd () {
+      this.isDialog = true
+      this.$refs.dialogForm.add();
+      this.$refs.dialogForm.title = "新增";
+    },
 
-      // 修改
-      handleEdit (record) {
-        this.isDialog = true
-        this.$refs.dialogForm.edit(record);
-        this.$refs.dialogForm.title = "修改";
-      },
-      // 删除
-      handleDelete (id, content) {
-        this.$confirm(
-          `<div  class="customer-message-wrapper">
+    // 修改
+    handleEdit (record) {
+      this.isDialog = true
+      this.$refs.dialogForm.edit(record);
+      this.$refs.dialogForm.title = "修改";
+    },
+    // 删除
+    handleDelete (id, content) {
+      this.$confirm(
+        `<div  class="customer-message-wrapper">
               <h5 class="title">您确认要执行该操作用于以下信息:</h5>
               <p class="content" aria-controls="${content}">${content}
               </p>
@@ -211,48 +211,48 @@
                  <span >无法恢复</span>
                 </p>
         </div>`,
-          '执行确认',
-          {
-            dangerouslyUseHTMLString: true,
-            customClass: 'customer-delete',
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
+        '执行确认',
+        {
+          dangerouslyUseHTMLString: true,
+          customClass: 'customer-delete',
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      )
+        .then(() => {
+          if (!this.tableUrl) {
+            this.$message.error({
+              message: '请设置tableUrl属性为接口地址!',
+              showClose: true
+            })
+            return
           }
-        )
-          .then(() => {
-            if (!this.tableUrl) {
-              this.$message.error({
-                message: '请设置tableUrl属性为接口地址!',
-                showClose: true
-              })
-              return
+          const url = this.tableUrl + '/' + id
+          deleteAction(url).then(res => {
+            if (res.status === 1) {
+              this.$message.success({ message: res.message, showClose: true })
+              this.reloadTableData()
+            } else {
+              this.$message.error({ message: res.message, showClose: true })
             }
-            const url = this.tableUrl + '/' + id
-            deleteAction(url).then(res => {
-              if (res.status === 1) {
-                this.$message.success({ message: res.message, showClose: true })
-                this.reloadTableData()
-              } else {
-                this.$message.error({ message: res.message, showClose: true })
-              }
-            })
           })
-          .catch(() => { })
-      },
-      // 新增、编辑回显
-      reloadTableData () {
-        this.getTableList()
-      },
+        })
+        .catch(() => { })
+    },
+    // 新增、编辑回显
+    reloadTableData () {
+      this.getTableList()
     },
-  };
+  },
+};
 </script>
 <style scoped lang="scss">
-  @import "~@/styles/mixin.scss";
+@import "~@/styles/mixin.scss";
 
-  // @import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 
-  /deep/.el-table__expand-icon {
-    color: #fff;
-  }
+/deep/.el-table__expand-icon {
+  color: #fff;
+}
 </style>

@@ -19,8 +19,9 @@
       </el-form>
     </div>
     <div class="from-clues-content">
-      <lb-table :pagination="false" @size-change="handleSizeChange" :calcHeight="200" @p-current-change="handleCurrentChange"
-        :column="tableData.columns" :data="listdata" :expand-row-keys="keyList" row-key="dictid">
+      <lb-table :pagination="false" @size-change="handleSizeChange" :calcHeight="200"
+        @p-current-change="handleCurrentChange" :column="tableData.columns" :data="listdata" :expand-row-keys="keyList"
+        row-key="dictid">
       </lb-table>
     </div>
     <EditDialog ref="addEditDialog" v-model="isDialog" @ok="reloadTableData" />
@@ -28,439 +29,439 @@
   </div>
 </template>
 <script>
-  import {
-    getUuid,
-    judgeSort,
-    realMove,
-    findParents,
-    removeTreeListItem,
-  } from "@/utils/operation";
-  import { getRolesById, getAuthorityListAction } from "@/api/authorityManage";
-  import { getUserRoles } from "@/api/personnelManage";
-  import data from "./data";
-  import { getMenuInfo } from "@/api/user";
-  import { api, getAction, deleteAction } from "@/api/manageApi";
-  import tableMixin from "@/mixins/tableMixin.js";
-  import EditDialog from "./edit-dialog.vue";
-  import Roleslistdiglog from "./roleslistdiglog.vue";
-  import { mapGetters } from "vuex";
-  import { updateOrder } from "@/api/orders"
-  export default {
-    name: "menus",
-    mixins: [tableMixin],
-    components: {
-      EditDialog,
-      Roleslistdiglog,
-    },
-    data () {
-      return {
-        isDialog: false,
-        personlist: null,
-        waitMemberList: [],
-        keyList: [],
-        listdata: [],
-        setlistdata: [],
-        tableUrlroles: api.roles,
-        form: {
-          rolesName: "",
+import {
+  getUuid,
+  judgeSort,
+  realMove,
+  findParents,
+  removeTreeListItem,
+} from "@/utils/operation";
+import { getRolesById, getAuthorityListAction } from "@/api/authorityManage";
+import { getUserRoles } from "@/api/personnelManage";
+import data from "./data";
+import { getMenuInfo } from "@/api/user";
+import { api, getAction, deleteAction } from "@/api/manageApi";
+import tableMixin from "@/mixins/tableMixin.js";
+import EditDialog from "./edit-dialog.vue";
+import Roleslistdiglog from "./roleslistdiglog.vue";
+import { mapGetters } from "vuex";
+import { updateOrder } from "@/api/orders"
+export default {
+  name: "menus",
+  mixins: [tableMixin],
+  components: {
+    EditDialog,
+    Roleslistdiglog,
+  },
+  data () {
+    return {
+      isDialog: false,
+      personlist: null,
+      waitMemberList: [],
+      keyList: [],
+      listdata: [],
+      setlistdata: [],
+      tableUrlroles: api.roles,
+      form: {
+        rolesName: "",
+      },
+      // 当前所选角色id
+      roleId: "",
+      title: "",
+      queryParam: {},
+      multipleSelection: [],
+      // 菜单列表
+      menutablelistData: [],
+      tableUrl: api.menus, // 菜单接口地址
+      meumurlid: api.subsystem, // 项目id接口地址
+      selectType: "0",
+      queryName: "",
+      organizationId: "", // 组织机构ID
+      departmentId: "", // 部门ID
+      departmentList: [], // 部门列表
+      levelList: [], // 职务级别
+      sexList: [],
+      operationCodes: null, // 操作符对象
+      operationList: [], // 获取授权列表需要提交的操作符数组
+      typeOptions: [
+        {
+          value: "0",
+          label: "姓名",
         },
-        // 当前所选角色id
-        roleId: "",
-        title: "",
-        queryParam: {},
-        multipleSelection: [],
-        // 菜单列表
-        menutablelistData: [],
-        tableUrl: api.menus, // 菜单接口地址
-        meumurlid: api.subsystem, // 项目id接口地址
-        selectType: "0",
-        queryName: "",
-        organizationId: "", // 组织机构ID
-        departmentId: "", // 部门ID
-        departmentList: [], // 部门列表
-        levelList: [], // 职务级别
-        sexList: [],
-        operationCodes: null, // 操作符对象
-        operationList: [], // 获取授权列表需要提交的操作符数组
-        typeOptions: [
-          {
-            value: "0",
-            label: "姓名",
-          },
-          {
-            value: "1",
-            label: "工号",
-          },
-          {
-            value: "2",
-            label: "部门",
-          },
+        {
+          value: "1",
+          label: "工号",
+        },
+        {
+          value: "2",
+          label: "部门",
+        },
+        {
+          value: "3",
+          label: "机构",
+        },
+      ],
+
+      selectionList: [],
+      tableData: {
+        columns: [
           {
-            value: "3",
-            label: "机构",
+            label: "序号",
+            type: "index",
+            width: "50",
+            index: this.indexMethod,
           },
-        ],
-
-        selectionList: [],
-        tableData: {
-          columns: [
+        ]
+          .concat(data.columns())
+          .concat([
             {
-              label: "序号",
-              type: "index",
-              width: "50",
-              index: this.indexMethod,
+              label: "排序",
+              width: 300,
+              render: (h, scope) => {
+                return (
+                  <div>
+                    <el-button
+                      type="text"
+                      class='movebtnColor'
+                      disabled={scope.row.isTop}
+                      onClick={() => {
+                        this.updateOrder(scope.row, 'TOP');
+                      }}
+                    >
+                      置顶
+                    </el-button>
+                    <el-button
+                      type="text"
+                      class='movebtnColor'
+                      disabled={scope.row.isTop}
+                      onClick={() => {
+                        this.updateOrder(scope.row, 'UP');
+                      }}
+                    >
+                      上移
+                    </el-button>
+                    <el-button
+                      type="text"
+                      class='movebtnColor'
+                      disabled={scope.row.isBottom}
+                      onClick={() => {
+                        this.updateOrder(scope.row, 'DOWN');
+                      }}
+                    >
+                      下移
+                    </el-button>
+                    <el-button
+                      type="text"
+                      class='movebtnColor'
+                      disabled={scope.row.isBottom}
+                      onClick={() => {
+                        this.updateOrder(scope.row, 'BOTTOM');
+                      }}
+                    >
+                      置底
+                    </el-button>
+                  </div>
+                );
+              },
             },
-          ]
-            .concat(data.columns())
-            .concat([
-              {
-                label: "排序",
-                width: 300,
-                render: (h, scope) => {
-                  return (
-                    <div>
-                      <el-button
-                        type="text"
-                        class='movebtnColor'
-                        disabled={scope.row.isTop}
-                        onClick={() => {
-                          this.updateOrder(scope.row, 'TOP');
-                        }}
-                      >
-                        置顶
-                      </el-button>
-                      <el-button
-                        type="text"
-                        class='movebtnColor'
-                        disabled={scope.row.isTop}
-                        onClick={() => {
-                          this.updateOrder(scope.row, 'UP');
-                        }}
-                      >
-                        上移
-                      </el-button>
-                      <el-button
-                        type="text"
-                        class='movebtnColor'
-                        disabled={scope.row.isBottom}
-                        onClick={() => {
-                          this.updateOrder(scope.row, 'DOWN');
-                        }}
-                      >
-                        下移
-                      </el-button>
-                      <el-button
-                        type="text"
-                        class='movebtnColor'
-                        disabled={scope.row.isBottom}
-                        onClick={() => {
-                          this.updateOrder(scope.row, 'BOTTOM');
-                        }}
-                      >
-                        置底
-                      </el-button>
-                    </div>
-                  );
-                },
+          ])
+          .concat([
+            {
+              label: "操作",
+              width: 280,
+              render: (h, scope) => {
+                return (
+                  <div>
+                    <el-tooltip
+                      class="item"
+                      effect="dark"
+                      disabled={scope.row.type !== "Everyone"}
+                      content="没有点击的权限"
+                      placement="top"
+                    >
+                      <span>
+                        <el-button
+                          disabled={scope.row.type === "Everyone"}
+                          type="text"
+                          size="mini"
+                          class="configurationbtnColor"
+                          onClick={() => {
+                            this.getList(scope.row);
+                          }}
+                        >
+                          配置
+                        </el-button>
+                      </span>
+                    </el-tooltip>
+                    <el-tooltip
+                      class="item"
+                      effect="dark"
+                      disabled={scope.row.category !== 1}
+                      content="系统内置角色 不允许修改"
+                      placement="top"
+                    >
+                      <span>
+                        <el-button
+                          disabled={scope.row.category === 1}
+                          type="text"
+                          size="mini"
+                          class='successColor'
+                          onClick={() => {
+                            this.handleAddEdit(scope.row);
+                          }}
+                        >
+                          修改
+                        </el-button>
+                      </span>
+                    </el-tooltip>
+                    <el-tooltip
+                      class="item"
+                      effect="dark"
+                      disabled={scope.row.category !== 1}
+                      content="系统内置角色 不允许删除"
+                      placement="top"
+                    >
+                      <span>
+                        <el-button
+                          type="text"
+                          disabled={scope.row.category === 1}
+                          size="mini"
+                          class='delColor'
+                          // style="color:#F56C6C"
+                          onClick={() => {
+                            this.handleDelete(scope.row.id, scope.row.name);
+                          }}
+                        >
+                          删除
+                        </el-button>
+                      </span>
+                    </el-tooltip>
+                  </div>
+                );
               },
-            ])
-            .concat([
-              {
-                label: "操作",
-                width: 280,
-                render: (h, scope) => {
-                  return (
-                    <div>
-                      <el-tooltip
-                        class="item"
-                        effect="dark"
-                        disabled={scope.row.type !== "Everyone"}
-                        content="没有点击的权限"
-                        placement="top"
-                      >
-                        <span>
-                          <el-button
-                            disabled={scope.row.type === "Everyone"}
-                            type="text"
-                            size="mini"
-                            class="configurationbtnColor"
-                            onClick={() => {
-                              this.getList(scope.row);
-                            }}
-                          >
-                            配置
-                          </el-button>
-                        </span>
-                      </el-tooltip>
-                      <el-tooltip
-                        class="item"
-                        effect="dark"
-                        disabled={scope.row.category !== 1}
-                        content="系统内置角色 不允许修改"
-                        placement="top"
-                      >
-                        <span>
-                          <el-button
-                            disabled={scope.row.category === 1}
-                            type="text"
-                            size="mini"
-                            class='successColor'
-                            onClick={() => {
-                              this.handleAddEdit(scope.row);
-                            }}
-                          >
-                            修改
-                          </el-button>
-                        </span>
-                      </el-tooltip>
-                      <el-tooltip
-                        class="item"
-                        effect="dark"
-                        disabled={scope.row.category !== 1}
-                        content="系统内置角色 不允许删除"
-                        placement="top"
-                      >
-                        <span>
-                          <el-button
-                            type="text"
-                            disabled={scope.row.category === 1}
-                            size="mini"
-                            class='delColor'
-                            // style="color:#F56C6C"
-                            onClick={() => {
-                              this.handleDelete(scope.row.id, scope.row.name);
-                            }}
-                          >
-                            删除
-                          </el-button>
-                        </span>
-                      </el-tooltip>
-                    </div>
-                  );
-                },
 
-              }]),
-        },
-        data: [],
+            }]),
+      },
+      data: [],
+    }
+  },
+  created () {
+    this.getTableData();
+    this.getTableList()
+  },
+  computed: {
+    ...mapGetters(["products"])
+  },
+  mounted () { },
+  methods: {
+    //查询
+    searchQuery () {
+      if (this.form.rolesName) {
+        this.listdata = this.childrenFn(this.setlistdata, this.form.rolesName);
+      } else {
+        this.getTableData()
       }
     },
-    created () {
-      this.getTableData();
-      this.getTableList()
+    childrenFn (arr, key) {
+      let searchTree = [];
+      arr.forEach((item, index) => {
+        if (item.name.indexOf(key) != -1) {
+
+          searchTree.push(item);
+        }
+      });
+      if (searchTree != undefined && searchTree.length != 0) {
+        return judgeSort(searchTree);
+      }
     },
-    computed: {
-      ...mapGetters(["products"])
+    // 获取角色列表
+    getTableData () {
+      getRolesById([1, 2])
+        .then((res) => {
+          this.listdata = res.content;
+          this.listdata = judgeSort(this.listdata);
+          this.setlistdata = res.content;
+        })
+        .catch((e) => console.error(e));
     },
-    mounted () { },
-    methods: {
-      //查询
-      searchQuery () {
-        if (this.form.rolesName) {
-          this.listdata = this.childrenFn(this.setlistdata, this.form.rolesName);
-        } else {
-          this.getTableData()
-        }
-      },
-      childrenFn (arr, key) {
-        let searchTree = [];
-        arr.forEach((item, index) => {
-          if (item.name.indexOf(key) != -1) {
 
-            searchTree.push(item);
-          }
-        });
-        if (searchTree != undefined && searchTree.length != 0) {
-          return judgeSort(searchTree);
+    // 获取菜单列表
+    getTableList () {
+      getMenuInfo(this.BASE_API.CODE).then((res) => {
+        if (res.code === 200) {
+          this.menutablelistData = judgeSort(res.result)
+        } else {
+          this.$message.error({ message: res.message, showClose: true })
         }
-      },
-      // 获取角色列表
-      getTableData () {
-        getRolesById([1, 2])
-          .then((res) => {
-            this.listdata = res.content;
-            this.listdata = judgeSort(this.listdata);
-            this.setlistdata = res.content;
-          })
-          .catch((e) => console.error(e));
-      },
-
-      // 获取菜单列表
-      getTableList () {
-        getMenuInfo(sessionStorage.getItem("products")).then((res) => {
-          if (res.code === 200) {
-            this.menutablelistData = judgeSort(res.result)
-          } else {
-            this.$message.error({ message: res.message, showClose: true })
-          }
+      })
+      const queryOptionsid = {
+        conditionGroup: {
+          queryRelation: "AND",
+          conditions: [
+            {
+              property: "code",
+              value: this.products,
+              operator: "EQ",
+            },
+          ],
+        },
+      };
+      const params = {
+        queryOptions: queryOptionsid,
+      };
+      // 获取系统id
+      getAction(this.meumurlid, params)
+        .then((res) => {
+          this.productId = res.content[0].id;
+          this.getAuthorityList(res.content[0].id, res.content[0].code)
+          this.selectedSubsystemCode = res.content[0].code
+          // let queryOptions = {
+          //   conditionGroup: {
+          //     conditions: [
+          //       {
+          //         property: "productId",
+          //         value: this.productId,
+          //         operator: "EQ",
+          //       },
+          //     ],
+          //     queryRelation: "AND",
+          //   },
+          //   orderBys: [{ property: "sort", direction: "desc" }],
+          // };
+          // if (!this.tableUrl) {
+          //   console.log("请设置tableUrl属性为接口地址!");
+          //   return;
+          // }
+          // if (this.queryOptions !== "") {
+          //   this.queryParam.queryOptions = JSON.stringify(queryOptions);
+          // }
+          // 查询系统菜单
+          // getAction(this.tableUrl, this.queryParam)
+          //   .then((res) => {
+          //     if (res.status === 1) {
+          //       this.loading = false;
+          //       // this.menutablelistData = res.content;
+          //       console.log("res.content菜单", res.content);
+          //     } else {
+          //       this.$message.error({ message: res.message, showClose: true });
+          //       this.loading = false;
+          //     }
+          //   })
+          //   .catch((error) => {
+          //     console.log("er", error);
+          //     this.loading = false;
+          //   });
         })
-        const queryOptionsid = {
-          conditionGroup: {
-            queryRelation: "AND",
-            conditions: [
-              {
-                property: "code",
-                value: this.products,
-                operator: "EQ",
-              },
-            ],
-          },
-        };
-        const params = {
-          queryOptions: queryOptionsid,
-        };
-        // 获取系统id
-        getAction(this.meumurlid, params)
-          .then((res) => {
-            this.productId = res.content[0].id;
-            this.getAuthorityList(res.content[0].id, res.content[0].code)
-            this.selectedSubsystemCode = res.content[0].code
-            // let queryOptions = {
-            //   conditionGroup: {
-            //     conditions: [
-            //       {
-            //         property: "productId",
-            //         value: this.productId,
-            //         operator: "EQ",
-            //       },
-            //     ],
-            //     queryRelation: "AND",
-            //   },
-            //   orderBys: [{ property: "sort", direction: "desc" }],
-            // };
-            // if (!this.tableUrl) {
-            //   console.log("请设置tableUrl属性为接口地址!");
-            //   return;
-            // }
-            // if (this.queryOptions !== "") {
-            //   this.queryParam.queryOptions = JSON.stringify(queryOptions);
-            // }
-            // 查询系统菜单
-            // getAction(this.tableUrl, this.queryParam)
-            //   .then((res) => {
-            //     if (res.status === 1) {
-            //       this.loading = false;
-            //       // this.menutablelistData = res.content;
-            //       console.log("res.content菜单", res.content);
-            //     } else {
-            //       this.$message.error({ message: res.message, showClose: true });
-            //       this.loading = false;
-            //     }
-            //   })
-            //   .catch((error) => {
-            //     console.log("er", error);
-            //     this.loading = false;
-            //   });
-          })
-          .catch((error) => {
-            console.log("er", error);
-          });
-      },
-      // 获取权限列表
-      getAuthorityList (productId, code) {
-        getAuthorityListAction(productId, code).then(
-          res => {
-            if (res.status === 1) {
-              if (res.content.length !== 0) {
-                this.operationCodes = res.content[0].operations
-                this.operationList = []
-                for (var k in this.operationCodes) {
-                  this.operationList.push(k)
-                }
+        .catch((error) => {
+          console.log("er", error);
+        });
+    },
+    // 获取权限列表
+    getAuthorityList (productId, code) {
+      getAuthorityListAction(productId, code).then(
+        res => {
+          if (res.status === 1) {
+            if (res.content.length !== 0) {
+              this.operationCodes = res.content[0].operations
+              this.operationList = []
+              for (var k in this.operationCodes) {
+                this.operationList.push(k)
               }
-            } else {
-              this.$message.error({ message: res.message, showClose: true })
             }
+          } else {
+            this.$message.error({ message: res.message, showClose: true })
           }
-        )
-      },
+        }
+      )
+    },
 
-      //  配置
-      getList (row) {
-        this.getTableList()
-        const params = {};
-        const queryOptions = {
-          conditionGroup: {
-            conditions: [
-              {
-                property: "organizationId",
-                value: row.organizationId,
-                operator: "EQ",
-              },
-              {
-                property: "departmentId",
-                value: row.departmentId,
-                operator: "EQ",
-              },
-            ],
-            queryRelation: "AND",
-          },
-          orderBys: [{ property: "sort", direction: "desc" }],
-        };
-        params.queryOptions = JSON.stringify(queryOptions);
+    //  配置
+    getList (row) {
+      this.getTableList()
+      const params = {};
+      const queryOptions = {
+        conditionGroup: {
+          conditions: [
+            {
+              property: "organizationId",
+              value: row.organizationId,
+              operator: "EQ",
+            },
+            {
+              property: "departmentId",
+              value: row.departmentId,
+              operator: "EQ",
+            },
+          ],
+          queryRelation: "AND",
+        },
+        orderBys: [{ property: "sort", direction: "desc" }],
+      };
+      params.queryOptions = JSON.stringify(queryOptions);
 
-        getUserRoles(row.id).then((res) => {
-          if (res.status === 1) {
-            this.personlist = res.content;
-            getAction(api.users, params).then((res) => {
-              if (res.status === 1) {
-                this.waitMemberList = res.content;
-                if (this.personlist) {
-                  this.waitMemberList.forEach((item, i) => {
-                    this.personlist.forEach((val) => {
-                      if (item.id === val.id) {
-                        this.waitMemberList[i].selectStatus = 0;
-                      }
-                    });
+      getUserRoles(row.id).then((res) => {
+        if (res.status === 1) {
+          this.personlist = res.content;
+          getAction(api.users, params).then((res) => {
+            if (res.status === 1) {
+              this.waitMemberList = res.content;
+              if (this.personlist) {
+                this.waitMemberList.forEach((item, i) => {
+                  this.personlist.forEach((val) => {
+                    if (item.id === val.id) {
+                      this.waitMemberList[i].selectStatus = 0;
+                    }
                   });
-                }
-
-                this.$refs.rolesForm.personlist(this.waitMemberList, row.id);
-                this.$refs.rolesForm.menulist(this.operationList, row.id, this.selectedSubsystemCode, this.menutablelistData, this.operationCodes);
-              } else {
-                this.$message.error({ message: res.message, showClose: true });
+                });
               }
-            });
-            this.$refs.rolesForm.title = "人员配置";
-          } else this.$message.error({ message: res.message, showClose: true });
-        });
-      },
-      // 新增、修改角色
-      handleAddEdit (value) {
-        this.isDialog = true
-        this.$refs.addEditDialog.menuType = this.menuType;
-        this.$refs.addEditDialog.roleId = value.id;
-        this.roleSort = value.sort ? value.sort : 0;
-        this.$refs.addEditDialog.dialogForm.roleType = sessionStorage.getItem("products");
-        if (value.id) {
-          this.$refs.addEditDialog.dialogForm.roleName = value.name;
 
-          this.$refs.addEditDialog.dialogForm.roleTextArea = value.description;
-        }
-        this.$refs.addEditDialog.showAddEditDialog = true;
-        this.$refs.addEditDialog.title = value.id ? "修改" : "新增";
-      },
-      //排序
-      updateOrder (record, operate) {
-        const findIndex = this.listdata.findIndex(item => item.id === record.id)
-        let swapId = ''
-        if (operate === 'UP') {
-          swapId = this.listdata[findIndex - 1].id
-        } else if (operate === 'DOWN') {
-          swapId = this.listdata[findIndex + 1].id
+              this.$refs.rolesForm.personlist(this.waitMemberList, row.id);
+              this.$refs.rolesForm.menulist(this.operationList, row.id, this.selectedSubsystemCode, this.menutablelistData, this.operationCodes);
+            } else {
+              this.$message.error({ message: res.message, showClose: true });
+            }
+          });
+          this.$refs.rolesForm.title = "人员配置";
+        } else this.$message.error({ message: res.message, showClose: true });
+      });
+    },
+    // 新增、修改角色
+    handleAddEdit (value) {
+      this.isDialog = true
+      this.$refs.addEditDialog.menuType = this.menuType;
+      this.$refs.addEditDialog.roleId = value.id;
+      this.roleSort = value.sort ? value.sort : 0;
+      this.$refs.addEditDialog.dialogForm.roleType = sessionStorage.getItem("products");
+      if (value.id) {
+        this.$refs.addEditDialog.dialogForm.roleName = value.name;
+
+        this.$refs.addEditDialog.dialogForm.roleTextArea = value.description;
+      }
+      this.$refs.addEditDialog.showAddEditDialog = true;
+      this.$refs.addEditDialog.title = value.id ? "修改" : "新增";
+    },
+    //排序
+    updateOrder (record, operate) {
+      const findIndex = this.listdata.findIndex(item => item.id === record.id)
+      let swapId = ''
+      if (operate === 'UP') {
+        swapId = this.listdata[findIndex - 1].id
+      } else if (operate === 'DOWN') {
+        swapId = this.listdata[findIndex + 1].id
+      }
+      updateOrder('/rest/roles', record, operate, swapId).then(res => {
+        if (res.status === 1) {
+          this.$message.success({ message: res.message, showClose: true })
+          this.getTableData();
+        } else {
+          this.$message.error({ message: res.message, showClose: true })
         }
-        updateOrder('/rest/roles', record, operate, swapId).then(res => {
-          if (res.status === 1) {
-            this.$message.success({ message: res.message, showClose: true })
-            this.getTableData();
-          } else {
-            this.$message.error({ message: res.message, showClose: true })
-          }
-        })
-      },
-      // 删除
-      handleDelete: function (id, content = "") {
-        this.$confirm(
-          `<div  class="customer-message-wrapper">
+      })
+    },
+    // 删除
+    handleDelete: function (id, content = "") {
+      this.$confirm(
+        `<div  class="customer-message-wrapper">
               <h5 class="title">您确认要执行该操作用于以下信息:</h5>
               <p class="content" aria-controls="${content}">${content}
               </p>
@@ -468,50 +469,50 @@
                  <span >无法恢复</span>
                 </p>
         </div>`,
-          "执行确认",
-          {
-            dangerouslyUseHTMLString: true,
-            customClass: "customer-delete",
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
+        "执行确认",
+        {
+          dangerouslyUseHTMLString: true,
+          customClass: "customer-delete",
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(() => {
+          if (!this.tableUrlroles) {
+            this.$message.error({
+              message: "请设置tableUrl属性为接口地址!",
+              showClose: true,
+            });
+            return;
           }
-        )
-          .then(() => {
-            if (!this.tableUrlroles) {
-              this.$message.error({
-                message: "请设置tableUrl属性为接口地址!",
-                showClose: true,
-              });
-              return;
+          const url = this.tableUrlroles + "/" + id;
+          deleteAction(url).then((res) => {
+            if (res.status === 1) {
+              this.$message.success({ message: res.message, showClose: true });
+              this.getTableData();
+            } else {
+              this.$message.error({ message: res.message, showClose: true });
             }
-            const url = this.tableUrlroles + "/" + id;
-            deleteAction(url).then((res) => {
-              if (res.status === 1) {
-                this.$message.success({ message: res.message, showClose: true });
-                this.getTableData();
-              } else {
-                this.$message.error({ message: res.message, showClose: true });
-              }
-            });
-          })
-          .catch(() => { });
-      },
-      // 新增回显
-      reloadTableData () {
-        this.getTableData();
-      },
+          });
+        })
+        .catch(() => { });
+    },
+    // 新增回显
+    reloadTableData () {
+      this.getTableData();
     },
-  };
+  },
+};
 </script>
 <style scoped lang="scss">
-  @import "~@/styles/mixin.scss";
-  // @import "~@/styles/public.scss";
+@import "~@/styles/mixin.scss";
+// @import "~@/styles/public.scss";
 
-  /deep/.el-button.is-disabled.el-button--text {
-    width: 64px;
-    height: 28px;
-    background: rgba(255, 255, 255, 0.1);
-    border-radius: 16px;
-  }
+/deep/.el-button.is-disabled.el-button--text {
+  width: 64px;
+  height: 28px;
+  background: rgba(255, 255, 255, 0.1);
+  border-radius: 16px;
+}
 </style>

 /*
  * @Author: xiaomiao 1158771342@qq.com
  * @Date: 2023-01-30 17:59:51
- * @LastEditors: xiaomiao 1158771342@qq.com
- * @LastEditTime: 2023-03-21 18:34:17
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2023-03-23 09:34:50
  * @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
  */
@@ -29,7 +29,8 @@ class data extends filter {
       },
       {
         prop: "departmentName",
-        label: "组织机构"
+        label: "组织机构",
+        minWidth: 130
       },
       {
         prop: "telephone",