我的申请--申请详情 样式调整

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

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

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

@@ -3,27 +3,16 @@
     <div class="title" style="margin-bottom: 0.2rem">我的申请</div>
     <div class="tab" style="margin-bottom: 0.1rem">
       <span>类型</span>
-      <div
+      <div :class="typeIndex == index ? 'tabclass' : ' '" @click="changeType(item, index)"
-        :class="typeIndex == index ? 'tabclass' : ' '"
+        v-for="(item, index) in typeList" :key="index">
-        @click="changeType(item, index)"
-        v-for="(item, index) in typeList"
-        :key="index"
-      >
         {{ item }}
       </div>
     </div>
     <div class="tab">
       <span>申请状态</span>
-      <div
+      <div :class="tabIndex == index ? 'tabclass' : ' '" @click="changeApplyState(item, index)"
-        :class="tabIndex == index ? 'tabclass' : ' '"
+        v-for="(item, index) in tabList" :key="index">
-        @click="changeApplyState(item, index)"
+        <a-badge :count="item === '审核中' ? num.unfinished : num.finished" v-if="item !== '全部'">
-        v-for="(item, index) in tabList"
-        :key="index"
-      >
-        <a-badge
-          :count="item === '审核中' ? num.unfinished : num.finished"
-          v-if="item !== '全部'"
-        >
           {{ item }}
         </a-badge>
         <template v-else>
@@ -33,11 +22,7 @@
     </div>
     <div v-if="contentList.data.length > 0">
       <div class="content">
-        <div
+        <div class="content-body" v-for="item in contentList.data" :key="item.index">
-          class="content-body"
-          v-for="item in contentList.data"
-          :key="item.index"
-        >
           <div class="content-body-title">
             <span>申请单号：{{ item.applyNumber || '--' }}</span>
             <div></div>
@@ -48,9 +33,7 @@
             </template>
             <div class="content-body-title">
               <span>
-                名称：{{
+                名称：{{ item.cameraList ? item.system : (item.title || item.name) }}
-                  item.cameraList ? item.system : item.title || item.name
-                }}
               </span>
               <div></div>
             </div>
@@ -69,112 +52,53 @@
             <div v-if="isXiHaiAn">过期时间：{{ item.expireDate || '' }}</div>
           </div>
           <div class="button-box">
-            <div
+            <div class="button" v-if="typeName == '设备申请' && phoneSate.includes(item.state)"
-              class="button"
+              @click="showPhoneModal(item)">
-              v-if="typeName == '设备申请' && phoneSate.includes(item.state)"
-              @click="showPhoneModal(item)"
-            >
               联系方式
             </div>
             <div class="button" @click="showDetail(item)">查看详情</div>
             <div class="button" @click="showAdd(item)" v-if="item.backToFirst">
               修改
             </div>
-            <svg
+            <svg t="1652233950228" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
-              t="1652233950228"
+              p-id="5970" data-spm-anchor-id="a313x.7781069.0.i8" width="80" height="80" v-if="
-              class="icon"
-              viewBox="0 0 1024 1024"
-              version="1.1"
-              xmlns="http://www.w3.org/2000/svg"
-              p-id="5970"
-              data-spm-anchor-id="a313x.7781069.0.i8"
-              width="80"
-              height="80"
-              v-if="
                 item.processDefinitionName != '能力资源下架' &&
                 (item.resourceStatus == 4 || item.resourceStatus == 5)
-              "
+              " style="position: absolute; top: 20px; left: -850px">
-              style="position: absolute; top: 20px; left: -850px"
-            >
               <path
                 d="M955.22053 256C813.82053 11.2 500.72053-72.6 255.92053 68.8S-72.67947 523.2 68.72053 768 523.22053 1096.6 768.02053 955.2c244.7-141.2 328.6-454.1 187.4-698.8 0-0.1-0.1-0.3-0.2-0.4zM762.02053 944.7c-239 138.1-544.8 56.2-682.9-182.8S22.92053 217.1 261.92053 79.1s544.8-56.2 682.9 182.8c137.9 239 56.1 544.6-182.8 682.8z"
-                fill="#515151"
+                fill="#515151" opacity=".5" p-id="5971"></path>
-                opacity=".5"
-                p-id="5971"
-              ></path>
               <path
                 d="M898.12053 289.2C775.02053 76 502.42053 2.9 289.22053 126 76.02053 249.1 3.02053 521.6 126.02053 734.8 249.12053 948 521.62053 1021.1 734.82053 898 947.92053 774.9 1021.02053 502.4 898.12053 289.2zM731.62053 892.8C521.32053 1014.3 252.42053 942.2 131.02053 731.9 9.52053 521.6 81.62053 252.7 291.92053 131.3 502.12053 9.9 771.02053 81.8 892.42053 292c121.5 210.3 49.5 479.3-160.8 600.8z"
-                fill="#515151"
+                fill="#515151" opacity=".5" p-id="5972"></path>
-                opacity=".5"
-                p-id="5972"
-              ></path>
               <path
                 d="M323.62053 176.8c3.6-2 6 0.8 8.8 2.8 6 4.4 12.4 8.8 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 13.6-5.6 20.8 4.8 6 10 11.6 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.4 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.4-1.9-3.9-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.7-0.8-0.3-1.6 0.6-2zM200.72053 289.2c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 13.6-5.6 20.8 4.8 6 10 11.6 14.8 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.4-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5c-8.4-2-16.8-4.4-25.2-6.4-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 3.6-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.4-1.2 0-1.6 0.8-2.4l0.2 0.4z m276.6-159.6c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 14-5.6 20.8 4.8 6 10 12 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.8-1.2-0.4-1.6 0.4-2.4l0.2 0.4z m141.9 29.6c3.6-2 6 0.8 8.8 2.8l18.8 12.8c7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 14-5.6 20.8 4.8 6 10 12 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4-7.7 0.4-15.2 0.8-22.4 0.8-4.4 6.8-8.4 13.2-12.8 20-1.6 2.4-4 5.1-7.2 4-2.4-1.9-3.9-4.7-4.4-7.7l-7.2-20.5c-8.4-2-16.8-4.4-25.2-6.4-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.5-1.2 0.2-1.6 0.6-2zM150.02053 430c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-4 14-5.6 20.8 4.8 6 10 11.6 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 3.6-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.7-0.8-0.3-1.5 0.6-2z m558.9 414.4c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.1 4.4-0.7 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.5-1.1 0.8-1.1 1.6-1.1h0.1z m-158.8 50c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.1-3.7-5.6-3.6-7.7-4-6.8-1.6-14-3.6-20.8-5.6l-7.7-22c-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2-1 4.2-1.7 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.4-0.8 0.8-0.8 1.7-0.7z m276.5-159.6c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8s-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.2 4.4-0.7 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0-0.8 0.8-1.2 1.6-1.2l0.1 0.1z m45.6-137.6c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-1.6-14-3.6-20.8-5.6l-7.7-22c-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.2-0.7 0.6-0.7 1.4-0.7h0.3zM402.72053 868c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.5-0.8 1-1.1 1.7-1.1z"
-                fill="#515151"
+                fill="#515151" opacity=".5" p-id="5973"></path>
-                opacity=".5"
-                p-id="5973"
-              ></path>
               <path
                 d="M386.42053 590.4l-43.8-75.9L207.02053 592.7l10.2 17.7L334.02053 543l23.4 40.4-90.5 52.2-13.5-23.4-18.7 10.8 53.1 92c9.1 15.8 21.2 19.5 36.4 10.7l98.8-57c6.2-3.6 11-9.3 13.4-16.1-1.4-15.9-6.2-31.2-14.2-45l-21.4 4.8c6.7 10.3 11 21.9 12.8 34-1 3.3-3.2 6-6.1 7.8l-88.3 51c-6.2 3.6-11.1 2.1-14.8-4.3l-27.3-47.4 109.3-63.1z m2.9-103.2l10.4 18.1 65.6-37.9 79.9 138.4 18.6-10.8-55.9-96.9c18.8-0.9 43.2-0.6 73 0.7l1.5-23.1c-29.8-0.3-58.4 0.4-86 2.6l-12.5-21.6 74.9-43.2-10.4-18.1-159.1 91.8zM669.52053 329l38.2 66.2 61.4-35.4-38.1-66.1-61.5 35.3z m72.4 24.2l-26.3 15.2-19-33 26.3-15.2 19 33zM599.02053 356.7l7.9 13.7-23.3 13.5 9.8 17 21.8-12.6c7.5 18.7 6.6 39.6-2.5 57.6l20.7 4.4c10.3-23.1 10.3-49.4 0-72.5l18.8-10.9c6 9.2 10.7 19.2 14.2 29.7 0.3 5-2.6 9.7-7.2 11.7-2.9 1.2-6.4 2.8-10.9 4.9l14.1 14.1c3.7-1.3 7.3-2.9 10.7-4.8 8.6-3.9 14.4-12.2 15.2-21.6-5.4-22.1-14.6-43-27.4-61.8l-36.1 20.8-7.9-13.7-17.9 10.5z m29.9 108.1l10 17.4 53.2-30.7c-7.8 23.7-20.6 45.4-37.5 63.6l20.6 11.1c18.6-24.2 30-53.1 33-83.4l29.8 51.5 18.4-10.7-29.8-51.5c27.4 11.5 57.2 16.3 86.9 14.1l3.5-23.5c-24.7 5.1-50.1 5-74.8-0.1l53.5-30.9-10-17.3-69.3 40-7.3-12.6-18.4 10.7L698.02053 425l-69.1 39.8z"
-                fill="#515151"
+                fill="#515151" opacity=".5" p-id="5974"></path>
-                opacity=".5"
-                p-id="5974"
-              ></path>
             </svg>
           </div>
         </div>
       </div>
       <div class="bottom">
-        <a-pagination
+        <a-pagination size="small" pageSize="4" :total="total" :current="page" @change="handleCurrentChange"
-          size="small"
+          @showSizeChange="handlePageSizeChange" :showSizeChanger="false" />
-          pageSize="4"
-          :total="total"
-          :current="page"
-          @change="handleCurrentChange"
-          @showSizeChange="handlePageSizeChange"
-          :showSizeChanger="false"
-        />
       </div>
     </div>
     <a-empty v-else />
-    <!-- :title="detailModalTitle" -->
+    <a-modal bodyStyle="padding:0.1rem 0" v-model:visible="detailsVisible"
-    <a-modal
+      style="width: 900px" :footer="null" destroyOnClose="true" :maskClosable="false">
-      bodyStyle="padding:0.1rem 0"
+      <template v-slot:title>{{refObj.description && itShowXiHaiAn ? refObj.description + '申请详情' : '申请详情'}}</template>
-      v-model:visible="detailsVisible"
+      <apply-details :processDefinitionName="processDefinitionName" :businessKey="businessKey"
-      style="width: 1000px"
+        :processInstanceId="processInstanceId" :resourceId="resourceId" :refObj="refObj" :showType="showType">
-      :footer="null"
+      </apply-details>
-      destroyOnClose="true"
-      :maskClosable="false"
-    >
-      <template v-slot:title>{{ detailModalTitle }}</template>
-      <apply-details
-        :processDefinitionName="processDefinitionName"
-        :businessKey="businessKey"
-        :processInstanceId="processInstanceId"
-        :resourceId="resourceId"
-        :refObj="refObj"
-        :showType="showType"
-      ></apply-details>
     </a-modal>
-    <a-modal
+    <a-modal v-model:visible="visible" title="下架原因" @ok="del()" @cancel="reason = ''">
-      v-model:visible="visible"
-      title="下架原因"
-      @ok="del()"
-      @cancel="reason = ''"
-    >
       <a-input v-model:value="reason" placeholder="请输入下架原因" />
     </a-modal>
-    <a-modal
+    <a-modal v-model:visible="videoVisible" title="已申请摄像头列表" @ok="videoVisible = false">
-      v-model:visible="videoVisible"
+      <a-table :columns="columns" :data-source="xVideoList" bordered :pagination="{ defaultPageSize: 6 }">
-      title="已申请摄像头列表"
-      @ok="videoVisible = false"
-    >
-      <a-table
-        :columns="columns"
-        :data-source="xVideoList"
-        bordered
-        :pagination="{ defaultPageSize: 6 }"
-      >
         <template #bodyCell="{ column, text }">
           <!-- <template>
         <a>{{ text }}</a>
@@ -185,25 +109,14 @@
   </div>
 
   <!-- 联系方式弹框 -->
-  <a-modal
+  <a-modal v-model:visible="phoneVisible" title="提示" @ok="phoneVisible = false">
-    v-model:visible="phoneVisible"
-    title="提示"
-    @ok="phoneVisible = false"
-  >
     <!-- 工业信息化局那个号，电话配这个号：199 6399 0996 -->
     <p>请联系工业信息化局，电话：199 6399 0996</p>
   </a-modal>
 </template>
 
 <script setup>
-  import {
+import { onMounted, reactive, ref, onBeforeUnmount, h, defineProps } from 'vue'
-    onMounted,
-    reactive,
-    ref,
-    onBeforeUnmount,
-    h,
-    defineProps,
-  } from 'vue'
 import {
   getMyProcessInstancePage,
   getTabilityapplication,
@@ -241,15 +154,16 @@
 ])
 // 西海岸-设备申请
 let isXiHaiAn = whoShow.itShowXiHaiAn
+const itShowXiHaiAn = ref(isXiHaiAn)
 const phoneSate = ref([2, 3])
 if (isXiHaiAn) {
   typeList.value.push('设备申请')
 }
 const typeStrObj = {
-    能力上架: 'resourcemountapply',
+  '能力上架': 'resourcemountapply',
-    能力下架: 'resourcundercarriageapply',
+  '能力下架': 'resourcundercarriageapply',
-    能力需求: 'abilitydemandapply',
+  '能力需求': 'abilitydemandapply',
-    需求评论: 'comment_review',
+  '需求评论': 'comment_review',
 }
 let tabList = ref(['全部', '审核中', '审核完成'])
 const contentList = reactive({ data: [] })
@@ -327,18 +241,10 @@
 }
 
 const cilckRowData = ref({})
-  let detailModalTitle = '申请详情'
 const showDetail = (item) => {
-    cilckRowData.value = item
+  cilckRowData.value = item;
   // 西海岸-申请时间过期，提示
   if (isXiHaiAn) {
-      // 西海岸、单兵无人机设备
-      if (item.tbDeviceDTO) {
-        detailModalTitle = item.tbDeviceDTO.name
-          ? item.tbDeviceDTO.name + '申请详情'
-          : '申请详情'
-      }
-      console.log('detailModalTitle------------>', detailModalTitle)
     if (item.expireDate) {
       let diff = moment().diff(moment(item.expireDate), 'seconds')
       if (diff > 0) {
@@ -365,7 +271,6 @@
         if (res.data.code == 0) {
           refObj.value = res.data.data
           detailsVisible.value = true
-            processDefinitionName.value = item.processDefinitionName
         }
       })
       .catch((err) => { })
@@ -738,9 +643,11 @@
       num.value.finished = finished.total || ''
       numFlag.value = false
     })
-      .catch((err) => {})
+    .catch((err) => {
+    })
 }
 
+
 const showPhoneModal = () => {
   phoneVisible.value = true
 }
@@ -756,7 +663,7 @@
   getApplyList()
 
   if (props.tabTypeName) {
-      let _index = typeList.value.findIndex((v) => v == props.tabTypeName)
+    let _index = typeList.value.findIndex(v => v == props.tabTypeName)
     changeType(props.tabTypeName, _index != -1 ? _index : 0)
   }
 })

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

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