front/src/views/personalCenter/components/AbilityApplication.vue

@@ -159,32 +159,27 @@
                   <span class="channelName">{{ val.channelName }}</span>
                   <span class="type">基础设施</span>
                 </div>
-                <div>
+                <a-button type="primary" v-if="item.approveStatus == '通过' && whoShow1.itShowXiHaiAn"
-                  <a-button type="primary" v-if="item.approveStatus == '通过' && whoShow1.itShowXiHaiAn"
+                  @click.stop="openVideo(val)">
-                    @click.stop="openVideo(val)">
+                  视频预览
-                    视频预览
+                </a-button>
-                  </a-button>
+                <span class="channelName" style="color:#ff7875" v-if="whoShow1.itShowXiHaiAn && !item.ended" >该流程已终止</span>
-                  <div class="channelName" style="color:#ff7875" v-if="whoShow1.itShowXiHaiAn && item.ended">该流程已终止
+
-                  </div>
-                </div>
               </div>
               <div class="ability-bottom">
                 <div class="dec2">位置：{{ val.nodeName }}</div>
                 <div class="result" v-if="item.approveStatus == '通过'">
-                  申请结果：
+                  申请结果：{{
-                  <span>列表地址：</span><span style="cursor: pointer;" @click="openView(backUrl +
+                  '列表地址：' +
-                  'resource/getApplyCameraList/' +
-                  item.instanceId)">{{
                   backUrl +
                   'resource/getApplyCameraList/' +
-                  item.instanceId }}</span>
+                  item.instanceId +
-                  <span>视频流地址：</span>
+                  ';' +
-                  <span style="cursor: pointer" @click="openView(backUrl +
+                  '视频流地址：' +
-                  'resource/hls/getHls/?key=' +
-                  val.channelId)">{{
                   backUrl +
                   'resource/hls/getHls/?key=' +
-                  val.channelId}}</span>
+                  val.channelId
+                  }}
                 </div>
               </div>
             </div>
@@ -458,10 +453,6 @@ const handleUser = () => {
   })
 }
 
-const openView = (url) => {
-  window.open(url, '_blank')
-}
-
 </script>
 <style lang="less" scoped>
 .title {
@@ -540,7 +531,7 @@ const openView = (url) => {
         margin-left: 0.1rem;
 
         .ability {
-          height: 1.6rem;
+          height: 1.3rem;
           display: flex;
           border-bottom: 1px #eee solid;
           padding: 0.1rem 0;
@@ -742,7 +733,6 @@ const openView = (url) => {
   font-weight: bold;
   opacity: 0.4;
   transform: rotate(-25deg);
-  width: 470px;
+  width: 470px
-
 }
 </style>

front/src/views/personalCenter/components/PurchaseVehicle.vue

@@ -650,19 +650,17 @@ const ceshiFunction = () => {
 }
 // delOne delList handleDelete
 const handleDelete = (item, index) => {
-  console.log('item, index------------>', item, index);
-  
   console.log('item------------>', item);
   let delArr = [];
   // 单个删除
-  if (index) {
+  if (item) {
     delArr = [item.id]
   } else {
     // 批量删除
     if (checkedListAbility.value.length == 0) {
       return message.warning('请先选择需要操作的数据！')
     } else {
-      delArr = checkedListAbility.value
+      delArr = checkedListAbility.value.map(v=>v.id)
     }
   }
   sgcDel({