查询与认定 调整条件上正查、倒查、查重的颜色

src/views/SystemManage/RoleManage.vue

@@ -70,10 +70,6 @@
           <div @click="addrole">addrole</div>
           <div class="save">
             <div class="btn" @click="save">保存</div>
-            <!--            <el-button @click="add">add</el-button>-->
-            <!--            <el-button @click="edit">edit</el-button>-->
-            <!--            <el-button @click="del">del</el-button>-->
-            <!--            <el-button @click="search">search</el-button>-->
           </div>
         </div>
         <div class="role-info">
@@ -224,6 +220,10 @@ export default {
       addRoleParams: [],
       // 角色按钮
       defaultRoleBtns: [],
+      // 所有权限的列表
+      permissionDataList: [],
+      // 保存的角色选项
+      roleMenusSelection: [],
       // 角色权限菜单
       roleMenus: [
         { name: "指掌纹采集", code: 0, flag: false },
@@ -327,8 +327,7 @@ export default {
         { name: "本地重卡反馈", code: 14, flag: false },
         { name: "本地涉案反馈", code: 15, flag: false }
       ],
-      // 保存的角色选项
-      roleMenusSelection: [],
+
       // 自定义的角色组
       diyRoleList: [],
       diyRoleItemIndex: -1,
@@ -336,6 +335,27 @@ export default {
     };
   },
   methods: {
+    // 获取权限列表
+    getPermissionDataLists() {
+      this.$axios.get("/system/permissions").then(res => {
+        var arr = [];
+        if (res.data.length > 0) {
+          for (let i = 0; i < res.data.length; i++) {
+            if (res.data[i].parentId === 0) {
+              arr.push(res.data[i]);
+            } else {
+              for (let j = 0; j < arr.length; j++) {
+                if (arr[j].id === res.data[i].parentId) {
+                  this.$set(this.arr[j], "children", res.data[i]);
+                }
+              }
+            }
+          }
+        }
+        this.permissionDataList = arr;
+        console.info("权限列表=====>", arr);
+      });
+    },
     addrole() {
       var role = {
         name: "测试角色",
@@ -354,7 +374,7 @@ export default {
       this.roleMenusSelection = this.roleMenus;
       console.info("roleMenusSelection====", this.roleMenusSelection);
     },
-    // 列表
+    // 获取角色列表 和 角色权限列表
     search() {
       this.$axios
         .get("/system/roles")
@@ -363,7 +383,7 @@ export default {
           this.roles = res.data;
           res.data.forEach((item, index) => {
             // item.flag = false;
-            console.info(item);
+            // console.info(item);
             if (index < 7) {
               this.defaultRoleBtns.push(item);
             } else {
@@ -435,6 +455,7 @@ export default {
   },
   created() {
     this.search();
+    this.getPermissionDataLists();
   },
   mounted() {
     this.defaultRoleBtns[0].flag = true;

src/views/cxyrd/QueryConfirm.vue

@@ -91,7 +91,7 @@
             <!--              ]"-->
             <!--            >-->
             <div
-              class="btn"
+              class="btn1"
               @click="getQueryType(btn, 'querytypes')"
               :class="[
                 btn.value === '2'
@@ -315,12 +315,12 @@
           >
             <template slot-scope="scope">
               <template v-if="item.prop === 'querytype'">
-                <div v-if="scope.row.querytype === '3'" style="color: #ffa219">
+                <div v-if="scope.row.querytype === '3'" style="color: #055fe7">
                   {{ scope.row.queryTypeName }}
                 </div>
                 <div
                   v-else-if="scope.row.querytype === '0'"
-                  style="color: #005fe7"
+                  style="color: #fa9500"
                 >
                   {{ scope.row.queryTypeName }}
                 </div>
@@ -587,11 +587,20 @@ export default {
         .post("/api/queryque/standardQid", this.reqParam)
         .then(response => {
           if (response.data.code === 0) {
-            this.list = response.data.ret.list;
-            this.reqParam.page.total = response.data.ret.total;
-            console.info("查询结果===>", this.list);
-            this.userInfo = this.getUserInfo(this.list);
+            if (response.data.ret !== null) {
+              // 请求成功有返回值
+              this.list = response.data.ret.list;
+              this.reqParam.page.total = response.data.ret.total;
+              console.info("查询结果===>", this.list);
+              this.userInfo = this.getUserInfo(this.list);
+            } else {
+              // 请求成功无返回值
+              this.list = [];
+              this.reqParam.page.total = 0;
+              this.reqParam.page.currPage = 1;
+            }
           } else {
+            // 请求失败
             this.$message.error(response.data.message);
           }
           // console.info(JSON.stringify(this.list));
@@ -1623,6 +1632,24 @@ b {
   color: #055fe7;
 }
 
+.btn1 {
+  width: fit-content;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-family: MicrosoftYaHei;
+  border: none;
+  height: 22px;
+  padding: 0;
+  margin: 0 12px 0 12px;
+  font-size: 14px;
+  font-weight: 350;
+  cursor: pointer;
+}
+.btn1:hover {
+  font-weight: bolder;
+}
+
 .btn-active-zc {
   color: #00b47a;
 }