Merge remote-tracking branch 'origin/dev_xzeq' into dev_xzeq

src/layout/menuLayout.vue

@@ -24,7 +24,7 @@
             text-color="rgba(90, 93, 103, 1)"
             ref="menu"
           >
-            <div class="menu_wrap" v-for="item in leftMenus" :key="item.index">
+            <div class="menu_wrap" v-for="item in leftMenus" :key="item.index" v-permission='item.roles'>
               <el-menu-item
                 :index="item.index"
                 v-if="item.hasChildren == false"
@@ -43,6 +43,7 @@
                   v-for="(subitem, index) in item.children"
                   :key="index"
                   @click="goDetail(subitem)"
+                  v-permission='subitem.roles'
                   ><i
                     class="iconfont iconquanxianjiesuo"
                     v-show="subitem.disabled"
@@ -56,17 +57,6 @@
       </div>
 
       <div class="rightContent">
-        <!-- <div v-if="$route.meta.isAdd" class="topMenu">
-          <el-breadcrumb separator="/" style="line-height: 48px">
-            <el-breadcrumb-item
-              v-for="(item, index) in Breadcrumbs"
-              :key="index"
-              ><span @click="goDetail(item)" style="cursor: pointer" :class="item.isActive ? 'activeClass' : ''">{{
-                item.name
-              }}</span></el-breadcrumb-item
-            >
-          </el-breadcrumb>
-        </div> -->
         <div v-if="!$route.meta.isAdd">
           <el-tabs
             v-model="activeName"

src/views/userAuth/role/addRole.vue

@@ -108,7 +108,7 @@ export default {
             type: "success",
             callback: () => {
               loading.close();
-              this.$router.push("queryRole");
+              Window.close()
             },
           });
         } else {

src/views/userAuth/user/queryUser.vue

@@ -245,7 +245,7 @@ export default {
         {
           id: "queryUser",
           label: "用户信息管理",
-          newAuth: "M01",
+          roles: ["F0101", "admin",'A0000'],
           index: "queryUser",
           className: "iconfont icongongnengfuwu",
           hasChildren: false,
@@ -253,7 +253,7 @@ export default {
         {
           id: "queryRole",
           label: "角色信息管理",
-          newAuth: "M01",
+          roles: ["F0102", "admin",'A0000'],
           index: "queryRole",
           className: "iconfont icongongnengfuwu",
           hasChildren: false,
@@ -261,7 +261,7 @@ export default {
         {
           id: "queryMenu",
           label: "菜单信息管理",
-          newAuth: "M01",
+          roles: ["F0103", "admin",'A0000'],
           index: "queryMenu",
           className: "iconfont icongongnengfuwu",
           hasChildren: false,
@@ -269,7 +269,7 @@ export default {
         {
           id: "applyManager",
           label: "三员申报管理",
-          newAuth: "M01",
+          roles: ["F0104", "admin",'A0000'],
           index: "applyManager",
           className: "iconfont icongongnengfuwu",
           hasChildren: false,
@@ -277,7 +277,7 @@ export default {
         {
           id: "approvalManage",
           label: "三员审批管理",
-          newAuth: "M01",
+          roles: ["F0105", "admin",'A0000'],
           index: "approvalManage",
           className: "iconfont icongongnengfuwu",
           hasChildren: false,
@@ -285,7 +285,7 @@ export default {
         {
           id: "queryPWhite",
           label: "白名单管理",
-          newAuth: "M01",
+          roles: ["F0106", "admin",'A0000'],
           index: "queryPWhite",
           className: "iconfont icongongnengfuwu",
           hasChildren: true,
@@ -293,7 +293,7 @@ export default {
             {
               id: "queryPWhite",
               label: "用户白名单管理",
-              newAuth: "M01",
+              roles: ["F010601", "admin",'A0000'],
               index: "queryPWhite",
               className: "iconfont icongongnengfuwu",
               hasChildren: false,
@@ -301,7 +301,7 @@ export default {
             {
               id: "queryCWhite",
               label: "车辆白名单管理",
-              newAuth: "M01",
+              roles: ["F010602", "admin",'A0000'],
               index: "queryCWhite",
               className: "iconfont icongongnengfuwu",
               hasChildren: false,
@@ -309,7 +309,7 @@ export default {
             {
               id: "queryTWhite",
               label: "电话白名单管理",
-              newAuth: "M01",
+              roles: ["F010603", "admin",'A0000'],
               index: "queryTWhite",
               className: "iconfont icongongnengfuwu",
               hasChildren: false,
@@ -477,7 +477,7 @@ export default {
         this.$message.warning("只能单选");
         return;
       }
-        this.$nextTick(() => {
+      this.$nextTick(() => {
         this.$refs.tree.setCheckedKeys([]);
       });
       // row.forEach((item) => {

src/views/xsspPt/jzLb/queryJzlb.vue

@@ -182,7 +182,7 @@ export default {
         {
           id: "queryJz",
           label: "卷宗列表",
-          newAuth: "M01",
+          roles: ["E0901", "admin",'A0000'],
           index: "queryJz",
           className: "iconfont icongongnengfuwu",
           hasChildren: false,
@@ -190,7 +190,7 @@ export default {
         {
           id: "querySqdlb",
           label: "申请单列表",
-          newAuth: "M01",
+          roles: ["E0902", "admin",'A0000'],
           index: "querySqdlb",
           className: "iconfont icongongnengfuwu",
           hasChildren: false,
@@ -198,7 +198,7 @@ export default {
         {
           id: "queryXslb",
           label: "线索列表",
-          newAuth: "M01",
+          roles: ["E0903", "admin",'A0000'],
           index: "queryXslb",
           className: "iconfont icongongnengfuwu",
           hasChildren: false,
@@ -206,7 +206,7 @@ export default {
         {
           id: "queryDwsp",
           label: "待我审批",
-          newAuth: "M01",
+          roles: ["E0904", "admin",'A0000'],
           index: "queryDwsp",
           className: "iconfont icongongnengfuwu",
           hasChildren: false,
@@ -214,7 +214,7 @@ export default {
         {
           id: "queryWysp",
           label: "我已审批",
-          newAuth: "M01",
+          roles: ["E0905", "admin",'A0000'],
           index: "queryWysp",
           className: "iconfont icongongnengfuwu",
           hasChildren: false,
@@ -222,7 +222,7 @@ export default {
         {
           id: "querySptj",
           label: "审批统计",
-          newAuth: "M01",
+          roles: ["E0906", "admin",'A0000'],
           index: "querySptj",
           className: "iconfont icongongnengfuwu",
           hasChildren: false,

src/views/zjcl/zjclcj.vue

@@ -37,12 +37,12 @@
                 :name="i.label"
               >
                 <template slot="title">
+                  <el-badge :value="i.li.length" class="item"></el-badge>
                   <div class="slot_title">
-                    <el-badge :value="i.li.length" class="item" type="primary">
-                      <span> {{ i.label }}</span>
-                    </el-badge>
+                    <span> {{ i.label }}</span>
                   </div>
                 </template>
+
                 <div class="FileLi" v-for="(m, n) in i.li" :key="n">
                   <div>
                     <span class="defIcon">{{
@@ -76,7 +76,12 @@
         </div>
       </el-col>
     </el-row>
-    <el-dialog title="物证上传" :visible.sync="revokeVisiable" width="40%"  @closed="closed">
+    <el-dialog
+      title="物证上传"
+      :visible.sync="revokeVisiable"
+      width="40%"
+      @closed="closed"
+    >
       <el-form
         ref="form"
         :model="form"
@@ -93,14 +98,20 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="模板下载:" v-if="form.region == '08'"> 
-          <div @click="downFj('zjclDxl.xlsx')" style="color:#409EFF">zjclDxl.xlsx</div>
+        <el-form-item label="模板下载:" v-if="form.region == '08'">
+          <div @click="downFj('zjclDxl.xlsx')" style="color: #409eff">
+            zjclDxl.xlsx
+          </div>
         </el-form-item>
-        <el-form-item label="模板下载:" v-if="form.region == '09'"> 
-          <div @click="downFj('zjclWll.xlsx')" style="color:#409EFF">zjclWll.xlsx</div>
+        <el-form-item label="模板下载:" v-if="form.region == '09'">
+          <div @click="downFj('zjclWll.xlsx')" style="color: #409eff">
+            zjclWll.xlsx
+          </div>
         </el-form-item>
-         <el-form-item label="模板下载:" v-if="form.region == '10'"> 
-          <div @click="downFj('zjclZjl.xlsx')" style="color:#409EFF">zjclZjl.xlsx</div>
+        <el-form-item label="模板下载:" v-if="form.region == '10'">
+          <div @click="downFj('zjclZjl.xlsx')" style="color: #409eff">
+            zjclZjl.xlsx
+          </div>
         </el-form-item>
         <el-form-item label="嫌疑人姓名:">
           <el-input v-model="form.xyrxm" placeholder="嫌疑人姓名"></el-input>
@@ -212,14 +223,14 @@ export default {
     };
   },
   methods: {
-    closed(){
-      this.fileList = []
-      this.form.xyrxm = ''
-      this.form.xyrZjhm = ''
-      this.form.zjclNrms = ''
+    closed() {
+      this.fileList = [];
+      this.form.xyrxm = "";
+      this.form.xyrZjhm = "";
+      this.form.zjclNrms = "";
     },
-    downFj(type){
-      window.open(`file/${type}`,'_self')
+    downFj(type) {
+      window.open(`file/${type}`, "_self");
     },
     submitZjcl() {
       var params = new FormData();
@@ -252,13 +263,16 @@ export default {
     uploadHandleChange(file, fileList) {
       let self = this;
       var index = file.name.lastIndexOf(".");
-      const isJPG = /^.*\.(xlsx)$/i.test(
-        file.name.substring(index)
-      );
+      const isJPG = /^.*\.(xlsx)$/i.test(file.name.substring(index));
       self.fileList = fileList;
-      if(!isJPG && (this.form.region == '08' || this.form.region == '09' || this.form.region == '10')){
-        self.$message('请上传 xlsx 格式的文件')
-        self.handleRemove(file)
+      if (
+        !isJPG &&
+        (this.form.region == "08" ||
+          this.form.region == "09" ||
+          this.form.region == "10")
+      ) {
+        self.$message("请上传 xlsx 格式的文件");
+        self.handleRemove(file);
       }
     },
     del(i, type, m) {
@@ -502,9 +516,10 @@ export default {
   .el-button--text {
     color: #666666;
   }
-  .el-badge__content.is-fixed {
-    right: 2px !important;
-    top: 15px !important;
+  .el-badge__content {
+    position: absolute;
+    left: 680px;
+    top: -10px;
   }
 }
 </style>