Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev

back/src/views/modules/activiti/demo/putaway-process.vue

@@ -131,7 +131,7 @@
           </el-form-item>
           <el-form-item label="接口请求方式"  v-if="coverageNotShow">
             <el-input
-              v-model="dataForm.applyCount"
+              v-model="dataForm.apiMethodType"
               :disabled="fieldDisabled"
               placeholder="接口请求方式"
             ></el-input>

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

@@ -432,7 +432,7 @@
         </a-form-item>
         <a-form-item label="接口请求方式">
           <a-input
-            v-model:value="dataForm.data.applyCount"
+            v-model:value="dataForm.data.apiMethodType"
             disabled="true"
             placeholder="接口请求方式"
           ></a-input>

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

@@ -48,8 +48,13 @@
           <a-tooltip>
             <template #title>{{ item.name }}</template>
             <div class="content-body-title">
-              <span v-if="item.name ==='申请摄像头列表'" @click="showVideoList(item)"> 名称：{{ item.name }} </span>
+              <span
-              <span v-else> 名称：{{ item.name }} </span>
+                v-if="item.name === '申请摄像头列表'"
+                @click="showVideoList(item)"
+              >
+                名称：{{ item.name }}
+              </span>
+              <span v-else>名称：{{ item.name }}</span>
               <div></div>
             </div>
           </a-tooltip>
@@ -72,7 +77,18 @@
           </div>
           <div v-else>
             <p class="content-body-content-son">
-              <span v-if="item.name ==='申请摄像头列表'">申请结果：{{ '列表地址：' + backUrl +  'resource/getApplyCameraList/' + item.processInstanceId+';'+ '视频流地址：'+backUrl + '/resource/hls/getHls/?channelId='}}</span>
+              <span v-if="item.name === '申请摄像头列表'">
+                申请结果：{{
+                  '列表地址：' +
+                  backUrl +
+                  'resource/getApplyCameraList/' +
+                  item.processInstanceId +
+                  ';' +
+                  '视频流地址：' +
+                  backUrl +
+                  '/resource/hls/getHls/?channelId='
+                }}
+              </span>
               <span v-else>申请结果：{{ item.comment || '暂无' }}</span>
               <a-button
                 type="primary"
@@ -225,9 +241,14 @@
     <a-modal
       v-model:visible="videoVisible"
       title="已申请摄像头列表"
-      @ok="videoVisible=false"
+      @ok="videoVisible = false"
+    >
+      <a-table
+        :columns="columns"
+        :data-source="xVideoList"
+        bordered
+        :pagination="{ defaultPageSize: 6 }"
       >
-      <a-table :columns="columns" :data-source="xVideoList" bordered :pagination="{defaultPageSize: 6}">
         <template #bodyCell="{ column, text }">
           <!-- <template>
         <a>{{ text }}</a>
@@ -246,7 +267,12 @@
     getTaskHandleDetailInfo,
     // getProcDefBizRoute,
   } from '@/api/personalCenter'
-  import { updateRes, relaunch, selectOne,getApplyCameraList } from '@/api/home'
+  import {
+    updateRes,
+    relaunch,
+    selectOne,
+    getApplyCameraList,
+  } from '@/api/home'
   import { useRouter } from 'vue-router'
   import { message } from 'ant-design-vue'
   import ApplyDetails from '@/views/personalCenter/components/ApplyDetails'
@@ -257,39 +283,56 @@
   // let contentListLength = contentList.length
   let tabIndex = ref(0)
   const videoVisible = ref(false)
-  const columns = ref([{
+  const columns = ref([
+    {
       title: '摄像头名称',
-    dataIndex: 'name'
+      dataIndex: 'name',
-  }])
+    },
-  const xVideoList = ref([{
+  ])
-    name: '111'
+  const xVideoList = ref([
-  }, {
+    {
-    name: '222'
+      name: '111',
-  },{
+    },
-    name: '111'
+    {
-  }, {
+      name: '222',
-    name: '222'
+    },
-  },{
+    {
-    name: '111'
+      name: '111',
-  }, {
+    },
-    name: '222'
+    {
-  },{
+      name: '222',
-    name: '111'
+    },
-  }, {
+    {
-    name: '222'
+      name: '111',
-  },{
+    },
-    name: '111'
+    {
-  }, {
+      name: '222',
-    name: '222'
+    },
-  },{
+    {
-    name: '111'
+      name: '111',
-  }, {
+    },
-    name: '222'
+    {
-  },{
+      name: '222',
-    name: '111'
+    },
-  }, {
+    {
-    name: '222'
+      name: '111',
-  },])
+    },
+    {
+      name: '222',
+    },
+    {
+      name: '111',
+    },
+    {
+      name: '222',
+    },
+    {
+      name: '111',
+    },
+    {
+      name: '222',
+    },
+  ])
   function tabqiehuan(item, index) {
     // debugger
     tabIndex.value = index
@@ -636,13 +679,23 @@
           line-height: 16px;
           font-size: 12px;
           width: 100%;
-          text-overflow: -o-ellipsis-lastline;
+          // text-overflow: -o-ellipsis-lastline;
+          // overflow: hidden;
+          // text-overflow: ellipsis;
+          // display: -webkit-box;
+          // -webkit-line-clamp: 3;
+          // -webkit-box-orient: vertical;
+          display: flex;
+          color: #999999;
+          span {
             overflow: hidden;
             text-overflow: ellipsis;
             display: -webkit-box;
-          -webkit-line-clamp: 3;
+            -webkit-line-clamp: 1;
             -webkit-box-orient: vertical;
-          color: #999999;
+            max-width: 8.1rem;
+            line-height: 24px;
+          }
         }
         .content-body-bottom {
           display: flex;