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

back/public/config/basicConfig.js

@@ -7,8 +7,8 @@
  */
 var _global = {}
 var CONFIGITEM = {
-  version: 'qingdao', // 青岛
-  // version: 'xihaian', // 西海岸
+  // version: 'qingdao', // 青岛
+  version: 'xihaian', // 西海岸
   // version: 'test', // 测试
   // version: 'frp', // 内网穿透
   // version: 'dev', // 开发
@@ -24,7 +24,8 @@ var CONFIGITEM = {
     xihaian: {
       previewUrl: 'http://10.134.135.9:9796/',
       // apiURL: 'http://10.134.135.9:8888/renren-admin',
-      apiURL: 'http://10.16.5.35:8888/renren-admin', // 李志成
+      // apiURL: 'http://10.16.5.35:8888/renren-admin', // 李志成-研发
+      apiURL: 'http://192.168.124.254:8888/renren-admin', // 李志成-远雄
       websocketURL: 'ws://10.134.135.9:8888/renren-admin/websocket'
     },
     // 测试

front/src/views/home/DetailsPageconetent.vue

@@ -1085,7 +1085,7 @@ export default defineComponent({
 
     // 青岛-数据处理
     const getQingDao = (res) => {
-      ; ((res.data && res.data.data && res.data.data.data) || []).forEach(
+      ((res.data && res.data.data && res.data.data.data) || []).forEach(
         (val) => {
           val.id = val.guid // id
           val.name = val.zyname // 名字
@@ -1101,7 +1101,7 @@ export default defineComponent({
     }
     // 青岛-西海岸处理
     const getXiHaiAn = (res) => {
-      ; ((res.data && res.data.data && res.data.data.list) || []).forEach(
+      ((res.data && res.data.data && res.data.data.list) || []).forEach(
         (val) => {
           val.id = val.serviceId // id
           val.name = val.serviceName // 名字

front/src/views/home/infrastructurePage.vue

@@ -330,7 +330,6 @@
                 <a-input v-model:value="formState.name" style="width: 72%" />
               </a-form-item>
             </a-col>
-            <!-- v-bind="validateInfos.phone" -->
             <a-col :span="8">
               <a-form-item
                 name="phone"
@@ -416,7 +415,6 @@
             <span>{{ pagination.total || 0 }}</span>
             个
           </p>
-          <!-- <i class="boundary"></i> -->
           <p>
             已选
             <span>{{ selectedRowKeys.length }}</span>
@@ -425,7 +423,6 @@
         </div>
         <!-- 右侧 -->
         <div class="contentRight">
-          <!-- 搜索@search="onSearch" -->
           <div class="searchInput" v-if="isXiHaiAn">
             <a-input-search
               v-model:value="mapSearchParam.cameraName"
@@ -490,10 +487,10 @@
           @change="handleTableChange"
           :row-selection="{
             selectedRowKeys: selectedRowKeys,
-            // onChange: onSelectChange,
             onSelect: onSelectChange,
             onSelectAll: onSelectAll,
           }"
+          :loading="loadingCamera"
         >
           <template #bodyCell="{ column, record }">
             <template v-if="isXiHaiAn && column.dataIndex === 'status'">
@@ -512,18 +509,6 @@
               >
                 预览
               </a>
-              <!-- <a
-                v-else
-                @click="
-                  openPicture(
-                    record.channelCode ||
-                      record.channelId ||
-                      record.channelCode.channelId
-                  )
-                "
-              >
-                预览
-              </a> -->
             </template>
           </template>
         </a-table>
@@ -566,19 +551,19 @@
       >
         <template #footer></template>
         <div style="width: 100%; display: flex; justify-content: center">
-          <div style="width: 100%; height: 100%; position: relative">
+          <div style="width: 100%; height: 100%; position: relative" v-show="isXiHaiAn">
             <!-- 西海岸--预览视频--遮罩 todo-->
-            <div class="video-cover" @click="videoShowMsg" v-show="isXiHaiAn"></div>
-            <div class="waterMark waterMark-left-top" v-show="isXiHaiAn">
+            <div class="video-cover" @click="videoShowMsg"></div>
+            <div class="waterMark waterMark-left-top">
               {{ userInfo.usernameShow }}
             </div>
-            <div class="waterMark waterMark-right-top" v-show="isXiHaiAn">
+            <div class="waterMark waterMark-right-top">
               {{ userInfo.realNameShow }}
             </div>
-            <div class="waterMark waterMark-left-bottom" v-show="isXiHaiAn">
+            <div class="waterMark waterMark-left-bottom">
               {{ userInfo.usernameShow }}
             </div>
-            <div class="waterMark waterMark-right-bottom" v-show="isXiHaiAn">
+            <div class="waterMark waterMark-right-bottom">
               {{ userInfo.realNameShow }}
             </div>
             <vue3VideoPlay v-bind="options" />
@@ -843,13 +828,6 @@
       },
     ],
     matter: [{ min: 1, max: 500, required: true, message: '可输入500字内容' }],
-    // phone: [
-    //   {
-    //     required: true,
-    //     pattern: /^1[3|4|5|7|8|9][0-9]\d{8}$/,
-    //     message: '请输入正确的手机号',
-    //   },
-    // ],
     dept: [
       {
         required: true,
@@ -948,7 +926,6 @@
 
       dataSource.value = param.dataSource
       pagination.value.total = param.total
-      // getCamera()
     })
     //点位点击
     mybus.off('pointMarkerClick')
@@ -1004,10 +981,6 @@
       {
         arr: [
           {
-            // description:
-            //   '申请单兵手持便携终端，提告前端人员执法透明度，加强执法人员与指挥中心实时沟通。',
-            // resourceId: 'dbsb',
-            // type: '单兵设备',
             description: data.description,
             resourceId: data.id,
             resourceName: data.wrjName,
@@ -1444,14 +1417,6 @@
         pagination.value.total = 0
         selectType.value = '感知资源'
       } else if (name == '城市云脑会客厅') {
-        //     room.value = false
-        //     wrjFlag.value = true
-        //     showMap.value = false
-        // roomYuyue.value = true
-        //     roomResult.value = false
-        //     tabList.value[1] = []
-        //     emits('add', 6)
-        //     searchData()
       }
       clickList.value[indexFather].content.splice(
         clickList.value[indexFather].content.indexOf(name),
@@ -1491,12 +1456,10 @@
             mapSearchParam.value.labelCodes.push(item.labelCode)
           })
         }
-        // todo
         mapSearchParam.value.gpsX = ''
         mapSearchParam.value.gpsY = ''
         mapSearchParam.value.radius = ''
         mapSearchParam.value.type = ''
-        console.log('mapSearchParam----->查询条件', mapSearchParam.value)
         mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + ''
         emits('add', 1)
         getCamera()
@@ -1717,7 +1680,6 @@
           videoList.value.push(ob)
         })
       }
-      console.log('验证数据的准确性', videoList)
       batchVisible.value = true
     } else {
       message.error('请选择需要预览的数据')
@@ -1750,7 +1712,6 @@
           videoList.value.push(ob)
         })
       }
-      console.log('验证数据的准确性', videoList)
       batchPicVisible.value = true
     } else {
       message.error('请选择需要预览的数据')
@@ -1778,8 +1739,6 @@
   }
   const videoClean = () => {
     //视频预览弹窗关闭后不清除选中行
-    // selectedList.value = []
-    // selectedRowKeys.value = []
     videoList.value = []
     current.value = 1
   }
@@ -1787,11 +1746,8 @@
   const changePage = (page) => {}
   // 一键申请
   const dept = reactive({})
-  // eslint-disable-next-line no-undef
   if (infrastructure) {
-    // eslint-disable-next-line no-undef
     dept.deptId = infrastructure.deptId || ''
-    // eslint-disable-next-line no-undef
     dept.deptName = infrastructure.deptName || ''
   }
 
@@ -1809,7 +1765,6 @@
   }
 
   const apply = async () => {
-    console.log('一键申请', selectedList.value)
     if (selectedRowKeys.value.length != 0) {
       // 判断最大数量
       let maxNumRes = await judegNumber()
@@ -1831,6 +1786,7 @@
           deptName: dept.deptName,
         },
       ]
+      console.log('一键申请', arr)
       localStorage.setItem('applyList', JSON.stringify(arr))
       router.push({
         path: '/apply',
@@ -1851,30 +1807,27 @@
         break
     }
   }
-  // // 添加至购物车
-  // const addShopCar = () => {
-  //   console.log('添加至购物车')
-  // }
   const wrjFlag = ref(false)
+  // 西海岸-视频资源loading
+  const loadingCamera = ref(false)
   const getCamera = (flag, str) => {
-    console.log(
-      'mapSearchParam.value.cameraName------------>',
-      mapSearchParam.value.cameraName
-    )
+    loadingCamera.value = true;
     if (flag) {
       mapSearchParam.value.cameraName = str
-      console.log('赋值===============》', str, mapSearchParam.value)
     }
     console.log('初始化调用')
     console.log('不选左侧树的时候不调用接口', mapSearchParam.value)
     if (!whoShow1.value.itShowXiHaiAn) {
       getCameraByParentId(mapSearchParam.value).then((res) => {
-        console.log('RRRRRRRRRR', res.data.data)
+        console.log('res--查询摄像头---------->', res);
+        loadingCamera.value = false;
         dataSource.value = res.data.data
         pagination.value.total = res.data.count
+      }).catch(err => {
+        loadingCamera.value = false;
+        message.error(err)
       })
     } else {
-      console.log('mapSearchParam------------>', mapSearchParam)
       let params = {
         regionId:
           mapSearchParam.value.parentId || '70be8c5b664f4bcf869d82f2e8335051',
@@ -1911,9 +1864,13 @@
         }
       }
       getCameraByCondition(params).then((res) => {
+        console.log('res--查询摄像头---------->', res);
+        loadingCamera.value = false;
         dataSource.value = res.data.data
         pagination.value.total = res.data.count
-        console.log('根据parent查询摄像头', res.data.data)
+      }).catch(err => {
+        loadingCamera.value = false;
+        message.error(err)
       })
     }
   }
@@ -1931,9 +1888,7 @@
           note1: [v],
         })
       })
-      console.log('_arr------------>', _arr);
       sgcInsert(_arr).then((res) => {
-        console.log('res------申购车------>', res);
         if(res.data.code !== 0) {
           return message.error(res.data.msg)
         }
@@ -2001,7 +1956,6 @@
       align: 'center',
     },
   ])
-  // const allClick = ref([])
   const onSelectChange = (
     record,
     selected,
@@ -2009,7 +1963,6 @@
     nativeEvent,
     type
   ) => {
-    console.log('hahhahah', record, selected, selectedRows, nativeEvent)
     record = JSON.parse(JSON.stringify(record))
     if (selected) {
       if (selectedRowKeys.value.length == 1000) {
@@ -2041,9 +1994,6 @@
       if (selectedRowKeys.value.length > 1000) {
         message.warning('最多只能添加1000个摄像头！')
         changeRows.map((val) => {
-          // selectedList.value = selectedList.value.filter(
-          //   (item) => item.idtCameraChannel !== val.idtCameraChannel
-          // )
           selectedList.value.forEach((ele, index) => {
             if (ele.channelCode == record.channelCode) {
               selectedList.value.splice(index, 1)

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

@@ -8,65 +8,40 @@
       <div class="bottom">
         <div class="item">
           <div class="zj">组件服务</div>
-          <div
-            class="name"
-            v-for="(item, index) in zjList.slice(0, 5)"
-            :key="item.name"
-            :class="index == 4 ? 'name-last' : ''"
-            @click="selectOne1(item.name)"
-          >
+          <div class="name" v-for="(item, index) in zjList.slice(0, 5)" :key="item.name"
+            :class="index == 4 ? 'name-last' : ''" @click="selectOne1(item.name)">
             {{ item.name + '-' + item.num + '项' }}
           </div>
           <div class="btn" @click="jumpPage('组件服务')">查看更多</div>
         </div>
         <div class="item">
           <div class="yy">应用资源</div>
-        <div
-            class="name"
-            v-for="(item, index) in yyList.slice(0, 5)"
-            :key="item.name"
-            :class="index == 4 ? 'name-last' : ''"
-            @click="selectOne11(item.name)"
-          >
+          <div class="name" v-for="(item, index) in yyList.slice(0, 5)" :key="item.name"
+            :class="index == 4 ? 'name-last' : ''" @click="selectOne11(item.name)">
             {{ item.name + '-' + item.num + '项' }}
           </div>
           <div class="btn" @click="jumpPage('应用资源')">查看更多</div>
         </div>
         <div class="item">
           <div class="jc">基础设施</div>
-          <div
-            class="name"
-            v-for="(item, index) in jcList.slice(0, 5)"
-            :key="item.name"
-            :class="index == 2 ? 'name-last' : ''"
-            @click="selectOne2(item.name)"
-          >
+          <div class="name" v-for="(item, index) in jcList.slice(0, 5)" :key="item.name"
+            :class="index == 2 ? 'name-last' : ''" @click="selectOne2(item.name)">
             {{ item.name + '-' + item.num + '项' }}
           </div>
           <div class="btn" @click="jumpPage('基础设施')">查看更多</div>
         </div>
         <div class="item">
           <div class="sj">数据资源</div>
-          <div
-            class="name"
-            v-for="(item, index) in sjList"
-            :key="item.id"
-            :class="index == 4 ? 'name-last' : ''"
-            @click="selectOne3(item.name)"
-          >
+          <div class="name" v-for="(item, index) in sjList" :key="item.id" :class="index == 4 ? 'name-last' : ''"
+            @click="selectOne3(item.name)">
             {{ index + 1 }}-{{ item.name }}
           </div>
           <div class="btn" @click="jumpPage('数据资源')">查看更多</div>
         </div>
         <div class="item">
           <div class="zs">知识库</div>
-          <div
-            class="name"
-            v-for="(item, index) in zsList"
-            :key="item.id"
-            :class="index == 4 ? 'name-last' : ''"
-            @click="openHref(item)"
-          >
+          <div class="name" v-for="(item, index) in zsList" :key="item.id" :class="index == 4 ? 'name-last' : ''"
+            @click="openHref(item)">
             {{ index + 1 }}-{{ item.name }}
           </div>
           <div class="btn" @click="jumpPage('知识库')">查看更多</div>
@@ -76,29 +51,29 @@
   </div>
 </template>
 <script setup>
-  import {
+import {
   pageWithAttrs,
   getDataResource,
   selectInfrastructureList,
   selectCollectComponentList,
   selectCollectResourceList
-  } from '@/api/home.js'
-  import { ref, reactive } from 'vue'
-  import { useRouter } from 'vue-router'
-  import { useStore } from 'vuex'
-  import { updateVisits, browsingInsert, getSoldierList } from '@/api/home'
-  import { message, Upload } from 'ant-design-vue'
-  import mybus from '@/myplugins/mybus'
-  const store = useStore()
-  const router = useRouter()
-  const zjList = ref([])
-  const jcList = ref([])
-  const sjList = ref([])
-  const yyList = ref([])
-  // 知识库模块数据
-  const zsList = ref([])
-  // const jcList = ref([])
-  const paramsGetResources = {
+} from '@/api/home.js'
+import { ref, reactive } from 'vue'
+import { useRouter } from 'vue-router'
+import { useStore } from 'vuex'
+import { updateVisits, browsingInsert, getSoldierList } from '@/api/home'
+import { message, Upload } from 'ant-design-vue'
+import mybus from '@/myplugins/mybus'
+const store = useStore()
+const router = useRouter()
+const zjList = ref([])
+const jcList = ref([])
+const sjList = ref([])
+const yyList = ref([])
+// 知识库模块数据
+const zsList = ref([])
+// const jcList = ref([])
+const paramsGetResources = {
   districtId: '',
   pageNum: 1,
   pageSize: 5,
@@ -107,19 +82,19 @@
   infoList: [],
   orderField: 'total', // total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
   orderType: 'DESC', // ASC 升序  DESC 降序
-  }
-  console.log('dataShowdev==========================>', whoShow)
-  // eslint-disable-next-line no-undef
-  const whoShow1 = ref(whoShow)
-  const interfaceSuccess = ref(0)
-  const object = reactive({
+}
+console.log('dataShowdev==========================>', whoShow)
+// eslint-disable-next-line no-undef
+const whoShow1 = ref(whoShow)
+const interfaceSuccess = ref(0)
+const object = reactive({
   yyNum: '',
   zjNum: '',
   jcNum: '',
   sjNum: '',
   zsNum: '',
-  })
-  const getAppResources = (type, obj) => {
+})
+const getAppResources = (type, obj) => {
   paramsGetResources.type = type
   if (type === '数据资源' && !whoShow1.value.itShowBaoTou) {
     getDataResource({
@@ -162,7 +137,7 @@
     if (type == '基础设施') {
       jcList.value = []
       selectInfrastructureList().then((res) => {
-          console.log('基础设施==========>', res.data.data)
+        console.log('基础设施------res------>', res);
         for (const key in res.data.data) {
           if (whoShow1.value.itShowXiHaiAn) {
             if (key === '视频资源') {
@@ -208,41 +183,27 @@
     else if (type == '组件服务') {
       zjList.value = []
       selectCollectComponentList().then((res) => {
+        console.log('组件服务----res-------->', res);
         for (const key in res.data.data) {
-            if (whoShow1.value.itShowXiHaiAn) {
-              if (key === '视频资源') {
+          console.log('key------------>', key);
           zjList.value.push({
             name: key,
             num: res.data.data[key],
           })
         }
-            } else {
-              zjList.value.push({
-                name: key,
-                num: res.data.data[key],
-              })
-            }
-          }
+        console.log('zjList------------>', zjList);
       })
     }
     else if (type == '应用资源') {
       yyList.value = []
       selectCollectResourceList().then((res) => {
+        console.log('应用资源---res--------->', res);
         for (const key in res.data.data) {
-            if (whoShow1.value.itShowXiHaiAn) {
-              if (key === '视频资源') {
           yyList.value.push({
             name: key,
             num: res.data.data[key],
           })
         }
-            } else {
-              yyList.value.push({
-                name: key,
-                num: res.data.data[key],
-              })
-            }
-          }
       })
     }
     else {
@@ -266,10 +227,10 @@
       })
     }
   }
-  }
+}
 
-  // todo 获取无人机、单兵设备
-  const getSoldierData = (name) => {
+// todo 获取无人机、单兵设备
+const getSoldierData = (name) => {
   let _params = {
     type: name,
     page: 1,
@@ -288,9 +249,9 @@
         reject(err)
       })
   })
-  }
+}
 
-  const openHref = (item) => {
+const openHref = (item) => {
   console.log(item.id, 'wowowo')
   console.log(item.visits, 'wowowo')
   browsingInsert({ resourceId: item.id }).then((res) => {
@@ -308,27 +269,17 @@
     })
   }
   window.open(item.link)
-    // window.open(
-    //   window.SITE_CONFIG.previewUrl +
-    //     'hisense_office/onlinePreview?url=' +
-    //     btoa(encodeURI(item.fileHref))
-    // )
-  }
-  const assignmentMethod = (type, res) => {
+}
+const assignmentMethod = (type, res) => {
   object[type] = res.data.data.total
-    // interfaceSuccess.value++
-    // console.log('object个数======>', object, interfaceSuccess.value, type)
-    // if (interfaceSuccess.value >= 4) {
-    //   mybus.emit('chagneNum', object)
-    // }
-  }
-  getAppResources('组件服务', zjList)
-  getAppResources('应用资源', yyList)
-  getAppResources('基础设施', jcList)
-  getAppResources('数据资源', sjList)
-  getAppResources('知识库', zsList)
+}
+getAppResources('组件服务', zjList)
+getAppResources('应用资源', yyList)
+getAppResources('基础设施', jcList)
+getAppResources('数据资源', sjList)
+getAppResources('知识库', zsList)
 
-  function jumpPage(type) {
+function jumpPage(type) {
   // 点击内存入store
   store.commit('home/selectCardsData', {
     selectCardsnum: type,
@@ -344,8 +295,8 @@
       select: type,
     },
   })
-  }
-  const selectOne = (id) => {
+}
+const selectOne = (id) => {
   console.log('点击===============》', id)
   router.push({
     path: '/details',
@@ -353,8 +304,8 @@
       id: id,
     },
   })
-  }
-  const selectOne1 = (name) => {
+}
+const selectOne1 = (name) => {
   router.push({
     path: '/DetailsPageconetent',
     query: {
@@ -362,8 +313,8 @@
       select: '组件服务',
     },
   })
-  }
-  const selectOne11 = (name) => {
+}
+const selectOne11 = (name) => {
   router.push({
     path: '/DetailsPageconetent',
     query: {
@@ -371,8 +322,8 @@
       select: '应用资源',
     },
   })
-  }
-  const selectOne2 = (name) => {
+}
+const selectOne2 = (name) => {
   console.log('点击===============》', name)
   router.push({
     path: '/DetailsPageconetent',
@@ -381,8 +332,8 @@
       select: '基础设施',
     },
   })
-  }
-  const selectOne3 = (name) => {
+}
+const selectOne3 = (name) => {
   console.log('点击===============》', name)
   router.push({
     path: '/DetailsPageconetent',
@@ -391,10 +342,10 @@
       select: '数据资源',
     },
   })
-  }
+}
 </script>
 <style lang="less" scoped>
-  .capability-convergence {
+.capability-convergence {
   height: 7.2rem;
   background: url('~@/assets/newHome/Convergence-bg.png') no-repeat;
   background-size: 100%;
@@ -519,5 +470,5 @@
       }
     }
   }
-  }
+}
 </style>