style:样式修改

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-03-06 16:24:39
+ * @LastEditTime: 2023-03-07 09:15:01
 -->
 <template>
-  <div class="app-wrapper">
+  <div class="app-wrapper jgWrapper">
     <navbar />
     <div class="appMain">
       <app-main />
@@ -34,8 +34,10 @@ export default {
 }
 </script>
 <style lang="scss">
+@import "~@/styles/jgSidebar.scss";
+</style>
+<style lang="scss" scoped>
 @import "~@/styles/mixin.scss";
-@import "~@/styles/sidebar.scss";
 
 .app-wrapper {
   @include clearfix;

@@ -22,6 +22,6 @@ export default {
   box-sizing: border-box;
   flex: 1;
   width: 100%;
-  margin-right: 15px;
+  // background-color: #ffffff;
 }
 </style>

@@ -4,11 +4,7 @@
       <div class="logo">
         <img :src="require('@/image/logo.png')" alt="" />
       </div>
-      <!-- <div class="backdrop">
-        <Breadcrumb />
-      </div> -->
       <div class="right-menu">
-        <!-- <div class="dataView d-center pointer" @click="handleDataView">大屏展示</div> -->
         <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>
@@ -67,15 +63,6 @@ export default {
   }
 }
 
-.dataView {
-  color: #fff;
-  width: 120px;
-  height: 32px;
-  background: url("../../image/dp.png");
-  background-size: cover;
-  margin-right: 20px;
-}
-
 .NoticeBar {
   position: absolute;
   bottom: 0;
@@ -120,15 +107,11 @@ export default {
   height: $headerHeight;
   overflow: hidden;
   position: relative;
-  // background: linear-gradient(270deg, #148CEE 0%, #1870E3 100%); //默认颜色
-  // box-shadow: 0 1px 0px rgba(0, 21, 41, 0.08);
-  background: #0d1230;
+  background: #3D59C4;
   display: flex;
   align-items: center;
   padding-right: 20px;
   justify-content: space-between;
-  margin-bottom: 10px;
-
   .header-logo {
     width: 300px;
   }

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-03-06 16:23:31
+ * @LastEditTime: 2023-03-07 09:11:01
 -->
 <template>
   <div class="app-wrapper scWrapper">
@@ -43,7 +43,8 @@ export default {
   position: relative;
   height: 100%;
   width: 100%;
-  background-color: $containerbg;
+  // background-color: $containerbg;
+  padding: 0;
 
   &.mobile.openSidebar {
     position: fixed;

+/*
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-03-07 09:43:25
+ */
 import router from "./router";
 import store from "./store";
 import { getMenuInfo } from "@/api/user";
@@ -23,6 +28,7 @@ router.beforeEach(async (to, from, next) => {
       //请求用户信息
       if (!hasUser) {
         store.dispatch("user/getUserInfo");
+        import("@/styles/public.scss");
       }
       if (hasAddRoute) {
         next();

+/*
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-03-07 09:38:47
+ */
 import { getUserInfo } from "@/api/user";
 const state = {
   hasUser: false,
@@ -18,9 +23,6 @@ const actions = {
   getUserInfo ({ commit }) {
     return new Promise(async (resolve) => {
       let { result: res } = await getUserInfo();
-      // require.ensure([], function (require) {
-      //   require("@/assets/sass/smart-lift/index.scss");
-      // });
       commit("SET_USERINFO", res);
       resolve(true);
     });

-#app {
+.jgWrapper {
   .main-container {
     width: 100%;
     height: calc(100% - 74px);

 .tableClass {
-  /deep/.el-table {
+  .el-table {
     border: none !important;
     border-radius: 0 !important;
     background-color: rgba(0, 0, 0, 0);
@@ -40,6 +40,11 @@
 }
 
 //*****start*通用表单查询条件，列表样式******//
+.bgc {
+  box-shadow: inset 0px 0px 8px 0px rgba(255, 255, 255, 0.5);
+  background-color: rgba(0, 0, 0, 0);
+}
+
 .from-clues {
   height: 100%;
   width: 100%;
@@ -56,11 +61,11 @@
     background-size: 100% 100%;
     margin-top: 15px;
 
-    /deep/.el-form-item__label {
+    .el-form-item__label {
       color: #E3F1FF;
     }
 
-    /deep/.el-input__inner {
+    .el-input__inner {
       background: #07388B;
       border-radius: 2px;
       color: #CEF8FF;
@@ -114,16 +119,11 @@
     //修改表头的背景颜色横向渐变色
     @extend .tableClass;
 
-    /deep/.el-pagination__total {
+    .el-pagination__total {
       color: #FFFFFF;
     }
 
-    .bgc {
-      box-shadow: inset 0px 0px 8px 0px rgba(255, 255, 255, 0.5);
-      background-color: rgba(0, 0, 0, 0);
-    }
-
-    /deep/ .el-pagination {
+    .el-pagination {
       .el-input__inner {
         color: #FFFFFF;
         border: none;
@@ -142,14 +142,9 @@
         color: #FFFFFF;
       }
     }
+  }
 
-    /deep/.btn-next,
-    /deep/.btn-prev {
-      @extend .bgc;
-      color: #FFFFFF;
-    }
 
-  }
 
   .el-form--inline .el-form-item {
     width: auto;
@@ -167,10 +162,15 @@
   }
 }
 
+.el-pagination.is-background .btn-prev,
+.el-pagination.is-background .btn-next {
+  @extend .bgc;
+  color: #FFFFFF;
+}
 
 
 //*****end*通用表单查询条件，列表样式******//
-/deep/.el-range-separator {
+.el-range-separator {
   line-height: 28px !important;
 }
 
@@ -202,7 +202,7 @@
 
 // 修改弹框样式
 .modifydialog {
-  /deep/.el-dialog__header {
+  .el-dialog__header {
     text-align: center;
     margin-bottom: 10px;
 
@@ -211,36 +211,36 @@
     }
   }
 
-  /deep/.el-form-item__label {
+  .el-form-item__label {
     color: white;
   }
 
-  /deep/.el-input__inner {
+  .el-input__inner {
     background-color: #07388b;
   }
 
-  /deep/.el-input__inner {
+  .el-input__inner {
     background: #07388b;
     border-radius: 2px;
     border: 1px solid #6bc1fc;
   }
 
-  /deep/.el-textarea__inner {
+  .el-textarea__inner {
     background: #07388b;
     color: #fff;
   }
 
-  /deep/.el-form-item__label {
+  .el-form-item__label {
     color: #fff;
   }
 
-  /deep/.el-dialog__headerbtn {
+  .el-dialog__headerbtn {
     position: absolute;
     top: 22px;
     right: 30px;
   }
 
-  /deep/.el-dialog__header {
+  .el-dialog__header {
     text-align: center;
     margin-bottom: 10px;
 
@@ -252,23 +252,23 @@
 
 // 角色配置
 .roleconfiguration {
-  /deep/.el-dialog__body {
+  .el-dialog__body {
     display: flex;
     flex-direction: column;
   }
 
-  /deep/ .el-tabs {
+  .el-tabs {
     color: #cef8ff;
   }
 
   .sjmx {
-    /deep/.el-tabs__item {
+    .el-tabs__item {
       height: 50px;
       padding-top: 6px;
     }
   }
 
-  /deep/.el-tabs__item {
+  .el-tabs__item {
     color: #cef8ff !important;
 
     display: flex;
@@ -286,35 +286,35 @@
     background-size: 100% 100%;
   }
 
-  /deep/.el-tabs__nav-scroll {
+  .el-tabs__nav-scroll {
     background: none;
   }
 
-  /deep/.el-tabs__nav {
+  .el-tabs__nav {
     display: flex;
     border: none !important;
   }
 
-  /deep/.el-tabs__item.is-top {
+  .el-tabs__item.is-top {
     border: 1px solid #dfe4ed;
     border-top: 1px solid #dfe4ed;
     border-bottom: 1px solid transparent;
   }
 
-  /deep/.el-tabs__header {
+  .el-tabs__header {
     border: none;
     margin-bottom: 0;
   }
 
-  /deep/.el-tabs__item.is-top:not(:last-child) {
+  .el-tabs__item.is-top:not(:last-child) {
     margin-right: 5px;
   }
 
-  /deep/.el-tabs__item.is-top {
+  .el-tabs__item.is-top {
     background-color: none !important;
   }
 
-  /deep/.el-tabs__item.is-active {
+  .el-tabs__item.is-active {
     background: url("~@/image/tabitemse.png") no-repeat;
     background-size: 100% 100%;
   }
@@ -344,7 +344,7 @@
     border-top: none;
   }
 
-  /deep/.editDialogBox {
+  .editDialogBox {
     border-radius: 8px;
     overflow: hidden;
     min-width: 1228px;
@@ -424,7 +424,7 @@
     overflow: hidden;
   }
 
-  /deep/.el-table {
+  .el-table {
     background: none;
 
     th.el-table__cell {
@@ -440,5 +440,4 @@
       }
     }
   }
-
 }
\ No newline at end of file

 .scWrapper {
   .main-container {
     width: 100%;
-    height: calc(100% - 84px);
+    height: calc(100% - 74px);
     transition: margin-left 0.28s;
     display: flex;
-    background-color: $containerbg;
   }
 
   .sidebar-container {
@@ -12,6 +11,7 @@
     width: $sideBarWidth !important;
     font-size: 0px;
     margin-right: 15px;
+    background: #121F41;
 
     .horizontal-collapse-transition {
       transition: 0s width ease-in-out, 0s padding-left ease-in-out,
@@ -164,7 +164,7 @@
       // border-radius: 6px;
     }
   }
-  
+
   .hideSidebar {
     .sidebar-container {
       width: 54px !important;

+/*
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-03-07 09:35:10
+ */
 import Layout from '@/layout'
 export default function filterAsyncRouter (routers) {
   routers.forEach(item => {

@@ -161,5 +161,5 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 </style>

@@ -152,6 +152,6 @@ export default {
 </script>
 <style scoped lang="scss">
 // 引入表单整体样式
-@import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 </style>
 

@@ -160,5 +160,5 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 </style>

@@ -169,5 +169,5 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 </style>

@@ -135,5 +135,5 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 </style>

@@ -201,5 +201,5 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 </style>

@@ -151,5 +151,5 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 </style>

@@ -157,6 +157,6 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 </style>
 

@@ -163,6 +163,6 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 @import "./index.scss";
 </style>

@@ -143,5 +143,5 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 </style>

@@ -148,5 +148,5 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 </style>

@@ -145,5 +145,5 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 </style>

@@ -160,5 +160,5 @@ export default {
 </script>
 <style scoped lang="scss">
 // 引入表单整体样式
-@import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 </style>

@@ -151,5 +151,5 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 </style>

@@ -143,5 +143,5 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 </style>

@@ -10,29 +10,16 @@
         <el-row>
           <el-col :span="4">
             <el-form-item label="开始日期" prop="startTime">
-              <el-date-picker
-                type="date"
-                :clearable="false"
-                class="width100"
-                placeholder="开始日期"
-                :picker-options="pickerOptionsStart"
-                v-model="form.startTime"
-                value-format="yyyy-MM-dd HH:mm:ss"
-              ></el-date-picker>
+              <el-date-picker type="date" :clearable="false" class="width100" placeholder="开始日期"
+                :picker-options="pickerOptionsStart" v-model="form.startTime"
+                value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="结束日期" prop="endTime">
-              <el-date-picker
-                class="width100"
-                :clearable="false"
-                type="date"
-                placeholder="结束日期"
-                :picker-options="pickerOptionsEnd"
-                v-model="form.endTime"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                @change="endTimeChange"
-              ></el-date-picker>
+              <el-date-picker class="width100" :clearable="false" type="date" placeholder="结束日期"
+                :picker-options="pickerOptionsEnd" v-model="form.endTime" value-format="yyyy-MM-dd HH:mm:ss"
+                @change="endTimeChange"></el-date-picker>
             </el-form-item>
           </el-col>
           <!-- 操作按钮 -->
@@ -57,7 +44,7 @@ import efficient from "@/api/efficient";
 import { getFirstDayOfSeason, timeFormat } from "@/utils/operation";
 export default {
   name: "jktj",
-  data() {
+  data () {
     return {
       // 开始日期限制
       pickerOptionsStart: {
@@ -83,19 +70,19 @@ export default {
       pieChartsData: [],
     };
   },
-  created() {},
-  mounted() {
+  created () { },
+  mounted () {
     this.getProcessCounts();
   },
   computed: {
     ...mapGetters(["dicData"]),
   },
   methods: {
-    endTimeChange(val) {
+    endTimeChange (val) {
       this.form.endTime = timeFormat(new Date(val), true);
     },
     //查询各区县办件数量
-    async getProcessCounts() {
+    async getProcessCounts () {
       this.pieChartsData = [];
       let { result: res } = await efficient.getProcessCounts(
         this.form.startTime,
@@ -121,7 +108,7 @@ export default {
         });
     },
     // 重置
-    resetForm() {
+    resetForm () {
       this.form = {
         startTime: getFirstDayOfSeason(),
         endTime: timeFormat(new Date(), true),
@@ -129,7 +116,7 @@ export default {
       this.getProcessCounts();
     },
     //玫瑰图初始化
-    echartInit() {
+    echartInit () {
       let _this = this;
       // 基于准备好的dom，初始化echarts实例
       let myChart = this.$echarts.init(document.getElementById("myChart"));
@@ -190,7 +177,7 @@ export default {
       });
     },
     //柱图初始化
-    async barChartInit(recType) {
+    async barChartInit (recType) {
       //请求recType对应业务的各区县数据
       let { result: res } = await efficient.getProcessDays(
         recType,
@@ -325,7 +312,7 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 
 .jktjDetail {
   height: 100%;
@@ -364,5 +351,5 @@ export default {
 }
 </style>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 </style>

@@ -10,47 +10,24 @@
         <el-row>
           <el-col :span="4">
             <el-form-item label="行政区">
-              <el-select
-                v-model="form.qxdm"
-                class="width100"
-                clearable
-                placeholder="行政区"
-              >
-                <el-option
-                  v-for="item in dicData['A20']"
-                  :key="item.DCODE"
-                  :label="item.DNAME"
-                  :value="item.DCODE"
-                >
+              <el-select v-model="form.qxdm" class="width100" clearable placeholder="行政区">
+                <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="4">
             <el-form-item label="开始日期" prop="startTime">
-              <el-date-picker
-                type="date"
-                :clearable="false"
-                class="width100"
-                placeholder="开始日期"
-                :picker-options="pickerOptionsStart"
-                v-model="form.startTime"
-                value-format="yyyy-MM-dd HH:mm:ss"
-              ></el-date-picker>
+              <el-date-picker type="date" :clearable="false" class="width100" placeholder="开始日期"
+                :picker-options="pickerOptionsStart" v-model="form.startTime"
+                value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="结束日期" prop="endTime">
-              <el-date-picker
-                type="date"
-                :clearable="false"
-                class="width100"
-                placeholder="结束日期"
-                :picker-options="pickerOptionsEnd"
-                v-model="form.endTime"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                @change="endTimeChange"
-              ></el-date-picker>
+              <el-date-picker type="date" :clearable="false" class="width100" placeholder="结束日期"
+                :picker-options="pickerOptionsEnd" v-model="form.endTime" value-format="yyyy-MM-dd HH:mm:ss"
+                @change="endTimeChange"></el-date-picker>
             </el-form-item>
           </el-col>
           <!-- 操作按钮 -->
@@ -98,7 +75,7 @@ export default {
       // 搜索表单
       form: {
         startTime: getFirstDayOfSeason(),
-        endTime: timeFormat(new Date(),true),
+        endTime: timeFormat(new Date(), true),
         qxdm: "",
       },
     };
@@ -111,8 +88,8 @@ export default {
     ...mapGetters(["dicData"]),
   },
   methods: {
-    endTimeChange(val){
-      this.form.endTime = timeFormat(new Date(val),true)
+    endTimeChange (val) {
+      this.form.endTime = timeFormat(new Date(val), true)
     },
     async getSuucessRate () {
       this.recTypeArr = [];
@@ -137,7 +114,7 @@ export default {
     resetForm () {
       this.form = {
         startTime: getFirstDayOfSeason(),
-        endTime: timeFormat(new Date(),true),
+        endTime: timeFormat(new Date(), true),
         qxdm: "",
       };
       this.getSuucessRate();
@@ -231,7 +208,7 @@ export default {
               color: "#fff",
               fontSize: "16",
             },
-            splitNumber:2,
+            splitNumber: 2,
             axisLabel: {
               formatter: "{value} %",
               textStyle: {
@@ -302,7 +279,7 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 
 .jktjDetail {
   height: 100%;
@@ -337,5 +314,5 @@ export default {
 }
 </style>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 </style>

@@ -10,47 +10,24 @@
         <el-row>
           <el-col :span="4">
             <el-form-item label="行政区">
-              <el-select
-                v-model="form.qxdm"
-                class="width100"
-                clearable
-                placeholder="行政区"
-              >
-                <el-option
-                  v-for="item in dicData['A20']"
-                  :key="item.DCODE"
-                  :label="item.DNAME"
-                  :value="item.DCODE"
-                >
+              <el-select v-model="form.qxdm" class="width100" clearable placeholder="行政区">
+                <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="4">
             <el-form-item label="开始日期">
-              <el-date-picker
-                class="width100"
-                :clearable="false"
-                type="date"
-                placeholder="开始日期"
-                :picker-options="pickerOptionsStart"
-                v-model="form.startTime"
-                value-format="yyyy-MM-dd HH:mm:ss"
-              ></el-date-picker>
+              <el-date-picker class="width100" :clearable="false" type="date" placeholder="开始日期"
+                :picker-options="pickerOptionsStart" v-model="form.startTime"
+                value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="结束日期">
-              <el-date-picker
-                class="width100"
-                :clearable="false"
-                type="date"
-                placeholder="结束日期"
-                :picker-options="pickerOptionsEnd"
-                v-model="form.endTime"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                @change="endTimeChange"
-              ></el-date-picker>
+              <el-date-picker class="width100" :clearable="false" type="date" placeholder="结束日期"
+                :picker-options="pickerOptionsEnd" v-model="form.endTime" value-format="yyyy-MM-dd HH:mm:ss"
+                @change="endTimeChange"></el-date-picker>
             </el-form-item>
           </el-col>
           <!-- 操作按钮 -->
@@ -98,13 +75,13 @@ export default {
       // 搜索表单
       form: {
         startTime: getFirstDayOfSeason(),
-        endTime: timeFormat(new Date(),true),
+        endTime: timeFormat(new Date(), true),
         qxdm: "",
       },
-      chartData:[]
+      chartData: []
     };
   },
-  mounted() {
+  mounted () {
     // 查询业务量
     this.getProcessCounts();
   },
@@ -112,10 +89,10 @@ export default {
     ...mapGetters(["dicData"]),
   },
   methods: {
-    endTimeChange(val){
-      this.form.endTime = timeFormat(new Date(val),true)
+    endTimeChange (val) {
+      this.form.endTime = timeFormat(new Date(val), true)
     },
-    async getProcessCounts(){
+    async getProcessCounts () {
       this.chartData = [];
       let { result: res } = await efficient.getProcessCounts(
         this.form.startTime,
@@ -133,13 +110,13 @@ export default {
     resetForm () {
       this.form = {
         startTime: getFirstDayOfSeason(),
-        endTime: timeFormat(new Date(),true),
+        endTime: timeFormat(new Date(), true),
         qxdm: ""
       };
       this.getProcessCounts();
     },
     //图表渲染
-    echartInit(chartArr) {
+    echartInit (chartArr) {
       // 基于准备好的dom，初始化echarts实例
       let myChart = this.$echarts.init(document.getElementById("myChart"));
       // 绘制图表
@@ -158,7 +135,7 @@ export default {
         xAxis: [
           {
             type: "category",
-            data: chartArr.map(item=>item.recTypeName),
+            data: chartArr.map(item => item.recTypeName),
             axisLabel: {
               interval: 0,
               formatter: function (val) {
@@ -221,7 +198,7 @@ export default {
               },
             },
             barMaxWidth: '60',
-            data: chartArr.map(item=>item.counts),
+            data: chartArr.map(item => item.counts),
           },
         ],
       });
@@ -230,7 +207,7 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 
 .jktjDetail {
   height: 100%;
@@ -240,11 +217,13 @@ export default {
   .rows {
     margin-left: 100px;
   }
+
   .center {
     line-height: 50vh;
     text-align: center;
-    color:#b6b5b5
+    color: #b6b5b5
   }
+
   .echarts-box {
     display: flex;
     justify-content: center;
@@ -263,5 +242,5 @@ export default {
 }
 </style>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 </style>

@@ -293,7 +293,7 @@ export default {
 </script>
 <style scoped lang="scss">
 // 引入表单整体样式
-@import "~@/styles/public.scss";
+// // @import "~@/styles/public.scss";
 // 引入当前css
 @import "./index.scss";
 </style>

@@ -6,6 +6,10 @@
   border-right: 1px solid #458ACF !important;
 }
 
+/deep/.el-table thead.is-group th.el-table__cell {
+  background-color: transparent !important;
+}
+
 /deep/.el-table--group::after,
 .el-table--border::after {
   width: 0 !important;

@@ -164,7 +164,7 @@ export default {
 </script>
 <style scoped lang="scss">
 // 引入表单整体样式
-@import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 @import "../css/index.scss";
 </style>
 

@@ -155,7 +155,7 @@ export default {
 </script>
 <style scoped lang="scss">
 // 引入表单整体样式
-@import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 @import "../css/index.scss";
 </style>
 

@@ -148,7 +148,7 @@ export default {
 </script>
 <style scoped lang="scss">
 // 引入表单整体样式
-@import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 @import "../css/index.scss";
 </style>
 

@@ -459,7 +459,7 @@ export default {
 </script>
 <style scoped lang="scss">
 @import "~@/styles/mixin.scss";
-@import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 @import "~@/styles/dialogBox.scss";
 
 

@@ -154,6 +154,5 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
 @import "./index.scss";
 </style>

@@ -235,7 +235,6 @@ export default {
 </script>
 <style scoped lang="scss">
 // 引入页面公共样式
-@import "~@/styles/public.scss";
 @import "./index.scss";
 </style>
 

@@ -146,8 +146,7 @@ export default {
 }
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
-  @import "~@/styles/public.scss";
-
+  // @import "~@/styles/public.scss";
   .editDialogBox-box {
     margin: 14px 18px 30px 18px !important
   }

 <template>
   <!-- 编辑 -->
-  <dialogBox submitForm="submitForm" class="tableClass" @closeDialog="closeDialog" @submitForm="handleSubmit"
-    width="60%" v-model="myValue" :isMain="true" title="字典信息">
+  <dialogBox submitForm="submitForm" class="tableClass" @closeDialog="closeDialog" @submitForm="handleSubmit" width="60%"
+    v-model="myValue" :isMain="true" title="字典信息">
     <div class="editDialogBox-box ">
       <el-form :model="ruleForm" ref="ruleForm" label-width="100px">
         <el-row :gutter="20">
@@ -17,9 +17,8 @@
           </el-col>
         </el-row>
       </el-form>
-      <lb-table :column="column" class="loadingtext opacity-input" :heightNum="600" :key="key"
-        :expand-row-keys="keyList" row-key="dictid" :tree-props="{ children: 'children' }" :pagination="false"
-        :data="tableData">
+      <lb-table :column="column" class="loadingtext opacity-input" :heightNum="600" :key="key" :expand-row-keys="keyList"
+        row-key="dictid" :tree-props="{ children: 'children' }" :pagination="false" :data="tableData">
       </lb-table>
     </div>
   </dialogBox>
@@ -359,7 +358,7 @@ export default {
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
-@import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 
 /deep/.el-radio {
   margin-right: 5px !important;

@@ -127,5 +127,5 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 </style>

@@ -22,64 +22,68 @@
   </div>
 </template>
 <script>
-  import "@/utils/flexible.js";
-  import BaseSet from "./base-set.vue";
-  import PasswordEdit from "./password-edit.vue";
-  export default {
-    components: {
-      BaseSet,
-      PasswordEdit,
+import "@/utils/flexible.js";
+import BaseSet from "./base-set.vue";
+import PasswordEdit from "./password-edit.vue";
+export default {
+  components: {
+    BaseSet,
+    PasswordEdit,
+  },
+  data () {
+    return {
+      isshow: true,
+    };
+  },
+  computed: {
+    userData () {
+      return this.$store.state.user.userInfo;
     },
-    data () {
-      return {
-        isshow: true,
-      };
-    },
-    computed: {
-      userData () {
-        return this.$store.state.user.userInfo;
-      },
-    },
-    watch: {},
-    created () { },
-    mounted () {
+  },
+  watch: {},
+  created () { },
+  mounted () {
 
 
+  },
+  methods: {
+    information () {
+      this.isshow = true;
     },
-    methods: {
-      information () {
-        this.isshow = true;
-      },
-      password () {
-        this.isshow = false;
-      },
+    password () {
+      this.isshow = false;
     },
-  };
+  },
+};
 </script>
 
 <style scoped lang="scss">
-  @import "~@/styles/mixin.scss";
-  @import "~@/styles/public.scss";
-  .information {
-    .btnColRight {
-      margin-top: 20px;
-    }
-    /deep/.content {
-      .el-input__inner {
-        background: none;
-      }
-      .user-info {
-        background: none;
-      }
+@import "~@/styles/mixin.scss";
+
+// @import "~@/styles/public.scss";
+.information {
+  .btnColRight {
+    margin-top: 20px;
+  }
+
+  /deep/.content {
+    .el-input__inner {
+      background: none;
     }
-    /deep/.el-tabs {
-      .el-tabs__content {
-        height: 100%;
-        width: 100%;
-      }
+
+    .user-info {
+      background: none;
     }
-    .contentbox {
-      height: 3.0854rem;
+  }
+
+  /deep/.el-tabs {
+    .el-tabs__content {
+      height: 100%;
+      width: 100%;
     }
   }
-</style>
+
+  .contentbox {
+    height: 3.0854rem;
+  }
+}</style>

 <template>
   <div>
-    <Dialog
-      class="modifydialog"
-      :title="title"
-      :show.sync="visible"
-      :width="'767px'"
-      @close="close()">
+    <Dialog class="modifydialog" :title="title" :show.sync="visible" :width="'767px'" @close="close()">
       <template slot="content">
         <el-form ref="form" :model="form" :rules="rules">
           <el-row :gutter="24">
@@ -18,14 +13,8 @@
           <el-row :gutter="24">
             <el-col :span="12">
               <el-form-item label="上级菜单:" label-width="124px">
-                <el-cascader
-                  :key="menuKey"
-                  v-model="form.parentId"
-                  :options="parentMenuList"
-                  :props="setProps"
-                  placeholder="请选择上级菜单"
-                  clearable
-                  @change="handleChange" />
+                <el-cascader :key="menuKey" v-model="form.parentId" :options="parentMenuList" :props="setProps"
+                  placeholder="请选择上级菜单" clearable @change="handleChange" />
               </el-form-item>
             </el-col>
 
@@ -33,10 +22,7 @@
           <el-row :gutter="24">
             <el-col :span="24">
               <el-form-item label="代码:" prop="code" label-width="124px">
-                <el-input
-                  v-model="codeComputed"
-                  placeholder="请输入菜单代码"
-                  :disabled="type === 1" />
+                <el-input v-model="codeComputed" placeholder="请输入菜单代码" :disabled="type === 1" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -50,28 +36,17 @@
           <el-row :gutter="24">
             <el-col :span="24">
               <el-form-item label="浏览器跳转模式:" label-width="124px">
-                <el-select
-                  v-model="form.jumpMode"
-                  placeholder="请选择浏览器跳转模式">
-                  <el-option
-                    v-for="item in jumpModeList"
-                    :key="item.value"
-                    :label="item.name"
-                    :value="item.value" />
+                <el-select v-model="form.jumpMode" placeholder="请选择浏览器跳转模式">
+                  <el-option v-for="item in jumpModeList" :key="item.value" :label="item.name" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="24">
-              <el-form-item
-                label="配置参数:"
-                label-width="124px"
-                class="form-item-mb0">
+              <el-form-item label="配置参数:" label-width="124px" class="form-item-mb0">
                 <!-- 配置参数 -->
-                <JsonEditor
-                  :result-infos="form.metadata"
-                  @getJsonString="getJsonString" />
+                <JsonEditor :result-infos="form.metadata" @getJsonString="getJsonString" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -80,9 +55,7 @@
       <template slot="footer">
         <el-button class="cancel-button" @click="close()">取消</el-button>
 
-        <el-button
-          type="primary"
-          @click="submitForm()">保存</el-button>
+        <el-button type="primary" @click="submitForm()">保存</el-button>
       </template>
     </Dialog>
     <!-- 图标列表 -->
@@ -91,173 +64,173 @@
 </template>
 
 <script>
-  import Dialog from "@/components/Dialog/";
-  import { getParentMenuListAction } from '@/api/authorityManage'
-  import JsonEditor from '@/components/JsonEditors'
-  import IconList from '@/components/IconList'
-  import { validateCode } from '@/utils/validate';
-  import { api, httpAction } from '@/api/manageApi'
-  export default {
-    name: 'MenuModal',
-    components: {
-      IconList,
-      JsonEditor,
-      Dialog
-    },
-    props: {
-      productId: {
-        type: String,
-        default: ''
+import Dialog from "@/components/Dialog/";
+import { getParentMenuListAction } from '@/api/authorityManage'
+import JsonEditor from '@/components/JsonEditors'
+import IconList from '@/components/IconList'
+import { validateCode } from '@/utils/validate';
+import { api, httpAction } from '@/api/manageApi'
+export default {
+  name: 'MenuModal',
+  components: {
+    IconList,
+    JsonEditor,
+    Dialog
+  },
+  props: {
+    productId: {
+      type: String,
+      default: ''
+    }
+  },
+  data () {
+    return {
+      form: {
+        icon: '',
+        code: ''
+      },
+      rules: {
+        name: [{ required: true, message: '请输入菜单名称', trigger: 'blur' }],
+        code: [
+          { required: true, message: '必填', trigger: 'blur' },
+          { validator: validateCode, trigger: 'blur' }
+        ]
+      },
+      title: '',
+      type: '',
+      visible: false,
+      parentMenuList: [],
+      menuKey: 0,
+      jumpModeList: [
+        { name: '在当前页面显示', value: 1 },
+        { name: '跳转到新页面', value: 2 }
+      ],
+      setProps: {
+        value: 'id',
+        label: 'name',
+        children: 'children',
+        expandTrigger: 'hover',
+        checkStrictly: true, // 可取消关联，选择任意一级选项
+        emitPath: false
+      },
+      dataUrl: api.menus
+    }
+  },
+  computed: {
+    codeComputed: {
+      get: function () {
+        return this.form.code
+      },
+      set: function (val) {
+        this.form.code = val.toUpperCase()
       }
+    }
+  },
+  created () { },
+  mounted () { },
+  methods: {
+    // 获取父级菜单
+    getParentMenuList (id) {
+
+      getParentMenuListAction(id).then((res) => {
+        if (res.status === 1) {
+          const list = this.$dealArrChildren(res.content)
+          if (id) {
+            this.parentMenuList = this.$dealArrDisabled(
+              this.$deepCopy(list),
+              id
+            )
+            this.menuKey++
+          } else {
+            this.parentMenuList = list
+          }
+        } else {
+          this.$message.error({ message: res.message, showClose: true })
+        }
+      })
     },
-    data () {
-      return {
-        form: {
-          icon: '',
-          code: ''
-        },
-        rules: {
-          name: [{ required: true, message: '请输入菜单名称', trigger: 'blur' }],
-          code: [
-            { required: true, message: '必填', trigger: 'blur' },
-            { validator: validateCode, trigger: 'blur' }
-          ]
-        },
-        title: '',
-        type: '',
-        visible: false,
-        parentMenuList: [],
-        menuKey: 0,
-        jumpModeList: [
-          { name: '在当前页面显示', value: 1 },
-          { name: '跳转到新页面', value: 2 }
-        ],
-        setProps: {
-          value: 'id',
-          label: 'name',
-          children: 'children',
-          expandTrigger: 'hover',
-          checkStrictly: true, // 可取消关联，选择任意一级选项
-          emitPath: false
-        },
-        dataUrl: api.menus
-      }
+    getIconList () {
+      this.$refs.iconList.show(true)
     },
-    computed: {
-      codeComputed: {
-        get: function () {
-          return this.form.code
-        },
-        set: function (val) {
-          this.form.code = val.toUpperCase()
-        }
+    getIconName (data) {
+      this.form.icon = data
+    },
+    // 配置参数
+    getJsonString (data) {
+      this.form.metadata = data
+    },
+    // 新增菜单
+    add () {
+      this.getParentMenuList(this.productId)
+      this.visible = true
+      this.type = 0
+      this.form.jumpMode = 1
+    },
+    // 编辑菜单
+    edit (record) {
+      this.type = 1
+      // 若有id为编辑
+      if (record.id) {
+        this.$nextTick(() => {
+          this.form = Object.assign({}, record)
+          this.getParentMenuList(this.productId)
+        })
       }
+      this.visible = true
     },
-    created () { },
-    mounted () { },
-    methods: {
-      // 获取父级菜单
-      getParentMenuList (id) {
-
-        getParentMenuListAction(id).then((res) => {
-          if (res.status === 1) {
-            const list = this.$dealArrChildren(res.content)
-            if (id) {
-              this.parentMenuList = this.$dealArrDisabled(
-                this.$deepCopy(list),
-                id
-              )
-              this.menuKey++
-            } else {
-              this.parentMenuList = list
-            }
+    // 选择上级菜单
+    handleChange (value) {
+      this.form.parentId = value
+    },
+    // 保存
+    submitForm (submitType) {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          let method = ''
+          let url = ''
+          const formData = this.form
+          formData.productId = this.productId
+          if (!formData.id) {
+            method = 'post'
+            url = this.dataUrl
           } else {
-            this.$message.error({ message: res.message, showClose: true })
+            method = 'put'
+            url = `${this.dataUrl}/${formData.id}`
           }
-        })
-      },
-      getIconList () {
-        this.$refs.iconList.show(true)
-      },
-      getIconName (data) {
-        this.form.icon = data
-      },
-      // 配置参数
-      getJsonString (data) {
-        this.form.metadata = data
-      },
-      // 新增菜单
-      add () {
-        this.getParentMenuList(this.productId)
-        this.visible = true
-        this.type = 0
-        this.form.jumpMode = 1
-      },
-      // 编辑菜单
-      edit (record) {
-        this.type = 1
-        // 若有id为编辑
-        if (record.id) {
-          this.$nextTick(() => {
-            this.form = Object.assign({}, record)
-            this.getParentMenuList(this.productId)
-          })
-        }
-        this.visible = true
-      },
-      // 选择上级菜单
-      handleChange (value) {
-        this.form.parentId = value
-      },
-      // 保存
-      submitForm (submitType) {
-        this.$refs.form.validate((valid) => {
-          if (valid) {
-            let method = ''
-            let url = ''
-            const formData = this.form
-            formData.productId = this.productId
-            if (!formData.id) {
-              method = 'post'
-              url = this.dataUrl
-            } else {
-              method = 'put'
-              url = `${this.dataUrl}/${formData.id}`
-            }
-            httpAction(url, formData, method)
-              .then((res) => {
-                if (res.status === 1) {
-                  this.$message.success({
-                    message: res.message,
-                    showClose: true
-                  })
+          httpAction(url, formData, method)
+            .then((res) => {
+              if (res.status === 1) {
+                this.$message.success({
+                  message: res.message,
+                  showClose: true
+                })
 
-                  this.resetForm()
-                  this.$emit('ok')
-                } else {
-                  this.$message.error({ message: res.message, showClose: true })
-                }
-              })
-              .catch((err) => {
-                console.log(err)
-              })
-          }
-        })
-      },
-      resetForm () {
-        this.$refs.form.resetFields()
-        this.form = {
-          icon: '',
-          code: ''
+                this.resetForm()
+                this.$emit('ok')
+              } else {
+                this.$message.error({ message: res.message, showClose: true })
+              }
+            })
+            .catch((err) => {
+              console.log(err)
+            })
         }
-      },
-      close () {
-        this.resetForm()
-        this.visible = false
+      })
+    },
+    resetForm () {
+      this.$refs.form.resetFields()
+      this.form = {
+        icon: '',
+        code: ''
       }
+    },
+    close () {
+      this.resetForm()
+      this.visible = false
     }
   }
+}
 </script>
 <style scoped lang="scss">
-  @import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 </style>

@@ -13,182 +13,175 @@
       </el-form>
     </div>
     <div class="from-clues-content">
-      <lb-table
-        :pagination="false"
-        :column="tableData.columns"
-        :data="tablelistData"
-        row-key="id"
-        default-expand-all
+      <lb-table :pagination="false" :column="tableData.columns" :data="tablelistData" row-key="id" default-expand-all
         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
       </lb-table>
     </div>
-    <edit-dialog ref="dialogForm"
-      :product-id="productId"
-      :resource-category-id="resourceCategoryId"
+    <edit-dialog ref="dialogForm" :product-id="productId" :resource-category-id="resourceCategoryId"
       @ok="reloadTableData" />
     <!-- <authorizationdiglog ref="rolesForm" /> -->
   </div>
 </template>
 <script>
-  // 定时任务
-  import data from "./data";
-  import { deleteAction, getAction, api } from "@/api/manageApi";
-  import EditDialog from "./edit-dialog.vue";
-  // import authorizationdiglog from "./authorizationdiglog.vue";
-  export default {
-    name: "menus",
-    components: {
-      EditDialog,
-      // authorizationdiglog,
-    },
-    data () {
-      return {
-        tablelistData: [],
-        resourceCategoryId: "",
-        taskData: null,
-        form: {
-          job_name: "",
-          currentPage: 1,
-        },
-        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 authorizationdiglog from "./authorizationdiglog.vue";
+export default {
+  name: "menus",
+  components: {
+    EditDialog,
+    // authorizationdiglog,
+  },
+  data () {
+    return {
+      tablelistData: [],
+      resourceCategoryId: "",
+      taskData: null,
+      form: {
+        job_name: "",
+        currentPage: 1,
+      },
+      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"
-                      size="mini"
-                      icon="el-icon-edit"
-                      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"
+                    size="mini"
+                    icon="el-icon-edit"
+                    onClick={() => {
+                      this.handleEdit(scope.row);
+                    }}
+                  >
+                    修改
+                  </el-button>
 
-                    <el-button
-                      type="text"
-                      size="mini"
-                      icon="el-icon-delete"
-                      style="color:#F56C6C"
-                      onClick={() => {
-                        this.handleDelete(scope.row.id, scope.row.name);
-                      }}
-                    >
-                      删除
-                    </el-button>
-                  </div>
-                );
-              },
+                  <el-button
+                    type="text"
+                    size="mini"
+                    icon="el-icon-delete"
+                    style="color:#F56C6C"
+                    onClick={() => {
+                      this.handleDelete(scope.row.id, scope.row.name);
+                    }}
+                  >
+                    删除
+                  </el-button>
+                </div>
+              );
             },
-          ]),
-          data: [],
-        },
-        pageData: {
-          total: 5,
-          pageSize: 15,
-          current: 1,
+          },
+        ]),
+        data: [],
+      },
+      pageData: {
+        total: 5,
+        pageSize: 15,
+        current: 1,
+      },
+      tableUrl: api.menus, // 菜单接口地址
+      meumurlid: api.subsystem,// 项目id接口地址
+      productId: ""//项目id
+    };
+  },
+  created () {
+    this.getTableList();
+  },
+  methods: {
+    // 加载表格数据
+    getTableList () {
+
+      const queryOptionsid = {
+        conditionGroup: {
+          queryRelation: "AND",
+          conditions: [
+            {
+              property: "code",
+              value: "BDCJGPT",
+              operator: "EQ",
+            },
+          ],
         },
-        tableUrl: api.menus, // 菜单接口地址
-        meumurlid: api.subsystem,// 项目id接口地址
-        productId: ""//项目id
       };
+      const params = {
+        queryOptions: queryOptionsid,
+      };
+      // 获取系统id
+      getAction(this.meumurlid, params)
+        .then((res) => {
+          this.productId = res.content[0].id;
+          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.tablelistData = 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);
+        });
     },
-    created () {
-      this.getTableList();
+    // 新增菜单
+    handleAdd () {
+      this.$refs.dialogForm.add();
+      this.$refs.dialogForm.title = "添加";
     },
-    methods: {
-      // 加载表格数据
-      getTableList () {
 
-        const queryOptionsid = {
-          conditionGroup: {
-            queryRelation: "AND",
-            conditions: [
-              {
-                property: "code",
-                value: "BDCJGPT",
-                operator: "EQ",
-              },
-            ],
-          },
-        };
-        const params = {
-          queryOptions: queryOptionsid,
-        };
-        // 获取系统id
-        getAction(this.meumurlid, params)
-          .then((res) => {
-            this.productId = res.content[0].id;
-            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.tablelistData = 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);
-          });
-      },
-      // 新增菜单
-      handleAdd () {
-        this.$refs.dialogForm.add();
-        this.$refs.dialogForm.title = "添加";
-      },
-
-      // 修改
-      handleEdit (record) {
-        this.$refs.dialogForm.edit(record);
-        this.$refs.dialogForm.title = "修改";
-      },
-      // 删除
-      handleDelete (id, content) {
-        this.$confirm(
-          `<div  class="customer-message-wrapper">
+    // 修改
+    handleEdit (record) {
+      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>
@@ -196,49 +189,51 @@
                  <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/public.scss";
-  .btnColRight {
-    margin-top: 20px;
-  }
-  /deep/.el-table__expand-icon {
-    color: #fff;
-  }
+@import "~@/styles/mixin.scss";
+
+// @import "~@/styles/public.scss";
+.btnColRight {
+  margin-top: 20px;
+}
+
+/deep/.el-table__expand-icon {
+  color: #fff;
+}
 </style>

@@ -13,14 +13,8 @@
       </el-form>
     </div>
     <div class="from-clues-content">
-      <lb-table
-        :pagination="false"
-        @size-change="handleSizeChange"
-        @p-current-change="handleCurrentChange"
-        :column="tableData.columns"
-        :data="listdata"
-        :expand-row-keys="keyList"
-        row-key="dictid">
+      <lb-table :pagination="false" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
+        :column="tableData.columns" :data="listdata" :expand-row-keys="keyList" row-key="dictid">
       </lb-table>
     </div>
     <EditDialog ref="addEditDialog" @ok="reloadTableData" />
@@ -28,387 +22,387 @@
   </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 { api, getAction, deleteAction } from "@/api/manageApi";
-  import tableMixin from "@/mixins/tableMixin.js";
-  import EditDialog from "./edit-dialog.vue";
-  import Roleslistdiglog from "./roleslistdiglog.vue";
-  export default {
-    name: "menus",
-    mixins: [tableMixin],
-    components: {
-      EditDialog,
-      Roleslistdiglog,
-    },
-    data () {
-      return {
-        personlist: null,
-        waitMemberList: [],
-        keyList: [],
-        listdata: [],
-        tableUrl: api.roles,
-        form: {
-          job_name: "",
-          currentPage: 1,
+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 { api, getAction, deleteAction } from "@/api/manageApi";
+import tableMixin from "@/mixins/tableMixin.js";
+import EditDialog from "./edit-dialog.vue";
+import Roleslistdiglog from "./roleslistdiglog.vue";
+export default {
+  name: "menus",
+  mixins: [tableMixin],
+  components: {
+    EditDialog,
+    Roleslistdiglog,
+  },
+  data () {
+    return {
+      personlist: null,
+      waitMemberList: [],
+      keyList: [],
+      listdata: [],
+      tableUrl: api.roles,
+      form: {
+        job_name: "",
+        currentPage: 1,
+      },
+      // 当前所选角色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,
-            },
-          ]
-            .concat(data.columns())
-            .concat([
-              {
-                label: "排序",
-                width: 380,
-                render: (h, scope) => {
-                  return (
-                    <div>
-                      <el-button
-                        type="text"
-                        disabled={scope.row.isTop}
-                        onClick={() => {
-                          this.moveUpward(scope.$index, scope.row);
-                        }}
-                      >
-                        上移
-                      </el-button>
-                      <el-button
-                        type="text"
-                        disabled={scope.row.isBottom}
-                        onClick={() => {
-                          this.moveDown(scope.$index, scope.row);
-                        }}
-                      >
-                        下移
-                      </el-button>
-                    </div>
-                  );
-                },
+              label: "排序",
+              width: 380,
+              render: (h, scope) => {
+                return (
+                  <div>
+                    <el-button
+                      type="text"
+                      disabled={scope.row.isTop}
+                      onClick={() => {
+                        this.moveUpward(scope.$index, scope.row);
+                      }}
+                    >
+                      上移
+                    </el-button>
+                    <el-button
+                      type="text"
+                      disabled={scope.row.isBottom}
+                      onClick={() => {
+                        this.moveDown(scope.$index, scope.row);
+                      }}
+                    >
+                      下移
+                    </el-button>
+                  </div>
+                );
               },
-            ])
-            .concat([
-              {
-                label: "操作",
-                width: 380,
-                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"
-                            icon="el-icon-video-pause"
-                            onClick={() => {
-                              this.getUserList(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"
-                            icon="el-icon-edit"
-                            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"
-                            icon="el-icon-delete"
-                            // style="color:#F56C6C"
-                            onClick={() => {
-                              this.handleDelete(scope.row.id, scope.row.name);
-                            }}
-                          >
-                            删除
-                          </el-button>
-                        </span>
-                      </el-tooltip>
-                    </div>
-                  );
-                },
+            },
+          ])
+          .concat([
+            {
+              label: "操作",
+              width: 380,
+              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"
+                          icon="el-icon-video-pause"
+                          onClick={() => {
+                            this.getUserList(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"
+                          icon="el-icon-edit"
+                          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"
+                          icon="el-icon-delete"
+                          // style="color:#F56C6C"
+                          onClick={() => {
+                            this.handleDelete(scope.row.id, scope.row.name);
+                          }}
+                        >
+                          删除
+                        </el-button>
+                      </span>
+                    </el-tooltip>
+                  </div>
+                );
               },
-            ]),
-          data: [],
-        },
-      };
-    },
-    created () {
-      this.getTableData();
-      this.getTableList()
-    },
-    mounted () { },
-    methods: {
-      // 获取角色列表
-      getTableData () {
-        let Builtinrole = [];
-        let Publicrole = [];
+            },
+          ]),
+        data: [],
+      },
+    };
+  },
+  created () {
+    this.getTableData();
+    this.getTableList()
+  },
+  mounted () { },
+  methods: {
+    // 获取角色列表
+    getTableData () {
+      let Builtinrole = [];
+      let Publicrole = [];
 
-        getRolesById(1)
-          .then((res) => {
-            Builtinrole = res.content;
-            getRolesById(2)
-              .then((res) => {
-                console.log("角色列表", res);
-                Publicrole = res.content;
+      getRolesById(1)
+        .then((res) => {
+          Builtinrole = res.content;
+          getRolesById(2)
+            .then((res) => {
+              console.log("角色列表", res);
+              Publicrole = res.content;
 
-                this.listdata = Builtinrole.concat(Publicrole);
+              this.listdata = Builtinrole.concat(Publicrole);
 
-                this.listdata = judgeSort(this.listdata);
-              })
-              .catch((e) => console.error(e));
-          })
-          .catch((e) => console.error(e));
-      },
+              this.listdata = judgeSort(this.listdata);
+            })
+            .catch((e) => console.error(e));
+        })
+        .catch((e) => console.error(e));
+    },
 
-      // 获取菜单列表
-      getTableList () {
-        const queryOptionsid = {
-          conditionGroup: {
-            queryRelation: "AND",
-            conditions: [
-              {
-                property: "code",
-                value: "BDCJGPT",
-                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;
-                } 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)
-                }
-              }
-            } else {
-              this.$message.error({ message: res.message, showClose: true })
-            }
+    // 获取菜单列表
+    getTableList () {
+      const queryOptionsid = {
+        conditionGroup: {
+          queryRelation: "AND",
+          conditions: [
+            {
+              property: "code",
+              value: "BDCJGPT",
+              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;
           }
-        )
-      },
-
-      //  配置
-      getUserList (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 (this.queryOptions !== "") {
+            this.queryParam.queryOptions = JSON.stringify(queryOptions);
+          }
+          // 查询系统菜单
+          getAction(this.tableUrl, this.queryParam)
+            .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);
+                this.loading = false;
+                this.menutablelistData = res.content;
               } else {
                 this.$message.error({ message: res.message, showClose: true });
+                this.loading = false;
               }
+            })
+            .catch((error) => {
+              console.log("er", error);
+              this.loading = false;
             });
-            this.$refs.rolesForm.title = "人员配置";
-          } else this.$message.error({ message: res.message, showClose: true });
+        })
+        .catch((error) => {
+          console.log("er", error);
         });
-      },
-      // 新增、修改角色
-      handleAddEdit (value) {
-        this.$refs.addEditDialog.menuType = this.menuType;
-        this.$refs.addEditDialog.roleId = value.id;
-        this.roleSort = value.sort ? value.sort : 0;
-        if (value.id) {
-          this.$refs.addEditDialog.dialogForm.roleName = value.name;
-          this.$refs.addEditDialog.dialogForm.roleType = value.type;
-          this.$refs.addEditDialog.dialogForm.roleTextArea = value.description;
+    },
+    // 获取权限列表
+    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 })
+          }
         }
-        this.$refs.addEditDialog.showAddEditDialog = true;
-        this.$refs.addEditDialog.dialogTitle = value.id ? "修改" : "新增";
-      },
-      // 上移下移
-      moveUpward (index, row) {
-        realMove(row.dictid, "UP", this.listdata);
-        this.key++;
-        let id = findParents(this.listdata, row.dictid);
-        this.keyList = id;
-      },
-      moveDown (index, row) {
-        realMove(row.dictid, "DOWN", this.listdata);
-        this.key++;
-        let id = findParents(this.listdata, row.dictid);
-        this.keyList = id;
-      },
+      )
+    },
+
+    //  配置
+    getUserList (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;
+                    }
+                  });
+                });
+              }
 
-      // 删除
-      handleDelete: function (id, content = "") {
-        this.$confirm(
-          `<div  class="customer-message-wrapper">
+              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.$refs.addEditDialog.menuType = this.menuType;
+      this.$refs.addEditDialog.roleId = value.id;
+      this.roleSort = value.sort ? value.sort : 0;
+      if (value.id) {
+        this.$refs.addEditDialog.dialogForm.roleName = value.name;
+        this.$refs.addEditDialog.dialogForm.roleType = value.type;
+        this.$refs.addEditDialog.dialogForm.roleTextArea = value.description;
+      }
+      this.$refs.addEditDialog.showAddEditDialog = true;
+      this.$refs.addEditDialog.dialogTitle = value.id ? "修改" : "新增";
+    },
+    // 上移下移
+    moveUpward (index, row) {
+      realMove(row.dictid, "UP", this.listdata);
+      this.key++;
+      let id = findParents(this.listdata, row.dictid);
+      this.keyList = id;
+    },
+    moveDown (index, row) {
+      realMove(row.dictid, "DOWN", this.listdata);
+      this.key++;
+      let id = findParents(this.listdata, row.dictid);
+      this.keyList = id;
+    },
+
+    // 删除
+    handleDelete: function (id, content = "") {
+      this.$confirm(
+        `<div  class="customer-message-wrapper">
               <h5 class="title">您确认要执行该操作用于以下信息:</h5>
               <p class="content" aria-controls="${content}">${content}
               </p>
@@ -416,47 +410,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.getTableData();
+            } 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.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";
-  .btnColRight {
-    margin-left: -30px;
-    margin-top: 20px;
-  }
+@import "~@/styles/mixin.scss";
+
+// @import "~@/styles/public.scss";
+.btnColRight {
+  margin-left: -30px;
+  margin-top: 20px;
+}
 </style>

@@ -249,5 +249,5 @@ export default {
 </script>
 <style scoped lang="scss">
 @import "~@/styles/mixin.scss";
-@import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 </style>

@@ -16,295 +16,289 @@
       </el-form>
     </div>
     <div class="from-clues-content">
-      <lb-table
-        :pagination="false"
-        @size-change="handleSizeChange"
-        @p-current-change="handleCurrentChange"
-        :column="tableData.columns"
-        :data="tableData.data"
-        :expand-row-keys="keyList"
-        row-key="dictid">
+      <lb-table :pagination="false" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
+        :column="tableData.columns" :data="tableData.data" :expand-row-keys="keyList" row-key="dictid">
       </lb-table>
     </div>
     <EditDialog ref="dialogForm" @ok="reloadTableData" />
   </div>
 </template>
 <script>
-  import {
-    getUuid,
-    judgeSort,
-    realMove,
-    findParents,
-    removeTreeListItem,
-  } from "@/utils/operation";
-  import {
-    resetPassword,
-    getUserList,
-  } from "@/api/personnelManage";
-  import { api, deleteAction } from '@/api/manageApi'
-  import data from "./data";
-  import { deleteDomStr } from '@/utils/proDomStr'
-  import tableMixin from "@/mixins/tableMixin.js";
-  import EditDialog from "./edit-dialog.vue";
-  export default {
-    name: "menus",
-    mixins: [tableMixin],
-    components: {
-      EditDialog,
-    },
-    data () {
-      return {
-        taskData: null,
-        keyList: [],
-        form: {
-          job_name: "",
-          currentPage: 1,
+import {
+  getUuid,
+  judgeSort,
+  realMove,
+  findParents,
+  removeTreeListItem,
+} from "@/utils/operation";
+import {
+  resetPassword,
+  getUserList,
+} from "@/api/personnelManage";
+import { api, deleteAction } from '@/api/manageApi'
+import data from "./data";
+import { deleteDomStr } from '@/utils/proDomStr'
+import tableMixin from "@/mixins/tableMixin.js";
+import EditDialog from "./edit-dialog.vue";
+export default {
+  name: "menus",
+  mixins: [tableMixin],
+  components: {
+    EditDialog,
+  },
+  data () {
+    return {
+      taskData: null,
+      keyList: [],
+      form: {
+        job_name: "",
+        currentPage: 1,
+      },
+      queryParam: {},
+      selectType: "0",
+      queryName: "",
+      organizationId: "", // 组织机构ID
+      departmentId: "", // 部门ID
+      departmentList: [], // 部门列表
+      levelList: [], // 职务级别
+      sexList: [],
+      typeOptions: [
+        {
+          value: "0",
+          label: "姓名",
         },
-        queryParam: {},
-        selectType: "0",
-        queryName: "",
-        organizationId: "", // 组织机构ID
-        departmentId: "", // 部门ID
-        departmentList: [], // 部门列表
-        levelList: [], // 职务级别
-        sexList: [],
-        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: "负责人",
+              render: (h, scope) => {
+                return (
+                  <i v-show={scope.row.isDuty !== null} class="el-icon-check" />
+                )
+              }
             },
-          ]
-            .concat(data.columns())
-            .concat([
-              {
-                label: "负责人",
-                render: (h, scope) => {
-                  return (
-                    <i v-show={scope.row.isDuty !== null} class="el-icon-check" />
-                  )
-                }
-              },
-              {
-                label: "排序",
-                width: 280,
-                render: (h, scope) => {
-                  return (
-                    <div>
-                      <el-button
-                        type="text"
-                        disabled={scope.row.isTop}
-                        onClick={() => {
-                          this.moveUpward(scope.$index, scope.row);
-                        }}
-                      >
-                        上移
-                      </el-button>
-                      <el-button
-                        type="text"
-                        disabled={scope.row.isBottom}
-                        onClick={() => {
-                          this.moveDown(scope.$index, scope.row);
-                        }}
-                      >
-                        下移
-                      </el-button>
-                    </div>
-                  );
-                },
+            {
+              label: "排序",
+              width: 280,
+              render: (h, scope) => {
+                return (
+                  <div>
+                    <el-button
+                      type="text"
+                      disabled={scope.row.isTop}
+                      onClick={() => {
+                        this.moveUpward(scope.$index, scope.row);
+                      }}
+                    >
+                      上移
+                    </el-button>
+                    <el-button
+                      type="text"
+                      disabled={scope.row.isBottom}
+                      onClick={() => {
+                        this.moveDown(scope.$index, scope.row);
+                      }}
+                    >
+                      下移
+                    </el-button>
+                  </div>
+                );
               },
-              {
-                label: "操作",
-                width: 380,
-                render: (h, scope) => {
-                  return (
-                    <div>
-                      <el-button
-                        type="text"
-                        size="mini"
-                        icon="el-icon-video-pause"
-                        onClick={() => {
-                          this.resetPassword(scope.row.id);
-                        }}
-                      >
-                        重置
-                      </el-button>
-                      <el-button
-                        type="text"
-                        size="mini"
-                        icon="el-icon-edit"
-                        onClick={() => {
-                          this.handleEdit(scope.row);
-                        }}
-                      >
-                        修改
-                      </el-button>
-                      <el-button
-                        type="text"
-                        size="mini"
-                        icon="el-icon-delete"
-                        style="color:#F56C6C"
-                        onClick={() => {
-                          this.handleDelete(scope.row.id, scope.row.name);
-                        }}
-                      >
-                        删除
-                      </el-button>
-                    </div>
-                  );
-                },
+            },
+            {
+              label: "操作",
+              width: 380,
+              render: (h, scope) => {
+                return (
+                  <div>
+                    <el-button
+                      type="text"
+                      size="mini"
+                      icon="el-icon-video-pause"
+                      onClick={() => {
+                        this.resetPassword(scope.row.id);
+                      }}
+                    >
+                      重置
+                    </el-button>
+                    <el-button
+                      type="text"
+                      size="mini"
+                      icon="el-icon-edit"
+                      onClick={() => {
+                        this.handleEdit(scope.row);
+                      }}
+                    >
+                      修改
+                    </el-button>
+                    <el-button
+                      type="text"
+                      size="mini"
+                      icon="el-icon-delete"
+                      style="color:#F56C6C"
+                      onClick={() => {
+                        this.handleDelete(scope.row.id, scope.row.name);
+                      }}
+                    >
+                      删除
+                    </el-button>
+                  </div>
+                );
               },
-            ]),
-          data: [],
-        },
-      };
-    },
-    created () {
-      this.getTableList();
-    },
-    computed: {
-      departmentid () {
-        return this.$store.state.user.userInfo;
+            },
+          ]),
+        data: [],
       },
+    };
+  },
+  created () {
+    this.getTableList();
+  },
+  computed: {
+    departmentid () {
+      return this.$store.state.user.userInfo;
     },
-    methods: {
-      handleAdd () {
-        this.$refs.dialogForm.adds();
-        this.$refs.dialogForm.title = "添加";
-      },
-      getTableList () {
-        this.loading = true;
-        this.queryParam = {
-          organizationId: this.departmentid.organizationId,
-          departmentId: this.departmentid.departmentId,
-        };
-        getUserList(this.queryParam).then((res) => {
-          console.log("人员列表", res);
-          if (res.status === 1) {
-            this.loading = false;
-            this.tableData.data = res.content;
-            this.tableData.data = judgeSort(this.tableData.data);
-          } else {
-            this.$message.error({ message: res.message, showClose: true });
-          }
-        });
-      },
-
-      // 重置用户密码
-      resetPassword (data) {
-        const ids = []
-        if (data instanceof Array) {
-          data.forEach((item) => {
-            ids.push(item.id)
-          })
+  },
+  methods: {
+    handleAdd () {
+      this.$refs.dialogForm.adds();
+      this.$refs.dialogForm.title = "添加";
+    },
+    getTableList () {
+      this.loading = true;
+      this.queryParam = {
+        organizationId: this.departmentid.organizationId,
+        departmentId: this.departmentid.departmentId,
+      };
+      getUserList(this.queryParam).then((res) => {
+        console.log("人员列表", res);
+        if (res.status === 1) {
+          this.loading = false;
+          this.tableData.data = res.content;
+          this.tableData.data = judgeSort(this.tableData.data);
         } else {
-          ids.push(data)
-        }
-        if (ids.length === 0) {
-          this.$message({
-            message: '请选择需要重置密码的用户!',
-            showClose: true
-          })
-          return
+          this.$message.error({ message: res.message, showClose: true });
         }
-        this.$confirm(
-          `<div  class="customer-message-wrapper">
+      });
+    },
+
+    // 重置用户密码
+    resetPassword (data) {
+      const ids = []
+      if (data instanceof Array) {
+        data.forEach((item) => {
+          ids.push(item.id)
+        })
+      } else {
+        ids.push(data)
+      }
+      if (ids.length === 0) {
+        this.$message({
+          message: '请选择需要重置密码的用户!',
+          showClose: true
+        })
+        return
+      }
+      this.$confirm(
+        `<div  class="customer-message-wrapper">
               <h5 class="title">确定要重置密码吗</h5>
                <p class="result">执行后，数据将
                  <span >无法恢复</span>
                 </p>
         </div>`,
-          '执行确认',
-          {
-            dangerouslyUseHTMLString: true,
-            customClass: 'customer-delete',
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        )
-          .then(() => {
-            resetPassword(ids).then((res) => {
-              if (res.status === 1) {
-                this.$message.success({ message: res.message, showClose: true })
-                this.getTableList()
-              } else {
-                this.$message.error({ message: res.message, showClose: true })
-              }
-            })
-          })
-          .catch(() => { })
-      },
-      // 上移下移
-      moveUpward (index, row) {
-        realMove(row.dictid, "UP", this.tableData.data);
-        this.key++;
-        let id = findParents(this.tableData.data, row.dictid);
-        this.keyList = id;
-      },
-      moveDown (index, row) {
-        realMove(row.dictid, "DOWN", this.tableData.data);
-        this.key++;
-        let id = findParents(this.tableData.data, row.dictid);
-        this.keyList = id;
-      },
-      // 修改人员信息
-      handleEdit (row) {
-        this.$refs.dialogForm.edit(row);
-        this.$refs.dialogForm.title = "修改";
-      },
-      // 删除
-      handleDelete (id, content) {
-        this.$confirm(deleteDomStr(content), '执行确认', {
+        '执行确认',
+        {
           dangerouslyUseHTMLString: true,
           customClass: 'customer-delete',
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
-        })
-          .then(() => {
-            deleteAction(`${api.users}/${id}`).then((res) => {
-              if (res.status === 1) {
-                this.$message.success({ message: res.message, showClose: true })
-              } else {
-                this.$message.error({ message: res.message, showClose: true })
-              }
+        }
+      )
+        .then(() => {
+          resetPassword(ids).then((res) => {
+            if (res.status === 1) {
+              this.$message.success({ message: res.message, showClose: true })
               this.getTableList()
-            })
+            } else {
+              this.$message.error({ message: res.message, showClose: true })
+            }
           })
-          .catch(() => { })
-      },
-      // 新增回显
-      reloadTableData () {
-        this.getTableList()
-      },
+        })
+        .catch(() => { })
+    },
+    // 上移下移
+    moveUpward (index, row) {
+      realMove(row.dictid, "UP", this.tableData.data);
+      this.key++;
+      let id = findParents(this.tableData.data, row.dictid);
+      this.keyList = id;
+    },
+    moveDown (index, row) {
+      realMove(row.dictid, "DOWN", this.tableData.data);
+      this.key++;
+      let id = findParents(this.tableData.data, row.dictid);
+      this.keyList = id;
+    },
+    // 修改人员信息
+    handleEdit (row) {
+      this.$refs.dialogForm.edit(row);
+      this.$refs.dialogForm.title = "修改";
+    },
+    // 删除
+    handleDelete (id, content) {
+      this.$confirm(deleteDomStr(content), '执行确认', {
+        dangerouslyUseHTMLString: true,
+        customClass: 'customer-delete',
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          deleteAction(`${api.users}/${id}`).then((res) => {
+            if (res.status === 1) {
+              this.$message.success({ message: res.message, showClose: true })
+            } else {
+              this.$message.error({ message: res.message, showClose: true })
+            }
+            this.getTableList()
+          })
+        })
+        .catch(() => { })
+    },
+    // 新增回显
+    reloadTableData () {
+      this.getTableList()
     },
-  };
+  },
+};
 </script>
 <style scoped lang="scss">
-  @import "~@/styles/mixin.scss";
-  @import "~@/styles/public.scss";
-  @import "./index.scss";
+@import "~@/styles/mixin.scss";
+// @import "~@/styles/public.scss";
+@import "./index.scss";
 </style>

@@ -199,6 +199,6 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-@import "~@/styles/public.scss";
+// @import "~@/styles/public.scss";
 @import "./index.scss";
 </style>