coys 1 rok pred
rodič
commit
37d8fb41d4

+ 42 - 44
package-lock.json

@@ -2094,49 +2094,6 @@
         "webpack-merge": "^5.7.3",
         "webpack-virtual-modules": "^0.4.2",
         "whatwg-fetch": "^3.6.2"
-      },
-      "dependencies": {
-        "@vue/vue-loader-v15": {
-          "version": "npm:vue-loader@15.11.1",
-          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.11.1.tgz",
-          "integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==",
-          "dev": true,
-          "requires": {
-            "@vue/component-compiler-utils": "^3.1.0",
-            "hash-sum": "^1.0.2",
-            "loader-utils": "^1.1.0",
-            "vue-hot-reload-api": "^2.3.0",
-            "vue-style-loader": "^4.1.0"
-          },
-          "dependencies": {
-            "hash-sum": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
-              "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
-              "dev": true
-            }
-          }
-        },
-        "json5": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
-          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "loader-utils": {
-          "version": "1.4.2",
-          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.2.tgz",
-          "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^1.0.1"
-          }
-        }
       }
     },
     "@vue/cli-shared-utils": {
@@ -2301,6 +2258,47 @@
         }
       }
     },
+    "@vue/vue-loader-v15": {
+      "version": "npm:vue-loader@15.11.1",
+      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.11.1.tgz",
+      "integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==",
+      "dev": true,
+      "requires": {
+        "@vue/component-compiler-utils": "^3.1.0",
+        "hash-sum": "^1.0.2",
+        "loader-utils": "^1.1.0",
+        "vue-hot-reload-api": "^2.3.0",
+        "vue-style-loader": "^4.1.0"
+      },
+      "dependencies": {
+        "hash-sum": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
+          "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+          "dev": true
+        },
+        "json5": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
+          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.4.2",
+          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.2.tgz",
+          "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        }
+      }
+    },
     "@vue/web-component-wrapper": {
       "version": "1.3.0",
       "resolved": "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz",
@@ -7381,7 +7379,7 @@
     },
     "vue-hot-reload-api": {
       "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
+      "resolved": "https://registry.npmmirror.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
       "integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==",
       "dev": true
     },

+ 24 - 16
src/views/home/works.vue

@@ -35,19 +35,22 @@
           <!-- <van-empty description="暂无数据" /> -->
           <van-cell-group>
             <van-cell
+              @click.stop="isFalgHandler(i, item.taskType, item.id)"
               v-for="(i, index) in item.dataList"
               :key="index"
               class="mainTitle"
               :value="worksLink(2, item.taskType, i.recStatus ? i.recStatus : i.status)"
-              :label="i.startTime + '-' + i.endTime"
-              :value-class="iColorClas(item.taskType,i.status) "
+              :label="
+                i.startTime.substring(5, i.startTime.length - 3) + '至' + i.endTime.substring(5, i.endTime.length - 3)
+              "
+              :value-class="iColorClas(item.taskType, i.status)"
             >
               <template #title>
                 <span class="custom-title"
                   >{{ i.taskName }}
                   <van-tag
                     class="resetDy"
-                    @click="resetHandler(item.id)"
+                    @click.stop="resetHandler(item.id)"
                     v-if="i.status == 1 && item.taskType == 3"
                     type="primary"
                     >重新调阅</van-tag
@@ -56,12 +59,10 @@
               </template>
 
               <template #right-icon>
-                <van-icon name="arrow" class="rightIcon" @click="isFalgHandler(i, item.taskType, item.id)" />
+                <van-icon name="arrow" class="rightIcon" />
               </template>
             </van-cell>
-            <!-- <van-tag class="resetDy" @click="resetHandler(item.id)" v-if="item.status == 1" type="primary"
-                  >重新调阅</van-tag
-                > -->
+         
           </van-cell-group>
         </div>
       </div>
@@ -104,16 +105,14 @@ export default {
     this.getList()
   },
   methods: {
-    iColorClas(type,status){
-      
-      if(status==0||type==0&&status==1){
+    iColorClas(type, status) {
+      if (status == 0 || (type == 0 && status == 1)|| (type == 2 && status == 1)) {
         return 'wj-title-blue'
-      }else {
+      } else {
         return 'wj-title-orange'
       }
     },
     isFalgHandler(i, taskType, id) {
-      
       if (i.isExist != undefined && i.isExist == 0) {
         return Dialog.alert({
           message: '机构下没有主机摄像头,不能开启调阅任务!',
@@ -190,7 +189,10 @@ export default {
           path = '/monitoringCall'
           pathInfo = '/consultInfo_' + id
           break
-        case '/jc':
+        case 2:
+          strName = '待检查'
+          path = '/securityCheckRegister'
+          pathInfo = '/securityDetail' + id
           str = '/jc'
           break
         case 4:
@@ -225,6 +227,10 @@ export default {
         if (val == 0 && taskType == 2) {
           strName = '进行中'
         }
+        //安全检查
+        if (val == 2 && taskType == 2) {
+          strName = '进行中'
+        }
 
         //监控调阅
         if (val == 3 && taskType == 1) {
@@ -276,6 +282,10 @@ export default {
         if (val == 5 && taskType == 1) {
           pathInfo = '/personnelSignature/' + id + '_edit'
         }
+        //安全检查跳转
+        if (val == 2 && taskType == 1||(val == 2 && taskType == 2)) {
+          pathInfo = `/securityDetail?id=${id}&enable=${taskType}` 
+        }
         //履职跳转
         if ((val == 0 && taskType == 1) || (val == 0 && taskType == 2)) {
           pathInfo = `/resumption_detail?id=${id}&enable=${taskType}&taskDate=${item.startTime.split(' ')[0]}
@@ -312,8 +322,6 @@ export default {
     },
     //tab栏点击
     tabClickHandler(name) {
-    
-      
       const filePath = `/#${name}`
       const tempLink = document.createElement('a')
       tempLink.style.display = 'none'
@@ -346,7 +354,7 @@ export default {
 </script>
 <style>
 .van-info {
-right: -12px;
+  right: -12px;
   background-color: #008cd6;
 }
 </style>

+ 9 - 1
src/views/menu/cockpit/components/overviewCom.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="titleCom">
-    <div>
+    <div class="titleRow">
       <van-cell v-for="i in list" :key="i.name">
         <!-- 使用 title 插槽来自定义标题 -->
         <template #title>
@@ -202,6 +202,11 @@ export default {
   background-color: #f0f0f0;
   margin: 10px;
   box-shadow: 0 2px 10px #ccc;
+  .titleRow{
+    box-shadow: 0 2px 10px #ccc;
+    margin-left: 12px;
+  margin-right: 14px;
+  }
   .itemNum {
     width: 40px;
     height: 40px;
@@ -216,6 +221,9 @@ export default {
 }
 .equipment {
   margin-top: 20px;
+  box-shadow: 0 2px 10px #ccc;
+  margin-left: 12px;
+  margin-right: 14px;
 }
 .bigModule {
   display: flex;

+ 1 - 4
src/views/menu/cockpit/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="index-container">
-    <NavBar :go="{ type: 'push', path: goBack }" />
+    <NavBar :go="{ type: 'push', path: '/menu' }" />
     <van-row>
       <van-col span="24">
         <org-tree v-model="cascaderValue" :name="'sss'" @changeItem="getDataList"></org-tree>
@@ -21,7 +21,6 @@
           <div class="GA38">
             <van-row>
               <van-col :span="24">
-                
                 <div class="textTitle">GA38-2021标准</div>
               </van-col>
             </van-row>
@@ -223,7 +222,6 @@ export default {
     this.getResumptionfoHandler({ desc: this.desc, month: this.month })
   },
   methods: {
-    goBack() {},
     getDataList() {},
     onConfirm(val) {
       this.monthVal = val
@@ -370,5 +368,4 @@ export default {
   font-size: 30px;
   padding: 20px;
 }
-
 </style>

+ 7 - 10
src/views/menu/monitoringCall/index.vue

@@ -59,6 +59,7 @@
       <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
         <van-cell-group>
           <van-cell
+            @click.stop="linkHandler(item.status, item.id, item)"
             :title="item.taskName"
             v-for="item in taskList"
             :key="item.id"
@@ -69,14 +70,11 @@
             <template #title>
               <span class="custom-title"
                 >{{ item.taskName
-                }}<van-tag class="resetDy" @click="resetHandler(item.id)" v-if="item.status == 1" type="primary"
-                  >重新调阅</van-tag
-                ></span
+                }}<van-tag class="resetDy" @click.stop="resetHandler(item.id)" v-if="item.status == 1" type="primary">重新调阅</van-tag></span
               >
+             
 
-              <span @click="linkHandler(item.status, item.id, item)" :class="monitor[item.status]">{{
-                item.status | statusFilter(this_)
-              }}</span>
+              <span :class="monitor[item.status]">{{ item.status | statusFilter(this_) }}</span>
             </template>
           </van-cell>
         </van-cell-group>
@@ -274,9 +272,9 @@ export default {
             callBack()
           } else {
             this.finished = false
-            this.taskList=rows||[]
-            if(rows.length == 0){
-              this.taskList=[]
+            this.taskList = rows || []
+            if (rows.length == 0) {
+              this.taskList = []
             }
           }
         } else {
@@ -320,7 +318,6 @@ export default {
     },
     //文件上传
     resultImg(img) {
-      
       this.photoHandler(img[0].url)
     },
     //上传NFC