Merge branch 'V0.0.6' of http://10.87.21.221:8000/jzyd_yyds/soc_app into V0.0.6

 Conflicts:
	src/views/menu/monitoringCall/components/consultInfo.vue

babel.config.js

@@ -9,6 +9,5 @@ if (IS_PROD) {
 }
 
 module.exports = {
-  presets: [['@vue/cli-plugin-babel/preset', { useBuiltIns: 'usage', corejs: 3 }]],
-  plugins
+  presets: [['@babel/preset-env', {useBuiltIns: 'usage', corejs: 3}], '@vue/babel-preset-jsx'], plugins
 }

package.json

@@ -10,6 +10,7 @@
     "build": "vue-cli-service build"
   },
   "dependencies": {
+    "@babel/polyfill": "^7.12.1",
     "@better-scroll/core": "^2.5.1",
     "@better-scroll/observe-dom": "^2.5.1",
     "@better-scroll/pull-down": "^2.5.1",
@@ -17,6 +18,8 @@
     "@popperjs/core": "^2.11.8",
     "@riophae/vue-treeselect": "0.4.0",
     "@vant/touch-emulator": "^1.4.0",
+    "@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
+    "@vue/babel-preset-jsx": "^1.4.0",
     "amfe-flexible": "^2.2.1",
     "axios": "^1.6.0",
     "browser-fs-access": "^0.34.1",

src/App.vue

@@ -8,7 +8,7 @@
 // import watercom from '@/components/waterCom.vue'
 
 export default {
-  
+
   name: 'App'
 }
 </script>
@@ -37,4 +37,8 @@ html,body,div,h1,h2,h3,h4,h5,p{
   padding: 0;
   margin: 0;
 }
+pre{
+  white-space: pre-wrap;
+  word-wrap: break-word;
+}
 </style>

src/utils/globalMixins.js

@@ -40,7 +40,7 @@ export default {
         return v.key === key
       })
       console.log(item, 'item')
-      return item?.value
+      return item.value
     },
     /** 获取字典值
      * key: String 查询具体值
@@ -48,15 +48,15 @@ export default {
      * 组件页面中需要设置：mapGetters(['dictionary']']),
      * */
     getDictLabel(key, dictType) {
-      let item = this.dictionary?.find(v => {
+      let item = this.dictionary.find(v => {
         return v.key === dictType
       })
-      let dictLabel = item?.value?.find(v => {
+      let dictLabel = item.value.find(v => {
         if (v.dictValue == key) {
-          return v?.dictLabel
+          return v.dictLabel
         }
       })
-      return dictLabel?.dictLabel
+      return dictLabel.dictLabel
     },
     //时间范围模板：2020-01-01~2020-01-02
     rangDate(start, end, a) {

src/views/menu/monitoringCall/components/consultInfo.vue

@@ -19,7 +19,7 @@
             <MonitoingList :list="item" :taskStatus="taskData.taskStatus"></MonitoingList>
           </div>
         </div>
-       
+
         <div v-else>
           <van-collapse-item :name="item.hostId" v-for="item in hostList" :key="item.hostId">
             <template #title>
@@ -97,15 +97,16 @@ export default {
         let { code, data, msg } = res
         if (code == 200) {
           this.taskData = data
-          // console.log("this.taskData",this.taskData)
-          if(this.taskData.taskStatus!="2"){
-            Toast(`当前为调阅通道选择界面，仅需选择实际调阅通道，无需全选。`,{duration:5000});
-          }
-          //如果当前是调阅中则获取视频主机和通道
-          if (data && data.taskStatus < 2) {
-            this.getHostHandler(num)
-          }
-        }
+        if (data && data.taskStatus < 2) {
+              this.getHostHandler(num)
+            }
+          if(num === 1 && data.taskStatus !=2){
+            Dialog.alert({
+            message: '当前为调阅通道选择界面，仅需选择实际调阅通道，无需全选。',
+            }).then(() => {
+              
+            });
+          }        }
       })
     },
     getHostHandlerA(num) {
@@ -152,7 +153,7 @@ export default {
               // on cancel
             })
         }
-        
+
       } else {
         Dialog({ message: '调阅项目登记不能为全空!' })
         return
@@ -221,11 +222,11 @@ export default {
         taskId: this.$route.params.id.split('_')[0]
       }).then(res => {
         this.$router.go(-1)
-        
+
       })
     },
     addActiveNames() {
-      
+
     }
   }
 }

src/views/menu/monitoringCall/components/taskInfo.vue

@@ -120,7 +120,13 @@
     methods: {
       //组件初始化
       init(taskId, videoId, hostId) {
-        Toast(`当前为调阅项目选择界面，仅需部分登记发现调阅项目填写正常或者异常项，无需全部填写。`,{duration:5000});
+        // Toast(`当前为调阅项目选择界面，仅需部分登记发现调阅项目填写正常或者异常项，无需全部填写。`,{duration:5000});
+        Dialog.alert({
+            message: '当前为调阅项目选择界面，仅需部分登记发现调阅项目填写正常或者异常项，无需全部填写。',
+          }).then(() => {
+          });
+        
+        
         this.taskId = taskId
         this.show = true
         //获取调阅字典