Merge branch 'hi-ucs-dev' into release

front/src/views/demandCenter/index.vue

@@ -38,7 +38,7 @@
                     {{ item.demandSubject }}
                   </span>
                 </a-tooltip>
-                <span v-else>
+                <span v-else  @click="showDetail(item)">
                   {{ item.demandSubject }}
                 </span>
                 <span class="time">{{ item.createDate }}</span>

front/src/views/home/AbilityToApplyFor.vue

@@ -1,10 +1,10 @@
 <template>
-  <div class="ability-to-apply-for" :class="{ all: falg }">
+  <div class="ability-to-apply-for" :class="{ all: flag }">
     <div class="title">
       <span>申请能力</span>
       <div
         class="btnBox"
-        v-show="!falg"
+        v-show="!flag"
         v-if="dataForm[0].arr.length > 1 || dataForm.length > 1"
       >
         <svg
@@ -16,7 +16,7 @@
           p-id="5926"
           width="20"
           height="20"
-          @click="falg = !falg"
+          @click="flag = !flag"
         >
           <path
             d="M512 565.12a45.44 45.44 0 0 1-32.64-13.44l-448-451.84a45.44 45.44 0 0 1 64-64L512 454.4 931.84 35.2a46.08 46.08 0 0 1 64 0 45.44 45.44 0 0 1 0 64L545.28 551.68a45.44 45.44 0 0 1-33.28 13.44z"
@@ -29,10 +29,14 @@
             p-id="5928"
           ></path>
         </svg>
-        <span class="btn" style="font-weight:600" @click="falg = !falg">展开</span>
-        <span class="btn" @click="falg = !falg">(共{{totalDataNum}}条数据)</span>
+        <span class="btn" style="font-weight: 600" @click="flag = !flag">
+          展开
+        </span>
+        <span class="btn" @click="flag = !flag">
+          (共{{ totalDataNum }}条数据)
+        </span>
       </div>
-      <div class="btnBox" v-show="falg">
+      <div class="btnBox" v-show="flag">
         <svg
           t="1659420014519"
           class="btn"
@@ -42,7 +46,7 @@
           p-id="9781"
           width="20"
           height="20"
-          @click="falg = !falg"
+          @click="flag = !flag"
         >
           <path
             d="M498.095 146.134l403.416 403.415c17.387 17.387 45.576 17.387 62.963 0s17.387-45.576 0-62.963L499.888 22 35.302 486.586c-17.388 17.387-17.388 45.575 0 62.963 17.387 17.387 45.576 17.387 62.964 0L498.095 146.134zM498.817 592.073l402.693 402.693c17.387 17.387 45.576 17.387 62.963 0s17.387-45.576 0-62.963L499.888 467.219 35.302 931.804c-17.388 17.387-17.388 45.576 0 62.963 17.387 17.387 45.576 17.387 62.964 0L498.817 592.073z"
@@ -50,7 +54,9 @@
             fill="#13227a"
           ></path>
         </svg>
-        <span class="btn" style="font-weight:600" @click="falg = !falg">收起</span>
+        <span class="btn" style="font-weight: 600" @click="flag = !flag">
+          收起
+        </span>
       </div>
     </div>
     <div
@@ -127,23 +133,29 @@
     title="已申请摄像头列表"
     @ok="videoVisible = false"
   >
-  <a-select placeholder="请选择归属部门" 
-                  style="width: 200px" 
-                  v-model:value="deptName" 
-                   :getPopupContainer="(triggerNode) => triggerNode.parentNode" 
-                     show-search 
-                     :filterOption="true"  
-                     @change="deptIdChangeFunction">
-                    <a-select-option v-for="(item, index) in deptNameAll" :key="`${index}-${item}`" :value="item.name">
-                      {{ item.name }}
-                    </a-select-option>
+    <a-select
+      placeholder="请选择归属部门"
+      style="width: 200px"
+      v-model:value="deptName"
+      :getPopupContainer="(triggerNode) => triggerNode.parentNode"
+      show-search
+      :filterOption="true"
+      @change="deptIdChangeFunction"
+    >
+      <a-select-option
+        v-for="(item, index) in deptNameAll"
+        :key="`${index}-${item}`"
+        :value="item.name"
+      >
+        {{ item.name }}
+      </a-select-option>
     </a-select>
     <a-table
       :columns="columns"
       :data-source="xVideoList"
       bordered
       :pagination="{ defaultPageSize: 6 }"
-      style="margin-top:10px"
+      style="margin-top: 10px"
     >
       <template #bodyCell="{ column, text }">
         <!-- <template>
@@ -164,9 +176,9 @@
   const props = defineProps({
     dataList: { type: Array, default: null },
   })
-  const falg = ref(false)
+  const flag = ref(false)
   let dataForm = ref([])
-  let totalDataNum = ref(0);
+  let totalDataNum = ref(0)
   const videoVisible = ref(false)
   const xVideoList = ref([])
   const xVideoListAll = ref([])
@@ -178,10 +190,10 @@
       title: '摄像头名称',
       dataIndex: 'name',
     },
-     {
+    {
       title: '归属部门',
       dataIndex: 'managementUnitName',
-    }
+    },
   ])
   // eslint-disable-next-line vue/no-setup-props-destructure
   dataForm.value = props.dataList
@@ -211,17 +223,17 @@
   // 详情
   const showItem = (id, type, delFlag, note1) => {
     if (type == '基础设施') {
-      let arr = JSON.parse(note1);
+      let arr = JSON.parse(note1)
       //console.log('arrarr====',arr);
       xVideoList.value = []
       arr.map((val) => {
         xVideoList.value.push({
           name: val.channelName || '',
           key: val.channelId,
-          managementUnitName:val.managementUnitName || '',
+          managementUnitName: val.managementUnitName || '',
         })
       })
-      xVideoListAll.value = xVideoList.value;
+      xVideoListAll.value = xVideoList.value
       videoVisible.value = true
     } else {
       if (delFlag == 0) {
@@ -236,34 +248,33 @@
       }
     }
   }
-    //归属部门选中改变事件
-    const deptIdChangeFunction = (name) => {
-      //console.log('nnnndddd',name);
-      //console.log('过滤前xVideoList',xVideoList);
-      //通过name过滤xVideoList
-        xVideoList.value =  xVideoListAll.value.filter((item) => {
-        if (name && item.managementUnitName.indexOf(name) < 0) return false
-        return true
-      });
-    }
-    //获取所有的归属部门列表
-     const getDeptAllData = () =>{
-      getDeptAll().then((res) => {
-       deptNameAll.value = res.data.data
-        })
-    } 
-      getDeptAllData(); 
-      const getDataTotalNum = () =>{
-        let totalNum  =0;
-       dataForm.value.forEach((item)=>{
-        totalNum = totalNum +item.arr.length;
-     });
-     totalDataNum.value = totalNum;
-    } 
-    getDataTotalNum();
-    //获取数据的总条数
-    
-</script> 
+  //归属部门选中改变事件
+  const deptIdChangeFunction = (name) => {
+    //console.log('nnnndddd',name);
+    //console.log('过滤前xVideoList',xVideoList);
+    //通过name过滤xVideoList
+    xVideoList.value = xVideoListAll.value.filter((item) => {
+      if (name && item.managementUnitName.indexOf(name) < 0) return false
+      return true
+    })
+  }
+  //获取所有的归属部门列表
+  const getDeptAllData = () => {
+    getDeptAll().then((res) => {
+      deptNameAll.value = res.data.data
+    })
+  }
+  getDeptAllData()
+  const getDataTotalNum = () => {
+    let totalNum = 0
+    dataForm.value.forEach((item) => {
+      totalNum = totalNum + item.arr.length
+    })
+    totalDataNum.value = totalNum
+  }
+  getDataTotalNum()
+  //获取数据的总条数
+</script>
 
 <style scoped lang="less">
   .ability-to-apply-for {
@@ -355,7 +366,7 @@
   }
 
   .all {
-    height: unset;
+    max-height: unset;
     min-height: 2.9rem;
   }
 
@@ -404,10 +415,10 @@
     align-items: center;
   }
   ::v-deep .ant-table-thead > tr > th {
-  //padding-left: px;
-  font-size: 18px;
-  font-weight: bold;
-  color:#000000 ;
-  //background: # !important;
-}
+    //padding-left: px;
+    font-size: 18px;
+    font-weight: bold;
+    color: #000000;
+    //background: # !important;
+  }
 </style>

front/src/views/home/detailsPageconetentTree.vue

@@ -39,7 +39,7 @@
                     fill="#0058e1"
                   ></path>
                 </svg>
-                <a-tooltip>
+                <a-tooltip @mouseenter="showToolTip">
                   <template #title>{{ val.title }}</template>
                   <span class="name">
                     {{ val.title }}
@@ -88,7 +88,7 @@
                       fill="#0058e1"
                     ></path>
                   </svg>
-                  <a-tooltip>
+                  <a-tooltip @mouseenter="showToolTip">
                     <template #title>{{ child.title }}</template>
                     <span class="name">
                       {{ child.title }}
@@ -251,6 +251,13 @@
           })
         }
       }
+      const showToolTip = (e) => {
+        console.log('鼠标移入', e, e.target.clientWidth, e.target.scrollWidth)
+        debugger
+        if (e.target.clientWidth < 200) {
+          e.target.style.pointerEvents = 'none' // 阻止鼠标事件
+        }
+      }
       // 区级特殊处理
       const generateChildren2 = (val, obj) => {
         if (val.dataList.length > 0) {
@@ -395,6 +402,7 @@
         showBottom,
         showDown,
         selectId,
+        showToolTip,
       }
     },
     beforeUnmount() {
@@ -511,6 +519,7 @@
           -webkit-line-clamp: 1;
           -webkit-box-orient: vertical;
           word-break: break-all;
+          max-width: 200px;
         }
       }
       .up:hover {

front/src/views/newHome/components/Carousel.vue

@@ -2,7 +2,7 @@
  * @Author: Light
  * @Date: 2022-11-30 17:43:43
  * @LastEditors: Light
- * @LastEditTime: 2022-12-02 16:02:26
+ * @LastEditTime: 2022-12-08 15:20:23
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -128,6 +128,7 @@
       position: relative;
       overflow: hidden;
       .notice-item {
+        width: 740px;
         font-size: 16px;
         position: absolute;
         top: 0;

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

@@ -288,6 +288,8 @@
           formName.demandSubject = res.data.data.demandSubject
           formName.detailsType = res.data.data.detailsType
           formName.detailsField = res.data.data.detailsField
+            .split(';')
+            .filter((val) => val)
           formName.demandDetails = res.data.data.demandDetails
           formName.enclosure = res.data.data.enclosure
           fileList.value = [
@@ -348,7 +350,7 @@
           formName.enclosure = info.file.response.data
         } else if (info.file.status === 'error') {
           formName.enclosure = ''
-          fileList.value=[]
+          fileList.value = []
           message.error(`${info.file.name} 文件上传失败`)
         }
       }