coys 2 lat temu
rodzic
commit
6a53b300aa

+ 4 - 1
src/views/home/works.vue

@@ -37,7 +37,7 @@
               :label="i.startTime + '-' + i.endTime"
               is-link
               @click="isFalgHandler(i, item.taskType, item.id)"
-              :value-class="`title-orange`"
+              :value-class="(i.status==0&&item.taskType==3)?`title-blue`:`title-orange`"
             />
           </van-cell-group>
         </div>
@@ -342,6 +342,9 @@ export default {
 .title-orange {
   color: #fd8104;
 }
+.title-blue {
+  color: #1989fa;
+}
 .big_box {
   height: calc(100vh - 520px);
   overflow: auto;

+ 19 - 3
src/views/menu/monitoringCall/components/passage.vue

@@ -14,7 +14,13 @@
         <span class="pors error" v-if="item.type == '2'">
           <van-icon name="fail" size="14" color="#fff" />
         </span>
+        
+       <span :class="item.videoName.length<=10? 'textClass':'textClassLength10'">
         {{ item.videoName }}
+        
+       </span> 
+       
+        
       </van-col>
     </van-row>
     <!-- 添加或编辑调阅任务弹框 -->
@@ -76,6 +82,16 @@ export default {
   margin: 10px 10px 0px 10px;
   box-sizing: border-box;
   border-radius: 10px;
+  min-height: 100px;
+  .textClass{
+    line-height: 100px;
+    
+  }
+  .textClassLength10{
+  text-align: left !important;
+  }
+
+  
 }
 .cls0 {
   background-color: #e6e6e6;
@@ -89,8 +105,8 @@ export default {
 .cls2 {
   background-color: #fff;
   // background-color: #ff6b00;
-  border: 1px solid #ff6b00;
-  color: #ff6b00;
+  border: 1px solid #f30407;
+  color: #f30407;
 }
 .pors {
   position: absolute;
@@ -106,7 +122,7 @@ export default {
   background-color: #3cbda9;
 }
 .error {
-  background-color: #ff6b00;
+  background-color: #f30407;
 }
 // 'cls0', 'cls1', 'cls2']
 </style>

+ 39 - 15
src/views/menu/monitoringCall/components/taskInfo.vue

@@ -11,7 +11,6 @@
             <van-col span="24">
               <div class="text">{{ videoChannelName }}</div>
             </van-col>
-            
           </van-row>
           <!-- //主体内容 -->
           <div class="mainBox">
@@ -22,8 +21,7 @@
             </van-row>
             <div class="mainItem">
               <van-row class="rowItem" v-for="item in dataList" :key="item.id">
-                <van-col class="itemCls" span="10"
-                style="display: flex;"
+                <van-col class="itemCls" span="10" style="display: flex"
                   ><van-checkbox
                     v-model="item.isChecked"
                     @change="checkedFc($event, item)"
@@ -31,8 +29,10 @@
                     icon-size="16px"
                     shape="square"
                   >
-                </van-checkbox>
-                <span @click="textTitleHandler(item.remark)" class="info">{{ item.dictLabel }}</span>
+                  </van-checkbox>
+                  <span class="info"
+                    >{{ item.dictLabel }}<van-icon class="info-o" name="info-o" @click="textTitleHandler(item.remark)"
+                  /></span>
                 </van-col>
                 <van-radio-group v-model="item.situation" @change="checkHandler($event, item)">
                   <van-col class="itemCls" span="7" v-for="itemDict in dictList" :key="itemDict.dictValue">
@@ -55,6 +55,13 @@
                 /></van-col>
               </van-row>
             </div>
+            <!-- 文字描述弹框 -->
+            <van-dialog v-model="showDialog" title="提示">
+             <div class="showtext">
+              <!-- {{ showText }} -->
+              <div v-for="item in showText" :key="item">{{ item }}</div>
+             </div> 
+            </van-dialog>
             <!-- 底部按钮 -->
             <div>
               <van-row>
@@ -83,6 +90,8 @@ export default {
 
   data() {
     return {
+      showText:[],
+      showDialog: false,
       taskId: '', //任务ID
       show: false,
       host: '',
@@ -102,11 +111,11 @@ export default {
   created() {
     this.disabled = +this.$route.params.id.split('_')[3] ? true : false
   },
- 
-mounted(){
-  let list = document.querySelector('.mainItem')
-  list.addEventListener('touchmove', e => e.stopPropagation(), false)
-},
+
+  mounted() {
+    let list = document.querySelector('.mainItem')
+    list.addEventListener('touchmove', e => e.stopPropagation(), false)
+  },
 
   methods: {
     //组件初始化
@@ -186,7 +195,7 @@ mounted(){
         if (item.isChecked) {
           console.log(item)
           if (item.situation == '1' && item.abnormalIllustrate == '') {
-            Toast(`${item.dictLabel}的异常情况说明不能为空!`)
+            Toast(`${item.dictLabel}的异常原因不能为空!`)
 
             this.falg = true
           }
@@ -206,7 +215,9 @@ mounted(){
             list.push(item)
           }
         })
-
+        if(list.length==0){
+          return Toast(`单通道调阅项至少勾选一项!`)
+        }
         //编辑提交
         updateInfo({
           host: this.hostId,
@@ -227,7 +238,9 @@ mounted(){
     },
     //文字提示
     textTitleHandler(text) {
-      Dialog({ message: text ? text : '提示' })
+      // text='1.挖掘第哦啊uiOS多i,2.是多久啊了多久哦'
+      this.showDialog = true
+      this.showText = text.split(',')
     }
   }
 }
@@ -265,7 +278,6 @@ mounted(){
   color: black;
 }
 .mainBox {
-  
   .titleList {
     background-color: #e8e8e8;
     margin-top: 20px;
@@ -291,6 +303,18 @@ mounted(){
 }
 .info {
   color: #1989fa;
-  text-decoration: underline;
+  margin-left: 10px;
+  // text-decoration: underline;
+  .info-o{
+    margin-left: 10px;
+  }
+}
+.showtext{
+  text-align: left;
+  color: black;
+  padding-left: 50px;
+  margin-top: 50px;
+  margin-bottom: 50px;
 }
+
 </style>

+ 4 - 4
src/views/menu/monitoringCall/index.vue

@@ -415,7 +415,7 @@ export default {
   padding-right: 10px;
  
   float: right;
-  font-size: 20px;
+  // font-size: 20px;
   // border-radius: 10px;
   // background-color: #8cb585;
 }
@@ -425,7 +425,7 @@ export default {
   padding-left: 10px;
   padding-right: 10px;
   float: right;
-  font-size: 20px;
+  // font-size: 20px;
   
   // border-radius: 10px;
   // background-color: #1989fa;
@@ -435,7 +435,7 @@ export default {
   padding-left: 10px;
   padding-right: 10px;
   float: right;
-  font-size: 20px;
+  // font-size: 20px;
   // border-radius: 10px;
   // background-color: #25da0b;
 }
@@ -446,7 +446,7 @@ export default {
   padding-right: 10px;
   float: right;
   
-  font-size: 20px;
+  // font-size: 20px;
   // border-radius: 10px;
   // background-color: #e46962;
 }