coys hace 2 años
padre
commit
f72b58b0c6

+ 8 - 3
src/views/home/works.vue

@@ -85,7 +85,7 @@ export default {
         this.$refs.scandialog.visible = true
       } else {
         this.falg = true
-        this.$router.push({ path: this.worksLink(4, taskType, i.status, i.id) })
+        this.$router.push({ path: this.worksLink(4, taskType, i.status, i.id,i) })
       }
     },
     scrolling(el) {
@@ -129,7 +129,7 @@ export default {
         this.workList = data
       })
     },
-    worksLink(type, val, taskType = '', id = '') {
+    worksLink(type, val, taskType = '', id = '',item) {
       //type 列表类型区分 //val 类型值 //taskType 具体列表项区分 //id 任务id
       let str = ''
       let strName = ''
@@ -140,7 +140,7 @@ export default {
           str = '/lz'
           strName = '待履职'
           path = '/resumption'
-          pathInfo = `/resumption_detail?id=${id}&enable=1&taskDate=2023-09-28`
+          pathInfo = `/resumption_detail`
           break
         case 3:
           str = '/dy'
@@ -213,6 +213,11 @@ export default {
         if (val == 5 && taskType == 1) {
           pathInfo = '/personnelSignature/' + id + '_edit'
         }
+        //履职跳转
+        if (val == 0 && taskType == 1) {
+         
+          pathInfo = `/resumption_detail?id=${id}&enable=${taskType}&taskDate=${item.startTime.split(' ')[0]}
+`        }
         return pathInfo
       }
     },

+ 1 - 1
src/views/menu/monitoringCall/components/passage.vue

@@ -2,7 +2,7 @@
   <div>
     <van-row v-if="list && list.length > 0">
       <van-col
-        span="12"
+        span="11"
         @click="passageEdit(item.videoId)"
         :class="'passageIcon' + ' ' + classlist[item.type]"
         v-for="item in list"

+ 2 - 4
src/views/menu/monitoringCall/components/taskInfo.vue

@@ -11,9 +11,7 @@
             <van-col span="24">
               <div class="text">{{ videoChannelName }}</div>
             </van-col>
-            <van-col span="24">
-              <div class="text">{{ videoChannelName }}</div>
-            </van-col>
+            
           </van-row>
           <!-- //主体内容 -->
           <div class="mainBox">
@@ -244,7 +242,7 @@ mounted(){
 }
 .block {
   width: 85vw;
-  height: 140vw;
+  height: 142vw;
   background-color: #fff;
   margin: auto;
   position: absolute;

+ 2 - 2
vue.config.js

@@ -109,8 +109,8 @@ module.exports = defineConfig({
         }
       },
       '/dev': {
-        target: "http://10.87.10.55:8080",
-        // target: "http://10.87.11.173:8080",
+        // target: "http://10.87.10.55:8080",
+        target: "http://47.92.229.224:9002",
         // ws:true,
         changOrigin:true,
         pathRewrite:{