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

back/public/config/basicConfig.js

@@ -2,16 +2,16 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-08-25 14:37:49
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-12 15:25:01
+ * @LastEditTime: 2022-10-13 14:49:32
  * @Description: 告诉大家这是什么
  */
 var _global = {}
 var CONFIGITEM = {
   // version: 'qingdao', // 青岛
   // version: 'xihaian', // 西海岸
-  // version: 'test', // 测试
+  version: 'test', // 测试
   // version: 'frp', // 内网穿透
-  version: 'xihaian', // 开发
+  // version: 'xihaian', // 开发
   vNum: 'v0.8.7.2',
   configData: {
     // 青岛市大数据局

front/public/static/config/location.js

@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-08-29 09:55:56
+ * @LastEditTime: 2022-10-13 15:29:31
  * @Description: 数据资源参数配置
  */
 // eslint-disable-next-line no-undef
@@ -51,10 +51,10 @@ if (newLocation !== 'baotou' && newLocation !== 'xihaian') {
       right: '海信网络科技股份有限公司',
     },
     address: [
-      {
-        name: '鲁IC备00000000号',
-        value: '政府标识码3702000106',
-      },
+      // {
+      //   name: '鲁IC备00000000号',
+      //   value: '政府标识码3702000106',
+      // },
       {
         name: '版权所有：青岛市大数据发展管理局',
         value: '地址：山东省青岛市香港中路17号市级机关办公楼',
@@ -523,6 +523,11 @@ else if (newLocation === 'xihaian') {
       },
     ],
   }
-  xhaHasPermissionUser.list = ['xihaian01', 'xihaian02', 'xihaian03', 'xihaian04', 'admin']
-  
+  xhaHasPermissionUser.list = [
+    'xihaian01',
+    'xihaian02',
+    'xihaian03',
+    'xihaian04',
+    'admin',
+  ]
 }

front/src/views/abilityStatistics/components/Footer.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Author: hisense.wuhongjian
+ * @Date: 2022-07-05 12:53:04
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-10-13 15:29:14
+ * @Description: 告诉大家这是什么
+-->
 <template>
   <div class="footer">
     <div class="fotter-son">
@@ -18,10 +25,10 @@
 <script setup>
   import { reactive } from 'vue'
   let dataList = reactive([
-    {
-      name: '鲁IC备00000000号',
-      value: '政府标识码3702000106',
-    },
+    // {
+    //   name: '鲁IC备00000000号',
+    //   value: '政府标识码3702000106',
+    // },
     {
       name: '版权所有：青岛市大数据发展管理局',
       value: '地址：山东省青岛市香港中路17号市级机关办公楼',

front/src/views/home/infrastructurePage.vue

@@ -331,10 +331,7 @@
               </a-form-item>
             </a-col>
             <a-col :span="8">
-              <a-form-item
-                name="phone"
-                label="联系电话"
-              >
+              <a-form-item name="phone" label="联系电话">
                 <a-input v-model:value="formState.phone" style="width: 72%" />
               </a-form-item>
             </a-col>
@@ -389,7 +386,9 @@
             :wrapper-col="{ span: 14, offset: 4 }"
             style="text-align: center; margin-top: 0.4rem"
           >
-            <a-button @click="resetFields" type="primary" danger>取消</a-button>
+            <a-button @click="appointmentRoom = false" type="primary" danger>
+              取消
+            </a-button>
             <a-button
               style="margin-left: 10px"
               type="primary"
@@ -551,7 +550,10 @@
       >
         <template #footer></template>
         <div style="width: 100%; display: flex; justify-content: center">
-          <div style="width: 100%; height: 100%; position: relative" v-show="isXiHaiAn">
+          <div
+            style="width: 100%; height: 100%; position: relative"
+            v-show="isXiHaiAn"
+          >
             <!-- 西海岸--预览视频--遮罩 todo-->
             <div class="video-cover" @click="videoShowMsg"></div>
             <div class="waterMark waterMark-left-top">
@@ -635,17 +637,33 @@
             style="width: 100%; height: 100%; position: relative"
           >
             <!-- 批量预览视频--遮罩 -->
-            <div class="batch-video-cover" @click="videoShowMsg(index)" v-show="isXiHaiAn"></div>
-            <div class="batch-waterMark batch-waterMark-left-top" v-show="isXiHaiAn">
+            <div
+              class="batch-video-cover"
+              @click="videoShowMsg(index)"
+              v-show="isXiHaiAn"
+            ></div>
+            <div
+              class="batch-waterMark batch-waterMark-left-top"
+              v-show="isXiHaiAn"
+            >
               {{ userInfo.usernameShow }}
             </div>
-            <div class="batch-waterMark batch-waterMark-right-top" v-show="isXiHaiAn">
+            <div
+              class="batch-waterMark batch-waterMark-right-top"
+              v-show="isXiHaiAn"
+            >
               {{ userInfo.realNameShow }}
             </div>
-            <div class="batch-waterMark batch-waterMark-left-bottom" v-show="isXiHaiAn">
+            <div
+              class="batch-waterMark batch-waterMark-left-bottom"
+              v-show="isXiHaiAn"
+            >
               {{ userInfo.usernameShow }}
             </div>
-            <div class="batch-waterMark batch-waterMark-right-bottom" v-show="isXiHaiAn">
+            <div
+              class="batch-waterMark batch-waterMark-right-bottom"
+              v-show="isXiHaiAn"
+            >
               {{ userInfo.realNameShow }}
             </div>
             <p></p>
@@ -1397,7 +1415,7 @@
           tabList.value[1].title = '视频标签'
         }
         selectType.value = '视频资源'
-        console.log('444------------>', 444);
+        console.log('444------------>', 444)
       } else if (name == '政务云资源') {
         room.value = true
         tableHeight.value = 600
@@ -1579,7 +1597,10 @@
       clickList.value[1].content = []
     }
     clickList.value[indexFather].content[0] = name
-    console.log('clickList.value[indexFather].content[0]------------>', clickList.value[indexFather].content[0]);
+    console.log(
+      'clickList.value[indexFather].content[0]------------>',
+      clickList.value[indexFather].content[0]
+    )
 
     if (tabList.value[1]) {
       tabList.value[1].title = ''
@@ -1814,20 +1835,22 @@
   // 西海岸-视频资源loading
   const loadingCamera = ref(false)
   const getCamera = (flag, str) => {
-    loadingCamera.value = true;
+    loadingCamera.value = true
     if (flag) {
       mapSearchParam.value.cameraName = str
     }
     console.log('初始化调用')
     console.log('不选左侧树的时候不调用接口', mapSearchParam.value)
     if (!whoShow1.value.itShowXiHaiAn) {
-      getCameraByParentId(mapSearchParam.value).then((res) => {
-        console.log('res--查询摄像头---------->', res);
-        loadingCamera.value = false;
+      getCameraByParentId(mapSearchParam.value)
+        .then((res) => {
+          console.log('res--查询摄像头---------->', res)
+          loadingCamera.value = false
           dataSource.value = res.data.data
           pagination.value.total = res.data.count
-      }).catch(err => {
-        loadingCamera.value = false;
+        })
+        .catch((err) => {
+          loadingCamera.value = false
           message.error(err)
         })
     } else {
@@ -1866,13 +1889,15 @@
           }
         }
       }
-      getCameraByCondition(params).then((res) => {
-        console.log('res--查询摄像头---------->', res);
-        loadingCamera.value = false;
+      getCameraByCondition(params)
+        .then((res) => {
+          console.log('res--查询摄像头---------->', res)
+          loadingCamera.value = false
           dataSource.value = res.data.data
           pagination.value.total = res.data.count
-      }).catch(err => {
-        loadingCamera.value = false;
+        })
+        .catch((err) => {
+          loadingCamera.value = false
           message.error(err)
         })
     }
@@ -1884,7 +1909,7 @@
   const addShoppingCart = () => {
     if (selectedList.value.length > 0) {
       let _arr = []
-      selectedList.value.map(v => {
+      selectedList.value.map((v) => {
         _arr.push({
           delFlag: '0',
           resourceId: v.idtCameraChannel,

front/src/views/home/integrationServices.vue

@@ -5,8 +5,13 @@
     <div class="top">
       <div class="top-title">
         全部：
-        <div v-for="(item, index) in titleName" :key="index" class="tabAll" @click="changeCards(index)"
-          :class="{ sel: index == number }">
+        <div
+          v-for="item in titleName"
+          :key="item.index"
+          class="tabAll"
+          @click="changeCards(item.index)"
+          :class="{ sel: item.index === number }"
+        >
           <span>
             {{ item.name === '赋能场景' ? '典型赋能场景' : '打包模式' }}
           </span>
@@ -15,26 +20,55 @@
       <div class="resultListSearchInput-father" v-if="number === 0">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            @search="getIntegrationList" @change="onSearch" class="resultListSearchInput" />
+          <a-input-search
+            v-model:value="searchValue"
+            placeholder="请输入关键词"
+            enter-button="搜索"
+            size="large"
+            @search="getIntegrationList"
+            @change="onSearch"
+            class="resultListSearchInput"
+          />
           <button class="button-reset" @click="resetAction()">重置</button>
           <div class="hengxian"></div>
         </div>
       </div>
       <div v-loading="loadingData">
-        <searchResultList v-if="number === 0" v-show="resourceList.data && resourceList.data.length > 0"
-          :resourceList="resourceList" :resourceTotal="resourceTotal" @saveSearchCodition="saveSearchCodition"
-          ref="searchResultListDom" :selectCardsname="number == 0 ? '融合服务' : '赋能场景'" />
-        <CanAssignCase v-else v-show="resourceList.data && resourceList.data.length > 0" :resourceList="resourceList"
-          @saveSearchCodition="saveSearchCodition" :resourceTotal="resourceTotal"
-          :selectCardsname="number == 0 ? '融合服务' : '赋能场景'" />
+        <searchResultList
+          v-if="number === 0"
+          v-show="resourceList.data && resourceList.data.length > 0"
+          :resourceList="resourceList"
+          :resourceTotal="resourceTotal"
+          @saveSearchCodition="saveSearchCodition"
+          ref="searchResultListDom"
+          :selectCardsname="number == 0 ? '融合服务' : '赋能场景'"
+        />
+        <CanAssignCase
+          v-else
+          v-show="resourceList.data && resourceList.data.length > 0"
+          :resourceList="resourceList"
+          @saveSearchCodition="saveSearchCodition"
+          :resourceTotal="resourceTotal"
+          :selectCardsname="number == 0 ? '融合服务' : '赋能场景'"
+        />
         <div class="pagination">
-          <a-pagination v-if="resourceList.data && resourceList.data.length > 0" v-model:current="currentPage"
-            v-model:pageSize="currentPageSize" show-size-changer show-less-items show-quick-jumper
-            :total="resourceTotal" :page-size-options="pageSizeOptions" @change="pageChange"
-            @showSizeChange="onShowSizeChange" />
+          <a-pagination
+            v-if="resourceList.data && resourceList.data.length > 0"
+            v-model:current="currentPage"
+            v-model:pageSize="currentPageSize"
+            show-size-changer
+            show-less-items
+            show-quick-jumper
+            :total="resourceTotal"
+            :page-size-options="pageSizeOptions"
+            @change="pageChange"
+            @showSizeChange="onShowSizeChange"
+          />
         </div>
-        <div v-if="resourceList.data && resourceList.data.length <= 0" style="margin-top: 2rem">
+        <div
+          v-if="resourceList.data && resourceList.data.length <= 0"
+          style="margin-top: 2rem"
+        >
           <a-empty />
         </div>
       </div>
@@ -45,7 +79,14 @@
 <script>
   import HomeFooter from '@/views/newHome/components/Footer'
   import mybus from '@/myplugins/mybus'
-import { defineComponent, reactive, ref, toRefs, onMounted, nextTick } from 'vue'
+  import {
+    defineComponent,
+    reactive,
+    ref,
+    toRefs,
+    onMounted,
+    nextTick,
+  } from 'vue'
   import { getIntegrationServicesList } from '@/api/home.js'
   import { useRouter } from 'vue-router'
   import HomeHeader from '@/views/home/components/header'
@@ -58,7 +99,10 @@ export default defineComponent({
       console.log('to---integrationServices--beforeRouteLeave------->', to)
       console.log('from---integrationServices--beforeRouteLeave------->', from)
       console.log('next---integrationServices--beforeRouteLeave------->', next)
-    if (to.name !== 'packagingDetails' && to.name !== 'integrationServicesDetails') {
+      if (
+        to.name !== 'packagingDetails' &&
+        to.name !== 'integrationServicesDetails'
+      ) {
         localStorage.removeItem('integrationServices')
       }
       next()
@@ -79,13 +123,15 @@ export default defineComponent({
       // 选项卡
       const titleName = ref([
         {
-        name: '打包模式',
+          name: '赋能场景',
+          index: 1,
         },
         {
-        name: '赋能场景',
+          name: '打包模式',
+          index: 0,
         },
       ])
-    const number = ref(0)
+      let number = ref(1)
       // 查询参数
       const paramsGetResources = {
         page: currentPage.value,
@@ -96,24 +142,31 @@ export default defineComponent({
         orderType: 'DESC', // ASC 升序  DESC 降序
       }
       const searchResultListDom = ref(null)
-    const storageSearchInfo = JSON.parse(localStorage.getItem('integrationServices'))
+      const storageSearchInfo = JSON.parse(
+        localStorage.getItem('integrationServices')
+      )
       // 读取本地存储：表单赋值
       const handleSetSearchData = () => {
         if (storageSearchInfo) {
-        number.value = storageSearchInfo.type == '打包模式' ? 0 : 1;
+          number.value = storageSearchInfo.type == '打包模式' ? 1 : 0
           // 搜索名称
-        searchValue.value = storageSearchInfo.name;
-        currentPage.value = storageSearchInfo.page;
-        currentPageSize.value = storageSearchInfo.limit;
-        paramsGetResources.limit = storageSearchInfo.limit;
-        paramsGetResources.page = storageSearchInfo.page;
-        paramsGetResources.type = storageSearchInfo.type;
+          searchValue.value = storageSearchInfo.name
+          currentPage.value = storageSearchInfo.page
+          currentPageSize.value = storageSearchInfo.limit
+          paramsGetResources.limit = storageSearchInfo.limit
+          paramsGetResources.page = storageSearchInfo.page
+          paramsGetResources.type = storageSearchInfo.type
           // 延迟使用，因为还没有返回跟挂载
           nextTick(() => {
-          searchResultListDom.value && searchResultListDom.value.changeCondition && searchResultListDom.value.changeCondition({
+            searchResultListDom.value &&
+              searchResultListDom.value.changeCondition &&
+              searchResultListDom.value.changeCondition(
+                {
                   value: storageSearchInfo.orderField,
                   orderType: storageSearchInfo.orderType,
-          }, true)
+                },
+                true
+              )
           })
           getIntegrationList()
         }
@@ -121,8 +174,8 @@ export default defineComponent({
 
       const changeCards = (val) => {
         // 打包模式
-      number.value = val;
-      paramsGetResources.type = titleName.value[number.value].name;
+        number.value = val
+        paramsGetResources.type = titleName.value[number.value].name
         resetAction()
       }
 
@@ -153,8 +206,11 @@ export default defineComponent({
       // 获取融合服务列表
       const getIntegrationList = () => {
         loadingData.value = true
-      paramsGetResources.name = searchValue.value;
-      console.log('paramsGetResources------参数下发------>', paramsGetResources);
+        paramsGetResources.name = searchValue.value
+        console.log(
+          'paramsGetResources------参数下发------>',
+          paramsGetResources
+        )
         getIntegrationServicesList(paramsGetResources).then(
           (res) => {
             loadingData.value = false
@@ -217,7 +273,10 @@ export default defineComponent({
 
       // 存储查询条件到本地
       const saveSearchCodition = (n) => {
-      console.log('融合服务-----存储查询条件到本地------->', paramsGetResources);
+        console.log(
+          '融合服务-----存储查询条件到本地------->',
+          paramsGetResources
+        )
         localStorage.setItem(
           'integrationServices',
           JSON.stringify(paramsGetResources)

front/src/views/home/integrationServicesDetails.vue

@@ -100,7 +100,16 @@
           class="data-count"
           style="font-size: 0.14rem; text-align: right; margin-bottom: 0.2rem"
         >
-         <span style="color:#909399;">共 {{ i == 0 ? infrastructureCount : i == 1 ? componentCount : dataSourceCount }}条数据，示例数据如下：</span>
+          <span style="color: #909399">
+            共
+            {{
+              i == 0
+                ? infrastructureCount
+                : i == 1
+                ? componentCount
+                : dataSourceCount
+            }}条数据，示例数据如下：
+          </span>
         </div>
         <div class="bottom" style="display: flex; align-items: flex-start">
           <div class="title" :class="'title' + i"></div>
@@ -679,7 +688,8 @@
         // width: 100%;
         font-size: 16px;
       }
-      .data-count{}
+      .data-count {
+      }
     }
 
     .name-box {