样式调整

@@ -2,6 +2,7 @@
   <div>
   <div>
     <i class="el-icon-s-management icon" :title="title" @click="openDialog" />
     <i class="el-icon-s-management icon" :title="title" @click="openDialog" />
     <el-dialog
     <el-dialog
+      class="configuration"
       :key="key"
       :key="key"
       :title="title"
       :title="title"
       :inner-dialog="true"
       :inner-dialog="true"
@@ -9,8 +10,7 @@
       width="600px"
       width="600px"
       :close-on-click-modal="false"
       :close-on-click-modal="false"
       append-to-body
       append-to-body
-      @cancel="cancel"
-    >
+      @cancel="cancel">
       <vue-json-editor
       <vue-json-editor
         id="minejson"
         id="minejson"
         v-model="resultInfo"
         v-model="resultInfo"
@@ -18,15 +18,13 @@
         lang="zh"
         lang="zh"
         @json-change="onJsonChange"
         @json-change="onJsonChange"
         @json-save="onJsonSave"
         @json-save="onJsonSave"
-        @has-error="onError"
-      />
+        @has-error="onError" />
       <el-tooltip
       <el-tooltip
         content="全屏缩放"
         content="全屏缩放"
         effect="dark"
         effect="dark"
         placement="bottom"
         placement="bottom"
         fullscreen
         fullscreen
-        class="fullScreen"
-      >
+        class="fullScreen">
         <i class="el-icon-full-screen" @click="enLarge" />
         <i class="el-icon-full-screen" @click="enLarge" />
       </el-tooltip>
       </el-tooltip>
       <template slot="footer">
       <template slot="footer">
@@ -34,142 +32,156 @@
           <el-button
           <el-button
             type="primary"
             type="primary"
             class="confirmBtn"
             class="confirmBtn"
-            @click="onJsonSave"
-          >保存</el-button>
+            @click="onJsonSave">保存</el-button>
           <el-button
           <el-button
             type="primary"
             type="primary"
             class="cancelBtn"
             class="cancelBtn"
-            @click="cancel"
-          >关闭</el-button>
+            @click="cancel">关闭</el-button>
         </div>
         </div>
       </template>
       </template>
     </el-dialog>
     </el-dialog>
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
-import vueJsonEditor from 'vue-json-editor'
-export default {
-  components: {
-    vueJsonEditor
-  },
-  props: {
-    title: {
-      type: String,
-      default: '配置参数'
+  import vueJsonEditor from 'vue-json-editor'
+  export default {
+    components: {
+      vueJsonEditor
     },
     },
-    resultInfos: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      activeNames: [],
-      resultInfo: {},
-      tmpResultInfo: {},
-      dialogVisible: false,
-      hasJsonFlag: true,
-      key: 0,
-      isEnlarge: false
-    }
-  },
-  watch: {
-    resultInfos: {
-      handler: function(val) {
-        ++this.key
-        this.resultInfo =
-          this.resultInfos === '' ? {} : JSON.parse(this.resultInfos)
-        this.tmpResultInfo = this.resultInfo
+    props: {
+      title: {
+        type: String,
+        default: '配置参数'
       },
       },
-      deep: true,
-      immediate: true
-    }
-  },
-
-  mounted() {
-    this.resultInfo =
-      this.resultInfos === '' ? {} : JSON.parse(this.resultInfos)
-  },
-
-  methods: {
-    onJsonChange(value) {
-      // 只有在格式正确的时候进入此事件
-      this.hasJsonFlag = true
-    },
-    onJsonSave() {
-      const value = this.resultInfo
-      console.log(this.resultInfo, 'resultInfo')
-      if (this.hasJsonFlag === false) {
-        this.$message.error({ message: 'json格式验证失败', showClose: true })
-        // alert("json验证失败")
-        return false
-      } else {
-        this.dialogVisible = false
-        this.$emit('getJsonString', JSON.stringify(value))
-        return true
+      resultInfos: {
+        type: String,
+        default: ''
       }
       }
     },
     },
-    onError(value) {
-      this.hasJsonFlag = false
+    data () {
+      return {
+        activeNames: [],
+        resultInfo: {},
+        tmpResultInfo: {},
+        dialogVisible: false,
+        hasJsonFlag: true,
+        key: 0,
+        isEnlarge: false
+      }
     },
     },
-    openDialog() {
-      this.dialogVisible = true
+    watch: {
+      resultInfos: {
+        handler: function (val) {
+          ++this.key
+          this.resultInfo =
+            this.resultInfos === '' ? {} : JSON.parse(this.resultInfos)
+          this.tmpResultInfo = this.resultInfo
+        },
+        deep: true,
+        immediate: true
+      }
     },
     },
-    cancel() {
-      console.log(this.tmpResultInfo, 'tmpResultInfo')
-      this.resultInfo = this.tmpResultInfo
-      this.dialogVisible = false
+
+    mounted () {
+      this.resultInfo =
+        this.resultInfos === '' ? {} : JSON.parse(this.resultInfos)
     },
     },
-    // 放大
-    enLarge() {
-      const fullarea = document.getElementById('minejson')
-      if (fullarea.requestFullscreen) {
-        fullarea.requestFullscreen()
-      } else if (fullarea.webkitRequestFullScreen) {
-        fullarea.webkitRequestFullScreen() // webkit内核(chrome、safari、Opera等)
-      } else if (fullarea.mozRequestFullScreen) {
-        fullarea.mozRequestFullScreen() // moz内核(firefox)
-      } else if (fullarea.msRequestFullscreen) {
-        fullarea.msRequestFullscreen() // IE11、edge
+
+    methods: {
+      onJsonChange (value) {
+        // 只有在格式正确的时候进入此事件
+        this.hasJsonFlag = true
+      },
+      onJsonSave () {
+        const value = this.resultInfo
+        console.log(this.resultInfo, 'resultInfo')
+        if (this.hasJsonFlag === false) {
+          this.$message.error({ message: 'json格式验证失败', showClose: true })
+          // alert("json验证失败")
+          return false
+        } else {
+          this.dialogVisible = false
+          this.$emit('getJsonString', JSON.stringify(value))
+          return true
+        }
+      },
+      onError (value) {
+        this.hasJsonFlag = false
+      },
+      openDialog () {
+        this.dialogVisible = true
+      },
+      cancel () {
+        console.log(this.tmpResultInfo, 'tmpResultInfo')
+        this.resultInfo = this.tmpResultInfo
+        this.dialogVisible = false
+      },
+      // 放大
+      enLarge () {
+        const fullarea = document.getElementById('minejson')
+        if (fullarea.requestFullscreen) {
+          fullarea.requestFullscreen()
+        } else if (fullarea.webkitRequestFullScreen) {
+          fullarea.webkitRequestFullScreen() // webkit内核(chrome、safari、Opera等)
+        } else if (fullarea.mozRequestFullScreen) {
+          fullarea.mozRequestFullScreen() // moz内核(firefox)
+        } else if (fullarea.msRequestFullscreen) {
+          fullarea.msRequestFullscreen() // IE11、edge
+        }
+        this.isEnlarge = true
       }
       }
-      this.isEnlarge = true
     }
     }
   }
   }
-}
 </script>
 </script>
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">
-/* jsoneditor右上角默认有一个链接,加css去掉了 */
-.icon {
-  color: #349af3;
-}
-/deep/ .jsoneditor-vue {
-  height: 100%;
-}
-.fullScreen {
-  position: absolute;
-  right: 5%;
-  top: 22%;
-  cursor: pointer;
-  color: #fff;
-}
-/deep/ .jsoneditor-modes {
-  display: none !important;
-}
-.jsoneditor-poweredBy {
-  display: none !important;
-}
-.jsoneditor-menu {
-  background-color: #9c9e9f !important;
-  border-bottom: 1px solid #9c9e9f !important;
-}
-.jsoneditor {
-  border: 1px solid #9c9e9f !important;
-}
-.el-collapse {
-  border: 0;
-}
-.el-collapse-item__header {
-  height: 44px;
-}
+  /* jsoneditor右上角默认有一个链接,加css去掉了 */
+  .icon {
+    color: #349af3;
+  }
+  /deep/ .jsoneditor-vue {
+    height: 100%;
+  }
+  .fullScreen {
+    position: absolute;
+    right: 5%;
+    top: 20%;
+    cursor: pointer;
+    color: #fff;
+  }
+  /deep/ .jsoneditor-modes {
+    display: none !important;
+  }
+  /deep/.jsoneditor-poweredBy {
+    display: none !important;
+  }
+  .jsoneditor-menu {
+    background-color: #9c9e9f !important;
+    border-bottom: 1px solid #9c9e9f !important;
+  }
+  .jsoneditor {
+    border: 1px solid #9c9e9f !important;
+  }
+  .el-collapse {
+    border: 0;
+  }
+  .el-collapse-item__header {
+    height: 44px;
+  }
+  .configuration {
+    color: white;
+    margin-top: 6vh;
+    /deep/.el-dialog {
+      background-color: #031a46 !important;
+      border: 1px solid #5f82c7;
+      .el-dialog__header {
+        .el-dialog__title {
+          color: white !important;
+        }
+        .el-dialog__headerbtn {
+          top: 20px;
+        }
+      }
+    }
+  }
 </style>
 </style>

@@ -519,3 +519,31 @@ tr:hover {
     color: white;
     color: white;
   }
   }
 }
 }
+ // 上级菜单
+.el-cascader__dropdown {
+  background-color: #031a46;
+  border: 1px solid #5f82c7;
+
+}
+.el-cascader-menu{
+  color: white;
+}
+.el-radio
+{
+  .el-cascader-menu:hover{
+    color: white;
+  }
+}
+.el-cascader-node:not(.is-disabled):hover, .el-cascader-node:not(.is-disabled):focus {
+  background: #F5F7FA;
+  background-image: initial;
+  background-position-x: initial;
+  background-position-y: initial;
+  background-size: initial;
+  background-repeat-x: initial;
+  background-repeat-y: initial;
+  background-attachment: initial;
+  background-origin: initial;
+  background-clip: initial;
+  background-color: rgb(80, 142, 235);
+}

@@ -21,4 +21,4 @@ export default function filterAsyncRouter (routers) {
 }
 }
 function loadView (view) {
 function loadView (view) {
   return r => require.ensure([], () => r(require(`@/views${view}.vue`)))
   return r => require.ensure([], () => r(require(`@/views${view}.vue`)))
-}
\ No newline at end of file
+}

@@ -272,4 +272,5 @@
   /deep/.el-input__inner {
   /deep/.el-input__inner {
     background-color: #07388b;
     background-color: #07388b;
   }
   }
+ 
 </style>
 </style>

@@ -8,7 +8,7 @@
     <template slot="content">
     <template slot="content">
       <el-form ref="form" :model="dialogForm" :rules="rules" label-width="82px">
       <el-form ref="form" :model="dialogForm" :rules="rules" label-width="82px">
         <el-row :gutter="24">
         <el-row :gutter="24">
-          <el-col :span="12">
+          <el-col :span="15">
             <el-form-item label="角色名称:" prop="roleName">
             <el-form-item label="角色名称:" prop="roleName">
               <el-input
               <el-input
                 v-model="dialogForm.roleName"
                 v-model="dialogForm.roleName"
@@ -16,7 +16,9 @@
                 placeholder="角色名称" />
                 placeholder="角色名称" />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <el-col :span="12">
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="24">
             <el-form-item label="角色类型:" prop="roleType">
             <el-form-item label="角色类型:" prop="roleType">
               <el-input
               <el-input
                 v-model="dialogForm.roleType"
                 v-model="dialogForm.roleType"
@@ -25,7 +27,6 @@
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
-        <br>
         <el-row>
         <el-row>
           <el-col :span="24">
           <el-col :span="24">
             <el-form-item label="备注:" class="form-item-mb0">
             <el-form-item label="备注:" class="form-item-mb0">

@@ -14,9 +14,7 @@
     </div>
     </div>
     <div class="from-clues-content">
     <div class="from-clues-content">
       <lb-table
       <lb-table
-        :page-size="pageData.size"
-        :current-page.sync="pageData.current"
-        :total="pageData.total"
+        :pagination="false"
         @size-change="handleSizeChange"
         @size-change="handleSizeChange"
         @p-current-change="handleCurrentChange"
         @p-current-change="handleCurrentChange"
         :column="tableData.columns"
         :column="tableData.columns"
@@ -219,11 +217,6 @@
             ]),
             ]),
           data: [],
           data: [],
         },
         },
-        pageData: {
-          total: 5,
-          pageSize: 15,
-          current: 1,
-        },
       };
       };
     },
     },
     created () {
     created () {
@@ -242,6 +235,7 @@
             Builtinrole = res.content;
             Builtinrole = res.content;
             getRolesById(2)
             getRolesById(2)
               .then((res) => {
               .then((res) => {
+                console.log("角色列表", res);
                 Publicrole = res.content;
                 Publicrole = res.content;
 
 
                 this.listdata = Builtinrole.concat(Publicrole);
                 this.listdata = Builtinrole.concat(Publicrole);

@@ -594,13 +594,8 @@
       display: flex;
       display: flex;
       margin-bottom: 15px;
       margin-bottom: 15px;
     }
     }
-
-    .dialog_footer {
-      flex-direction: column;
-
-      .dialog_button {
-        margin-top: 8px;
-      }
+    .el-dialog__footer {
+      padding-right: 40px;
     }
     }
 
 
     .divider {
     .divider {

@@ -17,9 +17,7 @@
     </div>
     </div>
     <div class="from-clues-content">
     <div class="from-clues-content">
       <lb-table
       <lb-table
-        :page-size="pageData.size"
-        :current-page.sync="pageData.current"
-        :total="pageData.total"
+        :pagination="false"
         @size-change="handleSizeChange"
         @size-change="handleSizeChange"
         @p-current-change="handleCurrentChange"
         @p-current-change="handleCurrentChange"
         :column="tableData.columns"
         :column="tableData.columns"
@@ -182,11 +180,6 @@
             ]),
             ]),
           data: [],
           data: [],
         },
         },
-        pageData: {
-          total: 5,
-          pageSize: 15,
-          current: 1,
-        },
       };
       };
     },
     },
     created () {
     created () {
@@ -209,6 +202,7 @@
           departmentId: this.departmentid.departmentId,
           departmentId: this.departmentid.departmentId,
         };
         };
         getUserList(this.queryParam).then((res) => {
         getUserList(this.queryParam).then((res) => {
+          console.log("人员列表", res);
           if (res.status === 1) {
           if (res.status === 1) {
             this.loading = false;
             this.loading = false;
             this.tableData.data = res.content;
             this.tableData.data = res.content;
@@ -316,5 +310,4 @@
   .btnColRight {
   .btnColRight {
     margin-top: 20px;
     margin-top: 20px;
   }
   }
-  
 </style>
 </style>