样式调整

@@ -2,6 +2,7 @@
   <div>
     <i class="el-icon-s-management icon" :title="title" @click="openDialog" />
     <el-dialog
+      class="configuration"
       :key="key"
       :title="title"
       :inner-dialog="true"
@@ -9,8 +10,7 @@
       width="600px"
       :close-on-click-modal="false"
       append-to-body
-      @cancel="cancel"
-    >
+      @cancel="cancel">
       <vue-json-editor
         id="minejson"
         v-model="resultInfo"
@@ -18,15 +18,13 @@
         lang="zh"
         @json-change="onJsonChange"
         @json-save="onJsonSave"
-        @has-error="onError"
-      />
+        @has-error="onError" />
       <el-tooltip
         content="全屏缩放"
         effect="dark"
         placement="bottom"
         fullscreen
-        class="fullScreen"
-      >
+        class="fullScreen">
         <i class="el-icon-full-screen" @click="enLarge" />
       </el-tooltip>
       <template slot="footer">
@@ -34,21 +32,19 @@
           <el-button
             type="primary"
             class="confirmBtn"
-            @click="onJsonSave"
-          >保存</el-button>
+            @click="onJsonSave">保存</el-button>
           <el-button
             type="primary"
             class="cancelBtn"
-            @click="cancel"
-          >关闭</el-button>
+            @click="cancel">关闭</el-button>
         </div>
       </template>
     </el-dialog>
   </div>
 </template>
 <script>
-import vueJsonEditor from 'vue-json-editor'
-export default {
+  import vueJsonEditor from 'vue-json-editor'
+  export default {
     components: {
       vueJsonEditor
     },
@@ -62,7 +58,7 @@ export default {
         default: ''
       }
     },
-  data() {
+    data () {
       return {
         activeNames: [],
         resultInfo: {},
@@ -75,7 +71,7 @@ export default {
     },
     watch: {
       resultInfos: {
-      handler: function(val) {
+        handler: function (val) {
           ++this.key
           this.resultInfo =
             this.resultInfos === '' ? {} : JSON.parse(this.resultInfos)
@@ -86,17 +82,17 @@ export default {
       }
     },
 
-  mounted() {
+    mounted () {
       this.resultInfo =
         this.resultInfos === '' ? {} : JSON.parse(this.resultInfos)
     },
 
     methods: {
-    onJsonChange(value) {
+      onJsonChange (value) {
         // 只有在格式正确的时候进入此事件
         this.hasJsonFlag = true
       },
-    onJsonSave() {
+      onJsonSave () {
         const value = this.resultInfo
         console.log(this.resultInfo, 'resultInfo')
         if (this.hasJsonFlag === false) {
@@ -109,19 +105,19 @@ export default {
           return true
         }
       },
-    onError(value) {
+      onError (value) {
         this.hasJsonFlag = false
       },
-    openDialog() {
+      openDialog () {
         this.dialogVisible = true
       },
-    cancel() {
+      cancel () {
         console.log(this.tmpResultInfo, 'tmpResultInfo')
         this.resultInfo = this.tmpResultInfo
         this.dialogVisible = false
       },
       // 放大
-    enLarge() {
+      enLarge () {
         const fullarea = document.getElementById('minejson')
         if (fullarea.requestFullscreen) {
           fullarea.requestFullscreen()
@@ -135,41 +131,57 @@ export default {
         this.isEnlarge = true
       }
     }
-}
+  }
 </script>
 
 <style scoped lang="scss">
-/* jsoneditor右上角默认有一个链接,加css去掉了 */
-.icon {
+  /* jsoneditor右上角默认有一个链接,加css去掉了 */
+  .icon {
     color: #349af3;
-}
-/deep/ .jsoneditor-vue {
+  }
+  /deep/ .jsoneditor-vue {
     height: 100%;
-}
-.fullScreen {
+  }
+  .fullScreen {
     position: absolute;
     right: 5%;
-  top: 22%;
+    top: 20%;
     cursor: pointer;
     color: #fff;
-}
-/deep/ .jsoneditor-modes {
+  }
+  /deep/ .jsoneditor-modes {
     display: none !important;
-}
-.jsoneditor-poweredBy {
+  }
+  /deep/.jsoneditor-poweredBy {
     display: none !important;
-}
-.jsoneditor-menu {
+  }
+  .jsoneditor-menu {
     background-color: #9c9e9f !important;
     border-bottom: 1px solid #9c9e9f !important;
-}
-.jsoneditor {
+  }
+  .jsoneditor {
     border: 1px solid #9c9e9f !important;
-}
-.el-collapse {
+  }
+  .el-collapse {
     border: 0;
-}
-.el-collapse-item__header {
+  }
+  .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>

@@ -519,3 +519,31 @@ tr:hover {
     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);
+}

@@ -99,17 +99,17 @@
 </template>
 
 <script>
-// 接收报文查询
-// 引入表格头部数据
-import data from "./data";
-// 引入table混入方法
-import tableMixin from "@/mixins/tableMixin.js";
-import { getReceiveDataReportPage } from "@/api/dataReport.js";
-// 引入详情弹框
-import dataDetails from "@/components/EditDialog";
-//引入日期处理方法
-import { timeFormat } from "@/utils/operation";
-export default {
+  // 接收报文查询
+  // 引入表格头部数据
+  import data from "./data";
+  // 引入table混入方法
+  import tableMixin from "@/mixins/tableMixin.js";
+  import { getReceiveDataReportPage } from "@/api/dataReport.js";
+  // 引入详情弹框
+  import dataDetails from "@/components/EditDialog";
+  //引入日期处理方法
+  import { timeFormat } from "@/utils/operation";
+  export default {
     name: "jsbwcx",
     mixins: [tableMixin],
     // 注册组件
@@ -224,6 +224,7 @@ export default {
         getReceiveDataReportPage({ ...this.form, ...this.formData }).then(
           (res) => {
             if (res.code === 200) {
+              console.log("菜单列表", res);
               let { total, records, current } = res.result;
               this.tableData.total = total;
               this.tableData.data = records ? records : [];
@@ -274,12 +275,12 @@ export default {
         }
       },
     }
-}
+  }
 </script>
 <style scoped lang="scss">
-// 引入表单整体样式
-@import "~@/styles/public.scss";
-// 引入当前css
-@import "./index.scss";
+  // 引入表单整体样式
+  @import "~@/styles/public.scss";
+  // 引入当前css
+  @import "./index.scss";
 </style>
 

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

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

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

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

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