From 44e2d6a9b9d711eefc211f59f09d5d0e3c1571b5 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Mon, 25 Jul 2022 19:21:41 +0800
Subject: [PATCH 01/27] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/api/file.js                         |  53 ++--
 front/src/views/home/DetailsPageconetent.vue  | 112 +++++++-
 .../home/detailsPageInfrastructureTree.vue    |  89 +++++--
 front/src/views/home/infrastructurePage.vue   |  65 ++++-
 .../views/home/videoSurveillance/index.vue    | 242 +++++++++++-------
 5 files changed, 394 insertions(+), 167 deletions(-)

diff --git a/front/src/api/file.js b/front/src/api/file.js
index 5848b83a..70115607 100644
--- a/front/src/api/file.js
+++ b/front/src/api/file.js
@@ -61,11 +61,11 @@ export function count() {
 export function getVideoList(params) {
   return axios.get(
     'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraListByName?name=' +
-      params.name +
-      '&pageNo=' +
-      params.pageNo +
-      '&pageSize=' +
-      params.pageSize,
+    params.name +
+    '&pageNo=' +
+    params.pageNo +
+    '&pageSize=' +
+    params.pageSize,
     config2
   )
 }
@@ -73,17 +73,17 @@ export function getVideoList(params) {
 export function getRecord(params) {
   return axios.get(
     'http://10.134.135.24:30090/api/share-portal/platform/catalogue/query?serviceName=' +
-      params.serviceName +
-      '&orderField=' +
-      params.orderField +
-      '&orderType=' +
-      params.orderType +
-      '&pageNum=' +
-      params.pageNum +
-      '&pageSize=' +
-      params.pageSize +
-      '&serviceType=' +
-      params.serviceType,
+    params.serviceName +
+    '&orderField=' +
+    params.orderField +
+    '&orderType=' +
+    params.orderType +
+    '&pageNum=' +
+    params.pageNum +
+    '&pageSize=' +
+    params.pageSize +
+    '&serviceType=' +
+    params.serviceType,
     config2
   )
 }
@@ -91,9 +91,24 @@ export function getRecord(params) {
 export function getHls(params) {
   return axios.get(
     'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraLiveStreamByCode?cameraCode=' +
-      params.cameraId +
-      '&protocol=' +
-      params.protocol,
+    params.cameraId +
+    '&protocol=' +
+    params.protocol,
+    config2
+  )
+}
+//能力集市基础设施-左侧列表
+export function getCameraInfoByAreaId(params) {
+  return axios.get(
+    'http://10.134.135.92:9537/data_service/getCamera/getCameraInfoByAreaId?areaId=' +
+    params.areaId,
+    config2
+  )
+}
+//能力集市基础设施-摄像头
+export function getCameraByCondition(params) {
+  return axios.get(
+    'http://10.134.135.92:9537/data_service/getCamera/getCameraByCondition?' + params,
     config2
   )
 }
diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 799cd94e..ea3343c6 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -232,10 +232,13 @@
     v-else-if="whoShow1 && whoShow1.itShowXiHaiAn"
   >
     <home-header></home-header>
-    <div class="details-pageconetent-left">
+    <div class="details-pageconetent-left" v-if="Cardsname != '基础设施'">
       <detailsPageconetentTree />
     </div>
-    <div class="top" v-if="Cardsname != '知识库'">
+    <div class="details-pageconetent-left" v-else>
+      <detailsPageInfrastructureTree />
+    </div>
+    <div class="top" v-if="Cardsname != '知识库' && Cardsname != '基础设施'">
       <div class="top-title">
         <div
           v-for="item in titleName"
@@ -247,12 +250,12 @@
             class="photo"
             :style="{
               backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
             }"
           ></span>
           <span>{{ item.name }}</span>
         </div>
       </div>
-      <!-- 搜索框 -->
       <div class="resultListSearchInput-father">
         <div class="resultListSearchInput-son">
           模糊搜索
@@ -266,10 +269,17 @@
             class="resultListSearchInput"
           />
           <button class="button-reset" @click="chongzhi()">重置</button>
+          <button
+            v-if="Cardsname == '应用资源'"
+            class="button-reset"
+            @click="applyAll()"
+            style="margin-left: 0.1rem"
+          >
+            全部申请
+          </button>
           <div class="hengxian"></div>
         </div>
       </div>
-      <!-- 分类 -->
       <div class="top-content-father" :key="listKey">
         <template
           v-if="
@@ -324,7 +334,10 @@
                 />
               </div>
             </div>
-            <!-- <div class="top-content" v-if="Cardsname == '组件服务'">
+            <!-- <div
+              class="top-content"
+              v-if="Cardsname == '组件服务' || Cardsname == '应用资源'"
+            >
               <span class="top-content-title">共享条件</span>
               <div class="leixingsumfather">
                 <div class="leixingsum">
@@ -340,7 +353,7 @@
                     :checked="tagFlag == '免批申请'"
                     @change="() => chagneTag('免批申请')"
                   >
-                    免批申请
+                    免批
                   </a-checkable-tag>
                 </div>
               </div>
@@ -348,7 +361,6 @@
           </div>
         </template>
       </div>
-      <!-- 中心内容 -->
       <searchResultList
         v-show="resourceList.data && resourceList.data.length > 0"
         :key="listKey2"
@@ -356,7 +368,6 @@
         :resourceTotal="resourceTotal"
         :select-cardsname="Cardsname"
       />
-      <!-- 分页 -->
       <div class="pagination">
         <a-pagination
           v-if="resourceList.data && resourceList.data.length > 0"
@@ -373,11 +384,33 @@
       </div>
       <div
         v-if="resourceList.data && resourceList.data.length <= 0"
-        style="margin-top: 200px"
+        style="margin-top: 2rem"
       >
         <a-empty />
       </div>
     </div>
+    <div class="top" v-else-if="Cardsname === '基础设施'">
+      <div class="top-title">
+        <div
+          v-for="item in titleName"
+          :key="item.name"
+          :class="item.name === Cardsname ? 'sel' : ''"
+          @click="changeCards(item.name)"
+        >
+          <span
+            class="photo"
+            :style="{
+              backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
+            }"
+          ></span>
+          <span>{{ item.name }}</span>
+        </div>
+      </div>
+      <div class="top-content-father">
+        <infrastructurePage />
+      </div>
+    </div>
     <div class="top" v-else>
       <div class="top-title">
         <div
@@ -390,6 +423,7 @@
             class="photo"
             :style="{
               backgroundImage: `url(${item.photo}) `,
+              backgroundSize: 'cover',
             }"
           ></span>
           <span>{{ item.name }}</span>
@@ -741,7 +775,13 @@
         orderField: 'total', // total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
         orderType: 'DESC', // ASC 升序  DESC 降序
       }
-
+      //西海岸查询参数
+      let paramsGetResources2 = ref({
+        regionId: '70be8c5b664f4bcf869d82f2e8335051',
+        pageNum: 1,
+        pageSize: currentPageSize.value,
+        name: '',
+      })
       // 查询
       const onSearch = () => {
         loading.value = true
@@ -820,6 +860,12 @@
         currentPage.value = 1
         currentPageSize.value = 5
         // 重置查询条件
+        paramsGetResources2.value = {
+          regionId: '70be8c5b664f4bcf869d82f2e8335051',
+          pageNum: 1,
+          pageSize: currentPageSize.value,
+          name: '',
+        }
         paramsGetResources.districtId = ''
         paramsGetResources.deptIds = []
         paramsGetResources.pageNum = 1
@@ -955,12 +1001,18 @@
             searchValue.value,
             searchValue.value.length
           )
-          if (searchValue.value.length >= 2) {
+          if (
+            searchValue.value.length >= 2 &&
+            paramsGetResources.type !== '基础设施'
+          ) {
             str = searchValue.value.substring(0, 2)
             console.log('str================>', str)
             r = re.test(str)
           }
-          if (searchValue.value.length > 1 && r) {
+          if (
+            (searchValue.value.length > 1 && r) ||
+            paramsGetResources.type === '基础设施'
+          ) {
             //switchIndex这个参数是下面的分页传过来的参数
             paramsGetResources.name = searchValue.value
             paramsGetResources.type = Cardsname.value
@@ -1016,7 +1068,11 @@
                   loading.value = false
                 }
               })
-            } else if (paramsGetResources.type !== '数据资源') {
+            } else if (
+              paramsGetResources.type !== '数据资源' &&
+              (paramsGetResources.type !== '基础设施' ||
+                !whoShow1.value.itShowXiHaiAn)
+            ) {
               if (switchIndex != '分页查询') {
                 paramsGetResources.pageNum = 1
               }
@@ -1038,6 +1094,16 @@
                   // getShoppingCartList(res.data.data.records)
                 }
               })
+            } else if (
+              paramsGetResources.type === '基础设施' &&
+              whoShow1.value.itShowXiHaiAn
+            ) {
+              if (switchIndex != '分页查询') {
+                paramsGetResources.pageNum = 1
+              }
+              paramsGetResources2.value.pageNum = paramsGetResources.pageNum
+              paramsGetResources2.value.pageSize = paramsGetResources.pageSize
+              paramsGetResources2.value.name = paramsGetResources.name
             }
           } else {
             message.error('请以两位以上汉字或数字开头')
@@ -1098,7 +1164,11 @@
                 loading.value = false
               }
             })
-          } else if (paramsGetResources.type !== '数据资源') {
+          } else if (
+            paramsGetResources.type !== '数据资源' &&
+            (paramsGetResources.type !== '基础设施' ||
+              !whoShow1.value.itShowXiHaiAn)
+          ) {
             if (switchIndex != '分页查询') {
               paramsGetResources.pageNum = 1
             }
@@ -1116,6 +1186,15 @@
                 // getShoppingCartList(res.data.data.records)
               }
             })
+          } else if (
+            paramsGetResources.type === '基础设施' ||
+            whoShow1.value.itShowXiHaiAn
+          ) {
+            if (switchIndex != '分页查询') {
+              paramsGetResources.pageNum = 1
+            }
+            paramsGetResources2.value.pageNum = paramsGetResources.pageNum
+            paramsGetResources2.value.pageSize = paramsGetResources.pageSize
           }
         }
       }
@@ -1141,6 +1220,10 @@
           resourceList.data = list
         })
       }
+      mybus.on('getCameraByParentId', (ids) => {
+        paramsGetResources2.value.regionId = ids
+        getAppResources()
+      })
       mybus.on('paramsGetResources', (ids) => {
         if (ids && ids.length > 0) {
           paramsGetResources.deptIds = ids
@@ -1333,6 +1416,7 @@
       detailsPageInfrastructureTree,
     },
     beforeUnmount() {
+      mybus.off('getCameraByParentId')
       mybus.off('selectCardsitem')
       mybus.off('paramsGetResources')
       mybus.off('changeCondition')
diff --git a/front/src/views/home/detailsPageInfrastructureTree.vue b/front/src/views/home/detailsPageInfrastructureTree.vue
index 9fb6aaca..2d8613fb 100644
--- a/front/src/views/home/detailsPageInfrastructureTree.vue
+++ b/front/src/views/home/detailsPageInfrastructureTree.vue
@@ -97,6 +97,7 @@
 <script>
   import { defineComponent, ref, watch } from 'vue'
   import { getCameraAllOrgan } from '@/api/videoSurveillance'
+  import { getCameraInfoByAreaId } from '@/api/file'
   import mybus from '@/myplugins/mybus'
   import { useRouter } from 'vue-router'
   import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
@@ -109,6 +110,7 @@
         children: 'children',
         title: 'name',
       }
+      const whoShow1 = ref(whoShow)
       const showKey = ref(0)
       const treeData = ref([])
       const init = () => {
@@ -126,11 +128,19 @@
           router.currentRoute.value.query.select
         )
         if (select == '基础设施') {
-          getCameraAllOrgan({ parentId: 'S4NbecfYB1DBH8HNULGS34' }).then(
-            (res) => {
+          if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
+            getCameraAllOrgan({ parentId: 'S4NbecfYB1DBH8HNULGS34' }).then(
+              (res) => {
+                treeData.value = res.data.data
+              }
+            )
+          } else {
+            getCameraInfoByAreaId({
+              areaId: '70be8c5b664f4bcf869d82f2e8335051',
+            }).then((res) => {
               treeData.value = res.data.data
-            }
-          )
+            })
+          }
           // selectDeptList({ type: select }).then((res) => {
           //   // console.log('区划数据=========================>', res.data.data)
           //   res.data.data.forEach((val) => {
@@ -240,23 +250,41 @@
       // }
       const selectId = ref('')
       const onSelect = (item, val, child) => {
-        debugger
         console.log('item, val, child', child)
         mybus.emit('getCameraByParentId', val.id)
         mybus.emit('getListByParentId', val.id)
-        getCameraAllOrgan({ parentId: val.id }).then((res) => {
-          treeData.value.map((treeDataItem, index) => {
-            if (item.id == treeDataItem.id) {
-              treeData.value[index].children.map((childItem, childIndex) => {
-                if (childItem.id == val.id) {
-                  treeData.value[index].children[childIndex].children =
-                    res.data.data
-                }
-              })
-              console.log('treeData.value.[index]', treeData.value[index])
-            }
+        if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
+          getCameraAllOrgan({ parentId: val.id }).then((res) => {
+            treeData.value.map((treeDataItem, index) => {
+              if (item.id == treeDataItem.id) {
+                treeData.value[index].children.map((childItem, childIndex) => {
+                  if (childItem.id == val.id) {
+                    treeData.value[index].children[childIndex].children =
+                      res.data.data
+                  }
+                })
+                console.log('treeData.value.[index]', treeData.value[index])
+              }
+            })
           })
-        })
+        } else {
+          getCameraInfoByAreaId({
+            areaId: val.id,
+          }).then((res) => {
+            treeData.value.map((treeDataItem, index) => {
+              if (item.id == treeDataItem.id) {
+                treeData.value[index].children.map((childItem, childIndex) => {
+                  if (childItem.id == val.id) {
+                    treeData.value[index].children[childIndex].children =
+                      res.data.data
+                  }
+                })
+                console.log('treeData.value.[index]', treeData.value[index])
+              }
+            })
+          })
+        }
+
         if (child) {
           selectId.value = child.id
         }
@@ -305,14 +333,27 @@
       }
       const showBottom = (item) => {
         item.show = !item.show
-        getCameraAllOrgan({ parentId: item.id }).then((res) => {
-          treeData.value.map((treeDataItem, index) => {
-            if (item.id == treeDataItem.id) {
-              treeData.value[index].children = res.data.data
-              console.log('treeData.value.[index]', treeData.value[index])
-            }
+        if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
+          getCameraAllOrgan({ parentId: item.id }).then((res) => {
+            treeData.value.map((treeDataItem, index) => {
+              if (item.id == treeDataItem.id) {
+                treeData.value[index].children = res.data.data
+                console.log('treeData.value.[index]', treeData.value[index])
+              }
+            })
           })
-        })
+        } else {
+          getCameraInfoByAreaId({
+            areaId: item.id,
+          }).then((res) => {
+            treeData.value.map((treeDataItem, index) => {
+              if (item.id == treeDataItem.id) {
+                treeData.value[index].children = res.data.data
+                console.log('treeData.value.[index]', treeData.value[index])
+              }
+            })
+          })
+        }
       }
       const showDown = (item, val) => {
         console.log('showDown', val)
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index cb792e31..ebcba005 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -93,7 +93,13 @@
       >
         <template #bodyCell="{ column, record }">
           <template v-if="column.dataIndex === 'operation'">
-            <a @click="openVideo(record.channelCode)">预览</a>
+            <a
+              @click="
+                openVideo(record.channelCode || record.channelCode.channelId)
+              "
+            >
+              预览
+            </a>
           </template>
         </template>
       </a-table>
@@ -125,9 +131,11 @@
     getStreamByChannelCode,
     getCameraAllLabel,
   } from '@/api/videoSurveillance'
+  import { getCameraByCondition } from '@/api/file'
   import { sgcInsert } from '@/api/home'
   import mybus from '@/myplugins/mybus'
   const router = useRouter()
+  const whoShow1 = ref(whoShow)
   const options = reactive({
     width: '700px', //播放器宽度
     height: '400px', //播放器高度
@@ -415,13 +423,44 @@
   const getCamera = () => {
     console.log('初始化调用')
     console.log('不选左侧树的时候不调用接口', mapSearchParam.value)
-    // if (mapSearchParam.value.parentId) {
-    getCameraByParentId(mapSearchParam.value).then((res) => {
-      console.log('RRRRRRRRRR', res.data.data)
-      dataSource.value = res.data.data
-      pagination.value.total = res.data.count
-    })
-    // }
+    if (!whoShow1.value.itShowXiHaiAn) {
+      getCameraByParentId(mapSearchParam.value).then((res) => {
+        console.log('RRRRRRRRRR', res.data.data)
+        dataSource.value = res.data.data
+        pagination.value.total = res.data.count
+      })
+    } else {
+      let params = {
+        regionId:
+          mapSearchParam.value.parentId || '70be8c5b664f4bcf869d82f2e8335051',
+        pageNum: mapSearchParam.value.pageNum,
+        pageSize: mapSearchParam.value.pageSize,
+        name: mapSearchParam.value.name || '',
+        longitude: mapSearchParam.value.gpsX || '',
+        atitude: mapSearchParam.value.gpsY || '',
+        radius: mapSearchParam.value.radius || '',
+      }
+      let paramsFather = ''
+      let i = 1
+      for (var key in params) {
+        if (params[key] === '') {
+          delete params[key]
+        } else {
+          if (i != 1) {
+            paramsFather += `&${key}=` + params[key]
+            i += 1
+          } else if (i == 1) {
+            paramsFather += `${key}=` + params[key]
+            i += 1
+          }
+        }
+      }
+      getCameraByCondition(paramsFather).then((res) => {
+        dataSource.value = res.data.data
+        pagination.value.total = res.data.count
+        console.log('根据parent查询摄像头', res.data.data)
+      })
+    }
   }
   //加入申购车
   const addShoppingCart = () => {
@@ -469,14 +508,14 @@
         message.warning('最多只能添加10个摄像头！')
       } else {
         selectedList.value.push(record)
-        selectedRowKeys.value.push(record.channelCode)
+        selectedRowKeys.value.push(record.channelCode || record.channelId)
       }
     } else {
       selectedList.value = selectedList.value.filter(
         (item) => item.idtCameraChannel !== record.idtCameraChannel
       )
       selectedRowKeys.value.splice(
-        selectedRowKeys.value.indexOf(record.channelCode),
+        selectedRowKeys.value.indexOf(record.channelCode || record.channelId),
         1
       )
     }
@@ -488,7 +527,7 @@
     if (selected) {
       changeRows.map((val) => {
         selectedList.value.push(val)
-        selectedRowKeys.value.push(val.channelCode)
+        selectedRowKeys.value.push(val.channelCode || val.channelId)
       })
       if (selectedRowKeys.value.length > 10) {
         message.warning('最多只能添加10个摄像头！')
@@ -497,7 +536,7 @@
             (item) => item.idtCameraChannel !== val.idtCameraChannel
           )
           selectedRowKeys.value.splice(
-            selectedRowKeys.value.indexOf(val.channelCode),
+            selectedRowKeys.value.indexOf(val.channelCode || val.channelId),
             1
           )
         })
@@ -508,7 +547,7 @@
           (item) => item.idtCameraChannel !== val.idtCameraChannel
         )
         selectedRowKeys.value.splice(
-          selectedRowKeys.value.indexOf(val.channelCode),
+          selectedRowKeys.value.indexOf(val.channelCode || val.channelId),
           1
         )
       })
diff --git a/front/src/views/home/videoSurveillance/index.vue b/front/src/views/home/videoSurveillance/index.vue
index ecb113e3..10a7bcbc 100644
--- a/front/src/views/home/videoSurveillance/index.vue
+++ b/front/src/views/home/videoSurveillance/index.vue
@@ -8,16 +8,24 @@
       </div>
 
       <div class="searchPoint">
-       <el-autocomplete
-                  v-model="address"
-                  placeholder="请输入地址"
-                  clearable
-                  :fetch-suggestions="((queryString,cb) =>{searchAddressByKeyWord(queryString,cb,i)})"
-                  :trigger-on-focus="false"
-                  :popper-append-to-body="false"
-                  class="address-auto-complete-input"
-                  @select="((addressItem) =>{selectedAddress(addressItem,i)})"
-                />
+        <el-autocomplete
+          v-model="address"
+          placeholder="请输入地址"
+          clearable
+          :fetch-suggestions="
+            (queryString, cb) => {
+              searchAddressByKeyWord(queryString, cb, i)
+            }
+          "
+          :trigger-on-focus="false"
+          :popper-append-to-body="false"
+          class="address-auto-complete-input"
+          @select="
+            (addressItem) => {
+              selectedAddress(addressItem, i)
+            }
+          "
+        />
         <!-- <el-autocomplete
           class="inline-input"
           prefix-icon="Search"
@@ -68,7 +76,7 @@
 </template>
 
 <script>
-  import { message } from 'ant-design-vue';
+  import { message } from 'ant-design-vue'
   import { HieimpMap } from '@/supermap/map-init'
   import TiledMap from './components/tiledMap'
   import { createCameraDetailsPop } from '@/supermap/createMarkerPopup'
@@ -83,6 +91,7 @@
     selectByLabelName,
     selectByChannelName,
   } from '@/api/videoSurveillance'
+  import { getCameraByCondition } from '@/api/file'
   import mybus from '@/myplugins/mybus'
 
   export default {
@@ -106,6 +115,7 @@
         circleModeFlag: false,
         addressMatchUrl: '',
         address: '',
+        whoShow1: whoShow,
         mapSearchParam: {
           // 地图搜索初始化数据
           parentId: '',
@@ -114,8 +124,8 @@
           pageSize: '20000',
           gpsX: '',
           gpsY: '',
-          radius: ''
-        }
+          radius: '',
+        },
       }
     },
     components: {
@@ -136,7 +146,7 @@
         this.hiMapFun
       )
       this.hiMap.mapObj.map.flyTo({ lat: 36.06, lng: 120.3899 }, 16)
-      this.addressMatchUrl = window.SITE_CONFIG.POI_URL;
+      this.addressMatchUrl = window.SITE_CONFIG.POI_URL
       // 初始化地址检索服务
       this.initAddressMatchService()
       this.getCameraAllLabel()
@@ -146,72 +156,113 @@
       // 根据parentId查询摄像头列表
       mybus.off('getCameraByParentId')
       mybus.on('getCameraByParentId', (parentId) => {
-          this.mapSearchParam.parentId = parentId
-          this.getCameraByParentId()
+        this.mapSearchParam.parentId = parentId
+        this.getCameraByParentId()
       })
     },
     methods: {
-      selectedAddress(item,index) {
+      selectedAddress(item, index) {
         // 跳转到相应经纬度
         console.log('跳转', item)
         const latLng = {
           lat: item.location.y,
-          lng: item.location.x
+          lng: item.location.x,
         }
         this.hiMapFun.mapFlyTo(latLng)
       },
       // 圈选方法
-    circleSelectResource() {
-      L.drawLocal.draw.handlers.circle.tooltip.start = '请圈选区域';
-      L.drawLocal.draw.handlers.circle.radius = '半径';
-      L.drawLocal.draw.handlers.circle.tooltip.end = '松开绘制完成';
+      circleSelectResource() {
+        L.drawLocal.draw.handlers.circle.tooltip.start = '请圈选区域'
+        L.drawLocal.draw.handlers.circle.radius = '半径'
+        L.drawLocal.draw.handlers.circle.tooltip.end = '松开绘制完成'
 
-      this.hiMap.mapObj.map.off('draw:created');
-      this.hiMap.mapObj.drawCircle.enable();
-      this.hiMap.mapObj.map.once('draw:created', (e) => {
-        const type = e.layerType;
-        const circleLayer = e.layer;
-        if (type === 'circle') {
-          const radius = (e.layer._mRadius)
-          if (radius > 5000) {
-            message.info('最大支持5km范围的圈选')
-          } else {
-            const circlePloygonLayer = this.multiScreenFun.createCircleLayer(circleLayer);
-            this.hiMap.mapObj.featureGroup.addLayer(circlePloygonLayer);
-            this.hiMap.mapObj.layerGroup.set('circlePloygonLayer', circlePloygonLayer);
-            console.log('查询图层为何发生了改变', e.layer);
-            this.mapSearchParam.gpsX = e.layer._latlng.lng
-            this.mapSearchParam.gpsY = e.layer._latlng.lat
-            this.mapSearchParam.radius = radius
-            const params = {
-              gpsX: this.mapSearchParam.gpsX,
-              gpsY: this.mapSearchParam.gpsY,
-              radius: radius
+        this.hiMap.mapObj.map.off('draw:created')
+        this.hiMap.mapObj.drawCircle.enable()
+        this.hiMap.mapObj.map.once('draw:created', (e) => {
+          const type = e.layerType
+          const circleLayer = e.layer
+          if (type === 'circle') {
+            const radius = e.layer._mRadius
+            if (radius > 5000) {
+              message.info('最大支持5km范围的圈选')
+            } else {
+              const circlePloygonLayer =
+                this.multiScreenFun.createCircleLayer(circleLayer)
+              this.hiMap.mapObj.featureGroup.addLayer(circlePloygonLayer)
+              this.hiMap.mapObj.layerGroup.set(
+                'circlePloygonLayer',
+                circlePloygonLayer
+              )
+              console.log('查询图层为何发生了改变', e.layer)
+              this.mapSearchParam.gpsX = e.layer._latlng.lng
+              this.mapSearchParam.gpsY = e.layer._latlng.lat
+              this.mapSearchParam.radius = radius
+              const params = {
+                gpsX: this.mapSearchParam.gpsX,
+                gpsY: this.mapSearchParam.gpsY,
+                radius: radius,
+              }
+              mybus.emit('getListByMap', params)
+              this.getCameraByParentId()
             }
-            mybus.emit('getListByMap', params)
-            this.getCameraByParentId()
           }
-        }
-      });
-    },
-    getCameraByParentId() {
+        })
+      },
+      getCameraByParentId() {
+        if (!this.whoShow1.itShowXiHaiAn) {
+          debugger
           getCameraByParentId(this.mapSearchParam).then((res) => {
+            debugger
             console.log('根据parent查询摄像头', res.data.data)
             this.addResourceTomap('videoMap', res.data.data)
-      })
+          })
+        } else {
+          let params = {
+            regionId:
+              this.mapSearchParam.parentId ||
+              '70be8c5b664f4bcf869d82f2e8335051',
+            pageNum: this.mapSearchParam.pageNum,
+            pageSize: this.mapSearchParam.pageSize,
+            name: this.mapSearchParam.name || '',
+            longitude: this.mapSearchParam.gpsX || '',
+            atitude: this.mapSearchParam.gpsY || '',
+            radius: this.mapSearchParam.radius || '',
+          }
+          let paramsFather = ''
+          let i = 1
+          for (var key in params) {
+            if (params[key] === '') {
+              delete params[key]
+            } else {
+              if (i != 1) {
+                paramsFather += `&${key}=` + params[key]
+                i += 1
+              } else if (i == 1) {
+                paramsFather += `${key}=` + params[key]
+                i += 1
+              }
+            }
+          }
+          getCameraByCondition(paramsFather).then((res) => {
+            console.log('根据parent查询摄像头', res.data.data)
+            this.addResourceTomap('videoMap', res.data.data)
+          })
+        }
       },
-    // 初始化地址匹配服务
+      // 初始化地址匹配服务
       initAddressMatchService() {
-        this.L = window.L || {};
-        this.addressMatchService = L.supermap.addressMatchService(this.addressMatchUrl);
+        this.L = window.L || {}
+        this.addressMatchService = L.supermap.addressMatchService(
+          this.addressMatchUrl
+        )
       },
       circleMode() {
         // 转换圈选模式
         this.circleModeFlag = !this.circleModeFlag
-        if(this.circleModeFlag){
+        if (this.circleModeFlag) {
           // 打开圈选模式
           this.circleSelectResource()
-        }else {
+        } else {
           // 关闭圈选模式，清空圈选内容，重新上图
           this.hiMapFun.removeLayerByLayerName('circlePloygonLayer')
           // 重置内容
@@ -220,38 +271,37 @@
           this.mapSearchParam.radius = ''
           this.getCameraByParentId()
           const params = {
-              gpsX: this.mapSearchParam.gpsX,
-              gpsY: this.mapSearchParam.gpsY,
-              radius: this.mapSearchParam.radius
-            }
-            mybus.emit('getListByMap', params)
+            gpsX: this.mapSearchParam.gpsX,
+            gpsY: this.mapSearchParam.gpsY,
+            radius: this.mapSearchParam.radius,
+          }
+          mybus.emit('getListByMap', params)
         }
-
       },
       //查询地址建议匹配
       async searchAddressByKeyWord(queryString, cb, indexX) {
-        this.disasterPointIndex = indexX;
-       /* const res = await bdPlaceSearch({ searchKey: queryString });
+        this.disasterPointIndex = indexX
+        /* const res = await bdPlaceSearch({ searchKey: queryString });
         if (res.data) {
           for(var i=0;i<res.data.length;i++){
             res.data[i].value = res.data[i].name;
           }
           cb(res.data);
         }*/
-        const match = function(obj) {
+        const match = function (obj) {
           //console.log('ooooo',obj);
-          obj.result.map(item => {
-            item.value = item.address;
-          });
-          cb(obj.result);
-        };
+          obj.result.map((item) => {
+            item.value = item.address
+          })
+          cb(obj.result)
+        }
         if (!queryString) {
-          cb([]);
+          cb([])
         } else {
           var geoCodeParam = new SuperMap.GeoCodingParameter({
-            'address': queryString,
-          });
-          this.addressMatchService.code(geoCodeParam, match);
+            address: queryString,
+          })
+          this.addressMatchService.code(geoCodeParam, match)
         }
       },
       getCameraAllPage(page) {
@@ -268,9 +318,7 @@
           // console.log("时间#############" + (t2 - t1));
         })
       },
-      getCameraAllLabel() {
-
-      },
+      getCameraAllLabel() {},
       tabChange(item) {
         if (this.checkboxGroup.indexOf(item.labelName) !== -1) {
           if (item.labelName == '全部') {
@@ -488,26 +536,26 @@
   }
 </style>
 <style lang="less">
-.ucs-leaflet-map {
-  .iclient-leaflet-logo {
-    display: none;
+  .ucs-leaflet-map {
+    .iclient-leaflet-logo {
+      display: none;
+    }
+    .leaflet-control-attribution {
+      display: none;
+    }
+    svg {
+      position: absolute;
+      bottom: 0.1rem;
+      right: 0.1rem;
+      z-index: 1001;
+      cursor: pointer;
+    }
+    .address-auto-complete-input {
+      width: 2.4rem;
+    }
+    ::v-deep.el-autocomplete .el-popper {
+      width: auto !important;
+      max-width: 2.4rem;
+    }
   }
-  .leaflet-control-attribution {
-    display: none;
-  }
-  svg {
-    position: absolute;
-    bottom: 0.1rem;
-    right: 0.1rem;
-    z-index: 1001;
-    cursor: pointer;
-  }
-  .address-auto-complete-input {
-    width: 2.4rem;
-  }
-  ::v-deep.el-autocomplete .el-popper{
-    width: auto !important;
-    max-width: 2.4rem;
-}
-}
 </style>

From b8e4c362238250cbeedb5d2ef61a14053a53cfb7 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 26 Jul 2022 09:51:47 +0800
Subject: [PATCH 02/27] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9=20=20=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E7=9F=A5=E8=AF=86=E5=BA=93=E8=B7=B3=E8=BD=AC=20?=
 =?UTF-8?q?=E3=80=81=20=E8=83=BD=E5=8A=9B=E7=BB=9F=E8=AE=A1=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0tooltip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/AtlasResources.vue             |  7 +++--
 .../components/CapabilityConvergence.vue      | 28 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/front/src/views/abilityStatistics/components/AtlasResources.vue b/front/src/views/abilityStatistics/components/AtlasResources.vue
index 49131229..9992ac31 100644
--- a/front/src/views/abilityStatistics/components/AtlasResources.vue
+++ b/front/src/views/abilityStatistics/components/AtlasResources.vue
@@ -65,7 +65,10 @@
         <div class="itemList" v-else-if="navSelect.indexOf('应用领域') > 0">
           <div class="item" v-for="item in dataList" :key="item.deptId">
             <div class="top" :class="item.show ? 'showBottom' : ''">
-              <div class="name">{{ item.deptName }}</div>
+              <a-tooltip>
+                <template #title>{{ item.deptName }}</template>
+                <div class="name">{{ item.deptName }}</div>
+              </a-tooltip>
               <a-progress
                 :percent="((item.provide.length / 15) * 100).toFixed(2)"
                 :showInfo="false"
@@ -596,7 +599,7 @@
               align-items: center;
               padding: 0.08rem 0.1rem;
               .name {
-                width: 3rem;
+                width: 3.2rem;
                 text-align: right;
                 margin-right: 0.1rem;
                 overflow: hidden;
diff --git a/front/src/views/newHome/components/CapabilityConvergence.vue b/front/src/views/newHome/components/CapabilityConvergence.vue
index f0bfeb1b..c78174bb 100644
--- a/front/src/views/newHome/components/CapabilityConvergence.vue
+++ b/front/src/views/newHome/components/CapabilityConvergence.vue
@@ -65,7 +65,7 @@
             v-for="(item, index) in zsList"
             :key="item.id"
             :class="index == 4 ? 'name-last' : ''"
-            @click="selectOne(item.id)"
+            @click="openHref(item)"
           >
             {{ index + 1 }}-{{ item.name }}
           </div>
@@ -84,6 +84,7 @@
   import { ref, reactive } from 'vue'
   import { useRouter } from 'vue-router'
   import { useStore } from 'vuex'
+  import { updateVisits, browsingInsert } from '@/api/home'
   import mybus from '@/myplugins/mybus'
   const store = useStore()
   const router = useRouter()
@@ -193,6 +194,31 @@
       }
     }
   }
+
+  const openHref = (item) => {
+    console.log(item.id, 'wowowo')
+    console.log(item.visits, 'wowowo')
+    browsingInsert({ resourceId: item.id }).then((res) => {
+      // console.log(res)
+    })
+    const arrList = ref([])
+    arrList.value = JSON.parse(window.sessionStorage.getItem('visits'))
+    if (arrList.value.indexOf(item.id) === -1) {
+      arrList.value.push(item.id)
+      updateVisits({
+        id: item.id,
+        visits: item.visits || '0',
+      }).then(() => {
+        window.sessionStorage.setItem('visits', JSON.stringify(arrList.value))
+      })
+    }
+    window.open(item.link)
+    // window.open(
+    //   window.SITE_CONFIG.previewUrl +
+    //     'hisense_office/onlinePreview?url=' +
+    //     btoa(encodeURI(item.fileHref))
+    // )
+  }
   const assignmentMethod = (type, res) => {
     object[type] = res.data.data.total
     // interfaceSuccess.value++

From 73ed69f315ea7b65dd85cb4803509b45d3d27c13 Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Tue, 26 Jul 2022 10:07:39 +0800
Subject: [PATCH 03/27] =?UTF-8?q?=E5=89=8D=E5=8F=B0=E5=BF=85=E5=A1=AB?=
 =?UTF-8?q?=E9=A1=B9=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/capacityOnTheShelf/Algorithm.vue    | 174 ++++++--
 .../views/capacityOnTheShelf/Application.vue  |  97 +++-
 .../capacityOnTheShelf/BusinessComponent.vue  | 156 +++++--
 .../DevelopmentComponents.vue                 | 156 +++++--
 .../capacityOnTheShelf/LayerServices.vue      | 157 +++++--
 .../components/PutOnTheShelf.vue              | 419 ++++++++++--------
 .../Algorithm/AlgorithmUsageMode.vue          |   4 +-
 .../LayerService/LayerServiceUsageMode.vue    |   4 +-
 8 files changed, 812 insertions(+), 355 deletions(-)

diff --git a/front/src/views/capacityOnTheShelf/Algorithm.vue b/front/src/views/capacityOnTheShelf/Algorithm.vue
index 3c2205dd..df8d2d41 100644
--- a/front/src/views/capacityOnTheShelf/Algorithm.vue
+++ b/front/src/views/capacityOnTheShelf/Algorithm.vue
@@ -37,6 +37,8 @@
           '部门联系人',
           '部门联系人电话',
         ]"
+        :required="required"
+        :notFilled="notFilled"
       ></put-on-the-shelf>
       <put-on-the-shelf
         v-else-if="showView === '算法优势'"
@@ -46,6 +48,8 @@
         :configure="sfys"
         @next="next()"
         @back="back()"
+        :required="required"
+        :notFilled="notFilled"
       ></put-on-the-shelf>
       <put-on-the-shelf
         v-else-if="showView === '应用场景'"
@@ -55,6 +59,8 @@
         :configure="yycj"
         @next="next()"
         @back="back()"
+        :required="required"
+        :notFilled="notFilled"
       ></put-on-the-shelf>
       <put-on-the-shelf
         v-else-if="showView === '部署与使用'"
@@ -68,6 +74,8 @@
         :configure="bs"
         @submit="submit()"
         @back="back()"
+        :required="required"
+        :notFilled="notFilled"
       ></put-on-the-shelf>
       <!-- <algorithm-essential-information
         v-if="showView === '基本信息' && refData.name"
@@ -356,6 +364,25 @@
     type: '组件服务',
     deptId: '',
   })
+  const required = ref([
+    '归属部门',
+    '部门联系人',
+    '部门联系人电话',
+    '应用领域',
+    '共享条件',
+    '算法名称',
+    '算法描述',
+    '图层名称',
+    '图层描述',
+    '组件名称',
+    '组件描述',
+    '组件地址',
+    '服务地址',
+    '服务接口',
+    '接口请求方式',
+    '算法类别',
+  ])
+  const notFilled = ref([])
   getUser().then((res) => {
     dataFrom.value.deptId = res.data.data.deptId
   })
@@ -374,18 +401,58 @@
     })
   }
   const next = () => {
-    let i = -1
-    navList.value.forEach((val, index) => {
-      if (val.key === showView.value && index < navList.value.length - 1) {
-        i = index + 1
+    notFilled.value = []
+    console.log(dataFrom.value, 'dataFrom.value.name')
+    if (!dataFrom.value.name) {
+      notFilled.value.push('算法名称')
+    }
+    if (!dataFrom.value.description) {
+      notFilled.value.push('算法描述')
+    }
+    if (!dataFrom.value.shareCondition) {
+      notFilled.value.push('共享条件')
+    }
+    if (!dataFrom.value.deptContacts) {
+      notFilled.value.push('部门联系人')
+    }
+    if (!dataFrom.value.deptPhone) {
+      notFilled.value.push('部门联系人电话')
+    }
+    if (
+      !dataFrom.value.infoList.filter(
+        (val) => val.attrType === '算法类别'
+      )[0] ||
+      !dataFrom.value.infoList.filter((val) => val.attrType === '算法类别')[0]
+        .attrValue
+    ) {
+      notFilled.value.push('算法类别')
+    }
+    if (
+      !dataFrom.value.infoList.filter(
+        (val) => val.attrType === '应用领域'
+      )[0] ||
+      !dataFrom.value.infoList.filter((val) => val.attrType === '应用领域')[0]
+        .attrValue
+    ) {
+      notFilled.value.push('应用领域')
+    }
+    if (notFilled.value.length > 0) {
+      message.warning('请填写必填字段')
+      console.log(notFilled.value)
+    } else {
+      let i = -1
+      navList.value.forEach((val, index) => {
+        if (val.key === showView.value && index < navList.value.length - 1) {
+          i = index + 1
+        }
+      })
+      if (i !== -1) {
+        showView.value = navList2.value[i]
+        refData.value = data.value.filter(
+          (item) => item.name === showView.value
+        )[0]
+        console.log('表单数据=============>', dataFrom.value, refData.value)
       }
-    })
-    if (i !== -1) {
-      showView.value = navList2.value[i]
-      refData.value = data.value.filter(
-        (item) => item.name === showView.value
-      )[0]
-      console.log('表单数据=============>', dataFrom.value, refData.value)
     }
   }
   // 预览
@@ -401,40 +468,65 @@
     window.open(newpage.href, '_blank')
   }
   const submit = () => {
-    console.log('提交数据=============>', dataFrom.value)
-    if (submitFlag.value) {
-      submitFlag.value = false
-      dataFrom.value.infoList = dataFrom.value.infoList.filter(
-        (item) => item.attrValue !== ''
-      )
-      shangjiainsert(dataFrom.value).then((res) => {
-        const instanceId = res.data.data
-        dataFrom.value.id = res.data.data
-        getUser().then((res6) => {
-          getUserInfo(res6.data.data.id).then((res2) => {
-            const deptId = dataFrom.value.deptId
-            const userId = res2.data.data.id
-            const userName = res2.data.data.realName
-            const params = {
-              instanceId: instanceId,
-              deptId: deptId,
-              userId: userId,
-              userName: userName,
-              resourceDTO: [dataFrom.value],
-            }
-            shangjiaapply(params).then((res3) => {
-              console.log('res3', res3)
-              if (res3.data.code == 0) {
-                message.success('上架申请提交成功，请注意查看消息通知！')
-                window.setTimeout(() => {
-                  window.close()
-                  submitFlag.value = true
-                }, 1000)
+    notFilled.value = []
+    console.log(dataFrom.value, 'dataFrom.value.name')
+    if (
+      dataFrom.value.infoList.filter((val) => val.attrType === '使用方式')[0] &&
+      dataFrom.value.infoList.filter((val) => val.attrType === '使用方式')[0]
+        .attrValue == '调用接口'
+    ) {
+      if (
+        !dataFrom.value.infoList.filter(
+          (val) => val.attrType === '服务接口'
+        )[0] ||
+        !dataFrom.value.infoList.filter((val) => val.attrType === '服务接口')[0]
+          .attrValue
+      ) {
+        notFilled.value.push('服务接口')
+      }
+      if (!dataFrom.value.apiMethodType) {
+        notFilled.value.push('接口请求方式')
+      }
+    }
+    if (notFilled.value.length > 0) {
+      message.warning('请填写必填字段')
+      console.log(notFilled.value)
+    } else {
+      console.log('提交数据=============>', dataFrom.value)
+      if (submitFlag.value) {
+        submitFlag.value = false
+        dataFrom.value.infoList = dataFrom.value.infoList.filter(
+          (item) => item.attrValue !== ''
+        )
+        shangjiainsert(dataFrom.value).then((res) => {
+          const instanceId = res.data.data
+          dataFrom.value.id = res.data.data
+          getUser().then((res6) => {
+            getUserInfo(res6.data.data.id).then((res2) => {
+              const deptId = dataFrom.value.deptId
+              const userId = res2.data.data.id
+              const userName = res2.data.data.realName
+              const params = {
+                instanceId: instanceId,
+                deptId: deptId,
+                userId: userId,
+                userName: userName,
+                resourceDTO: [dataFrom.value],
               }
+              shangjiaapply(params).then((res3) => {
+                console.log('res3', res3)
+                if (res3.data.code == 0) {
+                  message.success('上架申请提交成功，请注意查看消息通知！')
+                  window.setTimeout(() => {
+                    window.close()
+                    submitFlag.value = true
+                  }, 1000)
+                }
+              })
             })
           })
         })
-      })
+      }
     }
   }
   const init = () => {
diff --git a/front/src/views/capacityOnTheShelf/Application.vue b/front/src/views/capacityOnTheShelf/Application.vue
index 0469ef71..3bf5ef52 100644
--- a/front/src/views/capacityOnTheShelf/Application.vue
+++ b/front/src/views/capacityOnTheShelf/Application.vue
@@ -36,6 +36,8 @@
           '部门联系人',
           '部门联系人电话',
         ]"
+        :required="required"
+        :notFilled="notFilled"
       ></put-on-the-shelf>
       <put-on-the-shelf
         v-else-if="showView === '功能介绍'"
@@ -45,6 +47,8 @@
         :configure="gnjs"
         @next="next()"
         @back="back()"
+        :required="required"
+        :notFilled="notFilled"
       ></put-on-the-shelf>
       <put-on-the-shelf
         v-else-if="showView === '关联组件'"
@@ -54,6 +58,8 @@
         :configure="glzj"
         @next="next()"
         @back="back()"
+        :required="required"
+        :notFilled="notFilled"
       ></put-on-the-shelf>
       <put-on-the-shelf
         ref="refPutOnTheShelf"
@@ -64,6 +70,8 @@
         :configure="bs"
         @submit="submit()"
         @back="back()"
+        :required="required"
+        :notFilled="notFilled"
       ></put-on-the-shelf>
       <!-- <application-essential-information
         v-if="showView === '基本信息' && refData.name"
@@ -260,6 +268,18 @@
       ],
     },
   ])
+  const required = ref([
+    '归属部门',
+    '部门联系人',
+    '部门联系人电话',
+    '应用领域',
+    '共享条件',
+    '应用名称',
+    '应用描述',
+    '应用状态',
+    '应用类型',
+  ])
+  const notFilled = ref([])
   getUser().then((res) => {
     dataFrom.value.deptId = res.data.data.deptId
   })
@@ -275,18 +295,73 @@
     })
   }
   const next = () => {
-    let i = -1
-    navList.value.forEach((val, index) => {
-      if (val.key === showView.value && index < navList.value.length - 1) {
-        i = index + 1
+    notFilled.value = []
+    console.log(dataFrom.value, notFilled.value, 'dataFrom.value.name')
+    if (!dataFrom.value.name) {
+      notFilled.value.push('应用名称')
+    }
+    if (!dataFrom.value.description) {
+      notFilled.value.push('应用描述')
+    }
+    if (!dataFrom.value.deptContacts) {
+      notFilled.value.push('部门联系人')
+    }
+    if (!dataFrom.value.deptPhone) {
+      notFilled.value.push('部门联系人电话')
+    }
+    if (
+      !dataFrom.value.infoList.filter(
+        (val) => val.attrType === '应用领域'
+      )[0] ||
+      !dataFrom.value.infoList.filter((val) => val.attrType === '应用领域')[0]
+        .attrValue
+    ) {
+      notFilled.value.push('应用领域')
+    }
+    if (
+      !dataFrom.value.infoList.filter(
+        (val) => val.attrType === '应用状态'
+      )[0] ||
+      !dataFrom.value.infoList.filter((val) => val.attrType === '应用状态')[0]
+        .attrValue
+    ) {
+      notFilled.value.push('应用状态')
+    }
+    if (
+      !dataFrom.value.infoList.filter(
+        (val) => val.attrType === '应用类型'
+      )[0] ||
+      !dataFrom.value.infoList.filter((val) => val.attrType === '应用类型')[0]
+        .attrValue
+    ) {
+      notFilled.value.push('应用类型')
+    }
+    if (
+      !dataFrom.value.infoList.filter(
+        (val) => val.attrType === '共享条件'
+      )[0] ||
+      !dataFrom.value.infoList.filter((val) => val.attrType === '共享条件')[0]
+        .attrValue
+    ) {
+      notFilled.value.push('共享条件')
+    }
+    if (notFilled.value.length > 0) {
+      message.warning('请填写必填字段')
+      console.log(notFilled.value)
+    } else {
+      let i = -1
+      navList.value.forEach((val, index) => {
+        if (val.key === showView.value && index < navList.value.length - 1) {
+          i = index + 1
+        }
+      })
+      if (i !== -1) {
+        showView.value = navList2.value[i]
+        refData.value = data.value.filter(
+          (item) => item.name === showView.value
+        )[0]
+        console.log('表单数据=============>', dataFrom.value, refData.value)
       }
-    })
-    if (i !== -1) {
-      showView.value = navList2.value[i]
-      refData.value = data.value.filter(
-        (item) => item.name === showView.value
-      )[0]
-      console.log('表单数据=============>', dataFrom.value, refData.value)
     }
   }
   const submit = () => {
diff --git a/front/src/views/capacityOnTheShelf/BusinessComponent.vue b/front/src/views/capacityOnTheShelf/BusinessComponent.vue
index 4ea7f7b3..0b3df2fe 100644
--- a/front/src/views/capacityOnTheShelf/BusinessComponent.vue
+++ b/front/src/views/capacityOnTheShelf/BusinessComponent.vue
@@ -37,6 +37,8 @@
           '部门联系人',
           '部门联系人电话',
         ]"
+        :required="required"
+        :notFilled="notFilled"
       ></put-on-the-shelf>
       <put-on-the-shelf
         v-else-if="showView === '功能介绍'"
@@ -46,6 +48,8 @@
         :configure="gnjs"
         @next="next()"
         @back="back()"
+        :required="required"
+        :notFilled="notFilled"
       ></put-on-the-shelf>
       <put-on-the-shelf
         v-else-if="showView === '应用场景'"
@@ -55,6 +59,8 @@
         :configure="yycj"
         @next="next()"
         @back="back()"
+        :required="required"
+        :notFilled="notFilled"
       ></put-on-the-shelf>
       <put-on-the-shelf
         v-else-if="showView === '部署与使用'"
@@ -67,6 +73,8 @@
         :configure="bs"
         @submit="submit()"
         @back="back()"
+        :required="required"
+        :notFilled="notFilled"
       ></put-on-the-shelf>
     </div>
     <div class="btn" :class="showView === '基本信息' ? 'first' : ''">
@@ -327,6 +335,25 @@
     type: '组件服务',
     deptId: '',
   })
+  const required = ref([
+    '归属部门',
+    '部门联系人',
+    '部门联系人电话',
+    '应用领域',
+    '共享条件',
+    '算法名称',
+    '算法描述',
+    '图层名称',
+    '图层描述',
+    '组件名称',
+    '组件描述',
+    '组件地址',
+    '服务地址',
+    '服务接口',
+    '接口请求方式',
+    '算法类别',
+  ])
+  const notFilled = ref([])
 
   const close = () => {
     window.close()
@@ -346,18 +373,49 @@
     })
   }
   const next = () => {
-    let i = -1
-    navList.value.forEach((val, index) => {
-      if (val.key === showView.value && index < navList.value.length - 1) {
-        i = index + 1
+    notFilled.value = []
+    console.log(dataFrom.value, 'dataFrom.value.name')
+    if (!dataFrom.value.name) {
+      notFilled.value.push('组件名称')
+    }
+    if (!dataFrom.value.description) {
+      notFilled.value.push('组件描述')
+    }
+    if (!dataFrom.value.shareCondition) {
+      notFilled.value.push('共享条件')
+    }
+    if (!dataFrom.value.deptContacts) {
+      notFilled.value.push('部门联系人')
+    }
+    if (!dataFrom.value.deptPhone) {
+      notFilled.value.push('部门联系人电话')
+    }
+    if (
+      !dataFrom.value.infoList.filter(
+        (val) => val.attrType === '应用领域'
+      )[0] ||
+      !dataFrom.value.infoList.filter((val) => val.attrType === '应用领域')[0]
+        .attrValue
+    ) {
+      notFilled.value.push('应用领域')
+    }
+    if (notFilled.value.length > 0) {
+      message.warning('请填写必填字段')
+      console.log(notFilled.value)
+    } else {
+      let i = -1
+      navList.value.forEach((val, index) => {
+        if (val.key === showView.value && index < navList.value.length - 1) {
+          i = index + 1
+        }
+      })
+      if (i !== -1) {
+        showView.value = navList2.value[i]
+        refData.value = data.value.filter(
+          (item) => item.name === showView.value
+        )[0]
+        console.log('表单数据=============>', dataFrom.value, refData.value)
       }
-    })
-    if (i !== -1) {
-      showView.value = navList2.value[i]
-      refData.value = data.value.filter(
-        (item) => item.name === showView.value
-      )[0]
-      console.log('表单数据=============>', dataFrom.value, refData.value)
     }
   }
   // 预览
@@ -373,40 +431,56 @@
     window.open(newpage.href, '_blank')
   }
   const submit = () => {
-    console.log('提交数据=============>', dataFrom.value)
-    if (submitFlag.value) {
-      submitFlag.value = false
-      dataFrom.value.infoList = dataFrom.value.infoList.filter(
-        (item) => item.attrValue !== ''
-      )
-      shangjiainsert(dataFrom.value).then((res) => {
-        const instanceId = res.data.data
-        dataFrom.value.id = res.data.data
-        getUser().then((res6) => {
-          getUserInfo(res6.data.data.id).then((res2) => {
-            const deptId = dataFrom.value.deptId
-            const userId = res2.data.data.id
-            const userName = res2.data.data.realName
-            const params = {
-              instanceId: instanceId,
-              deptId: deptId,
-              userId: userId,
-              userName: userName,
-              resourceDTO: [dataFrom.value],
-            }
-            shangjiaapply(params).then((res3) => {
-              console.log('res3', res3)
-              if (res3.data.code == 0) {
-                message.success('上架申请提交成功，请注意查看消息通知！')
-                window.setTimeout(() => {
-                  window.close()
-                  submitFlag.value = true
-                }, 1000)
+    notFilled.value = []
+    console.log(dataFrom.value, 'dataFrom.value.name')
+    if (
+      !dataFrom.value.infoList.filter(
+        (val) => val.attrType === '组件地址'
+      )[0] ||
+      !dataFrom.value.infoList.filter((val) => val.attrType === '组件地址')[0]
+        .attrValue
+    ) {
+      notFilled.value.push('组件地址')
+    }
+    if (notFilled.value.length > 0) {
+      message.warning('请填写必填字段')
+      console.log(notFilled.value)
+    } else {
+      console.log('提交数据=============>', dataFrom.value)
+      if (submitFlag.value) {
+        submitFlag.value = false
+        dataFrom.value.infoList = dataFrom.value.infoList.filter(
+          (item) => item.attrValue !== ''
+        )
+        shangjiainsert(dataFrom.value).then((res) => {
+          const instanceId = res.data.data
+          dataFrom.value.id = res.data.data
+          getUser().then((res6) => {
+            getUserInfo(res6.data.data.id).then((res2) => {
+              const deptId = dataFrom.value.deptId
+              const userId = res2.data.data.id
+              const userName = res2.data.data.realName
+              const params = {
+                instanceId: instanceId,
+                deptId: deptId,
+                userId: userId,
+                userName: userName,
+                resourceDTO: [dataFrom.value],
               }
+              shangjiaapply(params).then((res3) => {
+                console.log('res3', res3)
+                if (res3.data.code == 0) {
+                  message.success('上架申请提交成功，请注意查看消息通知！')
+                  window.setTimeout(() => {
+                    window.close()
+                    submitFlag.value = true
+                  }, 1000)
+                }
+              })
             })
           })
         })
-      })
+      }
     }
   }
   // 特殊字段处理
diff --git a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue
index 7604080b..5bae9427 100644
--- a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue
+++ b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue
@@ -37,6 +37,8 @@
           '部门联系人',
           '部门联系人电话',
         ]"
+        :required="required"
+        :notFilled="notFilled"
       ></put-on-the-shelf>
       <put-on-the-shelf
         v-else-if="showView === '功能介绍'"
@@ -46,6 +48,8 @@
         :configure="gnjs"
         @next="next()"
         @back="back()"
+        :required="required"
+        :notFilled="notFilled"
       ></put-on-the-shelf>
       <put-on-the-shelf
         v-else-if="showView === '应用场景'"
@@ -55,6 +59,8 @@
         :configure="yycj"
         @next="next()"
         @back="back()"
+        :required="required"
+        :notFilled="notFilled"
       ></put-on-the-shelf>
       <put-on-the-shelf
         v-else-if="showView === '部署与使用'"
@@ -66,6 +72,8 @@
         :configure="bs"
         @submit="submit()"
         @back="back()"
+        :required="required"
+        :notFilled="notFilled"
       ></put-on-the-shelf>
     </div>
     <div class="btn" :class="showView === '基本信息' ? 'first' : ''">
@@ -326,6 +334,25 @@
     type: '组件服务',
     deptId: '',
   })
+  const required = ref([
+    '归属部门',
+    '部门联系人',
+    '部门联系人电话',
+    '应用领域',
+    '共享条件',
+    '算法名称',
+    '算法描述',
+    '图层名称',
+    '图层描述',
+    '组件名称',
+    '组件描述',
+    '组件地址',
+    '服务地址',
+    '服务接口',
+    '接口请求方式',
+    '算法类别',
+  ])
+  const notFilled = ref([])
 
   const close = () => {
     window.close()
@@ -345,18 +372,49 @@
     })
   }
   const next = () => {
-    let i = -1
-    navList.value.forEach((val, index) => {
-      if (val.key === showView.value && index < navList.value.length - 1) {
-        i = index + 1
+    notFilled.value = []
+    console.log(dataFrom.value, 'dataFrom.value.name')
+    if (!dataFrom.value.name) {
+      notFilled.value.push('组件名称')
+    }
+    if (!dataFrom.value.description) {
+      notFilled.value.push('组件描述')
+    }
+    if (!dataFrom.value.shareCondition) {
+      notFilled.value.push('共享条件')
+    }
+    if (!dataFrom.value.deptContacts) {
+      notFilled.value.push('部门联系人')
+    }
+    if (!dataFrom.value.deptPhone) {
+      notFilled.value.push('部门联系人电话')
+    }
+    if (
+      !dataFrom.value.infoList.filter(
+        (val) => val.attrType === '应用领域'
+      )[0] ||
+      !dataFrom.value.infoList.filter((val) => val.attrType === '应用领域')[0]
+        .attrValue
+    ) {
+      notFilled.value.push('应用领域')
+    }
+    if (notFilled.value.length > 0) {
+      message.warning('请填写必填字段')
+      console.log(notFilled.value)
+    } else {
+      let i = -1
+      navList.value.forEach((val, index) => {
+        if (val.key === showView.value && index < navList.value.length - 1) {
+          i = index + 1
+        }
+      })
+      if (i !== -1) {
+        showView.value = navList2.value[i]
+        refData.value = data.value.filter(
+          (item) => item.name === showView.value
+        )[0]
+        console.log('表单数据=============>', dataFrom.value, refData.value)
       }
-    })
-    if (i !== -1) {
-      showView.value = navList2.value[i]
-      refData.value = data.value.filter(
-        (item) => item.name === showView.value
-      )[0]
-      console.log('表单数据=============>', dataFrom.value, refData.value)
     }
   }
   // 预览
@@ -385,40 +443,56 @@
     refPutOnTheShelf.value.add('常见问题', true, type)
   }
   const submit = () => {
-    console.log('提交数据=============>', dataFrom.value)
-    if (submitFlag.value) {
-      submitFlag.value = false
-      dataFrom.value.infoList = dataFrom.value.infoList.filter(
-        (item) => item.attrValue !== ''
-      )
-      shangjiainsert(dataFrom.value).then((res) => {
-        const instanceId = res.data.data
-        dataFrom.value.id = res.data.data
-        getUser().then((res6) => {
-          getUserInfo(res6.data.data.id).then((res2) => {
-            const deptId = dataFrom.value.deptId
-            const userId = res2.data.data.id
-            const userName = res2.data.data.realName
-            const params = {
-              instanceId: instanceId,
-              deptId: deptId,
-              userId: userId,
-              userName: userName,
-              resourceDTO: [dataFrom.value],
-            }
-            shangjiaapply(params).then((res3) => {
-              console.log('res3', res3)
-              if (res3.data.code == 0) {
-                message.success('上架申请提交成功，请注意查看消息通知！')
-                window.setTimeout(() => {
-                  window.close()
-                  submitFlag.value = true
-                }, 1000)
+    notFilled.value = []
+    console.log(dataFrom.value, 'dataFrom.value.name')
+    if (
+      !dataFrom.value.infoList.filter(
+        (val) => val.attrType === '组件地址'
+      )[0] ||
+      !dataFrom.value.infoList.filter((val) => val.attrType === '组件地址')[0]
+        .attrValue
+    ) {
+      notFilled.value.push('组件地址')
+    }
+    if (notFilled.value.length > 0) {
+      message.warning('请填写必填字段')
+      console.log(notFilled.value)
+    } else {
+      console.log('提交数据=============>', dataFrom.value)
+      if (submitFlag.value) {
+        submitFlag.value = false
+        dataFrom.value.infoList = dataFrom.value.infoList.filter(
+          (item) => item.attrValue !== ''
+        )
+        shangjiainsert(dataFrom.value).then((res) => {
+          const instanceId = res.data.data
+          dataFrom.value.id = res.data.data
+          getUser().then((res6) => {
+            getUserInfo(res6.data.data.id).then((res2) => {
+              const deptId = dataFrom.value.deptId
+              const userId = res2.data.data.id
+              const userName = res2.data.data.realName
+              const params = {
+                instanceId: instanceId,
+                deptId: deptId,
+                userId: userId,
+                userName: userName,
+                resourceDTO: [dataFrom.value],
               }
+              shangjiaapply(params).then((res3) => {
+                console.log('res3', res3)
+                if (res3.data.code == 0) {
+                  message.success('上架申请提交成功，请注意查看消息通知！')
+                  window.setTimeout(() => {
+                    window.close()
+                    submitFlag.value = true
+                  }, 1000)
+                }
+              })
             })
           })
         })
-      })
+      }
     }
   }
   const init = () => {
diff --git a/front/src/views/capacityOnTheShelf/LayerServices.vue b/front/src/views/capacityOnTheShelf/LayerServices.vue
index 84f55cb1..f364398e 100644
--- a/front/src/views/capacityOnTheShelf/LayerServices.vue
+++ b/front/src/views/capacityOnTheShelf/LayerServices.vue
@@ -37,12 +37,16 @@
           '部门联系人',
           '部门联系人电话',
         ]"
+        :required="required"
+        :notFilled="notFilled"
       ></put-on-the-shelf>
       <put-on-the-shelf
         v-else-if="showView === '图层信息'"
         ref="refPutOnTheShelf"
         :refData="refData"
         :dataFrom="dataFrom"
+        :required="required"
+        :notFilled="notFilled"
       ></put-on-the-shelf>
       <put-on-the-shelf
         v-else-if="showView === '应用场景'"
@@ -50,6 +54,8 @@
         :refData="refData"
         :dataFrom="dataFrom"
         :configure="yycj"
+        :required="required"
+        :notFilled="notFilled"
         @next="next()"
         @back="back()"
       ></put-on-the-shelf>
@@ -63,6 +69,8 @@
         :configure="bs"
         @submit="submit()"
         @back="back()"
+        :required="required"
+        :notFilled="notFilled"
       ></put-on-the-shelf>
     </div>
     <div class="btn" :class="showView === '基本信息' ? 'first' : ''">
@@ -224,6 +232,26 @@
     type: '组件服务',
     deptId: '',
   })
+  const required = ref([
+    '归属部门',
+    '部门联系人',
+    '部门联系人电话',
+    '应用领域',
+    '共享条件',
+    '算法名称',
+    '算法描述',
+    '图层名称',
+    '图层描述',
+    '组件名称',
+    '组件描述',
+    '组件地址',
+    '服务地址',
+    '服务接口',
+    '接口请求方式',
+    '算法类别',
+  ])
+  const notFilled = ref([])
+
   getUser().then((res) => {
     dataFrom.value.deptId = res.data.data.deptId
   })
@@ -243,18 +271,49 @@
     window.close()
   }
   const next = () => {
-    let i = -1
-    navList.value.forEach((val, index) => {
-      if (val.key === showView.value && index < navList.value.length - 1) {
-        i = index + 1
+    notFilled.value = []
+    console.log(dataFrom.value, 'dataFrom.value.name')
+    if (!dataFrom.value.name) {
+      notFilled.value.push('图层名称')
+    }
+    if (!dataFrom.value.description) {
+      notFilled.value.push('图层描述')
+    }
+    if (!dataFrom.value.shareCondition) {
+      notFilled.value.push('共享条件')
+    }
+    if (!dataFrom.value.deptContacts) {
+      notFilled.value.push('部门联系人')
+    }
+    if (!dataFrom.value.deptPhone) {
+      notFilled.value.push('部门联系人电话')
+    }
+    if (
+      !dataFrom.value.infoList.filter(
+        (val) => val.attrType === '应用领域'
+      )[0] ||
+      !dataFrom.value.infoList.filter((val) => val.attrType === '应用领域')[0]
+        .attrValue
+    ) {
+      notFilled.value.push('应用领域')
+    }
+    if (notFilled.value.length > 0) {
+      message.warning('请填写必填字段')
+      console.log(notFilled.value)
+    } else {
+      let i = -1
+      navList.value.forEach((val, index) => {
+        if (val.key === showView.value && index < navList.value.length - 1) {
+          i = index + 1
+        }
+      })
+      if (i !== -1) {
+        showView.value = navList2.value[i]
+        refData.value = data.value.filter(
+          (item) => item.name === showView.value
+        )[0]
+        console.log('表单数据=============>', dataFrom.value, refData.value)
       }
-    })
-    if (i !== -1) {
-      showView.value = navList2.value[i]
-      refData.value = data.value.filter(
-        (item) => item.name === showView.value
-      )[0]
-      console.log('表单数据=============>', dataFrom.value, refData.value)
     }
   }
   // 预览
@@ -280,40 +339,56 @@
     refPutOnTheShelf.value.add('常见问题', true, type)
   }
   const submit = () => {
-    console.log('提交数据=============>', dataFrom.value)
-    if (submitFlag.value) {
-      submitFlag.value = false
-      dataFrom.value.infoList = dataFrom.value.infoList.filter(
-        (item) => item.attrValue !== ''
-      )
-      shangjiainsert(dataFrom.value).then((res) => {
-        const instanceId = res.data.data
-        dataFrom.value.id = res.data.data
-        getUser().then((res6) => {
-          getUserInfo(res6.data.data.id).then((res2) => {
-            const deptId = dataFrom.value.deptId
-            const userId = res2.data.data.id
-            const userName = res2.data.data.realName
-            const params = {
-              instanceId: instanceId,
-              deptId: deptId,
-              userId: userId,
-              userName: userName,
-              resourceDTO: [dataFrom.value],
-            }
-            shangjiaapply(params).then((res3) => {
-              console.log('res3', res3)
-              if (res3.data.code == 0) {
-                message.success('上架申请提交成功，请注意查看消息通知！')
-                window.setTimeout(() => {
-                  window.close()
-                  submitFlag.value = true
-                }, 1000)
+    notFilled.value = []
+    console.log(dataFrom.value, 'dataFrom.value.name')
+    if (
+      !dataFrom.value.infoList.filter(
+        (val) => val.attrType === '服务地址'
+      )[0] ||
+      !dataFrom.value.infoList.filter((val) => val.attrType === '服务地址')[0]
+        .attrValue
+    ) {
+      notFilled.value.push('服务地址')
+    }
+    if (notFilled.value.length > 0) {
+      message.warning('请填写必填字段')
+      console.log(notFilled.value)
+    } else {
+      console.log('提交数据=============>', dataFrom.value)
+      if (submitFlag.value) {
+        submitFlag.value = false
+        dataFrom.value.infoList = dataFrom.value.infoList.filter(
+          (item) => item.attrValue !== ''
+        )
+        shangjiainsert(dataFrom.value).then((res) => {
+          const instanceId = res.data.data
+          dataFrom.value.id = res.data.data
+          getUser().then((res6) => {
+            getUserInfo(res6.data.data.id).then((res2) => {
+              const deptId = dataFrom.value.deptId
+              const userId = res2.data.data.id
+              const userName = res2.data.data.realName
+              const params = {
+                instanceId: instanceId,
+                deptId: deptId,
+                userId: userId,
+                userName: userName,
+                resourceDTO: [dataFrom.value],
               }
+              shangjiaapply(params).then((res3) => {
+                console.log('res3', res3)
+                if (res3.data.code == 0) {
+                  message.success('上架申请提交成功，请注意查看消息通知！')
+                  window.setTimeout(() => {
+                    window.close()
+                    submitFlag.value = true
+                  }, 1000)
+                }
+              })
             })
           })
         })
-      })
+      }
     }
   }
   const init = () => {
diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
index 8f02f725..0e8cc563 100644
--- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
+++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
@@ -204,7 +204,7 @@
       <template v-else>
         <div class="bottom">
           <div
-            class="form"
+            class="form item"
             v-for="item in title.children"
             :key="item.id"
             v-show="
@@ -220,189 +220,221 @@
               )
             "
           >
-            <span>{{ item.name }}</span>
-            <a-input
-              v-if="item.type == 'input' && item.name.indexOf('名称') == -1"
-              v-model:value="item.note1"
-              :placeholder="'请输入' + item.name"
-            />
-            <a-input
-              v-else-if="
-                item.type == 'input' && item.name.indexOf('名称') != -1
-              "
-              :maxLength="50"
-              v-model:value="item.note1"
-              :placeholder="'请输入' + item.name + '，不超过50个字符'"
-            />
-            <a-radio-group
-              v-else-if="item.type == 'radio'"
-              v-model:value="item.note1"
-              :options="item.options"
-            />
-            <a-input
-              v-else-if="item.type == 'AbilityType'"
-              v-model:value="item.note1"
-              :placeholder="'请输入' + item.name"
-              :disabled="true"
-            />
-            <a-input
-              v-else-if="item.type == 'ComponentType'"
-              v-model:value="item.note1"
-              :placeholder="'请输入' + item.name"
-              :disabled="true"
-            />
-            <a-textarea
-              v-else-if="item.type == 'textArea'"
-              v-model:value="item.note1"
-              :showCount="true"
-              :maxlength="200"
-              :placeholder="'请输入' + item.name"
-            />
-            <upload
-              v-else-if="item.type == 'image'"
-              type="图片"
-              btnName="上传图片"
-              :maxCount="1"
-              :data="item"
-              :list="props.imgList"
-              tip="支持图片类型，大小不超过100M"
-            ></upload>
-            <upload
-              v-else-if="item.type == 'file' && item.name !== '使用手册'"
-              type="文件"
-              btnName="上传附件"
-              :maxCount="1"
-              :data="item"
-              :list="props.fileList"
-              tip="支持文件类型，大小不超过100M"
-            ></upload>
-            <upload
-              v-else-if="item.name == '使用手册'"
-              type="文件"
-              btnName="上传附件"
-              :maxCount="1"
-              :data="item"
-              :busType="2"
-              :list="props.fileList2"
-              tip="支持文件类型，大小不超过100M"
-            ></upload>
-            <upload
-              v-else-if="item.type == 'package'"
-              type="压缩包"
-              btnName="上传安装包"
-              :maxCount="1"
-              :data="item"
-              :list="props.packageList"
-              tip="支持.zip类型"
-            ></upload>
-            <div
-              class="Technical-text"
-              v-else-if="item.type == 'richText'"
-              @click="showTextFunction()"
-            >
-              编辑富文本
-              <div
-                v-if="showText"
-                class="fuwenbenbianjiqi"
-                style="position: absolute; z-index: 10000"
-              >
-                <VueTemplateDemo :dataFrom="props.dataFrom"></VueTemplateDemo>
+            <div class="box">
+              <div>
+                <b class="required" v-if="required.indexOf(item.name) > -1">
+                  *
+                </b>
+                {{ item.name }}
               </div>
-            </div>
-            <upload
-              v-else-if="item.type == 'video'"
-              type="视频"
-              btnName="上传视频"
-              :maxCount="1"
-              :data="item"
-              :list="props.videoList"
-              tip="支持视频类型，大小不超过100M"
-            ></upload>
-            <!-- <a-button
+              <a-input
+                v-if="item.type == 'input' && item.name.indexOf('名称') == -1"
+                v-model:value="item.note1"
+                :placeholder="'请输入' + item.name"
+                @change="changeIiem(name, data.note1)"
+              />
+              <a-input
+                v-else-if="
+                  item.type == 'input' && item.name.indexOf('名称') != -1
+                "
+                :maxLength="50"
+                v-model:value="item.note1"
+                :placeholder="'请输入' + item.name + '，不超过50个字符'"
+                @change="changeIiem(name, data.note1)"
+              />
+              <a-radio-group
+                v-else-if="item.type == 'radio'"
+                v-model:value="item.note1"
+                :options="item.options"
+              />
+              <a-input
+                v-else-if="item.type == 'AbilityType'"
+                v-model:value="item.note1"
+                :placeholder="'请输入' + item.name"
+                :disabled="true"
+              />
+              <a-input
+                v-else-if="item.type == 'ComponentType'"
+                v-model:value="item.note1"
+                :placeholder="'请输入' + item.name"
+                :disabled="true"
+              />
+              <a-textarea
+                v-else-if="item.type == 'textArea'"
+                v-model:value="item.note1"
+                :showCount="true"
+                :maxlength="200"
+                :placeholder="'请输入' + item.name"
+              />
+              <upload
+                v-else-if="item.type == 'image'"
+                type="图片"
+                btnName="上传图片"
+                :maxCount="1"
+                :data="item"
+                :list="props.imgList"
+                tip="支持图片类型，大小不超过100M"
+              ></upload>
+              <upload
+                v-else-if="item.type == 'file' && item.name !== '使用手册'"
+                type="文件"
+                btnName="上传附件"
+                :maxCount="1"
+                :data="item"
+                :list="props.fileList"
+                tip="支持文件类型，大小不超过100M"
+              ></upload>
+              <upload
+                v-else-if="item.name == '使用手册'"
+                type="文件"
+                btnName="上传附件"
+                :maxCount="1"
+                :data="item"
+                :busType="2"
+                :list="props.fileList2"
+                tip="支持文件类型，大小不超过100M"
+              ></upload>
+              <upload
+                v-else-if="item.type == 'package'"
+                type="压缩包"
+                btnName="上传安装包"
+                :maxCount="1"
+                :data="item"
+                :list="props.packageList"
+                tip="支持.zip类型"
+              ></upload>
+              <div
+                class="Technical-text"
+                v-else-if="item.type == 'richText'"
+                @click="showTextFunction()"
+              >
+                编辑富文本
+                <div
+                  v-if="showText"
+                  class="fuwenbenbianjiqi"
+                  style="position: absolute; z-index: 10000"
+                >
+                  <VueTemplateDemo :dataFrom="props.dataFrom"></VueTemplateDemo>
+                </div>
+              </div>
+              <upload
+                v-else-if="item.type == 'video'"
+                type="视频"
+                btnName="上传视频"
+                :maxCount="1"
+                :data="item"
+                :list="props.videoList"
+                tip="支持视频类型，大小不超过100M"
+              ></upload>
+              <!-- <a-button
               v-else-if="item.type == 'AssociatedApplication'"
               @click="sourceClick"
             >
               请选择来源应用
             </a-button> -->
-            <a-select
-              v-else-if="item.type == 'select' && item.name == '来源应用'"
-              style="width: 2.4rem"
-              v-model:value="item.note1"
-              show-search
-              placeholder="请输入关键字"
-              :options="item.options"
-              :filter-option="applicationsOption"
-              @focus="applicationsFocus"
-              @blur="applicationsBlur"
-              @change="applicationsChange"
-            ></a-select>
-            <a-button
-              v-else-if="item.type == 'AssociatedComponents'"
-              @click="componentsClick"
-            >
-              请选择关联组件
-            </a-button>
-            <a-select
-              v-else-if="item.type == 'select' && item.name == '使用方式'"
-              style="width: 2.4rem"
-              v-model:value="item.note1"
-              :placeholder="'请选择' + item.name"
-              @change="showTypeClick"
-            >
-              <a-select-option
-                v-for="(itemSelect, indexSelect) in item.options"
-                :key="indexSelect"
-                :value="itemSelect.dictLabel"
+              <a-select
+                v-else-if="item.type == 'select' && item.name == '来源应用'"
+                style="width: 2.4rem"
+                v-model:value="item.note1"
+                show-search
+                placeholder="请输入关键字"
+                :options="item.options"
+                :filter-option="applicationsOption"
+                @focus="applicationsFocus"
+                @blur="applicationsBlur"
+                @change="applicationsChange"
+              ></a-select>
+              <a-button
+                v-else-if="item.type == 'AssociatedComponents'"
+                @click="componentsClick"
               >
-                {{ itemSelect.dictLabel }}
-              </a-select-option>
-            </a-select>
-            <a-select
-              v-else-if="item.type == 'select' && item.name !== '归属部门'"
-              style="width: 2.4rem"
-              v-model:value="item.note1"
-              :placeholder="'请选择' + item.name"
-            >
-              <a-select-option
-                v-for="(itemSelect, indexSelect) in item.options"
-                :key="indexSelect"
-                :value="itemSelect.dictLabel"
+                请选择关联组件
+              </a-button>
+              <a-select
+                v-else-if="item.type == 'select' && item.name == '使用方式'"
+                style="width: 2.4rem"
+                v-model:value="item.note1"
+                :placeholder="'请选择' + item.name"
+                @change="showTypeClick"
               >
-                {{ itemSelect.dictLabel }}
-              </a-select-option>
-            </a-select>
-            <a-select
-              v-else-if="item.name === '归属部门'"
-              style="width: 2.4rem"
-              v-model:value="item.note1"
-              show-search
-              placeholder="请输入关键字"
-              :options="item.options"
-              :filter-option="filterOption"
-              @focus="handleFocus"
-              @blur="handleBlur"
-              @change="handleChange2"
-            ></a-select>
-            <div
-              v-else-if="item.type == 'checkBox'"
-              class="application-Area"
-              id="application-Area"
-              :key="showKey"
-            >
+                <a-select-option
+                  v-for="(itemSelect, indexSelect) in item.options"
+                  :key="indexSelect"
+                  :value="itemSelect.dictLabel"
+                >
+                  {{ itemSelect.dictLabel }}
+                </a-select-option>
+              </a-select>
+              <a-select
+                v-else-if="item.type == 'select' && item.name !== '归属部门'"
+                style="width: 2.4rem"
+                v-model:value="item.note1"
+                :placeholder="'请选择' + item.name"
+                @change="changeIiem(name, data.note1)"
+              >
+                <a-select-option
+                  v-for="(itemSelect, indexSelect) in item.options"
+                  :key="indexSelect"
+                  :value="itemSelect.dictLabel"
+                >
+                  {{ itemSelect.dictLabel }}
+                </a-select-option>
+              </a-select>
+              <a-select
+                v-else-if="item.name === '归属部门'"
+                style="width: 2.4rem"
+                v-model:value="item.note1"
+                show-search
+                placeholder="请输入关键字"
+                :options="item.options"
+                :filter-option="filterOption"
+                @focus="handleFocus"
+                @blur="handleBlur"
+                @change="changeIiem(name, data.note1)"
+              ></a-select>
               <div
-                v-for="(itemson, indexson) in item.options"
-                :key="indexson"
-                class="application-Area-son"
-                @click="ApplicationArea(item, itemson)"
-                :class="
-                  item.note2.indexOf(itemson.dictLabel) != -1
-                    ? 'application-Area-down'
-                    : ''
-                "
+                v-else-if="item.type == 'checkBox'"
+                class="application-Area"
+                id="application-Area"
+                :key="showKey"
               >
-                {{ itemson.dictLabel }}
+                <div
+                  v-for="(itemson, indexson) in item.options"
+                  :key="indexson"
+                  class="application-Area-son"
+                  @click="ApplicationArea(item, itemson)"
+                  :class="
+                    item.note2.indexOf(itemson.dictLabel) != -1
+                      ? 'application-Area-down'
+                      : ''
+                  "
+                >
+                  {{ itemson.dictLabel }}
+                </div>
               </div>
             </div>
+            <div
+              class="requiredTips"
+              v-show="
+                notFilled.indexOf(item.name) > -1 &&
+                (item.type == 'input' || item.type == 'textArea') &&
+                changeField.indexOf(item.name) == -1
+              "
+            >
+              请填写{{ item.name }}！
+            </div>
+            <div
+              class="requiredTips"
+              v-show="
+                notFilled.indexOf(item.name) > -1 &&
+                (item.type == 'select' ||
+                  item.type == 'checkBox' ||
+                  item.type == 'radio') &&
+                changeField.indexOf(item.name) == -1
+              "
+            >
+              请选择{{ item.name }}！
+            </div>
           </div>
           <!-- 来源应用 -->
           <div class="AssociatedApplication">
@@ -466,7 +498,6 @@
   import upload from '@/views/components/upload'
   import { message } from 'ant-design-vue'
   import { getUserInfo, getDeptAll } from '@/api/user'
-  import VueTemplateDemo from '@/views/personalCenter/VueTemplateDemo.vue'
   import {
     getCategoryTreePage,
     queryApplicationRelByResourceId,
@@ -477,6 +508,7 @@
   const router = useRouter()
   const abilityToType = router.currentRoute.value.query.abilityToType
   const componentTypeValue = router.currentRoute.value.query.componentTypeValue
+  const changeField = ref([])
   const props = defineProps({
     // 展示数据
     refData: { type: Object, default: null },
@@ -495,6 +527,8 @@
     externalField: { type: Array, default: null },
     // 多条的配置
     configure: { type: Array, default: null },
+    required: { type: Array, default: null },
+    notFilled: { type: Array, default: null },
     // [{
     //   name:'计费标准信息',
     //   list:[
@@ -551,6 +585,15 @@
   const radioChange = (e) => {
     numType.value = e.target.value
   }
+  const changeIiem = (name, value) => {
+    if (value && value !== '' && changeField.value.indexOf(name) == -1) {
+      changeField.value.push(name)
+    } else if (!value || value == '') {
+      if (changeField.value.indexOf(name) > -1) {
+        changeField.value.splice(changeField.value.indexOf(name), 1)
+      }
+    }
+  }
   props.refData.children.map((item) => {
     if (item.name == '基本信息') {
       item.children.map((val) => {
@@ -979,9 +1022,6 @@
       }
     })
   })
-  const handleChange2 = (value) => {
-    console.log(`selected ${value}`)
-  }
   const applicationsChange = (value) => {
     data.value.list.map((item) => {
       if (item.name === '来源应用') {
@@ -1275,4 +1315,31 @@
       cursor: pointer;
     }
   }
+  .item {
+    position: relative;
+    span:first-child {
+      width: unset;
+    }
+    .box {
+      display: flex;
+      align-items: center;
+      // margin: 15px 0;
+      & > div:nth-of-type(1) {
+        width: 105px;
+        display: flex;
+        align-items: center;
+      }
+      .required {
+        color: #f56c6c;
+        margin-right: 3px;
+      }
+    }
+    .requiredTips {
+      font-size: 14px;
+      color: #f56c6c;
+      position: absolute;
+      bottom: -20px;
+      left: 110px;
+    }
+  }
 </style>
diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue
index ae318480..36dfbb5c 100644
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue
@@ -287,7 +287,7 @@
       message.config({
         top: '100px', // 距离顶部的位置
       })
-      message.error('暂未上传使用手册')
+      message.error('暂未开放使用手册')
     }
   }
   function SDKClick() {
@@ -300,7 +300,7 @@
       message.config({
         top: '100px', // 距离顶部的位置
       })
-      message.error('SDK安装包')
+      message.error('暂未上传SDK安装包')
     }
   }
 </script>
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
index ae406496..59c5ffc3 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
@@ -204,7 +204,7 @@
       message.config({
         top: '100px', // 距离顶部的位置
       })
-      message.error('暂未上传接口文档')
+      message.error('暂未开放技术文档')
     }
   }
   function technicalNew() {
@@ -228,7 +228,7 @@
       message.config({
         top: '100px', // 距离顶部的位置
       })
-      message.error('暂未上传使用手册')
+      message.error('暂未开放新手指引')
     }
   }
 </script>

From 73ef6f5bdc527fa53d1d9602bd911af1d40c3d53 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 26 Jul 2022 10:17:47 +0800
Subject: [PATCH 04/27] =?UTF-8?q?BUG=20=E4=BF=AE=E6=94=B9=20=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E5=8F=91=E5=B8=83=E6=97=A0=E6=B3=95=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=20=20=E7=94=B3=E8=B4=AD=E8=BD=A6=20=E8=BF=87=E6=BB=A4=E5=B7=B2?=
 =?UTF-8?q?=E7=BB=8F=E4=B8=8B=E6=9E=B6=E7=9A=84=E8=83=BD=E5=8A=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/personalCenter/components/MyPublish.vue    |  2 +-
 .../personalCenter/components/PurchaseVehicle.vue    | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/front/src/views/personalCenter/components/MyPublish.vue b/front/src/views/personalCenter/components/MyPublish.vue
index f802d426..03508c97 100644
--- a/front/src/views/personalCenter/components/MyPublish.vue
+++ b/front/src/views/personalCenter/components/MyPublish.vue
@@ -484,7 +484,7 @@
     del()
   })
   onBeforeUnmount(() => {
-    mybus.off('tabsChange')
+    mybus.off('Cancellation')
     mybus.off('Determine')
   })
   const reason = ref('')
diff --git a/front/src/views/personalCenter/components/PurchaseVehicle.vue b/front/src/views/personalCenter/components/PurchaseVehicle.vue
index fc707d66..f557a4b3 100644
--- a/front/src/views/personalCenter/components/PurchaseVehicle.vue
+++ b/front/src/views/personalCenter/components/PurchaseVehicle.vue
@@ -821,9 +821,15 @@
     } else {
       let arr = []
       list.value.map((val) => {
-        val.arr = val.children.filter(
-          (item) => checkedListAbility.value.indexOf(item.id) > -1
-        )
+        val.arr = val.children.filter((item) => {
+          console.log('选择的数据=============>', item)
+          if (
+            checkedListAbility.value.indexOf(item.id) > -1 &&
+            item.delFlag != 0
+          ) {
+            return item
+          }
+        })
       })
       arr = list.value.filter((val) => val.arr.length !== 0)
       console.log('一键申请===================>', arr)

From 14d684bdfde5e7c35f4470c66f0363f3675b449d Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Tue, 26 Jul 2022 10:18:34 +0800
Subject: [PATCH 05/27] =?UTF-8?q?=E5=89=8D=E5=8F=B0=E5=BF=85=E5=A1=AB?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/capacityOnTheShelf/Application.vue  |  21 ++-
 .../components/PutOnTheShelf.vue              | 162 +++++++++++-------
 2 files changed, 114 insertions(+), 69 deletions(-)

diff --git a/front/src/views/capacityOnTheShelf/Application.vue b/front/src/views/capacityOnTheShelf/Application.vue
index 64b5abc6..a2de4f76 100644
--- a/front/src/views/capacityOnTheShelf/Application.vue
+++ b/front/src/views/capacityOnTheShelf/Application.vue
@@ -301,6 +301,9 @@
     if (!dataFrom.value.name) {
       notFilled.value.push('应用名称')
     }
+    if (!dataFrom.value.shareCondition) {
+      notFilled.value.push('共享条件')
+    }
     if (!dataFrom.value.description) {
       notFilled.value.push('应用描述')
     }
@@ -337,15 +340,15 @@
     ) {
       notFilled.value.push('应用类型')
     }
-    if (
-      !dataFrom.value.infoList.filter(
-        (val) => val.attrType === '共享条件'
-      )[0] ||
-      !dataFrom.value.infoList.filter((val) => val.attrType === '共享条件')[0]
-        .attrValue
-    ) {
-      notFilled.value.push('共享条件')
-    }
+    // if (
+    //   !dataFrom.value.infoList.filter(
+    //     (val) => val.attrType === '共享条件'
+    //   )[0] ||
+    //   !dataFrom.value.infoList.filter((val) => val.attrType === '共享条件')[0]
+    //     .attrValue
+    // ) {
+    //   notFilled.value.push('共享条件')
+    // }
     if (notFilled.value.length > 0) {
       message.warning('请填写必填字段')
       console.log(notFilled.value)
diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
index 2c5bf849..0e8cc563 100644
--- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
+++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
@@ -14,9 +14,8 @@
         <div></div>
       </div>
       <template v-if="title.isConfigure">
-        <a-form ref="formRef" :model="data" name="basic">
-          <div class="bottom">
-            <!-- <div class="items" v-if="data[title.name].length > 0">
+        <div class="bottom">
+          <!-- <div class="items" v-if="data[title.name].length > 0">
             <div
               class="item"
               v-for="(val, index) in data[title.name]"
@@ -44,75 +43,74 @@
               </div>
             </div>
           </div> -->
+          <div
+            v-for="(val, index) in data[title.name]"
+            :key="'key1' + val.name + index"
+          >
             <div
-              v-for="(val, index) in data[title.name]"
-              :key="'key1' + val.name + index"
+              style="
+                font-size: 0.18rem;
+                font-weight: 600;
+                display: flex;
+                justify-content: flex-start;
+              "
             >
-              <div
-                style="
-                  font-size: 0.18rem;
-                  font-weight: 600;
-                  display: flex;
-                  justify-content: flex-start;
-                "
+              <span>{{ title.name }}-{{ index + 1 }}</span>
+              <a-popconfirm
+                :title="'是否删除该条' + title.name + '?'"
+                ok-text="是"
+                cancel-text="否"
+                @confirm="del(title.name, index)"
               >
-                <span>{{ title.name }}-{{ index + 1 }}</span>
-                <a-popconfirm
-                  :title="'是否删除该条' + title.name + '?'"
-                  ok-text="是"
-                  cancel-text="否"
-                  @confirm="del(title.name, index)"
-                >
-                  <div class="del">
-                    <i class="delImg"></i>
-                    <div>删除</div>
-                  </div>
-                </a-popconfirm>
-              </div>
-              <div
-                class="form"
-                v-for="attr in props.configure.filter(
-                  (item, index2) => item.name === title.name
-                )[0].list"
-                :key="'key2' + attr.name + index2"
-              >
-                <span>{{ attr.name }}</span>
-
+                <div class="del">
+                  <i class="delImg"></i>
+                  <div>删除</div>
+                </div>
+              </a-popconfirm>
+            </div>
+            <div
+              class="form"
+              v-for="attr in props.configure.filter(
+                (item, index2) => item.name === title.name
+              )[0].list"
+              :key="'key2' + attr.name + index2"
+            >
+              <span>{{ attr.name }}</span>
+              <a-input
+                disabled
+                v-model:value="val[attr.field]"
+                :maxlength="24"
+                :placeholder="'请填写' + attr.name + ',不超过24个字符'"
+                v-if="attr.type == 'input'"
+              />
+              <template v-if="attr.type == 'input2'">
                 <a-input
                   disabled
                   v-model:value="val[attr.field]"
-                  :maxlength="24"
-                  :placeholder="'请填写' + attr.name + ',不超过24个字符'"
-                  v-if="attr.type == 'input'"
-                />
-                <template v-if="attr.type == 'input2'">
-                  <a-input
-                    disabled
-                    v-model:value="val[attr.field]"
-                    :placeholder="'请填写' + attr.name"
-                  />
-                </template>
-                <a-textarea
-                  disabled
-                  v-model:value="val[attr.field]"
-                  :showCount="true"
-                  :maxlength="200"
                   :placeholder="'请填写' + attr.name"
-                  v-else-if="attr.type == 'textArea'"
                 />
-                <!-- <a-radio-group
+              </template>
+              <a-textarea
+                disabled
+                v-model:value="val[attr.field]"
+                :showCount="true"
+                :maxlength="200"
+                :placeholder="'请填写' + attr.name"
+                v-else-if="attr.type == 'textArea'"
+              />
+              <!-- <a-radio-group
                 v-model:value="val[attr.field]"
                 :options="val.options"
                 @change="radioChange"
                 v-else-if="attr.type == 'radio'"
               /> -->
-                <div v-else-if="attr.type == 'radio'">
-                  {{ val[attr.field] + (attr.company || '') }}
-                </div>
-                <span v-else-if="attr.type === 'image'">
-                  <a-image :width="85" :height="60" :src="val.img" />
-                </span>
-                <!-- <upload
+              <div v-else-if="attr.type == 'radio'">
+                {{ val[attr.field] + (attr.company || '') }}
+              </div>
+              <span v-else-if="attr.type === 'image'">
+                <a-image :width="85" :height="60" :src="val.img" />
+              </span>
+              <!-- <upload
                 :key="showKey"
                 type="图片"
                 btnName="上传图片"
@@ -438,7 +436,51 @@
               请选择{{ item.name }}！
             </div>
           </div>
-        </a-form>
+          <!-- 来源应用 -->
+          <div class="AssociatedApplication">
+            <a-modal
+              v-model:visible="visibleAssociatedApplication"
+              :title="titleName"
+              @ok="handleOk"
+              @cancel="handleCancel"
+              style="width: 9.6rem"
+            >
+              <div>
+                <a-transfer
+                  v-model:target-keys="targetKeys"
+                  v-model:selected-keys="selectedKeys"
+                  :data-source="mockData"
+                  :titles="titles"
+                  :render="(item) => item.title"
+                  @change="handleChange"
+                  @selectChange="handleSelectChange"
+                />
+              </div>
+            </a-modal>
+          </div>
+          <!-- 关联组件 -->
+          <div class="AssociatedApplication">
+            <a-modal
+              v-model:visible="visibleAssociatedApplicationOther"
+              :title="titleName"
+              @ok="handleOk"
+              @cancel="handleCancel"
+              style="width: 960px"
+            >
+              <div>
+                <a-transfer
+                  v-model:target-keys="targetKeysOther"
+                  v-model:selected-keys="selectedKeysOther"
+                  :data-source="mockDataOther"
+                  :titles="titles"
+                  :render="(item) => item.title"
+                  @change="handleChangeOther"
+                  @selectChange="handleSelectChangeOther"
+                />
+              </div>
+            </a-modal>
+          </div>
+        </div>
       </template>
     </div>
   </div>

From 15a32365169861d67bcd8578fb6d1beec40ed4e7 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 26 Jul 2022 10:43:28 +0800
Subject: [PATCH 06/27] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9=20=20=E4=B8=8B?=
 =?UTF-8?q?=E6=9E=B6=E7=9A=84=E8=83=BD=E5=8A=9B=20=E4=B8=8D=E5=85=81?=
 =?UTF-8?q?=E8=AE=B8=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PurchaseVehicle.vue            | 58 +++++++++----------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/front/src/views/personalCenter/components/PurchaseVehicle.vue b/front/src/views/personalCenter/components/PurchaseVehicle.vue
index f557a4b3..6fd1634f 100644
--- a/front/src/views/personalCenter/components/PurchaseVehicle.vue
+++ b/front/src/views/personalCenter/components/PurchaseVehicle.vue
@@ -312,18 +312,18 @@
     // )
     let scArr = []
     if (checkedListAbility.value.length === 0) {
-      message.error('请选择需要收藏的数据')
+      message.warning('请选择需要收藏的数据')
     } else {
       list.value.forEach((val) => {
         if (val.children) {
           val.children.map((item) => {
-            if (item.resourceId == '8888888880000000001') {
-              message.warning('摄像头无法添加收藏！')
-            } else {
-              if (
-                checkedListAbility.value.indexOf(item.id) > -1 &&
-                item.delFlag == 0
-              ) {
+            if (
+              checkedListAbility.value.indexOf(item.id) > -1 &&
+              item.delFlag == 0
+            ) {
+              if (item.resourceId == '8888888880000000001') {
+                message.warning('摄像头无法添加收藏！')
+              } else {
                 scArr.push({ resourceId: item.resourceId })
               }
             }
@@ -338,7 +338,7 @@
           }
         })
       } else {
-        message.error('下架的数据无法收藏')
+        message.warning('下架的数据无法收藏')
       }
     }
   }
@@ -750,7 +750,7 @@
   // 删除按钮
   const delList = () => {
     if (checkedListAbility.value.length == 0) {
-      message.error('请先选择需要操作的数据！')
+      message.warning('请先选择需要操作的数据！')
     } else {
       sgcDel({
         ids: checkedListAbility.value,
@@ -807,36 +807,34 @@
   }
   // 一键申请
   const apply = () => {
-    // list.value.forEach((val) => {
-    //   if (checkedList.value.indexOf(val.deptId) !== -1) {
-    //     if (val.delFlag != 0) {
-    //       checkedList.value.splice(checkedList.value.indexOf(val.deptId), 1)
-    //       val.checked = false
-    //       message.error('已下架的能力无法申请！')
-    //     }
-    //   }
-    // })
     if (checkedListAbility.value.length == 0) {
-      message.error('请先选择需要申请的数据！')
+      message.warning('请先选择需要申请的数据！')
     } else {
       let arr = []
+      let delArr = []
       list.value.map((val) => {
         val.arr = val.children.filter((item) => {
           console.log('选择的数据=============>', item)
-          if (
-            checkedListAbility.value.indexOf(item.id) > -1 &&
-            item.delFlag != 0
-          ) {
-            return item
+          if (checkedListAbility.value.indexOf(item.id) > -1) {
+            if (item.delFlag == 0) {
+              return item
+            } else {
+              delArr.push(item)
+            }
           }
         })
       })
       arr = list.value.filter((val) => val.arr.length !== 0)
-      console.log('一键申请===================>', arr)
-      localStorage.setItem('applyList', JSON.stringify(arr))
-      router.push({
-        path: '/apply',
-      })
+      if (delArr.length > 0) {
+        message.warning('已经下架的能力无法申请！')
+      }
+      if (arr.length > 0) {
+        console.log('一键申请===================>', arr)
+        localStorage.setItem('applyList', JSON.stringify(arr))
+        router.push({
+          path: '/apply',
+        })
+      }
     }
   }
 </script>

From fe5b5e1102d610a08be62aeb7ac56d2b6bd633bf Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 26 Jul 2022 10:54:19 +0800
Subject: [PATCH 07/27] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9=20=20=20=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E8=BF=87=E9=95=BF=E5=AF=BC=E8=87=B4=E5=8F=B3=E8=BE=B9?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=B8=8D=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PurchaseVehicle.vue            | 44 +++++++++++++------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/front/src/views/personalCenter/components/PurchaseVehicle.vue b/front/src/views/personalCenter/components/PurchaseVehicle.vue
index 6fd1634f..2e2814df 100644
--- a/front/src/views/personalCenter/components/PurchaseVehicle.vue
+++ b/front/src/views/personalCenter/components/PurchaseVehicle.vue
@@ -108,20 +108,23 @@
                 >
                   <template #title>
                     <div>
-                      <span
-                        @click="
-                          showItem(
-                            item.resourceId,
-                            item.type,
-                            item.delFlag,
-                            item.note1
-                          )
-                        "
-                        style="cursor: pointer"
-                        class="name"
-                      >
-                        {{ item.resourceName }}
-                      </span>
+                      <a-tooltip>
+                        <template #title>{{ item.resourceName }}</template>
+                        <span
+                          @click="
+                            showItem(
+                              item.resourceId,
+                              item.type,
+                              item.delFlag,
+                              item.note1
+                            )
+                          "
+                          style="cursor: pointer"
+                          class="name"
+                        >
+                          {{ item.resourceName }}
+                        </span>
+                      </a-tooltip>
                       <span class="type">{{ item.type }}</span>
                     </div>
                     <span class="time">
@@ -973,6 +976,14 @@
       color: #0087ff;
     }
   }
+  .name {
+    max-width: 4.15rem;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+    word-break: break-all;
+  }
   .name:hover {
     color: #0087ff;
   }
@@ -1048,5 +1059,10 @@
   :deep(.ant-list-item-meta-title) {
     display: flex;
     justify-content: space-between;
+    align-items: center;
+    div {
+      display: flex;
+      align-items: center;
+    }
   }
 </style>

From 20e75d78cc6c27baa380de6ac61777569c335bb8 Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Tue, 26 Jul 2022 11:36:15 +0800
Subject: [PATCH 08/27] =?UTF-8?q?=E5=A1=AB=E5=86=99=E6=97=B6=E7=BA=A2?=
 =?UTF-8?q?=E5=AD=97=E6=8F=90=E7=A4=BA=E6=B6=88=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PutOnTheShelf.vue              | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
index 0e8cc563..bb8c58a2 100644
--- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
+++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
@@ -231,7 +231,7 @@
                 v-if="item.type == 'input' && item.name.indexOf('名称') == -1"
                 v-model:value="item.note1"
                 :placeholder="'请输入' + item.name"
-                @change="changeIiem(name, data.note1)"
+                @change="changeIiem(item.name, item.note1)"
               />
               <a-input
                 v-else-if="
@@ -240,7 +240,7 @@
                 :maxLength="50"
                 v-model:value="item.note1"
                 :placeholder="'请输入' + item.name + '，不超过50个字符'"
-                @change="changeIiem(name, data.note1)"
+                @change="changeIiem(item.name, item.note1)"
               />
               <a-radio-group
                 v-else-if="item.type == 'radio'"
@@ -265,6 +265,7 @@
                 :showCount="true"
                 :maxlength="200"
                 :placeholder="'请输入' + item.name"
+                @change="changeIiem(item.name, item.note1)"
               />
               <upload
                 v-else-if="item.type == 'image'"
@@ -370,7 +371,7 @@
                 style="width: 2.4rem"
                 v-model:value="item.note1"
                 :placeholder="'请选择' + item.name"
-                @change="changeIiem(name, data.note1)"
+                @change="changeIiem(item.name, item.note1)"
               >
                 <a-select-option
                   v-for="(itemSelect, indexSelect) in item.options"
@@ -390,7 +391,7 @@
                 :filter-option="filterOption"
                 @focus="handleFocus"
                 @blur="handleBlur"
-                @change="changeIiem(name, data.note1)"
+                @change="changeIiem(item.name, item.note1)"
               ></a-select>
               <div
                 v-else-if="item.type == 'checkBox'"
@@ -825,13 +826,26 @@
     })
   }
   const ApplicationArea = (item, itemson) => {
-    console.log('点击=========》', item, itemson)
+    // console.log('点击=========》', item, itemson)
     // console.log(item, itemson)
     if (item.note2.indexOf(itemson.dictLabel) === -1) {
       item.note2.push(itemson.dictLabel)
     } else {
       item.note2.splice(item.note2.indexOf(itemson.dictLabel), 1)
     }
+    // 多选判断是否为空
+    if (
+      item.note2.length !== 0 &&
+      changeField.value.indexOf('应用领域') == -1
+    ) {
+      changeField.value.push('应用领域')
+      console.log('点击=========》1', changeField.value, item.note2)
+    } else if (item.note2.length == 0) {
+      if (changeField.value.indexOf('应用领域') > -1) {
+        changeField.value.splice(changeField.value.indexOf('应用领域'), 1)
+        console.log('点击=========》2', changeField.value, item.note2)
+      }
+    }
     mybus.emit('chageDataFrom', {
       attrType: item.name,
       attrValue: item.note2.join(';'),

From 486c3e8d4611f18d1754b77c156d53ac16fb1f20 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 26 Jul 2022 14:05:58 +0800
Subject: [PATCH 09/27] =?UTF-8?q?websocket=20=E9=92=A9=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/App.vue | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/front/src/App.vue b/front/src/App.vue
index 245c68e0..0dce7f04 100644
--- a/front/src/App.vue
+++ b/front/src/App.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-05-06 11:12:00
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-21 17:09:10
+ * @LastEditTime: 2022-07-26 11:27:50
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -31,19 +31,28 @@
   const locale = zhCN
   const token = Cookies.get('ucsToken')
   console.log('token=================>', token)
-  var ws = new WebSocket(
+  let ws = new WebSocket(
     `ws://${window.SITE_CONFIG['websocketURL']}/websocket?token=${token}`
   )
   // ws.send()给服务器发送信息
   // 服务器每次返回信息都会执行一次onmessage方法
   ws.onmessage = function (e) {
-    console.log('服务器返回的信息: ' + e.data)
+    console.log('WebSocket服务器返回的信息: ' + e.data)
     mybus.emit('getMynotice')
     // 判断当前路由是否是消息中心
     if (router.currentRoute.value.name === 'mynoticeView') {
       mybus.emit('noticeListInit')
     }
   }
+  ws.onerror = function (e) {
+    console.log('WebSocket连接异常============================>', e)
+    ws = new WebSocket(
+      `ws://${window.SITE_CONFIG['websocketURL']}/websocket?token=${token}`
+    )
+  }
+  ws.onclose = function (e) {
+    console.log('WebSocket连接断开============================>', e)
+  }
   onBeforeUnmount(() => {
     // 4.卸载前, 关闭链接
     ws.close()

From 5f8d0059352a10f07ae836e7af305214805131cd Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 26 Jul 2022 14:38:09 +0800
Subject: [PATCH 10/27] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A2=84=E8=A7=88=20?=
 =?UTF-8?q?=E6=97=B6=E9=BB=98=E8=AE=A4=E4=BF=9D=E5=AD=98=20=20=E5=B8=B8?=
 =?UTF-8?q?=E8=A7=81=E9=97=AE=E9=A2=98=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/capacityOnTheShelf/Algorithm.vue    | 21 +++++++++++++++++--
 .../views/capacityOnTheShelf/Application.vue  | 20 ++++++++++++++++--
 .../capacityOnTheShelf/BusinessComponent.vue  | 19 +++++++++++++++--
 .../DevelopmentComponents.vue                 | 19 +++++++++++++++--
 .../capacityOnTheShelf/LayerServices.vue      | 20 ++++++++++++++++--
 .../components/PutOnTheShelf.vue              |  6 +++++-
 6 files changed, 94 insertions(+), 11 deletions(-)

diff --git a/front/src/views/capacityOnTheShelf/Algorithm.vue b/front/src/views/capacityOnTheShelf/Algorithm.vue
index df8d2d41..b0b418cd 100644
--- a/front/src/views/capacityOnTheShelf/Algorithm.vue
+++ b/front/src/views/capacityOnTheShelf/Algorithm.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-13 10:22:27
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-19 20:04:47
+ * @LastEditTime: 2022-07-26 14:35:45
  * @Description: 算法上架
 -->
 <template>
@@ -74,6 +74,7 @@
         :configure="bs"
         @submit="submit()"
         @back="back()"
+        @preview="preview()"
         :required="required"
         :notFilled="notFilled"
       ></put-on-the-shelf>
@@ -161,7 +162,23 @@
       <button v-else-if="showView !== '基本信息'" @click="back()">
         上一步
       </button>
-      <button v-show="showView === '部署与使用'" @click="preview()">
+      <a-popconfirm
+        v-if="
+          showView === '部署与使用' &&
+          (bs[0].list.filter(
+            (val) => val.note1 !== '' && val.name !== '计费方式'
+          ).length > 0 ||
+            bs[1].list.filter((val) => val.note1 !== '').length > 0)
+        "
+        title="如果计费标准信息或常见问题未填写完整将会被丢弃，是否进行预览?"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="changeBs('预览')"
+        @cancel="cancel"
+      >
+        <button>预览</button>
+      </a-popconfirm>
+      <button v-else-if="showView === '部署与使用'" @click="preview()">
         预览
       </button>
       <a-popconfirm
diff --git a/front/src/views/capacityOnTheShelf/Application.vue b/front/src/views/capacityOnTheShelf/Application.vue
index a2de4f76..eba834bd 100644
--- a/front/src/views/capacityOnTheShelf/Application.vue
+++ b/front/src/views/capacityOnTheShelf/Application.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-13 10:22:27
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-25 17:30:32
+ * @LastEditTime: 2022-07-26 14:35:22
  * @Description: 应用上架
 -->
 <template>
@@ -59,6 +59,7 @@
         :configure="glzj"
         @next="next()"
         @back="back()"
+        @preview="preview()"
         :required="required"
         :notFilled="notFilled"
       ></put-on-the-shelf>
@@ -127,7 +128,22 @@
       >
         上一步
       </button>
-      <button v-show="showView === '部署与应用'" @click="preview()">
+      <a-popconfirm
+        v-if="
+          showView === '部署与应用' &&
+          bs[0].list.filter(
+            (val) => val.note1 !== '' && val.name !== '常见问题'
+          ).length > 0
+        "
+        title="如果常见问题未填写完整将会被丢弃，是否进行预览?"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="changeBs('预览')"
+        @cancel="cancel"
+      >
+        <button>预览</button>
+      </a-popconfirm>
+      <button v-else-if="showView === '部署与应用'" @click="preview()">
         预览
       </button>
       <button v-show="showView === '基本信息'" @click="next()">下一步</button>
diff --git a/front/src/views/capacityOnTheShelf/BusinessComponent.vue b/front/src/views/capacityOnTheShelf/BusinessComponent.vue
index 0b3df2fe..4ac1e145 100644
--- a/front/src/views/capacityOnTheShelf/BusinessComponent.vue
+++ b/front/src/views/capacityOnTheShelf/BusinessComponent.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-20 09:35:51
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-15 17:39:35
+ * @LastEditTime: 2022-07-26 14:36:31
  * @Description: 业务组件
 -->
 <template>
@@ -73,6 +73,7 @@
         :configure="bs"
         @submit="submit()"
         @back="back()"
+        @preview="preview()"
         :required="required"
         :notFilled="notFilled"
       ></put-on-the-shelf>
@@ -132,7 +133,21 @@
       <button v-else-if="showView !== '基本信息'" @click="back()">
         上一步
       </button>
-      <button v-show="showView === '部署与使用'" @click="preview()">
+      <a-popconfirm
+        v-if="
+          showView === '部署与使用' &&
+          (bs[0].list.filter((val) => val.note1 !== '').length > 0 ||
+            bs[1].list.filter((val) => val.note1 !== '').length > 0)
+        "
+        title="如果常见问题未填写完整将会被丢弃，是否进行预览?"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="changeBs('预览')"
+        @cancel="cancel"
+      >
+        <button>预览</button>
+      </a-popconfirm>
+      <button v-else-if="showView === '部署与使用'" @click="preview()">
         预览
       </button>
       <a-popconfirm
diff --git a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue
index 5bae9427..1572dc75 100644
--- a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue
+++ b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-20 09:35:17
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-15 17:39:42
+ * @LastEditTime: 2022-07-26 14:37:17
  * @Description: 开发组件
 -->
 <template>
@@ -72,6 +72,7 @@
         :configure="bs"
         @submit="submit()"
         @back="back()"
+        @preview="preview()"
         :required="required"
         :notFilled="notFilled"
       ></put-on-the-shelf>
@@ -131,7 +132,21 @@
       <button v-else-if="showView !== '基本信息'" @click="back()">
         上一步
       </button>
-      <button v-show="showView === '部署与使用'" @click="preview()">
+      <a-popconfirm
+        v-if="
+          showView === '部署与使用' &&
+          (bs[0].list.filter((val) => val.note1 !== '').length > 0 ||
+            bs[1].list.filter((val) => val.note1 !== '').length > 0)
+        "
+        title="如果常见问题未填写完整将会被丢弃，是否进行预览?"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="changeBs('预览')"
+        @cancel="cancel"
+      >
+        <button>预览</button>
+      </a-popconfirm>
+      <button v-else-if="showView === '部署与使用'" @click="preview()">
         预览
       </button>
       <a-popconfirm
diff --git a/front/src/views/capacityOnTheShelf/LayerServices.vue b/front/src/views/capacityOnTheShelf/LayerServices.vue
index f364398e..0038a0e0 100644
--- a/front/src/views/capacityOnTheShelf/LayerServices.vue
+++ b/front/src/views/capacityOnTheShelf/LayerServices.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-20 09:35:17
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-15 17:39:47
+ * @LastEditTime: 2022-07-26 14:37:38
  * @Description: 图层服务
 -->
 <template>
@@ -69,6 +69,7 @@
         :configure="bs"
         @submit="submit()"
         @back="back()"
+        @preview="preview()"
         :required="required"
         :notFilled="notFilled"
       ></put-on-the-shelf>
@@ -103,7 +104,22 @@
       <button v-else-if="showView !== '基本信息'" @click="back()">
         上一步
       </button>
-      <button v-show="showView === '部署与使用'" @click="preview()">
+      <a-popconfirm
+        v-if="
+          showView === '部署与使用' &&
+          bs[0].list.filter(
+            (val) => val.note1 !== '' && val.name !== '计费方式'
+          ).length > 0
+        "
+        title="如果常见问题未填写完整将会被丢弃，是否进行预览?"
+        ok-text="是"
+        cancel-text="否"
+        @confirm="changeBs('预览')"
+        @cancel="cancel"
+      >
+        <button>预览</button>
+      </a-popconfirm>
+      <button v-else-if="showView === '部署与使用'" @click="preview()">
         预览
       </button>
       <a-popconfirm
diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
index bb8c58a2..d72a1111 100644
--- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
+++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-17 14:11:08
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-19 18:51:52
+ * @LastEditTime: 2022-07-26 14:33:42
  * @Description: 上架
 -->
 <template>
@@ -797,6 +797,8 @@
           emit('next')
         } else if (type == '提交') {
           emit('submit')
+        } else if (type == '预览') {
+          emit('preview')
         }
       }
     } else {
@@ -813,6 +815,8 @@
           emit('next')
         } else if (type == '提交') {
           emit('submit')
+        } else if (type == '预览') {
+          emit('preview')
         }
       }
     }

From c09aa9c1b98d3cfdb4f4ce79c4d64747d5d31be7 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 26 Jul 2022 14:42:17 +0800
Subject: [PATCH 11/27] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/capacityOnTheShelf/Application.vue            | 4 ++--
 .../src/views/capacityOnTheShelf/components/PutOnTheShelf.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/front/src/views/capacityOnTheShelf/Application.vue b/front/src/views/capacityOnTheShelf/Application.vue
index eba834bd..16812205 100644
--- a/front/src/views/capacityOnTheShelf/Application.vue
+++ b/front/src/views/capacityOnTheShelf/Application.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-13 10:22:27
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-26 14:35:22
+ * @LastEditTime: 2022-07-26 14:41:26
  * @Description: 应用上架
 -->
 <template>
@@ -59,7 +59,6 @@
         :configure="glzj"
         @next="next()"
         @back="back()"
-        @preview="preview()"
         :required="required"
         :notFilled="notFilled"
       ></put-on-the-shelf>
@@ -72,6 +71,7 @@
         :configure="bs"
         @submit="submit()"
         @back="back()"
+        @preview="preview()"
         :required="required"
         :notFilled="notFilled"
       ></put-on-the-shelf>
diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
index d72a1111..db0e0d35 100644
--- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
+++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-17 14:11:08
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-26 14:33:42
+ * @LastEditTime: 2022-07-26 14:39:16
  * @Description: 上架
 -->
 <template>
@@ -573,7 +573,7 @@
     //   ]
     // }]
   })
-  const emit = defineEmits(['next', 'back', 'submit'])
+  const emit = defineEmits(['next', 'back', 'submit', 'preview'])
   // console.log('props==========>', props)
   const changeAdd = () => {
     console.log('子组件方法触发~')

From 7ed6be40d7d8a40bbff965a585952e5a3f6d5c5e Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 26 Jul 2022 14:48:02 +0800
Subject: [PATCH 12/27] =?UTF-8?q?=E6=94=B9=E5=90=8D=20=20=E6=8A=80?=
 =?UTF-8?q?=E6=9C=AF=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/public/static/config/location.js        |  4 ++--
 front/src/router/index.js                     |  4 ++--
 front/src/views/home/components/header.vue    | 12 ++++++------
 front/src/views/newHome/components/Header.vue |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js
index d66ea6b5..6dc6207d 100644
--- a/front/public/static/config/location.js
+++ b/front/public/static/config/location.js
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-18 15:07:32
+ * @LastEditTime: 2022-07-26 14:46:43
  * @Description: 数据资源参数配置
  */
 const newLocation = 'qingdao'
@@ -31,7 +31,7 @@ if (newLocation === 'qingdao') {
     { name: '能力云图', key: 'capabilityCloud' },
     { name: '能力统计', key: 'abilityStatistics' },
     // { name: '开发指南', key: 'developmentGuide' },
-    { name: '指导手册', key: 'instructionManual' },
+    { name: '技术文档', key: 'instructionManual' },
     { name: '需求中心', key: 'demandCenter' },
     // { name: '个人中心', key: 'personalCenter' },
     { name: '区市站点', key: 'mapTest' },
diff --git a/front/src/router/index.js b/front/src/router/index.js
index b8702453..8a34d071 100644
--- a/front/src/router/index.js
+++ b/front/src/router/index.js
@@ -440,7 +440,7 @@ export const constantRoutes = [
     name: 'developmentGuide',
     component: () => import('@/views/developmentGuide/index'),
     meta: {
-      title: '开发指南',
+      title: '技术文档',
       icon: 'error-warning-line',
     },
   },
@@ -467,7 +467,7 @@ export const constantRoutes = [
     name: 'instructionManual',
     component: () => import('@/views/instructionManual/index'),
     meta: {
-      title: '指导手册',
+      title: '技术文档',
       icon: 'error-warning-line',
     },
   },
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index 36fd4337..54594087 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -201,12 +201,12 @@
           path: '/capabilityCloud',
         })
         break
-      case '开发指南':
-        router.push({
-          path: '/developmentGuide',
-        })
-        break
-      case '指导手册':
+      // case '技术文档':
+      //   router.push({
+      //     path: '/developmentGuide',
+      //   })
+      //   break
+      case '技术文档':
         router.push({
           path: '/instructionManual',
         })
diff --git a/front/src/views/newHome/components/Header.vue b/front/src/views/newHome/components/Header.vue
index 10826d5b..2bad4823 100644
--- a/front/src/views/newHome/components/Header.vue
+++ b/front/src/views/newHome/components/Header.vue
@@ -38,7 +38,7 @@
     { name: '共享门户', key: 'home' },
     { name: '能力集市', key: 'DetailsPageconetent' },
     { name: '能力统计', key: 'abilityStatistics' },
-    { name: '开发指南', key: 'developmentGuide' },
+    { name: '技术文档', key: 'developmentGuide' },
     { name: '需求中心', key: 'demandCenter' },
     { name: '个人中心', key: 'personalCenter' },
     { name: '后台管理', key: 'houtaiguanli' },
@@ -85,7 +85,7 @@
           },
         })
         break
-      case '开发指南':
+      case '技术文档':
         router.push({
           path: '/developmentGuide',
         })

From b4e6f56c4786d1242dfd221fc4ab79a43a079067 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Tue, 26 Jul 2022 15:16:28 +0800
Subject: [PATCH 13/27] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A5=BF=E6=B5=B7?=
 =?UTF-8?q?=E5=B2=B8=E5=9C=B0=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/public/index.html                       |  25 +--
 .../public/leaflet/leaflet-tilelayer-wmts.js  |  80 +++++++
 front/public/static/config/location.js        |   8 +-
 front/public/static/config/mapConfig.js       | 199 ++++++++++--------
 front/src/supermap/map-init.js                |  80 ++++---
 front/src/views/home/infrastructurePage.vue   |   2 +-
 .../views/home/videoSurveillance/index.vue    |   2 +-
 7 files changed, 262 insertions(+), 134 deletions(-)
 create mode 100644 front/public/leaflet/leaflet-tilelayer-wmts.js

diff --git a/front/public/index.html b/front/public/index.html
index 624b3039..81d09b86 100644
--- a/front/public/index.html
+++ b/front/public/index.html
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.wuhongjian
  * @Date: 2022-03-29 16:45:25
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-22 18:42:44
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-25 17:15:08
  * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@@ -48,16 +48,16 @@
     // window.SITE_CONFIG['websocketURL'] = '15.2.21.243:8888/renren-admin';
     // window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
     // 西海岸版本
-    // window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797';
-    // window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/';
-    // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
-    // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
+    window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797';
+    window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/';
+    window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
+    window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
     // 开发
-    window.SITE_CONFIG['backUrl'] = 'http://localhost:8001';
-    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.236:9796/';
-    window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.236:9796/document/#/devModelFile/';
-    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin';
-    window.SITE_CONFIG['websocketURL'] = '15.2.21.236:8888/renren-admin';
+    // window.SITE_CONFIG['backUrl'] = 'http://localhost:8001';
+    // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.236:9796/';
+    // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.236:9796/document/#/devModelFile/';
+    // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin';
+    // window.SITE_CONFIG['websocketURL'] = '15.2.21.236:8888/renren-admin';
     window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
     // window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
     // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
@@ -107,7 +107,8 @@
   <script type="text/javascript" src="./leaflet/MarkerClusterer_min.js"></script>
   <!-- 热力图 -->
   <script type="text/javascript" src="./leaflet/leaflet-heat.js"></script>
-
+  <!-- 加载WMTS服务 -->
+  <script type="text/javascript" src="./leaflet/leaflet-tilelayer-wmts.js"></script>
   <!-- 大华平台相关包 -->
   <script type="text/javascript" src="./static/js/encrypt.js"></script>
   <script type="text/javascript" src="./static/js/DHWs.js"></script>
diff --git a/front/public/leaflet/leaflet-tilelayer-wmts.js b/front/public/leaflet/leaflet-tilelayer-wmts.js
new file mode 100644
index 00000000..c9372723
--- /dev/null
+++ b/front/public/leaflet/leaflet-tilelayer-wmts.js
@@ -0,0 +1,80 @@
+/*
+ * @Author: hisense.wuhongjian
+ * @Date: 2022-07-25 17:13:49
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-26 10:23:40
+ * @Description: 告诉大家这是什么
+ */
+;(L.TileLayer.WMTS = L.TileLayer.extend({
+  defaultWmtsParams: {
+    service: 'WMTS',
+    request: 'GetTile',
+    version: '1.0.0',
+    layer: '',
+    style: '',
+    tilematrixset: '',
+    format: 'image/jpeg',
+  },
+  initialize: function (a, b) {
+    this._url = a
+    var c = {},
+      d = Object.keys(b)
+    d.forEach((a) => {
+      c[a.toLowerCase()] = b[a]
+    })
+    var e = L.extend({}, this.defaultWmtsParams),
+      f = c.tileSize || this.options.tileSize
+    for (var g in ((e.width =
+      c.detectRetina && L.Browser.retina ? (e.height = 2 * f) : (e.height = f)),
+    c))
+      e.hasOwnProperty(g) && 'matrixIds' != g && (e[g] = c[g])
+    ;(this.wmtsParams = e),
+      (this.matrixIds = b.matrixIds || this.getDefaultMatrix()),
+      L.setOptions(this, b)
+  },
+  onAdd: function (a) {
+    ;(this._crs = this.options.crs || a.options.crs),
+      L.TileLayer.prototype.onAdd.call(this, a)
+  },
+  getTileUrl: function (a) {
+    var b = this.options.tileSize,
+      c = a.multiplyBy(b)
+    ;(c.x += 1), (c.y -= 1)
+    var d = c.add(new L.Point(b, b)),
+      e = this._tileZoom,
+      f = this._crs.project(this._map.unproject(c, e)),
+      g = this._crs.project(this._map.unproject(d, e))
+    tilewidth = g.x - f.x
+    var h = this.matrixIds[e].identifier,
+      i = h,
+      j = this.matrixIds[e].topLeftCorner.lng,
+      k = this.matrixIds[e].topLeftCorner.lat,
+      l = Math.floor((f.x - j) / tilewidth),
+      m = -Math.floor((f.y - k) / tilewidth),
+      n = L.Util.template(this._url, { s: this._getSubdomain(a) })
+    return (
+      n +
+      L.Util.getParamString(this.wmtsParams, n) +
+      '&tilematrix=' +
+      i +
+      '&tilerow=' +
+      m +
+      '&tilecol=' +
+      l
+    )
+  },
+  setParams: function (a, b) {
+    return L.extend(this.wmtsParams, a), b || this.redraw(), this
+  },
+  getDefaultMatrix: function () {
+    for (var a = Array(22), b = 0; 22 > b; b++)
+      a[b] = {
+        identifier: '' + b,
+        topLeftCorner: new L.LatLng(20037508.3428, -20037508.3428),
+      }
+    return a
+  },
+})),
+  (L.tileLayer.wmts = function (a, b) {
+    return new L.TileLayer.WMTS(a, b)
+  })
diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js
index d66ea6b5..3f637cab 100644
--- a/front/public/static/config/location.js
+++ b/front/public/static/config/location.js
@@ -1,13 +1,13 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-18 15:07:32
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-26 09:51:32
  * @Description: 数据资源参数配置
  */
-const newLocation = 'qingdao'
+//const newLocation = 'qingdao'
 // const newLocation = 'baotou'
-// const newLocation = 'xihaian'
+const newLocation = 'xihaian'
 
 // 数据资源数据
 const whoShow = {}
diff --git a/front/public/static/config/mapConfig.js b/front/public/static/config/mapConfig.js
index b627ff6a..4f8dcf5b 100644
--- a/front/public/static/config/mapConfig.js
+++ b/front/public/static/config/mapConfig.js
@@ -2,78 +2,31 @@
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2021-12-07 13:33:55
+ * @LastEditTime: 2022-07-26 14:34:24
  * @Description: 地图静态参数配置
  */
-var _mapConfig = {};
+var _mapConfig = {}
 
-(function () {
-  var L = window.L || {};
+;(function () {
+  var L = window.L || {}
 
   // // 定义底图初始化化参数
   //  请在此处更改你的配置**********************************************
-  var CONFIGKEY = 'qingdao_highgo';
+  var CONFIGKEY = 'qingdao'
   // var CONFIGKEY = 'dev';
   // 请在上面更改你的配置***********************************************
   var BASECONFIGITEM = {
-    'qingdao': {
-      DATABASE_TYPE: 'Highgo',
-      POI_TYPE: 'Supermap', // POI接口类型 'Supermap'、'Amap'、'Survey_Institute'
-      ISERVER_URL: '15.2.21.238:8090',
-      WORKPLACE_NAME: 'weifang',
-      MAP_NAME: 'weifang',
-      DATASOURCE_NAME: 'himap_wf',
-      ATMOSPHERE_URL: 'http://15.2.21.151:9015/service-main',
-      BDMAP_CONFIG: {
-        location: 'qingdao',
-        _initpos: {
-          point: [120.392795, 36.072854],
-          zoom: 11
-        },
-        _keyframes: [
-          [119.165174, 36.718389],
-          [119.186697, 36.723567],
-          [119.16803, 36.713863]
-        ]
-      },
+    qingdao: {
+      base: 'xihaian',
       CURRENT_MAP_OPTIONS: {
-        center: [36.076209, 120.349632],
-        maxZoom: 17,
-        minZoom: 7,
-        zoom: 12,
+        // crs: CRS_4490,
+        center: [36.17, 120.13],
+        maxZoom: 18,
+        minZoom: 0,
+        zoom: 10,
       },
-      TILEDTYPE: 'H_zxy', // 底图服务类型  超图瓦片'Sci' 超图ZXY瓦片'S_zxy' 自有ZXY瓦片 'H_zxy'
-      TILEDCONFIG: {
-        digitalMap: {
-          tiledUrl: 'http://15.2.21.238:9889/{z}/{x}/{y}.png',
-          tiledName: '电子地图',
-          tiledIconURI: '',
-          options: {
-            center: [36.71, 119.16205],
-            zoom: 11,
-            minZoom:10,
-            maxZoom: 15
-          }
-        },
-        satelliteMap: {
-          tiledUrl: 'http://15.2.21.238:9888/{z}/{x}/{y}.png',
-          tiledName: '卫星地图',
-          tiledIconURI: '',
-          options: {
-            center: [36.71, 119.19],
-            zoom: 13,
-            minZoom: 5,
-            maxZoom: 15
-          }
-        }
-      },
-      MAPTYPE: 'digitalMap', // 默认地图类型 电子地图
-      TILEDMODE: 'bd', // 瓦片类型 百度
-      TITLE_LAYER: { mapUrl: 'http://10.16.3.2:8090/iserver/services/map-ShanDong/rest/maps/shandong', type: 'tiled', name: '矢量', icon: 'vector_map.png' },
-      TITLE_LAYER_REMOTE: { mapUrl: 'http://10.16.3.2:8090/iserver/services/map-ShanDong/rest/maps/shandong', type: 'remote', name: '影像', icon: 'satellite_map.png' },
-      TITLE_LAYER_DARK: { mapUrl: 'http://10.16.3.2:8090/iserver/services/map-ShanDong/rest/maps/shandong', type: 'dark', name: '其他', icon: 'other_map.png' },
     },
-    'qingdao_highgo': {
+    qingdao_highgo: {
       DATABASE_TYPE: 'Highgo',
       POI_TYPE: 'Supermap', // POI接口类型 'Supermap'、'Amap'、'Survey_Institute'
       ISERVER_URL: '15.2.21.238:8090',
@@ -92,23 +45,41 @@ var _mapConfig = {};
         location: 'qingdao',
         _initpos: {
           point: [120.392795, 36.072854],
-          zoom: 2
+          zoom: 2,
         },
         _keyframes: [
           [121.6011191295479, 36.73422934263509],
           [119.83371870221472, 36.082854],
-          [120.25937000453506, 36.34563716789656]
-        ]
+          [120.25937000453506, 36.34563716789656],
+        ],
       },
       MAP_VENDOR: 'Supermap', // 地图厂商 Supermap bdmap 3dbdmap
-      TITLE_LAYER: { mapUrl: 'http://15.72.177.174:8195/portalproxy/TileServer/arcgis/rest/services/normal2021/MapServer?key=iOgQotfgfyLvhj6WgfDTpq7F', type: 'tiled', name: '矢量', icon: 'vector_map.png' },
-      TITLE_LAYER_REMOTE: { mapUrl: 'http://q3d.qd.gov.cn:8195/portalproxy/vw6bffpy/TileServer/arcgis/rest/services/normal_2021_4490Arcgis/MapServer?key=iOgQotfgfyLvhj6WgfDTpq7F', type: 'tiled', name: '矢量', icon: 'vector_map.png' },
+      TITLE_LAYER: {
+        mapUrl:
+          'http://15.72.177.174:8195/portalproxy/TileServer/arcgis/rest/services/normal2021/MapServer?key=iOgQotfgfyLvhj6WgfDTpq7F',
+        type: 'tiled',
+        name: '矢量',
+        icon: 'vector_map.png',
+      },
+      TITLE_LAYER_REMOTE: {
+        mapUrl:
+          'http://q3d.qd.gov.cn:8195/portalproxy/vw6bffpy/TileServer/arcgis/rest/services/normal_2021_4490Arcgis/MapServer?key=iOgQotfgfyLvhj6WgfDTpq7F',
+        type: 'tiled',
+        name: '矢量',
+        icon: 'vector_map.png',
+      },
       // TITLE_LAYER_REMOTE: { mapUrl: 'http://15.72.177.174:8195/portalproxy/TileServer/arcgis/rest/services/normal2021/MapServer?key=iOgQotfgfyLvhj6WgfDTpq7F', type: 'tiled', name: '矢量', icon: 'vector_map.png' },
       // TITLE_LAYER_REMOTE: { mapUrl: 'http://15.2.21.238:8090/iserver/services/map-ugcv5-QingdaoRemoteImageMap/rest/maps/QingdaoRemoteImageMap', type: 'remote', name: '影像', icon: 'satellite_map.png' },
-      TITLE_LAYER_DARK: { mapUrl: 'http://15.2.21.238:8090/iserver/services/map-ugcv5-shandong/rest/maps/shandong', type: 'dark', name: '其他', icon: 'other_map.png' },
+      TITLE_LAYER_DARK: {
+        mapUrl:
+          'http://15.2.21.238:8090/iserver/services/map-ugcv5-shandong/rest/maps/shandong',
+        type: 'dark',
+        name: '其他',
+        icon: 'other_map.png',
+      },
     },
     //测试环境地图
-    'dev': {
+    dev: {
       DATABASE_TYPE: 'Highgo',
       POI_TYPE: 'Supermap', // POI接口类型 'Supermap'、'Amap'、'Survey_Institute'
       ISERVER_URL: '15.2.21.238:8090',
@@ -127,38 +98,94 @@ var _mapConfig = {};
         location: 'qingdao',
         _initpos: {
           point: [120.392795, 36.072854],
-          zoom: 2
+          zoom: 2,
         },
         _keyframes: [
           [121.6011191295479, 36.73422934263509],
           [119.83371870221472, 36.082854],
-          [120.25937000453506, 36.34563716789656]
-        ]
+          [120.25937000453506, 36.34563716789656],
+        ],
       },
       MAP_VENDOR: 'Supermap', // 地图厂商 Supermap bdmap 3dbdmap
-      TITLE_LAYER: { mapUrl: 'http://15.72.177.174:8195/portalproxy/TileServer/arcgis/rest/services/normal2021/MapServer?key=iOgQotfgfyLvhj6WgfDTpq7F', type: 'tiled', name: '矢量', icon: 'vector_map.png' },
-      TITLE_LAYER_REMOTE: { mapUrl: 'http://q3d.qd.gov.cn:8195/portalproxy/s9arfiqe/TileServer/arcgis/rest/services/normal2021_test/MapServer?key=p9PW1ipy9P3QHILzmsNOk8Gc', type: 'tiled', name: '矢量', icon: 'vector_map.png' },
+      TITLE_LAYER: {
+        mapUrl:
+          'http://15.72.177.174:8195/portalproxy/TileServer/arcgis/rest/services/normal2021/MapServer?key=iOgQotfgfyLvhj6WgfDTpq7F',
+        type: 'tiled',
+        name: '矢量',
+        icon: 'vector_map.png',
+      },
+      TITLE_LAYER_REMOTE: {
+        mapUrl:
+          'http://q3d.qd.gov.cn:8195/portalproxy/s9arfiqe/TileServer/arcgis/rest/services/normal2021_test/MapServer?key=p9PW1ipy9P3QHILzmsNOk8Gc',
+        type: 'tiled',
+        name: '矢量',
+        icon: 'vector_map.png',
+      },
       // TITLE_LAYER_REMOTE: { mapUrl: 'http://15.72.177.174:8195/portalproxy/TileServer/arcgis/rest/services/normal2021/MapServer?key=iOgQotfgfyLvhj6WgfDTpq7F', type: 'tiled', name: '矢量', icon: 'vector_map.png' },
       // TITLE_LAYER_REMOTE: { mapUrl: 'http://15.2.21.238:8090/iserver/services/map-ugcv5-QingdaoRemoteImageMap/rest/maps/QingdaoRemoteImageMap', type: 'remote', name: '影像', icon: 'satellite_map.png' },
-      TITLE_LAYER_DARK: { mapUrl: 'http://15.2.21.238:8090/iserver/services/map-ugcv5-shandong/rest/maps/shandong', type: 'dark', name: '其他', icon: 'other_map.png' },
+      TITLE_LAYER_DARK: {
+        mapUrl:
+          'http://15.2.21.238:8090/iserver/services/map-ugcv5-shandong/rest/maps/shandong',
+        type: 'dark',
+        name: '其他',
+        icon: 'other_map.png',
+      },
     },
-  };
+  }
   var MAPCONFIGMIXTRE = {
     CURRENT_SERVER_NAME: CONFIGKEY,
-    BUFFER_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/spatialAnalysis-' + BASECONFIGITEM[CONFIGKEY].WORKPLACE_NAME + '/restjsr/spatialanalyst',
-    QUERY_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/map-HIMAP_HIGHGO/rest/maps/' + BASECONFIGITEM[CONFIGKEY].MAP_NAME,
+    BUFFER_URL:
+      'http://' +
+      BASECONFIGITEM[CONFIGKEY].ISERVER_URL +
+      '/iserver/services/spatialAnalysis-' +
+      BASECONFIGITEM[CONFIGKEY].WORKPLACE_NAME +
+      '/restjsr/spatialanalyst',
+    QUERY_URL:
+      'http://' +
+      BASECONFIGITEM[CONFIGKEY].ISERVER_URL +
+      '/iserver/services/map-HIMAP_HIGHGO/rest/maps/' +
+      BASECONFIGITEM[CONFIGKEY].MAP_NAME,
     // QUERY_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/data-HIMAP_HIGHGO/rest/data/datasources/HISENSE_himap',
-    DYNAMIC_ROAD_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/spatialAnalysis-' + BASECONFIGITEM[CONFIGKEY].WORKPLACE_NAME + '/restjsr/spatialanalyst',
-    DYNMIC_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/map-' + BASECONFIGITEM[CONFIGKEY].WORKPLACE_NAME + '/rest/maps/' + BASECONFIGITEM[CONFIGKEY].MAP_NAME,
+    DYNAMIC_ROAD_URL:
+      'http://' +
+      BASECONFIGITEM[CONFIGKEY].ISERVER_URL +
+      '/iserver/services/spatialAnalysis-' +
+      BASECONFIGITEM[CONFIGKEY].WORKPLACE_NAME +
+      '/restjsr/spatialanalyst',
+    DYNMIC_URL:
+      'http://' +
+      BASECONFIGITEM[CONFIGKEY].ISERVER_URL +
+      '/iserver/services/map-' +
+      BASECONFIGITEM[CONFIGKEY].WORKPLACE_NAME +
+      '/rest/maps/' +
+      BASECONFIGITEM[CONFIGKEY].MAP_NAME,
     // 数据库型
     // NETWORK_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/transportationAnalyst-' + BASECONFIGITEM[CONFIGKEY].WORKPLACE_NAME + '/rest/networkanalyst/BuildNetwork_2@' + BASECONFIGITEM[CONFIGKEY].DATASOURCE_NAME,
     // 程工系统测试环境，因为是文件型，和数据库性有区别，发布时请注意
-    NETWORK_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/transportationAnalyst-road/rest/networkanalyst/BuildNetwork_2@road',
-    PLOTTING_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/plot-JY/rest/plot/',
-    POI_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
-    EDITORDATA_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/data-' + BASECONFIGITEM[CONFIGKEY].WORKPLACE_NAME + '/rest/data',
+    NETWORK_URL:
+      'http://' +
+      BASECONFIGITEM[CONFIGKEY].ISERVER_URL +
+      '/iserver/services/transportationAnalyst-road/rest/networkanalyst/BuildNetwork_2@road',
+    PLOTTING_URL:
+      'http://' +
+      BASECONFIGITEM[CONFIGKEY].ISERVER_URL +
+      '/iserver/services/plot-JY/rest/plot/',
+    POI_URL:
+      'http://' +
+      BASECONFIGITEM[CONFIGKEY].ISERVER_URL +
+      '/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
+    EDITORDATA_URL:
+      'http://' +
+      BASECONFIGITEM[CONFIGKEY].ISERVER_URL +
+      '/iserver/services/data-' +
+      BASECONFIGITEM[CONFIGKEY].WORKPLACE_NAME +
+      '/rest/data',
     ADDRESS_MATCH_URL: `http://${BASECONFIGITEM[CONFIGKEY].ISERVER_URL}/iserver/services/addressmatch-Address/restjsr/v1/address`,
-    TITLE_LAYER_ARRAY: BASECONFIGITEM[CONFIGKEY].TITLE_LAYER_ARRAY || [BASECONFIGITEM[CONFIGKEY].TITLE_LAYER, BASECONFIGITEM[CONFIGKEY].TITLE_LAYER_REMOTE, BASECONFIGITEM[CONFIGKEY].TITLE_LAYER_DARK]
-  };
-  _mapConfig.config = Object.assign(BASECONFIGITEM[CONFIGKEY], MAPCONFIGMIXTRE);
-})();
+    TITLE_LAYER_ARRAY: BASECONFIGITEM[CONFIGKEY].TITLE_LAYER_ARRAY || [
+      BASECONFIGITEM[CONFIGKEY].TITLE_LAYER,
+      BASECONFIGITEM[CONFIGKEY].TITLE_LAYER_REMOTE,
+      BASECONFIGITEM[CONFIGKEY].TITLE_LAYER_DARK,
+    ],
+  }
+  _mapConfig.config = Object.assign(BASECONFIGITEM[CONFIGKEY], MAPCONFIGMIXTRE)
+})()
diff --git a/front/src/supermap/map-init.js b/front/src/supermap/map-init.js
index 0d172320..580cab82 100644
--- a/front/src/supermap/map-init.js
+++ b/front/src/supermap/map-init.js
@@ -24,25 +24,12 @@ const CRS_4490 = new L.Proj.CRS(
     //   1.3411051811431041E-6
     // ],
     resolutions: [
-      0.703125,
-      0.3515625,
-      0.17578125,
-      0.087890625,
-      0.0439453125,
-      0.02197265625,
-      0.010986328125,
-      0.0054931640625,
-      0.00274658203125,
-      0.001373291015625,
-      0.0006866455078125,
-      0.00034332275390625,
-      0.000171661376953125,
-      0.0000858306884765625,
-      0.00004291534423828125,
-      0.000021457672119140625,
-      0.000010728836059570312,
-      0.0000053644180297851563,
-      0.0000026822090148925781
+      0.703125, 0.3515625, 0.17578125, 0.087890625, 0.0439453125, 0.02197265625,
+      0.010986328125, 0.0054931640625, 0.00274658203125, 0.001373291015625,
+      0.0006866455078125, 0.00034332275390625, 0.000171661376953125,
+      0.0000858306884765625, 0.00004291534423828125, 0.000021457672119140625,
+      0.000010728836059570312, 0.0000053644180297851563,
+      0.0000026822090148925781,
     ],
     // DEV
     // resolutions: [
@@ -147,17 +134,6 @@ export function HieimpMap() {
     //   console.log('地市级行政区划', result);
     // });
     switch (_mapConfig.config.CURRENT_SERVER_NAME) {
-      case 'xinjiang':
-        tileMapUrl = _mapConfig.config.TITLE_LAYER.mapUrl
-        tileMarkerUrl = _mapConfig.config.TITLE_MAKER.mapUrl
-        renderMapFun(mapId, tileMapUrl, centerPoint)
-        L.supermap
-          .tiledMapLayer(tileMarkerUrl, {
-            transparent: false,
-            opacity: 0.6,
-          })
-          .addTo(MapObj.map)
-        break
       case 'qingdao_highgo':
         if (type === 'tiled') {
           tileMapUrl = _mapConfig.config.TITLE_LAYER.mapUrl
@@ -168,6 +144,50 @@ export function HieimpMap() {
         }
         renderMapFun(mapId, tileMapUrl, centerPoint)
         break
+      case 'qingdao':
+        const tileMap = L.map(mapId, {
+          crs: L.CRS.EPSG4326,
+          // renderer: L.svg(),
+          center: centerPoint,
+          maxZoom: _mapConfig.config.CURRENT_MAP_OPTIONS.maxZoom,
+          minZoom: _mapConfig.config.CURRENT_MAP_OPTIONS.minZoom,
+          zoom: _mapConfig.config.CURRENT_MAP_OPTIONS.zoom,
+          zoomControl: false,
+          // preferCanvas: true,
+        })
+        MapObj.map = tileMap // 全局map对象赋值
+        var matrixIds = []
+        for (var i = 0; i < 19; ++i) {
+          matrixIds[i] = {
+            identifier: 1 + i,
+            topLeftCorner: new L.LatLng(90, -180),
+          }
+        }
+        var wmtsMap = new L.TileLayer.WMTS(
+          'http://10.134.135.3:21009/service/map/wmts-raster', //服务地址
+          {
+            style: 'standard',
+            layer: 'basemap', //图层名称
+            tilematrixSet: 'EPSG:4326', //GeoServer使用的网格名称
+            tileSize: 256, //切片大小
+            format: 'image/png',
+            matrixIds: matrixIds,
+          }
+        )
+        var labelMap = new L.TileLayer.WMTS(
+          'http://10.134.135.3:21009/service/map/wmts-raster', //服务地址
+          {
+            style: 'standard',
+            layer: 'label', //图层名称
+            tilematrixSet: 'EPSG:4326', //GeoServer使用的网格名称
+            tileSize: 256, //切片大小
+            format: 'image/png',
+            matrixIds: matrixIds,
+          }
+        )
+        MapObj.map.addLayer(wmtsMap)
+        MapObj.map.addLayer(labelMap)
+        break
       default:
         if (type === 'tiled') {
           tileMapUrl = _mapConfig.config.TITLE_LAYER.mapUrl
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index b61c00f5..c8aebfe2 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -95,7 +95,7 @@
           <template v-if="column.dataIndex === 'operation'">
             <a
               @click="
-                openVideo(record.channelCode || record.channelCode.channelId)
+                openVideo(record.channelCode ||record.channelId || record.channelCode.channelId)
               "
             >
               预览
diff --git a/front/src/views/home/videoSurveillance/index.vue b/front/src/views/home/videoSurveillance/index.vue
index 5b3fe854..70139cf6 100644
--- a/front/src/views/home/videoSurveillance/index.vue
+++ b/front/src/views/home/videoSurveillance/index.vue
@@ -145,7 +145,7 @@
         this.hiMap.mapObj,
         this.hiMapFun
       )
-      this.hiMap.mapObj.map.flyTo({ lat: 36.06, lng: 120.3899 }, 16)
+      // this.hiMap.mapObj.map.flyTo({ lat: 36.06, lng: 120.3899 }, 16)
       this.addressMatchUrl = window.SITE_CONFIG.POI_URL
       // 初始化地址检索服务
       this.initAddressMatchService()

From 072bf909131d0027d6089ed40200135ade183a15 Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Tue, 26 Jul 2022 15:47:48 +0800
Subject: [PATCH 14/27] 716\715 bug

---
 .../modules/myAgent/AbilityResourceShelf.vue  |  4 +-
 .../myAgent/AbilityResourcesRemoved.vue       |  4 +-
 .../ApplicationforCompetencyRequirements.vue  |  4 +-
 .../modules/myAgent/CommentModeration.vue     |  4 +-
 .../myAgent/demo/ResourcesAndServices.vue     | 44 ++++++++++++++++++-
 5 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/back/src/views/modules/myAgent/AbilityResourceShelf.vue b/back/src/views/modules/myAgent/AbilityResourceShelf.vue
index a7a8a9fe..5c69e18c 100644
--- a/back/src/views/modules/myAgent/AbilityResourceShelf.vue
+++ b/back/src/views/modules/myAgent/AbilityResourceShelf.vue
@@ -104,12 +104,12 @@
               @click="taskHandle(scope.row)"
               >{{ $t('manage') }}</el-button
             >
-            <el-button
+            <!-- <el-button
               type="text"
               size="small"
               @click="taskDetail(scope.row)"
               >{{ $t('process.viewFlowImage') }}</el-button
-            >
+            > -->
           </template>
         </el-table-column>
       </el-table>
diff --git a/back/src/views/modules/myAgent/AbilityResourcesRemoved.vue b/back/src/views/modules/myAgent/AbilityResourcesRemoved.vue
index 91a1826c..d36d485d 100644
--- a/back/src/views/modules/myAgent/AbilityResourcesRemoved.vue
+++ b/back/src/views/modules/myAgent/AbilityResourcesRemoved.vue
@@ -104,12 +104,12 @@
               @click="taskHandle(scope.row)"
               >{{ $t('manage') }}</el-button
             >
-            <el-button
+            <!-- <el-button
               type="text"
               size="small"
               @click="taskDetail(scope.row)"
               >{{ $t('process.viewFlowImage') }}</el-button
-            >
+            > -->
           </template>
         </el-table-column>
       </el-table>
diff --git a/back/src/views/modules/myAgent/ApplicationforCompetencyRequirements.vue b/back/src/views/modules/myAgent/ApplicationforCompetencyRequirements.vue
index 245903a5..bfe3f459 100644
--- a/back/src/views/modules/myAgent/ApplicationforCompetencyRequirements.vue
+++ b/back/src/views/modules/myAgent/ApplicationforCompetencyRequirements.vue
@@ -104,12 +104,12 @@
               @click="taskHandle(scope.row)"
               >{{ $t('manage') }}</el-button
             >
-            <el-button
+            <!-- <el-button
               type="text"
               size="small"
               @click="taskDetail(scope.row)"
               >{{ $t('process.viewFlowImage') }}</el-button
-            >
+            > -->
           </template>
         </el-table-column>
       </el-table>
diff --git a/back/src/views/modules/myAgent/CommentModeration.vue b/back/src/views/modules/myAgent/CommentModeration.vue
index d592773a..1fefa8ea 100644
--- a/back/src/views/modules/myAgent/CommentModeration.vue
+++ b/back/src/views/modules/myAgent/CommentModeration.vue
@@ -104,12 +104,12 @@
               @click="taskHandle(scope.row)"
               >{{ $t('manage') }}</el-button
             >
-            <el-button
+            <!-- <el-button
               type="text"
               size="small"
               @click="taskDetail(scope.row)"
               >{{ $t('process.viewFlowImage') }}</el-button
-            >
+            > -->
           </template>
         </el-table-column>
       </el-table>
diff --git a/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
index af120d5e..75305f2e 100644
--- a/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
+++ b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
@@ -21,6 +21,7 @@
               :label="
                 itemsonson.type != ' multipleAdditions' ? itemsonson.name : ''
               "
+               v-show="!(itemsonson.name==='平台地址'|| itemsonson.name==='SDK安装包' || itemsonson.name==='接口请求方式' || itemsonson.name==='服务接口')"
             >
               <div
                 class="videoAndImgCss"
@@ -57,12 +58,25 @@
                   <!-- <div>{{ multipleAdditionsItem }}</div> -->
                 </div>
               </div>
-              <el-input
+                <el-input
                 v-else
                 v-model="itemsonson.note1"
                 disabled="disabled"
               ></el-input>
             </el-form-item>
+            <el-form-item
+              v-for="itemsonson in itemson.children"
+              :key="itemsonson.name"
+              :label="
+                itemsonson.type != ' multipleAdditions' ? itemsonson.name : ''
+              "
+               v-show="((itemsonson.name==='平台地址'&&showDocking)|| (itemsonson.name==='SDK安装包'&&showSDK) || (itemsonson.name==='接口请求方式'&&showInterface) || (itemsonson.name==='服务接口'&&showInterface))"
+            >
+                <el-input
+                v-model="itemsonson.note1"
+                disabled="disabled"
+              ></el-input>
+            </el-form-item>
           </div>
           <div v-else-if="itemson.name === '算法优势'">
             <div
@@ -153,7 +167,13 @@ export default {
       dataList: [],
       dataView: [],
       // 归属部门
-      unit: ''
+      unit: '',
+      // 平台对接
+      showDocking: false,
+      // SDK
+      showSDK: false,
+      // 调用接口
+      showInterface: false
     }
   },
   watch: {
@@ -322,6 +342,26 @@ export default {
             this.dataForm,
             this.dataView
           )
+          // 智能算法-使用方式-3种方式联动
+          this.dataView.children.map(val => {
+            if (val.name === '部署与使用') {
+              val.children.map(val => {
+                if (val.name === '使用方式') {
+                  val.children.map(val => {
+                    if (val.name === '使用方式') {
+                      if (val.note1 === 'SDK') {
+                        this.showSDK = true
+                      } else if (val.note1 === '平台对接') {
+                        this.showDocking = true
+                      } else if (val.note1 === '调用接口') {
+                        this.showInterface = true
+                      }
+                    }
+                  })
+                }
+              })
+            }
+          })
         }
       }
     }

From 5dbaa26848c6233048bbe51b8ea25f1669a2d883 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 26 Jul 2022 16:32:07 +0800
Subject: [PATCH 15/27] =?UTF-8?q?=E5=BC=95=E5=85=A5=E5=AF=8C=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/public/index.html                       | 22 +++++++++----------
 .../components/PutOnTheShelf.vue              |  4 +++-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/front/public/index.html b/front/public/index.html
index 81d09b86..bdad5850 100644
--- a/front/public/index.html
+++ b/front/public/index.html
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.wuhongjian
  * @Date: 2022-03-29 16:45:25
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-25 17:15:08
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-07-26 16:23:53
  * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@@ -48,16 +48,16 @@
     // window.SITE_CONFIG['websocketURL'] = '15.2.21.243:8888/renren-admin';
     // window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
     // 西海岸版本
-    window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797';
-    window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/';
-    window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
-    window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
+    // window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797';
+    // window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/';
+    // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
+    // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
     // 开发
-    // window.SITE_CONFIG['backUrl'] = 'http://localhost:8001';
-    // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.236:9796/';
-    // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.236:9796/document/#/devModelFile/';
-    // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin';
-    // window.SITE_CONFIG['websocketURL'] = '15.2.21.236:8888/renren-admin';
+    window.SITE_CONFIG['backUrl'] = 'http://localhost:8001';
+    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.236:9796/';
+    window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.236:9796/document/#/devModelFile/';
+    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin';
+    window.SITE_CONFIG['websocketURL'] = '15.2.21.236:8888/renren-admin';
     window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
     // window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
     // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
index db0e0d35..db50a51e 100644
--- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
+++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-17 14:11:08
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-26 14:39:16
+ * @LastEditTime: 2022-07-26 16:29:25
  * @Description: 上架
 -->
 <template>
@@ -487,6 +487,7 @@
   </div>
 </template>
 <script setup>
+  import VueTemplateDemo from '@/views/personalCenter/VueTemplateDemo'
   import {
     ref,
     defineProps,
@@ -731,6 +732,7 @@
   //显示富文本
   let showText = ref(false)
   const showTextFunction = () => {
+    console.log('点击富文本=========================>')
     showText.value = true
   }
   mybus.on('showTextFunctionEmit', (show) => {

From efa51429f963cd865dc1cfa5f6a0e4de1dad817f Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Tue, 26 Jul 2022 16:33:10 +0800
Subject: [PATCH 16/27] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/supermap/createMarkerPopup.js     | 41 ++++++++++++---------
 front/src/views/home/infrastructurePage.vue | 17 +++++++--
 2 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/front/src/supermap/createMarkerPopup.js b/front/src/supermap/createMarkerPopup.js
index a899ef73..343620aa 100644
--- a/front/src/supermap/createMarkerPopup.js
+++ b/front/src/supermap/createMarkerPopup.js
@@ -1,3 +1,10 @@
+/*
+ * @Author: hisense.wuhongjian
+ * @Date: 2022-06-14 09:43:31
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-26 15:19:38
+ * @Description: 告诉大家这是什么
+ */
 /**
  * @Author: tiansiyuan
  * @Date: 2021/2/20 13:12:56
@@ -18,23 +25,23 @@ import { selectByChannelCode } from '@/api/videoSurveillance'
  */
 function createCameraDetailsPop(feature) {
   // if(feature.type !== 'cameraTree'){
-  selectByChannelCode({ channelCode: feature.data.channelCode }).then((res) => {
-    feature.data = res.data.data[0]
-  })
-  // }
-  const popupDom = new Dom({
-    template: '<Camera-Details-Pop :feature="feature"></Camera-Details-Pop>',
-    data() {
-      return {
-        feature: feature,
-      }
-    },
-    created() {},
-    components: {
-      CameraDetailsPop,
-    },
-  })
-  return popupDom.initDom()
+  // selectByChannelCode({ channelCode: feature.data.channelCode }).then((res) => {
+  //   feature.data = res.data.data[0]
+  // })
+  // // }
+  // const popupDom = new Dom({
+  //   template: '<Camera-Details-Pop :feature="feature"></Camera-Details-Pop>',
+  //   data() {
+  //     return {
+  //       feature: feature,
+  //     }
+  //   },
+  //   created() {},
+  //   components: {
+  //     CameraDetailsPop,
+  //   },
+  // })
+  // return popupDom.initDom()
 }
 function createSearchAddressTitlePop(feature) {
   const popupDom = new Dom({
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index c8aebfe2..eec677d2 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -5,7 +5,13 @@
     <div class="infrastructrue-tab">
       <div v-for="(item, index) in tabList" :key="index" class="tabBox">
         <b class="leftType">{{ item.title }}</b>
-        <button @click="nullClick" v-if="item.title == '视频标签'">清空</button>
+        <el-button
+          @click="nullClick"
+          v-if="item.title == '视频标签'"
+          type="small"
+        >
+          清空
+        </el-button>
         <span
           v-for="itemContent in item.content"
           :key="itemContent"
@@ -95,7 +101,11 @@
           <template v-if="column.dataIndex === 'operation'">
             <a
               @click="
-                openVideo(record.channelCode ||record.channelId || record.channelCode.channelId)
+                openVideo(
+                  record.channelCode ||
+                    record.channelId ||
+                    record.channelCode.channelId
+                )
               "
             >
               预览
@@ -588,7 +598,8 @@
         padding: 0 0.08rem;
       }
       .leftType {
-        margin: 0.1rem 0;
+        margin: 0.2rem 0;
+        margin-right: 0.06rem;
       }
       .down {
         background: #0087ff;

From 7c2cc4a7f1aa9cc95ca6be96ae77a8c5362bd0d9 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 26 Jul 2022 16:50:02 +0800
Subject: [PATCH 17/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E6=8C=82=E8=BD=BD=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/modules/ability/bsabilityai.vue | 32 ++++-----
 .../modules/ability/bsabilityservice.vue      | 70 +++++++++----------
 2 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue
index ccc5ff7b..810dcd2b 100644
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@@ -50,7 +50,7 @@
         border
         @selection-change="dataListSelectionChangeHandle"
         style="width: 100%"
-        :height="qp ? '650px' : '650px'"
+        height="650px"
       >
         <el-table-column
           type="selection"
@@ -126,7 +126,7 @@
           fixed="right"
           header-align="center"
           align="center"
-          width="300"
+          width="150"
         >
           <template slot-scope="scope">
             <!-- <el-button
@@ -284,7 +284,7 @@ export default {
         selectType: 0,
         type: '组件服务'
       },
-      qp: false,
+      // qp: false,
       // 关联应用弹窗
       relateApplicationVisible: false,
       relateInfo: {
@@ -306,8 +306,8 @@ export default {
     this.dataForm.type = '组件服务'
   },
   mounted () {
-    window.addEventListener('resize', this.a)
-    this.fullScreen()
+    // window.addEventListener('resize', this.a)
+    // this.fullScreen()
   },
   methods: {
     reset () {
@@ -448,17 +448,17 @@ export default {
         this.$message.error('查询信息不能为空')
       }
     },
-    fullScreen () {
-      if (window.outerHeight === screen.availHeight) {
-        if (window.outerWidth === screen.availWidth) {
-          this.qp = false
-        } else {
-          this.qp = true
-        }
-      } else {
-        this.qp = true
-      }
-    },
+    // fullScreen () {
+    //   if (window.outerHeight === screen.availHeight) {
+    //     if (window.outerWidth === screen.availWidth) {
+    //       this.qp = false
+    //     } else {
+    //       this.qp = true
+    //     }
+    //   } else {
+    //     this.qp = true
+    //   }
+    // },
     // 点击关联应用按钮
     showRelateApplication (row) {
       this.$http
diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue
index 008dea90..382d93b1 100644
--- a/back/src/views/modules/ability/bsabilityservice.vue
+++ b/back/src/views/modules/ability/bsabilityservice.vue
@@ -52,7 +52,7 @@
         border
         @selection-change="dataListSelectionChangeHandle"
         style="width: 100%"
-        :height="qp ? '810px' : '650px'"
+        height="650px"
       >
         <el-table-column
           type="selection"
@@ -287,8 +287,8 @@ export default {
     this.dataForm.type = '应用资源'
   },
   mounted () {
-    window.addEventListener('resize', this.a)
-    this.fullScreen()
+    // window.addEventListener('resize', this.a)
+    // this.fullScreen()
   },
   methods: {
     reset () {
@@ -425,38 +425,38 @@ export default {
         this.$message.error('查询不能输入为空')
       }
     },
-    fullScreen () {
-      if (window.outerHeight === screen.availHeight) {
-        if (window.outerWidth === screen.availWidth) {
-          console.log(
-            '全屏1',
-            window.outerHeight,
-            screen.availHeight,
-            window.outerWidth,
-            screen.availWidth
-          )
-          this.qp = false
-        } else {
-          console.log(
-            '不是全屏2',
-            window.outerHeight,
-            screen.availHeight,
-            window.outerWidth,
-            screen.availWidth
-          )
-          this.qp = true
-        }
-      } else {
-        console.log(
-          '不是全屏3',
-          window.outerHeight,
-          screen.availHeight,
-          window.outerWidth,
-          screen.availWidth
-        )
-        this.qp = true
-      }
-    },
+    // fullScreen () {
+    //   if (window.outerHeight === screen.availHeight) {
+    //     if (window.outerWidth === screen.availWidth) {
+    //       console.log(
+    //         '全屏1',
+    //         window.outerHeight,
+    //         screen.availHeight,
+    //         window.outerWidth,
+    //         screen.availWidth
+    //       )
+    //       this.qp = false
+    //     } else {
+    //       console.log(
+    //         '不是全屏2',
+    //         window.outerHeight,
+    //         screen.availHeight,
+    //         window.outerWidth,
+    //         screen.availWidth
+    //       )
+    //       this.qp = true
+    //     }
+    //   } else {
+    //     console.log(
+    //       '不是全屏3',
+    //       window.outerHeight,
+    //       screen.availHeight,
+    //       window.outerWidth,
+    //       screen.availWidth
+    //     )
+    //     this.qp = true
+    //   }
+    // },
     // 应用与组件
     applyAndAssembly (val) {
       console.log('vvvv', val)

From c2b323b14c550b1a22a4c23e882ca587bf13ff3d Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Tue, 26 Jul 2022 18:08:24 +0800
Subject: [PATCH 18/27] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/main-navbar.vue             |  86 +++++++-------
 back/src/views/main.vue                    | 126 ++++++++++-----------
 front/src/views/home/components/header.vue |   2 +
 3 files changed, 108 insertions(+), 106 deletions(-)

diff --git a/back/src/views/main-navbar.vue b/back/src/views/main-navbar.vue
index adb8b4fe..f624e6cd 100644
--- a/back/src/views/main-navbar.vue
+++ b/back/src/views/main-navbar.vue
@@ -100,25 +100,25 @@
   </nav>
 </template>
 <script>
-import { messages } from "@/i18n";
-import screenfull from "screenfull";
-import UpdatePassword from "./main-navbar-update-password";
-import { clearLoginInfo } from "@/utils";
+import { messages } from '@/i18n'
+import screenfull from 'screenfull'
+import UpdatePassword from './main-navbar-update-password'
+import { clearLoginInfo } from '@/utils'
 // import Cookies from 'js-cookie'
 // var socket = null
 export default {
-  inject: ["refresh"],
-  data() {
+  inject: ['refresh'],
+  data () {
     return {
       i18nMessages: messages,
       updatePasswordVisible: false,
-      messageTip: false,
-    };
+      messageTip: false
+    }
   },
   components: {
-    UpdatePassword,
+    UpdatePassword
   },
-  created() {
+  created () {
     // var vue = this
     // socket = new WebSocket(`${window.SITE_CONFIG['socketURL']}?token=${Cookies.get('token')}`)
     // socket.onopen = function () {}
@@ -144,70 +144,70 @@ export default {
     // }
 
     // 未读通知数
-    this.getUnReadCount();
+    this.getUnReadCount()
   },
   methods: {
-    myNoticeRouter() {
-      this.$router.replace("notice-notice-user");
+    myNoticeRouter () {
+      this.$router.replace('notice-notice-user')
     },
-    getUnReadCount() {
+    getUnReadCount () {
       this.$http
-        .get("/sys/notice/mynotice/unread")
+        .get('/sys/notice/mynotice/unread')
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg);
+            return this.$message.error(res.msg)
           }
           if (res.data > 0) {
-            this.messageTip = true;
+            this.messageTip = true
           }
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     // 全屏
-    fullscreenHandle() {
+    fullscreenHandle () {
       if (!screenfull.enabled) {
         return this.$message({
-          message: this.$t("fullscreen.prompt"),
-          type: "warning",
-          duration: 500,
-        });
+          message: this.$t('fullscreen.prompt'),
+          type: 'warning',
+          duration: 500
+        })
       }
-      screenfull.toggle();
+      screenfull.toggle()
     },
     // 修改密码
-    updatePasswordHandle() {
-      this.updatePasswordVisible = true;
+    updatePasswordHandle () {
+      this.updatePasswordVisible = true
       this.$nextTick(() => {
-        this.$refs.updatePassword.init();
-      });
+        this.$refs.updatePassword.init()
+      })
     },
     // 退出
-    logoutHandle() {
+    logoutHandle () {
       this.$confirm(
-        this.$t("prompt.info", { handle: this.$t("logout") }),
-        this.$t("prompt.title"),
+        this.$t('prompt.info', { handle: this.$t('logout') }),
+        this.$t('prompt.title'),
         {
-          confirmButtonText: this.$t("confirm"),
-          cancelButtonText: this.$t("cancel"),
-          type: "warning",
+          confirmButtonText: this.$t('confirm'),
+          cancelButtonText: this.$t('cancel'),
+          type: 'warning'
         }
       )
         .then(() => {
           this.$http
-            .post("/logout")
+            .post('/logout')
             .then(({ data: res }) => {
               if (res.code !== 0) {
-                return this.$message.error(res.msg);
+                return this.$message.error(res.msg)
               }
-              clearLoginInfo();
-              this.$router.push({ name: "login" });
+              clearLoginInfo()
+              this.$router.push({ name: 'login' })
             })
-            .catch(() => {});
+            .catch(() => {})
         })
-        .catch(() => {});
-    },
-  },
-};
+        .catch(() => {})
+    }
+  }
+}
 </script>
 <style scoped lang="scss">
 @font-face {
diff --git a/back/src/views/main.vue b/back/src/views/main.vue
index 612ba48d..60bcff29 100644
--- a/back/src/views/main.vue
+++ b/back/src/views/main.vue
@@ -16,122 +16,122 @@
 </template>
 
 <script>
-import MainNavbar from "./main-navbar";
-import MainSidebar from "./main-sidebar";
-import MainContent from "./main-content";
-import MainThemeTools from "./main-theme-tools";
-import debounce from "lodash/debounce";
-import { isURL } from "@/utils/validate";
+import MainNavbar from './main-navbar'
+import MainSidebar from './main-sidebar'
+import MainContent from './main-content'
+import MainThemeTools from './main-theme-tools'
+import debounce from 'lodash/debounce'
+import { isURL } from '@/utils/validate'
 export default {
-  provide() {
+  provide () {
     return {
       // 刷新
-      refresh() {
-        this.$store.state.contentIsNeedRefresh = true;
+      refresh () {
+        this.$store.state.contentIsNeedRefresh = true
         this.$nextTick(() => {
-          this.$store.state.contentIsNeedRefresh = false;
-        });
-      },
-    };
+          this.$store.state.contentIsNeedRefresh = false
+        })
+      }
+    }
   },
-  data() {
+  data () {
     return {
-      loading: true,
-    };
+      loading: true
+    }
   },
   components: {
     MainNavbar,
     MainSidebar,
     MainContent,
-    MainThemeTools,
+    MainThemeTools
   },
   watch: {
-    $route: "routeHandle",
+    $route: 'routeHandle'
   },
-  created() {
-    this.windowResizeHandle();
-    this.routeHandle(this.$route);
+  created () {
+    this.windowResizeHandle()
+    this.routeHandle(this.$route)
     Promise.all([this.getUserInfo(), this.getPermissions()]).then(() => {
-      this.loading = false;
-    });
+      this.loading = false
+    })
   },
   methods: {
     // 窗口改变大小
-    windowResizeHandle() {
+    windowResizeHandle () {
       this.$store.state.sidebarFold =
-        document.documentElement["clientWidth"] <= 992 || false;
+        document.documentElement.clientWidth <= 992 || false
       window.addEventListener(
-        "resize",
+        'resize',
         debounce(() => {
           this.$store.state.sidebarFold =
-            document.documentElement["clientWidth"] <= 992 || false;
+            document.documentElement.clientWidth <= 992 || false
         }, 150)
-      );
+      )
     },
     // 路由, 监听
-    routeHandle(route) {
+    routeHandle (route) {
       if (!route.meta.isTab) {
-        return false;
+        return false
       }
-      let tab = {};
-      let routeName = route.name;
-      let routeMeta = route.meta;
-      if (route.name === "iframe") {
-        let url = route.query.url || "";
+      let tab = {}
+      let routeName = route.name
+      const routeMeta = route.meta
+      if (route.name === 'iframe') {
+        const url = route.query.url || ''
         if (!isURL(url)) {
-          return false;
+          return false
         }
-        let key = route.query.key || new Date().getTime();
-        routeName = `${routeName}_${key}`;
-        routeMeta.title = key.toString();
-        routeMeta.menuId = route.query.menuId || "";
-        routeMeta.iframeURL = url;
+        const key = route.query.key || new Date().getTime()
+        routeName = `${routeName}_${key}`
+        routeMeta.title = key.toString()
+        routeMeta.menuId = route.query.menuId || ''
+        routeMeta.iframeURL = url
       }
       tab = this.$store.state.contentTabs.filter(
         (item) => item.name === routeName
-      )[0];
+      )[0]
       if (!tab) {
         tab = {
-          ...window.SITE_CONFIG["contentTabDefault"],
+          ...window.SITE_CONFIG.contentTabDefault,
           ...routeMeta,
           name: routeName,
           params: { ...route.params },
-          query: { ...route.query },
-        };
+          query: { ...route.query }
+        }
         this.$store.state.contentTabs =
-          this.$store.state.contentTabs.concat(tab);
+          this.$store.state.contentTabs.concat(tab)
       }
-      this.$store.state.sidebarMenuActiveName = tab.menuId;
-      this.$store.state.contentTabsActiveName = tab.name;
+      this.$store.state.sidebarMenuActiveName = tab.menuId
+      this.$store.state.contentTabsActiveName = tab.name
     },
     // 获取当前管理员信息
-    getUserInfo() {
+    getUserInfo () {
       return this.$http
-        .get("/sys/user/info")
+        .get('/sys/user/info')
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg);
+            return this.$message.error(res.msg)
           }
-          this.$store.state.user.id = res.data.id;
-          this.$store.state.user.name = res.data.username;
-          this.$store.state.user.superAdmin = res.data.superAdmin;
+          this.$store.state.user.id = res.data.id
+          this.$store.state.user.name = res.data.realName
+          this.$store.state.user.superAdmin = res.data.superAdmin
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     // 获取权限
-    getPermissions() {
+    getPermissions () {
       return this.$http
-        .get("/sys/menu/permissions")
+        .get('/sys/menu/permissions')
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg);
+            return this.$message.error(res.msg)
           }
-          window.SITE_CONFIG["permissions"] = res.data;
+          window.SITE_CONFIG.permissions = res.data
         })
-        .catch(() => {});
-    },
-  },
-};
+        .catch(() => {})
+    }
+  }
+}
 </script>
 <style scoped lang="scss">
 .aui-content__wrapper {
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index 54594087..c3a80d70 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -122,6 +122,7 @@
   import { mynotice } from '@/api/home'
   import { useStore } from 'vuex'
   import { getSgcTotal } from '@/api/home'
+  import Cookies from 'js-cookie'
   import mybus from '@/myplugins/mybus'
   const store = useStore()
   const router = useRouter()
@@ -222,6 +223,7 @@
         })
         break
       case '后台管理':
+        Cookies.remove('JESSIONID')
         window.open(window.SITE_CONFIG.backUrl + '/#/workBench-workBench')
         // window.reload('http://15.2.21.238:9797')
         break

From be75d352b294358b3ac21e02ea7fda3b9adfe21b Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Tue, 26 Jul 2022 18:55:33 +0800
Subject: [PATCH 19/27] =?UTF-8?q?JSESSIONID=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/components/header.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index c3a80d70..bb59648a 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -223,7 +223,7 @@
         })
         break
       case '后台管理':
-        Cookies.remove('JESSIONID')
+        Cookies.remove('JSESSIONID')
         window.open(window.SITE_CONFIG.backUrl + '/#/workBench-workBench')
         // window.reload('http://15.2.21.238:9797')
         break

From 806a45ccf7af438716fa8f47039d4b08473d41b3 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Wed, 27 Jul 2022 10:54:34 +0800
Subject: [PATCH 20/27] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/package.json                             |  1 +
 back/public/index.html                        |  9 +-
 .../src/views/modules/ability/bsabilityai.vue | 92 ++++++++++++++++++-
 .../views/personalCenter/VueTemplateDemo.vue  | 49 ++++++----
 4 files changed, 126 insertions(+), 25 deletions(-)

diff --git a/back/package.json b/back/package.json
index e9ac8253..ced391e7 100644
--- a/back/package.json
+++ b/back/package.json
@@ -34,6 +34,7 @@
     "lodash": "^4.17.19",
     "monaco-editor": "^0.20.0",
     "monaco-editor-webpack-plugin": "^1.9.0",
+    "pinyin-pro": "^3.11.0",
     "qs": "^6.9.4",
     "quill": "^1.3.7",
     "sass": "^1.51.0",
diff --git a/back/public/index.html b/back/public/index.html
index 3e830a61..c8f9e70b 100644
--- a/back/public/index.html
+++ b/back/public/index.html
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-11 10:11:40
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-21 15:03:51
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-26 20:23:13
  * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@@ -27,7 +27,8 @@
       'isTab': true,     // 是否通过tab展示内容?
       'iframeURL': ''    // 是否通过iframe嵌套展示内容? (以http[s]://开头, 自动匹配)
     };
-    window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.243:9796/#/vueTemplateDemo';  
+    window.SITE_CONFIG['frontUrl'] = 'http://localhost:8080/#/vueTemplateDemo'; 
+    // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.243:9796/#/vueTemplateDemo';  
     // window.SITE_CONFIG['frontUrl'] = 'http://124.222.94.39:9796/#/vueTemplateDemo';
     // window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/#/vueTemplateDemo';  
     // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9797/#/vueTemplateDemo'; 
@@ -45,7 +46,7 @@
     // window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin';
     // window.SITE_CONFIG['apiURL'] = 'http://10.16.5.35:8888/renren-admin';
     window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin';
-    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.236:9796/';
+    window.SITE_CONFIG['previewUrl'] = 'http://localhost:8080/';
     // window.SITE_CONFIG['apiURL'] = 'http://15.2.23.141:8000/renren-admin';
     // WebSocket地址
     window.SITE_CONFIG['socketURL'] ='ws://localhost:8080/renren-admin/websocket';
diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue
index 810dcd2b..3ad53de6 100644
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@@ -241,6 +241,7 @@ import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './bsabilityai-add-or-update'
 import dictionaries from '@/utils/dictionaries'
 import qs from 'qs'
+import { pinyin } from 'pinyin-pro'
 import RelateApplication from './bsabilityai-relate-application.vue'
 import putOnTheShelf from '@/views/modules/putOnTheShelf'
 export default {
@@ -292,7 +293,10 @@ export default {
         responseData: {},
         linkType: ''
       },
-      typeInput: '组件服务'
+      typeInput: '组件服务',
+      uuidOne: '',
+      uuidTwo: '',
+      uuidSnum: ''
     }
   },
   watch: {},
@@ -384,11 +388,89 @@ export default {
       // })
       // this.disabled = true
     },
+    // 创建uuid
+    uuid (len, radix) {
+      var chars =
+          '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
+      var uuid = []
+      var i
+      radix = radix || chars.length
+
+      if (len) {
+        // Compact form
+        for (i = 0; i < len; i++) uuid[i] = chars[0 | (Math.random() * radix)]
+      } else {
+        // rfc4122, version 4 form
+        var r
+
+        // rfc4122 requires these characters
+        uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-'
+        uuid[14] = '4'
+
+        // Fill in random data.  At i==19 set the high bits of clock sequence as
+        // per rfc4122, sec. 4.1.5
+        for (i = 0; i < 36; i++) {
+          if (!uuid[i]) {
+            r = 0 | (Math.random() * 16)
+            uuid[i] = chars[i == 19 ? (r & 0x3) | 0x8 : r]
+          }
+        }
+      }
+
+      return uuid.join('')
+    },
+    uuidSplice () {
+      this.uuidOne = this.uuid(13, 16)
+      this.uuidTwo = this.uuid(13, 16)
+      this.uuidSnum = this.uuidOne + this.uuidTwo
+      this.uuidSnum = this.uuidSnum.replace(/\s+/g, '')
+      console.log('this.uuidOne', this.uuidSnum)
+    },
     showDocument (val) {
-      window.open(
-        window.SITE_CONFIG.frontUrl + '?id=' + val.id + '&&type=' + val.type,
-        '_blank'
-      )
+      // 第一步：创建文档
+      // 不存在文档时创建空文档
+      this.uuidSplice()
+      const uuidParam = val.infoList.filter((item) => {
+        if (item.attrType === '技术文档') {
+          return item
+        }
+      })
+      if (uuidParam.length > 0) {
+        this.uuidSnum = uuidParam[0].attrValue.split('/')[1].split('.')[0]
+      } else {
+        const type = pinyin(val.type, {
+          pattern: 'initial'
+        }).replace(/\s*/g, '')
+        const obj = {
+          attrType: '技术文档',
+          attrValue: type + '/' + this.uuidSnum + '.md',
+          delFlag: 0
+        }
+        val.infoList.push(obj)
+      }
+
+      // 存在时加入文档
+      this.$http
+        .put('/resource/update', val)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              // 打开这个空的开发文档
+              window.open(
+                window.SITE_CONFIG.frontUrl + '?id=' + this.uuidSnum + '&&type=' + val.type,
+                '_blank'
+              )
+            }
+          })
+        })
+        .catch(() => {})
+      // 第二部，update列数据，成功后打开文档编辑
     },
     getDataList2 (names) {
       if (names != null) {
diff --git a/front/src/views/personalCenter/VueTemplateDemo.vue b/front/src/views/personalCenter/VueTemplateDemo.vue
index 46658761..73eed452 100644
--- a/front/src/views/personalCenter/VueTemplateDemo.vue
+++ b/front/src/views/personalCenter/VueTemplateDemo.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-19 17:18:48
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-18 16:40:21
+ * @LastEditTime: 2022-07-27 10:34:02
  * @Description: markdown编辑器
 -->
 <template>
@@ -44,10 +44,27 @@
       }
     },
     created() {
+      console.log('2222', this.route.currentRoute.query)
+      // const keyId = this.route.currentRoute.value.query.id
       // this.uuidSplice()
+      // 两种获取数据的形式： 1.父组件传递过来 2. 路由传递过来
+      console.log('111111111', this.newDateForm)
       this.getDevelopmentFile()
     },
+    computed: {
+      newDateForm() {
+        if (this.dataFrom && this.dataFrom.type) {
+          return this.dataFrom
+        } else {
+          return {
+            id: this.route.currentRoute.query.id,
+            type: this.route.currentRoute.query.type,
+          }
+        }
+      },
+    },
     methods: {
+      // 创建uuid
       uuid(len, radix) {
         var chars =
           '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
@@ -86,6 +103,7 @@
         this.uuidSnum = this.uuidSnum.replace(/\s+/g, '')
         console.log('this.uuidOne', this.uuidSnum)
       },
+      // 保存文档
       async saveText(file) {
         // console.log('保存成功', e)
         // const jsonStr = JSON.stringify(e)
@@ -97,7 +115,7 @@
         }
         let myfile = new File([blob], this.uuidSnum + '.md')
         var formData = new FormData()
-        const type = pinyin(this.dataFrom.type, {
+        const type = pinyin(this.newDateForm.type, {
           pattern: 'initial',
         }).replace(/\s*/g, '')
         formData.append('fileName', this.uuidSnum + '.md')
@@ -120,19 +138,24 @@
           message.error('保存失败')
         }
       },
+      // 初始化文档
       async getDevelopmentFile() {
         debugger
-        const uuidParam = this.dataFrom.infoList.filter((item) => {
-          if (item.attrType === '技术文档') {
-            return item
-          }
-        })
         let uuid = ''
-        if (uuidParam[0].attrValue) {
-          uuid = uuidParam[0].attrValue.split('/')[1].split('.')[0]
+        if (this.newDateForm.id) {
+          uuid = this.newDateForm.id
+        } else {
+          const uuidParam = this.newDateForm.infoList.filter((item) => {
+            if (item.attrType === '技术文档') {
+              return item
+            }
+          })
+          if (uuidParam[0].attrValue) {
+            uuid = uuidParam[0].attrValue.split('/')[1].split('.')[0]
+          }
         }
         this.uuidSnum = uuid
-        const type = pinyin(this.dataFrom.type, {
+        const type = pinyin(this.newDateForm.type, {
           pattern: 'initial',
         }).replace(/\s*/g, '')
         console.log(type)
@@ -142,12 +165,6 @@
         }
         const res = await getDevelopmentFile(param)
         this.text = res.data
-        // let infoList = {
-        //   attrType: '技术文档',
-        //   attrValue: this.text.data,
-        //   delFlag: 0,
-        // }
-        // mybus.emit('chageDataFrom', infoList)
         console.log('res', res)
       },
     },

From 42020cd1be378a8f7f601ff146f85c8b7421ca9b Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Wed, 27 Jul 2022 11:02:32 +0800
Subject: [PATCH 21/27] =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC=E5=89=8D?=
 =?UTF-8?q?=E5=8F=B0=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/personalCenter/VueTemplateDemo.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/front/src/views/personalCenter/VueTemplateDemo.vue b/front/src/views/personalCenter/VueTemplateDemo.vue
index 73eed452..3c1acbfc 100644
--- a/front/src/views/personalCenter/VueTemplateDemo.vue
+++ b/front/src/views/personalCenter/VueTemplateDemo.vue
@@ -173,5 +173,6 @@
 <style scoped>
   .md-fullscreen {
     z-index: 10;
+    color: initial;
   }
 </style>

From bb9856e5c108dcb02f2b8b93ce74188232ef0e41 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Wed, 27 Jul 2022 11:07:34 +0800
Subject: [PATCH 22/27] =?UTF-8?q?=E5=89=8D=E5=8F=B0=E5=AF=8C=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/personalCenter/VueTemplateDemo.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/front/src/views/personalCenter/VueTemplateDemo.vue b/front/src/views/personalCenter/VueTemplateDemo.vue
index 3c1acbfc..8ffe6f60 100644
--- a/front/src/views/personalCenter/VueTemplateDemo.vue
+++ b/front/src/views/personalCenter/VueTemplateDemo.vue
@@ -174,5 +174,8 @@
   .md-fullscreen {
     z-index: 10;
     color: initial;
+    font-size: initial;
+    line-height: initial;
+    text-align: initial;
   }
 </style>

From 291b65d03faa1d7de027ac6e4edd8f1222e435fa Mon Sep 17 00:00:00 2001
From: lizhicheng2 <lizhicheng2@hisense.com>
Date: Wed, 27 Jul 2022 13:53:59 +0800
Subject: [PATCH 23/27] =?UTF-8?q?=E5=89=8D=E5=8F=B0=E8=9E=8D=E5=90=88?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home/components/searchResultList.vue      | 34 ++++++++++-
 front/src/views/home/integrationServices.vue  | 56 ++++++++++++++++++-
 2 files changed, 87 insertions(+), 3 deletions(-)

diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index cb4ddee6..e7510cd5 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -67,6 +67,16 @@
             "
           />
         </div>
+        <div class="left"
+          style="display: flex;
+          align-items: center"
+          v-else-if="selectCardsname === '融合服务' && item.fuseAttrList && item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]">
+            <a-image
+              :width="106"
+              :preview="false"
+              :src="item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0].attrValue"
+            />
+        </div>
         <div
           class="left"
           :class="
@@ -135,7 +145,18 @@
               </svg>
             </span>
             <div class="header-right">
-              <div>
+              <div v-if="selectCardsname === '融合服务'"
+                class="label-content">
+                <template v-if="item.fuseAttrList && item.fuseAttrList.filter((val)=>val.attrType=='应用领域')[0]">
+                  <span class="label"
+                    v-for="(data, index) in item.fuseAttrList.filter((val)=>val.attrType=='应用领域')[0].attrValue.split(';')"
+                    :key="index"
+                  >
+                    {{data}}
+                  </span>
+                </template>
+              </div>
+              <div v-else>
                 发布时间：
                 <template v-if="item.createDate">
                   <span>
@@ -936,6 +957,17 @@
             div {
               margin-right: 24px;
             }
+            .label-content {
+              flex: 1;
+              display: flex;
+              justify-content: flex-end;
+              .label {
+                padding: 0.01rem 0.1rem;
+                margin-right: 0.1rem;
+                border-radius: 0.13rem;
+                background: #0087ff;
+              }
+            }
           }
           .header-right:last-child {
             div {
diff --git a/front/src/views/home/integrationServices.vue b/front/src/views/home/integrationServices.vue
index d2f0443b..5712ace6 100644
--- a/front/src/views/home/integrationServices.vue
+++ b/front/src/views/home/integrationServices.vue
@@ -3,6 +3,17 @@
   <div class="details-pageconetent">
     <home-header></home-header>
     <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 }">
+            <span>{{ item.name }}</span>
+        </div>
+      </div>
       <div class="resultListSearchInput-father">
         <div class="resultListSearchInput-son">
           模糊搜索
@@ -75,6 +86,17 @@
       const resourceList = reactive({ data: [] })
       const resourceTotal = ref(0)
       const current = ref(1)
+      // 选项卡
+      const titleName = ref([
+        {
+          name: '打包模式',
+        },
+        {
+          name: '赋能场景',
+        },
+      ])
+
+      const number = ref(0)
       // 刷新筛选条件组件
       let listKey = ref(0)
       // 刷新筛选列表信息组件
@@ -84,12 +106,18 @@
       const paramsGetResources = {
         pageNum: 1,
         pageSize: currentPageSize.value,
-        type: Cardsname.value,
+        type: titleName.value[number.value].name,
         name: '',
         orderField: 'create_date', // total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
         orderType: 'DESC', // ASC 升序  DESC 降序
       }
 
+      const changeCards = (val) => {
+        console.log(val)
+        number.value = val
+        chongzhi()
+      }
+
       // 查询
       const onSearch = () => {
         loading.value = true
@@ -109,7 +137,7 @@
         paramsGetResources.orderField = 'create_date'
         paramsGetResources.orderType = 'DESC'
         mybus.emit('chongzhi', {
-          type: '融合服务',
+          type: titleName.value[number.value].name,
         })
         getAppResources()
       }
@@ -126,6 +154,7 @@
           orderField: paramsGetResources.orderField,
           orderType: paramsGetResources.orderType,
           name: searchValue.value,
+          type: titleName.value[number.value].name,
         }
         getIntegrationServicesList(postData).then(
           (res) => {
@@ -211,6 +240,9 @@
         pageSizeOptions,
         current,
         loading,
+        titleName,
+        changeCards,
+        number,
       }
     },
     components: {
@@ -323,6 +355,26 @@
         background: #f3f5f9;
         padding-bottom: 0.6rem;
       }
+
+      .top-title {
+        padding: 0.2rem;
+        display: flex;
+        font-size: 22px;
+        .tabAll {
+          font-size: 22px;
+          color: #000000;
+          margin-right: 35px;
+          cursor: pointer;
+        }
+        .tabAll:nth-child(1) {
+          margin-left: 20px;
+        }
+        .sel {
+          font-weight: 600;
+          color: #0087ff;
+          border-bottom: 0.02rem solid #0087ff;
+        }
+      }
     }
   }
 

From ef980d77c340a9875fc3b4b1bb9f9f3112399ba0 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Wed, 27 Jul 2022 14:19:51 +0800
Subject: [PATCH 24/27] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/api/videoSurveillance.js          | 2 +-
 front/src/views/home/infrastructurePage.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/front/src/api/videoSurveillance.js b/front/src/api/videoSurveillance.js
index 94198d54..ddd9d6e7 100644
--- a/front/src/api/videoSurveillance.js
+++ b/front/src/api/videoSurveillance.js
@@ -68,7 +68,7 @@ export function selectByChannelCode(params) {
 }
 export function getStreamByChannelCode(params) {
   return request({
-    url: `/api/project/file`,
+    url: `/resource/hls/getHls`,
     method: 'get',
     params,
   })
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index eec677d2..ca1a3f45 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -234,7 +234,7 @@
   const openVideo = (id) => {
     console.log('打开视频', id)
     const param = {
-      channelCode: id,
+      key: id,
     }
     getStreamByChannelCode(param).then((res) => {
       console.log(res)

From 531aa7aafbfe9a404fd122db39e31166e4117830 Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Wed, 27 Jul 2022 16:19:34 +0800
Subject: [PATCH 25/27] =?UTF-8?q?=E5=89=8D=E5=8F=B0=E4=B8=8A=E6=9E=B6-?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/capacityOnTheShelf/Algorithm.vue    | 43 +++++++++++++++----
 .../capacityOnTheShelf/BusinessComponent.vue  | 34 +++++++++++----
 .../DevelopmentComponents.vue                 | 34 +++++++++++----
 .../capacityOnTheShelf/LayerServices.vue      | 34 +++++++++++----
 .../Algorithm/AlgorithmNavigation.vue         |  6 ++-
 5 files changed, 113 insertions(+), 38 deletions(-)

diff --git a/front/src/views/capacityOnTheShelf/Algorithm.vue b/front/src/views/capacityOnTheShelf/Algorithm.vue
index b0b418cd..4e9898e7 100644
--- a/front/src/views/capacityOnTheShelf/Algorithm.vue
+++ b/front/src/views/capacityOnTheShelf/Algorithm.vue
@@ -474,15 +474,40 @@
   }
   // 预览
   const preview = () => {
-    dataFrom.value.infoList = dataFrom.value.infoList.filter(
-      (item) => item.attrValue !== ''
-    )
-    console.log('预览==============>', dataFrom.value)
-    window.sessionStorage.setItem('preview', JSON.stringify(dataFrom.value))
-    const newpage = router.resolve({
-      path: '/details',
-    })
-    window.open(newpage.href, '_blank')
+    notFilled.value = []
+    console.log(dataFrom.value, 'dataFrom.value.name')
+    if (
+      dataFrom.value.infoList.filter((val) => val.attrType === '使用方式')[0] &&
+      dataFrom.value.infoList.filter((val) => val.attrType === '使用方式')[0]
+        .attrValue == '调用接口'
+    ) {
+      if (
+        !dataFrom.value.infoList.filter(
+          (val) => val.attrType === '服务接口'
+        )[0] ||
+        !dataFrom.value.infoList.filter((val) => val.attrType === '服务接口')[0]
+          .attrValue
+      ) {
+        notFilled.value.push('服务接口')
+      }
+      if (!dataFrom.value.apiMethodType) {
+        notFilled.value.push('接口请求方式')
+      }
+    }
+    if (notFilled.value.length > 0) {
+      message.warning('请填写必填字段')
+      console.log(notFilled.value)
+    } else {
+      dataFrom.value.infoList = dataFrom.value.infoList.filter(
+        (item) => item.attrValue !== ''
+      )
+      console.log('预览==============>', dataFrom.value)
+      window.sessionStorage.setItem('preview', JSON.stringify(dataFrom.value))
+      const newpage = router.resolve({
+        path: '/details',
+      })
+      window.open(newpage.href, '_blank')
+    }
   }
   const submit = () => {
     notFilled.value = []
diff --git a/front/src/views/capacityOnTheShelf/BusinessComponent.vue b/front/src/views/capacityOnTheShelf/BusinessComponent.vue
index 4ac1e145..607718da 100644
--- a/front/src/views/capacityOnTheShelf/BusinessComponent.vue
+++ b/front/src/views/capacityOnTheShelf/BusinessComponent.vue
@@ -435,15 +435,31 @@
   }
   // 预览
   const preview = () => {
-    dataFrom.value.infoList = dataFrom.value.infoList.filter(
-      (item) => item.attrValue !== ''
-    )
-    console.log('预览==============>', dataFrom.value)
-    window.sessionStorage.setItem('preview', JSON.stringify(dataFrom.value))
-    const newpage = router.resolve({
-      path: '/details',
-    })
-    window.open(newpage.href, '_blank')
+    notFilled.value = []
+    console.log(dataFrom.value, 'dataFrom.value.name')
+    if (
+      !dataFrom.value.infoList.filter(
+        (val) => val.attrType === '组件地址'
+      )[0] ||
+      !dataFrom.value.infoList.filter((val) => val.attrType === '组件地址')[0]
+        .attrValue
+    ) {
+      notFilled.value.push('组件地址')
+    }
+    if (notFilled.value.length > 0) {
+      message.warning('请填写必填字段')
+      console.log(notFilled.value)
+    } else {
+      dataFrom.value.infoList = dataFrom.value.infoList.filter(
+        (item) => item.attrValue !== ''
+      )
+      console.log('预览==============>', dataFrom.value)
+      window.sessionStorage.setItem('preview', JSON.stringify(dataFrom.value))
+      const newpage = router.resolve({
+        path: '/details',
+      })
+      window.open(newpage.href, '_blank')
+    }
   }
   const submit = () => {
     notFilled.value = []
diff --git a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue
index 1572dc75..b3533225 100644
--- a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue
+++ b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue
@@ -434,15 +434,31 @@
   }
   // 预览
   const preview = () => {
-    dataFrom.value.infoList = dataFrom.value.infoList.filter(
-      (item) => item.attrValue !== ''
-    )
-    console.log('预览==============>', dataFrom.value)
-    window.sessionStorage.setItem('preview', JSON.stringify(dataFrom.value))
-    const newpage = router.resolve({
-      path: '/details',
-    })
-    window.open(newpage.href, '_blank')
+    notFilled.value = []
+    console.log(dataFrom.value, 'dataFrom.value.name')
+    if (
+      !dataFrom.value.infoList.filter(
+        (val) => val.attrType === '组件地址'
+      )[0] ||
+      !dataFrom.value.infoList.filter((val) => val.attrType === '组件地址')[0]
+        .attrValue
+    ) {
+      notFilled.value.push('组件地址')
+    }
+    if (notFilled.value.length > 0) {
+      message.warning('请填写必填字段')
+      console.log(notFilled.value)
+    } else {
+      dataFrom.value.infoList = dataFrom.value.infoList.filter(
+        (item) => item.attrValue !== ''
+      )
+      console.log('预览==============>', dataFrom.value)
+      window.sessionStorage.setItem('preview', JSON.stringify(dataFrom.value))
+      const newpage = router.resolve({
+        path: '/details',
+      })
+      window.open(newpage.href, '_blank')
+    }
   }
   // 特殊字段处理
   const refPutOnTheShelf = ref(null)
diff --git a/front/src/views/capacityOnTheShelf/LayerServices.vue b/front/src/views/capacityOnTheShelf/LayerServices.vue
index 0038a0e0..bca26c23 100644
--- a/front/src/views/capacityOnTheShelf/LayerServices.vue
+++ b/front/src/views/capacityOnTheShelf/LayerServices.vue
@@ -334,15 +334,31 @@
   }
   // 预览
   const preview = () => {
-    dataFrom.value.infoList = dataFrom.value.infoList.filter(
-      (item) => item.attrValue !== ''
-    )
-    console.log('预览==============>', dataFrom.value)
-    window.sessionStorage.setItem('preview', JSON.stringify(dataFrom.value))
-    const newpage = router.resolve({
-      path: '/details',
-    })
-    window.open(newpage.href, '_blank')
+    notFilled.value = []
+    console.log(dataFrom.value, 'dataFrom.value.name')
+    if (
+      !dataFrom.value.infoList.filter(
+        (val) => val.attrType === '服务地址'
+      )[0] ||
+      !dataFrom.value.infoList.filter((val) => val.attrType === '服务地址')[0]
+        .attrValue
+    ) {
+      notFilled.value.push('服务地址')
+    }
+    if (notFilled.value.length > 0) {
+      message.warning('请填写必填字段')
+      console.log(notFilled.value)
+    } else {
+      dataFrom.value.infoList = dataFrom.value.infoList.filter(
+        (item) => item.attrValue !== ''
+      )
+      console.log('预览==============>', dataFrom.value)
+      window.sessionStorage.setItem('preview', JSON.stringify(dataFrom.value))
+      const newpage = router.resolve({
+        path: '/details',
+      })
+      window.open(newpage.href, '_blank')
+    }
   }
   // 特殊字段处理
   const refPutOnTheShelf = ref(null)
diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmNavigation.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmNavigation.vue
index 7c1de008..5a49469a 100644
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmNavigation.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmNavigation.vue
@@ -111,7 +111,8 @@
         item.attrType === '技术文档' ||
         item.attrType === '服务商' ||
         item.attrType === '服务商联系人' ||
-        item.attrType === '服务商联系电话'
+        item.attrType === '服务商联系电话' ||
+        item.attrType === '服务接口'
       ) {
         list.value.push('使用方式')
       }
@@ -164,7 +165,8 @@
             item.attrType === '技术文档' ||
             item.attrType === '服务商' ||
             item.attrType === '服务商联系人' ||
-            item.attrType === '服务商联系电话'
+            item.attrType === '服务商联系电话' ||
+            item.attrType === '服务接口'
           ) {
             list.value.push('使用方式')
           }

From a11d9eb22194693e51981a222585bcbdf9e6a4b0 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Wed, 27 Jul 2022 16:58:31 +0800
Subject: [PATCH 26/27] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=94=B3=E8=AF=B7=20?=
 =?UTF-8?q?=20=E6=91=84=E5=83=8F=E5=A4=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/apply.vue                       | 12 +++++++++++-
 .../src/views/mynoticeView/components/NoticeList.vue |  3 ++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index c58a256b..74cfa2f4 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -459,7 +459,17 @@
                       obj.system.push({
                         resourceId: sxt.idtCameraChannel + '',
                         resourceName: sxt.channelName,
-                        cameraId: sxt.channelId,
+                        cameraId: sxt.channelId, // 改接口后删除
+                        channelCode: sxt.channelCode,
+                        channelId: sxt.channelId,
+                        channelName: sxt.channelName,
+                        checkStatus: sxt.checkStatus + '',
+                        gpsX: sxt.gpsX,
+                        gpsY: sxt.gpsY,
+                        idtCameraChannel: sxt.idtCameraChannel + '',
+                        nodeName: sxt.nodeName,
+                        parentId: sxt.parentId,
+                        status: sxt.status + '',
                       })
                     })
                     submitApply(obj).then((res) => {
diff --git a/front/src/views/mynoticeView/components/NoticeList.vue b/front/src/views/mynoticeView/components/NoticeList.vue
index 2003708d..24bd8486 100644
--- a/front/src/views/mynoticeView/components/NoticeList.vue
+++ b/front/src/views/mynoticeView/components/NoticeList.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-21 11:55:07
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-21 17:05:11
+ * @LastEditTime: 2022-07-27 15:57:26
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -105,6 +105,7 @@
       v-model:pageSize="pageSize"
       :total="total"
       show-less-items
+      :show-size-changer="false"
       @change="changePageNum"
     />
   </div>

From fd3a7ef353b8f0679c1e3f5a87a106bc84c8224f Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 28 Jul 2022 09:40:05 +0800
Subject: [PATCH 27/27] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=20=E5=8E=BB=E9=99=A4X?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/public/static/config/location.js           | 8 ++++----
 front/src/views/home/videoSurveillance/index.vue | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js
index c6e2de12..11efe16f 100644
--- a/front/public/static/config/location.js
+++ b/front/public/static/config/location.js
@@ -1,13 +1,13 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-26 15:16:46
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-07-28 09:36:58
  * @Description: 数据资源参数配置
  */
-//const newLocation = 'qingdao'
+const newLocation = 'qingdao'
 // const newLocation = 'baotou'
-const newLocation = 'xihaian'
+// const newLocation = 'xihaian'
 
 // 数据资源数据
 const whoShow = {}
diff --git a/front/src/views/home/videoSurveillance/index.vue b/front/src/views/home/videoSurveillance/index.vue
index 70139cf6..54b2653d 100644
--- a/front/src/views/home/videoSurveillance/index.vue
+++ b/front/src/views/home/videoSurveillance/index.vue
@@ -11,7 +11,6 @@
         <el-autocomplete
           v-model="address"
           placeholder="请输入地址"
-          clearable
           :fetch-suggestions="
             (queryString, cb) => {
               searchAddressByKeyWord(queryString, cb, i)