合并版本v0.8.3.1

back/src/mixins/view-module.js

@@ -109,11 +109,15 @@ export default {
         }
 
         console.log('数据列表', this.dataList, this.mixinViewModuleOptions.getDataListURL)
-        // if (this.dataList[0].type === '组件服务') {
+        if (this.dataList[0].type === '组件服务') {
-        //   this.dataList.map(val => {
+          this.dataList.map(val => {
-        //     val.infoList = val.infoList.filter(item => item.attrType === '部署位置' || item.attrType === '组件类型' || item.attrType === '应用领域')
+            val.infoList2 = val.infoList.filter(item => item.attrType === '应用领域' || item.attrType === '组件类型')
-        //   })
+          })
-        // }
+        } else if (this.dataList[0].type === '应用资源') {
+          this.dataList.map(val => {
+            val.infoList2 = val.infoList.filter(item => item.attrType === '应用领域')
+          })
+        }
         if (this.mixinViewModuleOptions.requestCallback) {
           this.mixinViewModuleOptions.requestCallback(res.data)
         }

back/src/views/modules/ability/bsabilityai.vue

@@ -66,6 +66,38 @@
           header-align="center"
           align="center"
         ></af-table-column>
+        <af-table-column
+          :show-overflow-tooltip="true"
+          width="280"
+          prop="description"
+          label="组件描述"
+          header-align="center"
+          align="center"
+        ></af-table-column>
+        <af-table-column
+          :show-overflow-tooltip="true"
+          width="280"
+          prop="deptName"
+          label="归属部门"
+          header-align="center"
+          align="center"
+        ></af-table-column>
+        <af-table-column
+          :show-overflow-tooltip="true"
+          width="280"
+          prop="deptContacts"
+          label="部门联系人"
+          header-align="center"
+          align="center"
+        ></af-table-column>
+        <af-table-column
+          :show-overflow-tooltip="true"
+          width="280"
+          prop="deptPhone"
+          label="部门联系人电话"
+          header-align="center"
+          align="center"
+        ></af-table-column>
         <af-table-column
           :show-overflow-tooltip="true"
           width="280"
@@ -74,18 +106,18 @@
           header-align="center"
           align="center"
         ></af-table-column>
-        <template v-if="dataList[0] && dataList[0].infoList">
+        <template v-if="dataList[0] && dataList[0].infoList2">
         <af-table-column
           :show-overflow-tooltip="true"
-          width="300"
+          width="280"
-          v-for="(item, index) in dataList[0].infoList"
+          v-for="(item, index) in dataList[0].infoList2"
           :key="index"
           :label="item.attrType"
           header-align="center"
           align="center"
         >
           <template slot-scope="scope">
-            {{ findValue(scope.row.infoList, item.attrType) }}
+            {{ findValue(scope.row.infoList2, item.attrType) }}
           </template>
         </af-table-column>
         </template>
@@ -94,7 +126,7 @@
           fixed="right"
           header-align="center"
           align="center"
-          width="150"
+          width="300"
         >
           <template slot-scope="scope">
             <!-- <el-button
@@ -187,10 +219,14 @@
       width="50%"
     >
       <putOnTheShelf
+        ref="putOnTheShelf"
         :putOnTheShelfList="putOnTheShelfList"
         @changeInfoList="changeInfoList"
         :type="radio"
         :typeInput="typeInput"
+        :required="required"
+        :notFilled="notFilled"
+        @submitData="submitData"
       ></putOnTheShelf>
       <span slot="footer" class="dialog-footer">
         <el-button @click="clear">取 消</el-button>
@@ -211,6 +247,8 @@ export default {
   mixins: [mixinViewModule],
   data () {
     return {
+      required: ['归属部门', '部门联系人', '部门联系人电话', '应用领域', '共享条件', '算法名称', '算法描述', '图层名称', '图层描述', '组件名称', '组件描述', '组件地址', '服务地址', '服务接口', '接口请求方式', '算法类别'],
+      notFilled: [],
       insertList: [],
       putOnTheShelfList: [],
       radio: '',
@@ -300,19 +338,18 @@ export default {
           this.dataList = this.mixinViewModuleOptions.getDataListIsPage
             ? res.data.list
             : res.data
-          // this.dataList.map((item, index) => {
+          this.dataList.map((item, index) => {
-          //   const dataListSinforList = []
+            const dataListSinforList = []
-          //   item.infoList.map((itemson, indexson) => {
+            item.infoList.map((itemson, indexson) => {
-          //     if (
+              if (
-          //       itemson.attrType === '部署位置' ||
+                itemson.attrType === '应用领域' ||
-          //       itemson.attrType === '组件类型' ||
+                itemson.attrType === '组件类型'
-          //       itemson.attrType === '应用领域'
+              ) {
-          //     ) {
+                dataListSinforList.push(itemson)
-          //       dataListSinforList.push(itemson)
+              }
-          //     }
+            })
-          //   })
+            this.dataList[index].infoList2 = dataListSinforList
-          //   this.dataList[index].infoList = dataListSinforList
+          })
-          // })
           console.log('this.dataList', this.dataList)
           this.total = this.mixinViewModuleOptions.getDataListIsPage
             ? res.data.total
@@ -387,19 +424,18 @@ export default {
                 this.mixinViewModuleOptions.requestCallback(res.data)
               }
               this.dataListLoading = false
-              // this.dataList.map((item, index) => {
+              this.dataList.map((item, index) => {
-              //   const dataListSinforList = []
+                const dataListSinforList = []
-              //   item.infoList.map((itemson, indexson) => {
+                item.infoList.map((itemson, indexson) => {
-              //     if (
+                  if (
-              //       itemson.attrType === '部署位置' ||
+                    itemson.attrType === '应用领域' ||
-              //       itemson.attrType === '组件类型' ||
+                    itemson.attrType === '组件类型'
-              //       itemson.attrType === '应用领域'
+                  ) {
-              //     ) {
+                    dataListSinforList.push(itemson)
-              //       dataListSinforList.push(itemson)
+                  }
-              //     }
+                })
-              //   })
+                this.dataList[index].infoList2 = dataListSinforList
-              //   this.dataList[index].infoList = dataListSinforList
+              })
-              // })
             } else {
               this.$message.error('未查询到相关信息')
               this.reset()
@@ -448,6 +484,7 @@ export default {
     // 新上架
     clear () {
       console.log('清空----------------------------------------')
+      this.notFilled = []
       this.showPutOnTheShelfFlag = false
       this.showPutOnTheShelfFlag2 = false
       this.insertList = []
@@ -490,8 +527,24 @@ export default {
       )
       this.submitFrom.infoList.push(obj)
     },
+    changeAdd () {
+      const arr = []
+      switch (this.radio) {
+        case '智能算法':
+          arr.push('算法优势')
+          arr.push('计费标准信息')
+          break
+        case '开发组件':
+        case '业务组件':
+          arr.push('功能介绍')
+          break
+      }
+      arr.push('应用场景')
+      arr.push('常见问题')
+      this.$refs.putOnTheShelf.submit(arr)
+    },
     submitData () {
-      console.log('提交11111111111===============>', this.putOnTheShelfList)
+      console.log('提交11111111111===============>', this.putOnTheShelfList, this.submitFrom)
       const arr = []
       this.putOnTheShelfList.map((item) => {
         item.children.map((child) => {
@@ -527,7 +580,7 @@ export default {
                   (item) => item.attrType !== val.name
                 )
               }
-              if (val.note1) {
+              if (val.note1 == '' || val.note1) {
                 switch (val.name) {
                   case '算法名称':
                   case '应用名称':
@@ -603,6 +656,51 @@ export default {
       this.submitFrom.infoList = this.submitFrom.infoList.sort(
         (a, b) => arr.indexOf(a.attrType) - arr.indexOf(b.attrType)
       )
+      this.notFilled = []
+      if (!this.submitFrom.name) {
+        this.notFilled.push('算法名称')
+        this.notFilled.push('图层名称')
+        this.notFilled.push('组件名称')
+      }
+      if (!this.submitFrom.description) {
+        this.notFilled.push('算法描述')
+        this.notFilled.push('图层描述')
+        this.notFilled.push('组件描述')
+      }
+      if (!this.submitFrom.shareCondition) {
+        this.notFilled.push('共享条件')
+      }
+      if (!this.submitFrom.deptContacts) {
+        this.notFilled.push('部门联系人')
+      }
+      if (!this.submitFrom.deptPhone) {
+        this.notFilled.push('部门联系人电话')
+      }
+      if (this.radio === '智能算法' && !this.submitFrom.apiUrl) {
+        this.notFilled.push('服务接口')
+      }
+      if (this.radio === '智能算法' && !this.submitFrom.apiMethodType) {
+        this.notFilled.push('接口请求方式')
+      }
+      if (this.radio === '智能算法' && (!this.submitFrom.infoList.filter(val => val.attrType === '算法类别')[0] || !this.submitFrom.infoList.filter(val => val.attrType === '算法类别')[0].attrValue)) {
+        this.notFilled.push('算法类别')
+      }
+      if (!this.submitFrom.infoList.filter(val => val.attrType === '应用领域')[0] || !this.submitFrom.infoList.filter(val => val.attrType === '应用领域')[0].attrValue) {
+        this.notFilled.push('应用领域')
+      }
+      if (this.radio === '图层服务' && (!this.submitFrom.infoList.filter(val => val.attrType === '服务地址')[0] || !this.submitFrom.infoList.filter(val => val.attrType === '服务地址')[0].attrValue)) {
+        this.notFilled.push('服务地址')
+      }
+      if ((this.radio === '业务组件' || this.radio === '开发组件') && (!this.submitFrom.infoList.filter(val => val.attrType === '组件地址')[0] || !this.submitFrom.infoList.filter(val => val.attrType === '组件地址')[0].attrValue)) {
+        this.notFilled.push('组件地址')
+      }
+      console.log(this.submitFrom, this.notFilled, '表单验证')
+      if (this.notFilled.length > 0) {
+        this.$message({
+          message: '请填写必填字段！',
+          type: 'warning'
+        })
+      } else {
         if (this.submitFrom.id) {
         // 解决编辑无组件类型
           this.submitFrom.infoList.map((val) => {
@@ -621,10 +719,6 @@ export default {
             }
           )
           this.submitFrom.infoList = newArr
-        console.log(
-          this.submitFrom.infoList,
-          '====================================wpwpwp'
-        )
           this.$http
             .put('/resource/update', this.submitFrom)
             .then(({ data: res }) => {
@@ -637,6 +731,7 @@ export default {
             })
             .catch(() => {})
         } else {
+          console.log('提交11111111111===============>', this.putOnTheShelfList, this.submitFrom)
           this.$http
             .post('/resource/insert?source= b', this.submitFrom)
             .then(({ data: res }) => {
@@ -649,6 +744,7 @@ export default {
             })
             .catch(() => {})
         }
+      }
     },
     // 新修改
     UpdateData (item) {

back/src/views/modules/ability/bsabilityservice.vue

@@ -61,22 +61,65 @@
           width="50"
         ></el-table-column>
         <el-table-column
+          :show-overflow-tooltip="true"
+          width="280"
           prop="name"
           label="应用名称"
           header-align="center"
           align="center"
         ></el-table-column>
-        <template v-if="dataList[0] && dataList[0].infoList">
+        <af-table-column
+          :show-overflow-tooltip="true"
+          width="280"
+          prop="description"
+          label="应用描述"
+          header-align="center"
+          align="center"
+        ></af-table-column>
+        <af-table-column
+          :show-overflow-tooltip="true"
+          width="280"
+          prop="deptName"
+          label="归属部门"
+          header-align="center"
+          align="center"
+        ></af-table-column>
+        <af-table-column
+          :show-overflow-tooltip="true"
+          width="280"
+          prop="deptContacts"
+          label="部门联系人"
+          header-align="center"
+          align="center"
+        ></af-table-column>
+        <af-table-column
+          :show-overflow-tooltip="true"
+          width="280"
+          prop="deptPhone"
+          label="部门联系人电话"
+          header-align="center"
+          align="center"
+        ></af-table-column>
+        <af-table-column
+          :show-overflow-tooltip="true"
+          width="280"
+          prop="shareCondition"
+          label="共享条件"
+          header-align="center"
+          align="center"
+        ></af-table-column>
+        <template v-if="dataList[0] && dataList[0].infoList2">
           <el-table-column
-            v-for="(item, index) in dataList[0].infoList"
+            v-for="(item, index) in dataList[0].infoList2"
             :key="index"
             :label="item.attrType"
             header-align="center"
             align="center"
             :show-overflow-tooltip="true"
+            width="280"
           >
             <template slot-scope="scope">
-              {{ findValue(scope.row.infoList, item.attrType) }}
+              {{ findValue(scope.row.infoList2, item.attrType) }}
             </template>
           </el-table-column>
         </template>
@@ -85,8 +128,7 @@
           fixed="right"
           header-align="center"
           align="center"
-          width="94"
+          width="300"
-          right="0"
         >
           <template slot-scope="scope">
             <el-button
@@ -169,7 +211,7 @@
       :destroy-on-close='true'
       :before-close='clear'
       width="50%">
-      <putOnTheShelf :putOnTheShelfList='putOnTheShelfList' @changeInfoList='changeInfoList' :type='radio' :typeInput='typeInput'></putOnTheShelf>
+      <putOnTheShelf :required="required" :notFilled="notFilled":putOnTheShelfList='putOnTheShelfList' @changeInfoList='changeInfoList' :type='radio' :typeInput='typeInput'></putOnTheShelf>
       <span slot="footer" class="dialog-footer">
         <el-button @click="clear">取 消</el-button>
         <el-button type="primary" @click="submitData">确 定</el-button>
@@ -191,6 +233,8 @@ export default {
   mixins: [mixinViewModule],
   data () {
     return {
+      required: ['归属部门', '部门联系人', '部门联系人电话', '应用领域', '共享条件', '应用名称', '应用描述', '应用状态', '应用类型'],
+      notFilled: [],
       mixinViewModuleOptions: {
         getDataListURL: '/resource/page',
         getDataListIsPage: true,
@@ -282,6 +326,17 @@ export default {
             this.mixinViewModuleOptions.requestCallback(res.data)
           }
           this.dataListLoading = false
+          this.dataList.map((item, index) => {
+            const dataListSinforList = []
+            item.infoList.map((itemson, indexson) => {
+              if (
+                itemson.attrType === '应用领域'
+              ) {
+                dataListSinforList.push(itemson)
+              }
+            })
+            this.dataList[index].infoList2 = dataListSinforList
+          })
         })
         .catch(() => {
           this.dataListLoading = false
@@ -347,6 +402,17 @@ export default {
                 this.mixinViewModuleOptions.requestCallback(res.data)
               }
               this.dataListLoading = false
+              this.dataList.map((item, index) => {
+                const dataListSinforList = []
+                item.infoList.map((itemson, indexson) => {
+                  if (
+                    itemson.attrType === '应用领域'
+                  ) {
+                    dataListSinforList.push(itemson)
+                  }
+                })
+                this.dataList[index].infoList2 = dataListSinforList
+              })
             } else {
               this.$message.error('未查询到相关信息')
               this.reset()
@@ -485,6 +551,7 @@ export default {
     },
     // 新上架
     clear () {
+      this.notFilled = []
       this.showPutOnTheShelfFlag2 = false
       this.insertList = []
       this.putOnTheShelfList = []
@@ -517,7 +584,6 @@ export default {
       this.submitFrom.infoList.push(obj)
     },
     submitData () {
-      this.showPutOnTheShelfFlag2 = false
       const arr = []
       this.putOnTheShelfList.map(item => {
         item.children.map(child => {
@@ -537,7 +603,7 @@ export default {
               if (val.type === 'input' || val.type === 'textArea' || val.type === 'select' || val.type === 'checkBox' || val.type === 'radio') {
                 this.submitFrom.infoList = this.submitFrom.infoList.filter((item) => item.attrType !== val.name)
               }
-              if (val.note1) {
+              if (val.note1 || val.note1) {
                 switch (val.name) {
                   case '算法名称':
                   case '应用名称':
@@ -603,6 +669,38 @@ export default {
         })
       })
       this.submitFrom.infoList = this.submitFrom.infoList.sort((a, b) => arr.indexOf(a.attrType) - arr.indexOf(b.attrType))
+      this.notFilled = []
+      console.log(this.submitFrom, '表单验证')
+      if (!this.submitFrom.name) {
+        this.notFilled.push('应用名称')
+      }
+      if (!this.submitFrom.description) {
+        this.notFilled.push('应用描述')
+      }
+      if (!this.submitFrom.shareCondition) {
+        this.notFilled.push('共享条件')
+      }
+      if (!this.submitFrom.deptContacts) {
+        this.notFilled.push('部门联系人')
+      }
+      if (!this.submitFrom.deptPhone) {
+        this.notFilled.push('部门联系人电话')
+      }
+      if (!this.submitFrom.infoList.filter(val => val.attrType == '应用领域')[0] || !this.submitFrom.infoList.filter(val => val.attrType == '应用领域')[0].attrValue) {
+        this.notFilled.push('应用领域')
+      }
+      if (!this.submitFrom.infoList.filter(val => val.attrType == '应用状态')[0] || !this.submitFrom.infoList.filter(val => val.attrType == '应用状态')[0].attrValue) {
+        this.notFilled.push('应用状态')
+      }
+      if (!this.submitFrom.infoList.filter(val => val.attrType == '应用类型')[0] || !this.submitFrom.infoList.filter(val => val.attrType == '应用类型')[0].attrValue) {
+        this.notFilled.push('应用类型')
+      }
+      if (this.notFilled.length > 0) {
+        this.$message({
+          message: '请填写必填字段！',
+          type: 'warning'
+        })
+      } else {
         if (this.submitFrom.id) {
         // 解决编辑无组件类型
           this.submitFrom.infoList.map(val => {
@@ -616,8 +714,10 @@ export default {
             .then(({ data: res }) => {
               if (res.code !== 0) {
                 this.$message.error('修改失败!')
+                this.showPutOnTheShelfFlag2 = false
               } else {
                 this.$message.success('修改成功！')
+                this.showPutOnTheShelfFlag2 = false
                 this.clear()
               }
             })
@@ -628,13 +728,16 @@ export default {
             .then(({ data: res }) => {
               if (res.code !== 0) {
                 this.$message.error('上架失败!')
+                this.showPutOnTheShelfFlag2 = false
               } else {
                 this.$message.success('上架成功！')
+                this.showPutOnTheShelfFlag2 = false
                 this.clear()
               }
             })
             .catch(() => {})
         }
+      }
     },
     // 新修改
     UpdateData (item) {

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

@@ -4,7 +4,7 @@
     <div class="Ability-to-take-off-the-shelf-approval-title">能力下架审批</div>
     <div class="basic-information">
       <div class="basic-information-title">
-        <span></span><span>基本信息</span>
+        <span></span><span>基本1111信息</span>
       </div>
       <div class="basic-information-content">
         <p>
@@ -136,6 +136,7 @@
 
 <script>
 // 引入工作流公共方法
+import bus from '@/views/bus.js'
 import processModule from '@/mixins/process-module'
 import RenProcessDetail from '@/components/ren-process-detail/src/ren-process-detail'
 import debounce from 'lodash/debounce'
@@ -243,6 +244,7 @@ export default {
                 }
                 return
               }
+              bus.$emit('AbilityResourcesRemovedInit')
               this.$message({
                 message: this.$t('prompt.success'),
                 type: 'success',
@@ -272,6 +274,7 @@ export default {
                 }
                 return
               }
+              bus.$emit('AbilityResourcesRemovedInit')
               this.$message({
                 message: this.$t('prompt.success'),
                 type: 'success',

back/src/views/modules/myAgent/AbilityResourceShelf.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-27 11:27:22
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-29 16:31:26
+ * @LastEditTime: 2022-07-25 09:45:35
  * @Description: "能力资源上架"
 -->
 <template>
@@ -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>
@@ -128,6 +128,7 @@
 </template>
 
 <script>
+import bus from '@/views/bus.js'
 import mixinViewModule from '@/mixins/view-module'
 import processModule from '@/mixins/process-module'
 export default {
@@ -165,6 +166,12 @@ export default {
       }
       this.getProcDefRouteSet(row, this.forwardTaskDetail)
     }
+  },
+  created () {
+    bus.$off('abilityResourceShelfInit')
+    bus.$on('abilityResourceShelfInit', () => {
+      this.getDataList()
+    })
   }
 }
 </script>

back/src/views/modules/myAgent/AbilityResourcesRemoved.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-27 11:27:22
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-29 16:31:26
+ * @LastEditTime: 2022-07-25 09:48:46
  * @Description: "能力资源下架"
 -->
 <template>
@@ -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>
@@ -128,6 +128,7 @@
 </template>
 
 <script>
+import bus from '@/views/bus.js'
 import mixinViewModule from '@/mixins/view-module'
 import processModule from '@/mixins/process-module'
 export default {
@@ -165,6 +166,12 @@ export default {
       }
       this.getProcDefRouteSet(row, this.forwardTaskDetail)
     }
+  },
+  created () {
+    bus.$off('AbilityResourcesRemovedInit')
+    bus.$on('AbilityResourcesRemovedInit', () => {
+      this.getDataList()
+    })
   }
 }
 </script>

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>

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>

back/src/views/modules/myAgent/CompetencyApplication.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-27 11:27:22
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-29 16:31:26
+ * @LastEditTime: 2022-07-25 09:39:01
  * @Description: 能力申请
 -->
 <template>
@@ -118,6 +118,7 @@
 </template>
 
 <script>
+import bus from '@/views/bus.js'
 import mixinViewModule from '@/mixins/view-module'
 import processModule from '@/mixins/process-module'
 export default {
@@ -155,6 +156,12 @@ export default {
       }
       this.getProcDefRouteSet(row, this.forwardTaskDetail)
     }
+  },
+  created () {
+    bus.$off('competencyApplicationInit')
+    bus.$on('competencyApplicationInit', () => {
+      this.getDataList()
+    })
   }
 }
 </script>

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"
@@ -63,6 +64,19 @@
                 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
+                      }
+                    }
+                  })
+                }
+              })
+            }
+          })
         }
       }
     }

back/src/views/modules/myAgent/demo/ability-resource-shelf.vue

@@ -83,6 +83,7 @@
 </template>
 
 <script>
+import bus from '@/views/bus.js'
 import ResourcesAndServices from './ResourcesAndServices.vue'
 import debounce from 'lodash/debounce'
 import qs from 'qs'
@@ -214,6 +215,7 @@ export default {
                 }
                 return
               }
+              bus.$emit('abilityResourceShelfInit')
               this.$message({
                 message: this.$t('prompt.success'),
                 type: 'success',
@@ -244,6 +246,7 @@ export default {
                 }
                 return
               }
+              bus.$emit('abilityResourceShelfInit')
               this.$message({
                 message: this.$t('prompt.success'),
                 type: 'success',

back/src/views/modules/myAgent/demo/competency-application.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-29 15:59:51
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-21 16:41:09
+ * @LastEditTime: 2022-07-25 09:42:46
  * @Description: 告诉大家这是什么
 -->
 <!--  流程业务表单   -->
@@ -34,11 +34,13 @@
               dataForm.content.applicationSystem || '--'
             }}</span></span
           >
-          <span class="text" v-if="dataForm.content.applicationSceneStr"
+          <span class="text" ></span>
+        </p>
+        <p>
+          <span v-if="dataForm.content.applicationSceneStr"
             >应用场景：<span>
               {{ dataForm.content.applicationSceneStr || '--' }}</span
-            ></span
+            ></span>
-          >
         </p>
         <p>
           <span>
@@ -131,6 +133,7 @@ import processModule from '@/mixins/process-module'
 import debounce from 'lodash/debounce'
 import qs from 'qs'
 import RenProcessDetail from '@/components/ren-process-detail/src/ren-process-detail'
+import bus from '@/views/bus.js'
 export default {
   // 注入公共方法
   mixins: [processModule],
@@ -386,6 +389,7 @@ export default {
                 }
                 return
               }
+              bus.$emit('competencyApplicationInit')
               this.$message({
                 message: this.$t('prompt.success'),
                 type: 'success',
@@ -415,6 +419,7 @@ export default {
                 }
                 return
               }
+              bus.$emit('competencyApplicationInit')
               this.$message({
                 message: this.$t('prompt.success'),
                 type: 'success',

back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue

@@ -16,12 +16,13 @@ js:
 <template>
     <div id="inputSelectCheckbox">
       <!-- input框 -->
-      <a-input v-if="type == 'input'" v-model:value="data.note1" :placeholder="'请输入' + name" />
+      <a-input v-if="type == 'input'" v-model:value="data.note1" :placeholder="'请输入' + name" @change="changeIiem(name,data.note1)"/>
       <!-- 下拉框 -->
        <el-select
         v-else-if="(type === 'select' && name !== '归属部门' && name !== '使用方式') || type == 'radio'"
         style="width: 240px"
          v-model:value="data.note1"
+         @change="changeIiem(name,data.note1)"
         :placeholder="'请选择' + name">
         <el-option
           :value="itemSelect.dictLabel"
@@ -36,6 +37,7 @@ js:
          v-model:value="data.note1"
         filterable
         placeholder="请输入关键词"
+         @change="changeIiem(name,data.note1)"
         :loading="loading">
         <el-option
           v-for="(itemSelect) in options"
@@ -73,12 +75,13 @@ js:
         v-model="value"
         :placeholder="'请输入' + name"
         :disabled="true"
+         @change="changeIiem(name,data.note1)"
       />
       <!-- 单选 -->
        <!-- <el-radio-group v-model:value="data.note1" v-else-if="type == 'radio'">
         <el-radio v-for="item in options" :label="item.dictLabel" :key="item.dictLabel">{{item.dictLabel}}</el-radio>
       </el-radio-group> -->
-    <a-textarea v-else-if="type == 'textArea'"  v-model:value="data.note1" :showCount="true" :maxlength="200" :placeholder="'请填写' + name" />
+    <a-textarea v-else-if="type == 'textArea'" @change="changeIiem(name,data.note1)" v-model:value="data.note1" :showCount="true" :maxlength="200" :placeholder="'请填写' + name" />
     </div>
 </template>
 <script>
@@ -92,6 +95,7 @@ export default {
     data: Array,
     name: String,
     value: String,
+    changeField: Array,
     options: {
       type: Array,
       default: null
@@ -108,6 +112,15 @@ export default {
     }
   },
   methods: {
+    changeIiem (name, value) {
+      if (value && value !== '' && this.changeField.indexOf(name) == -1) {
+        this.changeField.push(name)
+      } else if (!value || value == '') {
+        if (this.changeField.indexOf(name) > -1) {
+          this.changeField.splice(this.changeField.indexOf(name), 1)
+        }
+      }
+    },
     selectOptions () {
       if (this.data.isLinkToDic === 'true' && this.data.linkValue) {
         this.$http
@@ -140,7 +153,7 @@ export default {
         //     dataList.push(element)
         //   })
         // this.options = dataList
-        if (!this.data.note1) {
+        if (this.data.note1 == null) {
           this.$http.get('/sys/user/info').then(({ data: res }) => {
             console.log(res.data)
             this.data.note1 = res.data.realName || ''
@@ -154,7 +167,7 @@ export default {
         //     dataList.push(element)
         //   })
         //   this.options = dataList
-        if (!this.data.note1) {
+        if (this.data.note1 == null) {
           this.$http.get('/sys/user/info').then(({ data: res }) => {
             console.log(res.data)
             this.data.note1 = res.data.mobile || ''
@@ -172,6 +185,13 @@ export default {
         }
       })
       this.data.note1 = str
+      if (str !== '' && this.changeField.indexOf('应用领域') == -1) {
+        this.changeField.push('应用领域')
+      } else if (str == '') {
+        if (this.changeField.indexOf('应用领域') > -1) {
+          this.changeField.splice(this.changeField.indexOf('应用领域'), 1)
+        }
+      }
     },
     showTypeClick (e) {
       this.showType = e

back/src/views/modules/putOnTheShelf/components/special.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-08 09:54:50
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-11 16:18:00
+ * @LastEditTime: 2022-07-25 11:20:25
  * @Description: 多条数据特殊处理
 -->
 <template>
@@ -33,7 +33,7 @@
               </div>
             </div>
           </div>
-          <div class="add">添加更多{{ configure.name }}</div>
+          <!-- <div class="add">添加更多{{ configure.name }}</div> -->
           <div class="form" v-for="(val, index) in configure.list" :key="'key3' + val.name + index">
             <span>{{ val.name }}</span>
             <a-input v-model:value="val.note1" ::maxlength="24" :placeholder="'请填写' + val.name + ',不超过24个字符'"
@@ -42,7 +42,7 @@
               <a-input
                 v-model:value="val.note1"
                 :placeholder="'请填写' + val.name"
-                style="width: calc(100% - 150px);"
+                style="width: 570px;"
               />
               <span style="width: 2.5rem; padding-left: 0.1rem">
                 {{
@@ -93,7 +93,8 @@ export default {
     }
   },
   methods: {
-    add (title) {
+    add (title, addFlag, submitFlag) {
+      console.log(title, addFlag, submitFlag)
       const list = this.configure.list
       let flag = true
       list.forEach((item) => {
@@ -142,10 +143,23 @@ export default {
         })
         list.forEach((item) => {
           item.note1 = ''
-        })
           this.showKey++
+        })
+        if (addFlag && submitFlag) {
+          this.$emit('submitData')
+        }
       } else {
+        if (!addFlag) {
           this.$message.warning('请填写完整')
+        } else {
+          list.forEach((item) => {
+            item.note1 = ''
+            this.showKey++
+          })
+          if (submitFlag) {
+            this.$emit('submitData')
+          }
+        }
       }
     },
     del (title, index) {

back/src/views/modules/putOnTheShelf/index.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-08 09:48:52
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-11 15:11:10
+ * @LastEditTime: 2022-07-25 15:57:25
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -21,7 +21,11 @@
                 (showTypeName == 'SDK' && item.name == '接口请求方式') ||
                 (showTypeName == 'SDK' && item.name == '服务接口')
             )">
-              <span >{{ item.name }}</span>
+              <div class="box">
+                <div>
+                <span class="required" v-if="required.indexOf(item.name) > -1">*</span>
+                {{ item.name }}
+              </div>
               <!-- <upload :list="[]" v-if="item.type == 'image'" type="图片" btnName="上传图片" :maxCount="1" :data="item"
                 tip="支持图片类型，大小不超过100M"></upload> -->
               <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.jpg,.jpeg,.png' :list="item" v-if="item.type == 'image'" type="图片" btnName="上传图片" :maxCount="1"
@@ -34,17 +38,20 @@
                 tip="支持视频类型，大小不超过100M"></upload>
               <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.zip' :list="item" v-else-if="item.type == 'package'" type="安装包" btnName="上传安装包" :maxCount="1" :dataList="item"
                 tip="支持.zip类型，大小不超过100M"></upload>
-              <input-select-checkbox :list="[]" v-else-if="item.type == 'AbilityType'" type="disabled" :data="item" :name="item.name" :value="typeInput"></input-select-checkbox>
+              <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'AbilityType'" type="disabled" :data="item" :name="item.name" :value="typeInput"></input-select-checkbox>
-              <input-select-checkbox :list="[]" v-else-if="item.type == 'ComponentType'" type="disabled" :data="item" :name="item.name" :value="type"></input-select-checkbox>
+              <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'ComponentType'" type="disabled" :data="item" :name="item.name" :value="type"></input-select-checkbox>
-              <input-select-checkbox :list="[]" v-else-if="item.type == 'input'" type="input" :data="item" :name="item.name"></input-select-checkbox>
+              <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'input'" type="input" :data="item" :name="item.name"></input-select-checkbox>
-              <input-select-checkbox :list="[]" v-else-if="item.type == 'select'" type="select" :data="item" :name="item.name" :options="item.options" @show-type="showType"></input-select-checkbox>
+              <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'select'" type="select" :data="item" :name="item.name" :options="item.options" @show-type="showType"></input-select-checkbox>
-              <input-select-checkbox :list="[]" v-else-if="item.type == 'checkBox'" type="checkBox" :data="item" :name="item.name" :options="item.options"></input-select-checkbox>
+              <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'checkBox'" type="checkBox" :data="item" :name="item.name" :options="item.options"></input-select-checkbox>
-              <input-select-checkbox :list="[]" v-else-if="item.type == 'radio'" type="radio" :data="item" :name="item.name" :options="item.options"></input-select-checkbox>
+              <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'radio'" type="radio" :data="item" :name="item.name" :options="item.options"></input-select-checkbox>
-              <input-select-checkbox :list="[]" v-else-if="item.type == 'textArea'" type="textArea" :data="item" :name="item.name"></input-select-checkbox>
+              <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'textArea'" type="textArea" :data="item" :name="item.name"></input-select-checkbox>
+              </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>
           </template>
           <template v-else>
-            <special :configure='judgmentType.filter(item => item.name==child.name)[0]' :showData='child' @changeInfoList='changeInfoList'></special>
+            <special @submitData="submitData" ref="specialRef" :configure='judgmentType.filter(item => item.name==child.name)[0]' :showData='child' @changeInfoList='changeInfoList'></special>
           </template>
         </div>
       </div>
@@ -64,10 +71,13 @@ export default {
   props: {
     type: String,
     putOnTheShelfList: Array,
-    typeInput: String
+    typeInput: String,
+    required: Array,
+    notFilled: Array
   },
   data () {
     return {
+      changeField: [],
       judgmentType: [
         {
           name: '算法优势',
@@ -182,6 +192,21 @@ export default {
     this.defaultContent()
   },
   methods: {
+    // 提交
+    submit (arr) {
+      console.log('提交', arr.length, this.$refs.specialRef)
+      arr.map((val, index) => {
+        if (index === arr.length - 1) {
+          this.$refs.specialRef[index].add(val, true, true)
+        } else {
+          this.$refs.specialRef[index].add(val, true, false)
+        }
+      })
+    },
+    submitData () {
+      // console.log('触发提交')
+      this.$emit('submitData')
+    },
     changeInfoList (obj) {
       this.$emit('changeInfoList', obj)
     },
@@ -241,11 +266,27 @@ export default {
   }
 }
 .item {
+  position: relative;
+  .box{
     display: flex;
     align-items: center;
     margin: 25px 0;
-  & > span:nth-of-type(1) {
+    & > 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>

front/public/index.html

@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.wuhongjian
  * @Date: 2022-03-29 16:45:25
- * @LastEditors: hisense.liangjunhua
+ * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-22 18:45:10
+ * @LastEditTime: 2022-07-26 16:34:20
  * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@@ -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>

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)
+  })

front/public/static/config/location.js

@@ -1,13 +1,13 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
- * @LastEditors: hisense.liangjunhua
+ * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-18 15:07:32
+ * @LastEditTime: 2022-07-26 15:16:46
  * @Description: 数据资源参数配置
  */
-const newLocation = 'qingdao'
+//const newLocation = 'qingdao'
 // const newLocation = 'baotou'
-// const newLocation = 'xihaian'
+const newLocation = 'xihaian'
 
 // 数据资源数据
 const whoShow = {}
@@ -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' },

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 () {
+;(function () {
-  var L = window.L || {};
+  var L = window.L || {}
 
   // // 定义底图初始化化参数
   //  请在此处更改你的配置**********************************************
-  var CONFIGKEY = 'qingdao_highgo';
+  var CONFIGKEY = 'qingdao'
   // var CONFIGKEY = 'dev';
   // 请在上面更改你的配置***********************************************
   var BASECONFIGITEM = {
-    'qingdao': {
+    qingdao: {
-      DATABASE_TYPE: 'Highgo',
+      base: 'xihaian',
-      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]
-        ]
-      },
       CURRENT_MAP_OPTIONS: {
-        center: [36.076209, 120.349632],
+        // crs: CRS_4490,
-        maxZoom: 17,
+        center: [36.17, 120.13],
-        minZoom: 7,
+        maxZoom: 18,
-        zoom: 12,
+        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: {
+    qingdao_highgo: {
-          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': {
       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: {
-      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' },
+        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: {
-      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' },
+        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',
+    BUFFER_URL:
-    QUERY_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/map-HIMAP_HIGHGO/rest/maps/' + BASECONFIGITEM[CONFIGKEY].MAP_NAME,
+      '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',
+    DYNAMIC_ROAD_URL:
-    DYNMIC_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/map-' + BASECONFIGITEM[CONFIGKEY].WORKPLACE_NAME + '/rest/maps/' + BASECONFIGITEM[CONFIGKEY].MAP_NAME,
+      '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',
+    NETWORK_URL:
-    PLOTTING_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/plot-JY/rest/plot/',
+      'http://' +
-    POI_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
+      BASECONFIGITEM[CONFIGKEY].ISERVER_URL +
-    EDITORDATA_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/data-' + BASECONFIGITEM[CONFIGKEY].WORKPLACE_NAME + '/rest/data',
+      '/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]
+    TITLE_LAYER_ARRAY: BASECONFIGITEM[CONFIGKEY].TITLE_LAYER_ARRAY || [
-  };
+      BASECONFIGITEM[CONFIGKEY].TITLE_LAYER,
-  _mapConfig.config = Object.assign(BASECONFIGITEM[CONFIGKEY], MAPCONFIGMIXTRE);
+      BASECONFIGITEM[CONFIGKEY].TITLE_LAYER_REMOTE,
-})();
+      BASECONFIGITEM[CONFIGKEY].TITLE_LAYER_DARK,
+    ],
+  }
+  _mapConfig.config = Object.assign(BASECONFIGITEM[CONFIGKEY], MAPCONFIGMIXTRE)
+})()

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()

front/src/api/file.js

@@ -97,3 +97,18 @@ export function getHls(params) {
     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
+  )
+}

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',
     },
   },

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) => {
+  // selectByChannelCode({ channelCode: feature.data.channelCode }).then((res) => {
-    feature.data = res.data.data[0]
+  //   feature.data = res.data.data[0]
-  })
+  // })
+  // // }
+  // const popupDom = new Dom({
+  //   template: '<Camera-Details-Pop :feature="feature"></Camera-Details-Pop>',
+  //   data() {
+  //     return {
+  //       feature: feature,
   //     }
-  const popupDom = new Dom({
+  //   },
-    template: '<Camera-Details-Pop :feature="feature"></Camera-Details-Pop>',
+  //   created() {},
-    data() {
+  //   components: {
-      return {
+  //     CameraDetailsPop,
-        feature: feature,
+  //   },
-      }
+  // })
-    },
+  // return popupDom.initDom()
-    created() {},
-    components: {
-      CameraDetailsPop,
-    },
-  })
-  return popupDom.initDom()
 }
 function createSearchAddressTitlePop(feature) {
   const popupDom = new Dom({

front/src/supermap/map-init.js

@@ -24,25 +24,12 @@ const CRS_4490 = new L.Proj.CRS(
     //   1.3411051811431041E-6
     // ],
     resolutions: [
-      0.703125,
+      0.703125, 0.3515625, 0.17578125, 0.087890625, 0.0439453125, 0.02197265625,
-      0.3515625,
+      0.010986328125, 0.0054931640625, 0.00274658203125, 0.001373291015625,
-      0.17578125,
+      0.0006866455078125, 0.00034332275390625, 0.000171661376953125,
-      0.087890625,
+      0.0000858306884765625, 0.00004291534423828125, 0.000021457672119140625,
-      0.0439453125,
+      0.000010728836059570312, 0.0000053644180297851563,
-      0.02197265625,
+      0.0000026822090148925781,
-      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

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' : ''">
+              <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;

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>
@@ -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,9 @@
         :configure="bs"
         @submit="submit()"
         @back="back()"
+        @preview="preview()"
+        :required="required"
+        :notFilled="notFilled"
       ></put-on-the-shelf>
       <!-- <algorithm-essential-information
         v-if="showView === '基本信息' && refData.name"
@@ -153,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
@@ -356,6 +381,25 @@
     type: '组件服务',
     deptId: '',
   })
+  const required = ref([
+    '归属部门',
+    '部门联系人',
+    '部门联系人电话',
+    '应用领域',
+    '共享条件',
+    '算法名称',
+    '算法描述',
+    '图层名称',
+    '图层描述',
+    '组件名称',
+    '组件描述',
+    '组件地址',
+    '服务地址',
+    '服务接口',
+    '接口请求方式',
+    '算法类别',
+  ])
+  const notFilled = ref([])
   getUser().then((res) => {
     dataFrom.value.deptId = res.data.data.deptId
   })
@@ -374,6 +418,45 @@
     })
   }
   const next = () => {
+    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) {
@@ -388,6 +471,7 @@
         console.log('表单数据=============>', dataFrom.value, refData.value)
       }
     }
+  }
   // 预览
   const preview = () => {
     dataFrom.value.infoList = dataFrom.value.infoList.filter(
@@ -401,6 +485,30 @@
     window.open(newpage.href, '_blank')
   }
   const submit = () => {
+    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
@@ -437,6 +545,7 @@
         })
       }
     }
+  }
   const init = () => {
     getCategoryTree().then((res) => {
       // console.clear()

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-15 17:39:25
+ * @LastEditTime: 2022-07-26 14:41:26
  * @Description: 应用上架
 -->
 <template>
@@ -35,7 +35,10 @@
           '归属部门',
           '部门联系人',
           '部门联系人电话',
+          '共享条件',
         ]"
+        :required="required"
+        :notFilled="notFilled"
       ></put-on-the-shelf>
       <put-on-the-shelf
         v-else-if="showView === '功能介绍'"
@@ -45,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 === '关联组件'"
@@ -54,16 +59,21 @@
         :configure="glzj"
         @next="next()"
         @back="back()"
+        :required="required"
+        :notFilled="notFilled"
       ></put-on-the-shelf>
       <put-on-the-shelf
         ref="refPutOnTheShelf"
         v-else-if="showView === '部署与应用'"
         :refData="refData"
         :dataFrom="dataFrom"
-        :externalField="['共享条件', '共享类型']"
+        :externalField="['共享类型']"
         :configure="bs"
         @submit="submit()"
         @back="back()"
+        @preview="preview()"
+        :required="required"
+        :notFilled="notFilled"
       ></put-on-the-shelf>
       <!-- <application-essential-information
         v-if="showView === '基本信息' && refData.name"
@@ -118,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>
@@ -260,6 +285,18 @@
       ],
     },
   ])
+  const required = ref([
+    '归属部门',
+    '部门联系人',
+    '部门联系人电话',
+    '应用领域',
+    '共享条件',
+    '应用名称',
+    '应用描述',
+    '应用状态',
+    '应用类型',
+  ])
+  const notFilled = ref([])
   getUser().then((res) => {
     dataFrom.value.deptId = res.data.data.deptId
   })
@@ -275,6 +312,63 @@
     })
   }
   const next = () => {
+    notFilled.value = []
+    console.log(dataFrom.value, notFilled.value, 'dataFrom.value.name')
+    if (!dataFrom.value.name) {
+      notFilled.value.push('应用名称')
+    }
+    if (!dataFrom.value.shareCondition) {
+      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) {
@@ -289,6 +383,7 @@
         console.log('表单数据=============>', dataFrom.value, refData.value)
       }
     }
+  }
   const submit = () => {
     console.log('提交数据=============>', dataFrom.value)
     if (submitFlag.value) {

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>
@@ -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,9 @@
         :configure="bs"
         @submit="submit()"
         @back="back()"
+        @preview="preview()"
+        :required="required"
+        :notFilled="notFilled"
       ></put-on-the-shelf>
     </div>
     <div class="btn" :class="showView === '基本信息' ? 'first' : ''">
@@ -124,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
@@ -327,6 +350,25 @@
     type: '组件服务',
     deptId: '',
   })
+  const required = ref([
+    '归属部门',
+    '部门联系人',
+    '部门联系人电话',
+    '应用领域',
+    '共享条件',
+    '算法名称',
+    '算法描述',
+    '图层名称',
+    '图层描述',
+    '组件名称',
+    '组件描述',
+    '组件地址',
+    '服务地址',
+    '服务接口',
+    '接口请求方式',
+    '算法类别',
+  ])
+  const notFilled = ref([])
 
   const close = () => {
     window.close()
@@ -346,6 +388,36 @@
     })
   }
   const next = () => {
+    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) {
@@ -360,6 +432,7 @@
         console.log('表单数据=============>', dataFrom.value, refData.value)
       }
     }
+  }
   // 预览
   const preview = () => {
     dataFrom.value.infoList = dataFrom.value.infoList.filter(
@@ -373,6 +446,21 @@
     window.open(newpage.href, '_blank')
   }
   const submit = () => {
+    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
@@ -409,6 +497,7 @@
         })
       }
     }
+  }
   // 特殊字段处理
   const refPutOnTheShelf = ref(null)
   const changeGnjs = (type) => {

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>
@@ -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,9 @@
         :configure="bs"
         @submit="submit()"
         @back="back()"
+        @preview="preview()"
+        :required="required"
+        :notFilled="notFilled"
       ></put-on-the-shelf>
     </div>
     <div class="btn" :class="showView === '基本信息' ? 'first' : ''">
@@ -123,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
@@ -326,6 +349,25 @@
     type: '组件服务',
     deptId: '',
   })
+  const required = ref([
+    '归属部门',
+    '部门联系人',
+    '部门联系人电话',
+    '应用领域',
+    '共享条件',
+    '算法名称',
+    '算法描述',
+    '图层名称',
+    '图层描述',
+    '组件名称',
+    '组件描述',
+    '组件地址',
+    '服务地址',
+    '服务接口',
+    '接口请求方式',
+    '算法类别',
+  ])
+  const notFilled = ref([])
 
   const close = () => {
     window.close()
@@ -345,6 +387,36 @@
     })
   }
   const next = () => {
+    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) {
@@ -359,6 +431,7 @@
         console.log('表单数据=============>', dataFrom.value, refData.value)
       }
     }
+  }
   // 预览
   const preview = () => {
     dataFrom.value.infoList = dataFrom.value.infoList.filter(
@@ -385,6 +458,21 @@
     refPutOnTheShelf.value.add('常见问题', true, type)
   }
   const submit = () => {
+    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
@@ -421,6 +509,7 @@
         })
       }
     }
+  }
   const init = () => {
     getCategoryTree().then((res) => {
       // console.clear()

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>
@@ -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,9 @@
         :configure="bs"
         @submit="submit()"
         @back="back()"
+        @preview="preview()"
+        :required="required"
+        :notFilled="notFilled"
       ></put-on-the-shelf>
     </div>
     <div class="btn" :class="showView === '基本信息' ? 'first' : ''">
@@ -95,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
@@ -224,6 +248,26 @@
     type: '组件服务',
     deptId: '',
   })
+  const required = ref([
+    '归属部门',
+    '部门联系人',
+    '部门联系人电话',
+    '应用领域',
+    '共享条件',
+    '算法名称',
+    '算法描述',
+    '图层名称',
+    '图层描述',
+    '组件名称',
+    '组件描述',
+    '组件地址',
+    '服务地址',
+    '服务接口',
+    '接口请求方式',
+    '算法类别',
+  ])
+  const notFilled = ref([])
+
   getUser().then((res) => {
     dataFrom.value.deptId = res.data.data.deptId
   })
@@ -243,6 +287,36 @@
     window.close()
   }
   const next = () => {
+    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) {
@@ -257,6 +331,7 @@
         console.log('表单数据=============>', dataFrom.value, refData.value)
       }
     }
+  }
   // 预览
   const preview = () => {
     dataFrom.value.infoList = dataFrom.value.infoList.filter(
@@ -280,6 +355,21 @@
     refPutOnTheShelf.value.add('常见问题', true, type)
   }
   const submit = () => {
+    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
@@ -316,6 +406,7 @@
         })
       }
     }
+  }
   const init = () => {
     getCategoryTree().then((res) => {
       // console.clear()

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 16:29:25
  * @Description: 上架
 -->
 <template>
@@ -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,11 +220,18 @@
               )
             "
           >
-            <span>{{ item.name }}</span>
+            <div class="box">
+              <div>
+                <b class="required" v-if="required.indexOf(item.name) > -1">
+                  *
+                </b>
+                {{ item.name }}
+              </div>
               <a-input
                 v-if="item.type == 'input' && item.name.indexOf('名称') == -1"
                 v-model:value="item.note1"
                 :placeholder="'请输入' + item.name"
+                @change="changeIiem(item.name, item.note1)"
               />
               <a-input
                 v-else-if="
@@ -233,6 +240,7 @@
                 :maxLength="50"
                 v-model:value="item.note1"
                 :placeholder="'请输入' + item.name + '，不超过50个字符'"
+                @change="changeIiem(item.name, item.note1)"
               />
               <a-radio-group
                 v-else-if="item.type == 'radio'"
@@ -257,6 +265,7 @@
                 :showCount="true"
                 :maxlength="200"
                 :placeholder="'请输入' + item.name"
+                @change="changeIiem(item.name, item.note1)"
               />
               <upload
                 v-else-if="item.type == 'image'"
@@ -362,6 +371,7 @@
                 style="width: 2.4rem"
                 v-model:value="item.note1"
                 :placeholder="'请选择' + item.name"
+                @change="changeIiem(item.name, item.note1)"
               >
                 <a-select-option
                   v-for="(itemSelect, indexSelect) in item.options"
@@ -381,7 +391,7 @@
                 :filter-option="filterOption"
                 @focus="handleFocus"
                 @blur="handleBlur"
-              @change="handleChange2"
+                @change="changeIiem(item.name, item.note1)"
               ></a-select>
               <div
                 v-else-if="item.type == 'checkBox'"
@@ -404,6 +414,29 @@
                 </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">
             <a-modal
@@ -454,6 +487,7 @@
   </div>
 </template>
 <script setup>
+  import VueTemplateDemo from '@/views/personalCenter/VueTemplateDemo'
   import {
     ref,
     defineProps,
@@ -476,6 +510,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 },
@@ -494,6 +529,8 @@
     externalField: { type: Array, default: null },
     // 多条的配置
     configure: { type: Array, default: null },
+    required: { type: Array, default: null },
+    notFilled: { type: Array, default: null },
     // [{
     //   name:'计费标准信息',
     //   list:[
@@ -537,7 +574,7 @@
     //   ]
     // }]
   })
-  const emit = defineEmits(['next', 'back', 'submit'])
+  const emit = defineEmits(['next', 'back', 'submit', 'preview'])
   // console.log('props==========>', props)
   const changeAdd = () => {
     console.log('子组件方法触发~')
@@ -550,6 +587,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) => {
@@ -686,6 +732,7 @@
   //显示富文本
   let showText = ref(false)
   const showTextFunction = () => {
+    console.log('点击富文本=========================>')
     showText.value = true
   }
   mybus.on('showTextFunctionEmit', (show) => {
@@ -752,6 +799,8 @@
           emit('next')
         } else if (type == '提交') {
           emit('submit')
+        } else if (type == '预览') {
+          emit('preview')
         }
       }
     } else {
@@ -768,6 +817,8 @@
           emit('next')
         } else if (type == '提交') {
           emit('submit')
+        } else if (type == '预览') {
+          emit('preview')
         }
       }
     }
@@ -781,13 +832,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(';'),
@@ -978,9 +1042,6 @@
       }
     })
   })
-  const handleChange2 = (value) => {
-    console.log(`selected ${value}`)
-  }
   const applicationsChange = (value) => {
     data.value.list.map((item) => {
       if (item.name === '来源应用') {
@@ -1274,4 +1335,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>

front/src/views/detailsAll/ApplicationDetails.vue

@@ -88,6 +88,7 @@
   import ApplicationNavigation from '@/views/detailsAll/components/Application/ApplicationNavigation.vue'
   import ApplicationPresentation from '@/views/detailsAll/components/Application/ApplicationPresentation.vue'
   import ApplicationCommonProblem from '@/views/detailsAll/components/Application/ApplicationCommonProblem.vue'
+  import ApplicationAbilityTrial from '@/views/detailsAll/components/Application/ApplicationAbilityTrial.vue'
   import { ref, onMounted, onBeforeUnmount, reactive } from 'vue'
   import {
     updateVisits,

front/src/views/detailsAll/components/Algorithm/AlgorithmApplicationScenarios.vue

@@ -179,6 +179,7 @@
             -webkit-line-clamp: 1;
             word-break: break-all;
             -webkit-box-orient: vertical;
+            text-align: center;
           }
           .tab-top-down {
             min-width: 120px;

front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue

@@ -87,6 +87,9 @@
   const deploymentLocation = ref('') //部署位置
   //加入申购车
   const addShoppingCart = () => {
+    if (props.dataList.isInShoppingCart) {
+      message.error('已经加入申购车了')
+    } else {
       console.log('加入申购车==================>', props.dataList)
       sgcInsert({
         delFlag: '0',
@@ -96,8 +99,14 @@
         console.log(res)
         message.success('添加申购车成功！')
         mybus.emit('getSgcNum')
+        props.dataList.isInShoppingCart = true
+        console.log(
+          props.dataList.isInShoppingCart,
+          'props.dataList.isInShoppingCart'
+        )
       })
     }
+  }
   //立即申请
   function toView() {
     // window.open(newpage.href, '_blank')

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>

front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue

@@ -6,7 +6,7 @@
  * @Description: 应用详情
 -->
 <template>
-  <div class="algorithm-on-trial" v-if="flag && whoShow1.itShowQingDao">
+  <div class="algorithm-on-trial" v-if="flag">
     <detals-title title="应用详情" type="PROBATION"></detals-title>
     <div class="main">
       <div class="main-left">
@@ -61,12 +61,12 @@
   })
   if (props.dataList.infoList) {
     let obj = props.dataList.approveStatus
-    if (obj !== '通过') {
+    if (obj !== '通过' && whoShow1.value.itShowQingDao) {
       flag.value = false
     } else {
       dataFrom.value.link = props.dataList.link
       props.dataList.infoList.map((item) => {
-        if (item.attrType == '试用用户名') {
+        if (item.attrType == '试用用户名' || item.attrType == '试用账号') {
           dataFrom.value.number = item.attrValue
         } else if (item.attrType == '试用密码') {
           dataFrom.value.password2 = item.attrValue
@@ -116,7 +116,7 @@
         } else {
           dataFrom.value.link = props.dataList.link
           props.dataList.infoList.map((item) => {
-            if (item.attrType == '试用用户名') {
+            if (item.attrType == '试用用户名' || item.attrType == '试用账号') {
               dataFrom.value.number = item.attrValue
             } else if (item.attrType == '试用密码') {
               dataFrom.value.password2 = item.attrValue

front/src/views/detailsAll/components/Application/ApplicationNavigation.vue

@@ -104,7 +104,6 @@
       }
     })
     if (
-      props.dataList.link &&
       whoShow1.value.itShowQingDao &&
       props.dataList.approveStatus === '通过'
     ) {
@@ -152,7 +151,6 @@
           }
         })
         if (
-          props.dataList.link &&
           whoShow1.value.itShowQingDao &&
           props.dataList.approveStatus === '通过'
         ) {

front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue

@@ -38,11 +38,11 @@
     englishTitle: 'DEPARTMENT&ERVICE',
     content: [
       {
-        childrenTitle: '归属部门信息',
+        childrenTitle: '归属部门',
         childrenContent: [],
       },
       {
-        childrenTitle: '服务商信息',
+        childrenTitle: '服务商',
         childrenContent: [],
       },
     ],
@@ -54,17 +54,17 @@
   })
   if (props.dataList.infoList) {
     let obj = {
-      attrType: '部门名称',
+      attrType: '归属部门',
       attrValue: props.dataList.deptName || '------',
     }
     dataFrom.value.content[0].childrenContent[0] = obj
     let deptContacts = {
-      attrType: '部门联系人',
+      attrType: '联系人',
       attrValue: props.dataList.deptContacts || '------',
     }
     dataFrom.value.content[0].childrenContent[1] = deptContacts
     let deptPhone = {
-      attrType: '部门联系电话',
+      attrType: '联系人电话',
       attrValue: props.dataList.deptPhone || '------',
     }
     dataFrom.value.content[0].childrenContent[2] = deptPhone
@@ -85,11 +85,13 @@
           }
         } else if (item.attrType === '服务商联系人') {
           dataFrom.value.content[1].childrenContent[1] = item
+          dataFrom.value.content[1].childrenContent[1].attrType = '联系人'
           if (dataFrom.value.content[1].childrenContent[1].attrValue == '') {
             dataFrom.value.content[1].childrenContent[1].attrValue = '------'
           }
         } else if (item.attrType === '服务商联系电话') {
           dataFrom.value.content[1].childrenContent[2] = item
+          dataFrom.value.content[1].childrenContent[2].attrType = '联系人电话'
           if (dataFrom.value.content[1].childrenContent[2].attrValue == '') {
             dataFrom.value.content[1].childrenContent[2].attrValue = '------'
           }
@@ -106,17 +108,17 @@
         // dataFrom.value.content[0].childrenContent = []
         // dataFrom.value.content[1].childrenContent = []
         let obj = {
-          attrType: '部门名称',
+          attrType: '归属部门',
           attrValue: props.dataList.deptName || '------',
         }
         dataFrom.value.content[0].childrenContent[0] = obj
         let deptContacts = {
-          attrType: '部门联系人',
+          attrType: '联系人',
           attrValue: props.dataList.deptContacts || '------',
         }
         dataFrom.value.content[0].childrenContent[1] = deptContacts
         let deptPhone = {
-          attrType: '部门联系电话',
+          attrType: '联系人电话',
           attrValue: props.dataList.deptPhone || '------',
         }
         dataFrom.value.content[0].childrenContent[2] = deptPhone
@@ -140,6 +142,7 @@
               }
             } else if (item.attrType === '服务商联系人') {
               dataFrom.value.content[1].childrenContent[1] = item
+              dataFrom.value.content[1].childrenContent[1].attrType = '联系人'
               if (
                 dataFrom.value.content[1].childrenContent[1].attrValue == ''
               ) {
@@ -148,6 +151,8 @@
               }
             } else if (item.attrType === '服务商联系电话') {
               dataFrom.value.content[1].childrenContent[2] = item
+              dataFrom.value.content[1].childrenContent[2].attrType =
+                '联系人电话'
               if (
                 dataFrom.value.content[1].childrenContent[2].attrValue == ''
               ) {
@@ -155,9 +160,9 @@
                   '------'
               }
             }
-          } else if (item.attrType === '部门联系人') {
+          } else if (item.attrType === '联系人') {
             deptContacts.attrValue = item.attrValue || '------'
-          } else if (item.attrType === '部门联系人电话') {
+          } else if (item.attrType === '联系人电话') {
             deptPhone.attrValue = item.attrValue || '------'
           }
         })
@@ -187,11 +192,10 @@
         height: 1.5rem;
         width: 6.2rem;
         border-radius: 0.2rem;
-        background: linear-gradient(
+        background: url('~@/assets/detailsAll/business/business_usage_mode_bg.png')
-          to right,
+          no-repeat;
-          rgba(113, 132, 252, 0.4),
+        background-position: center;
-          rgba(148, 163, 252, 0.4)
+        background-size: 100% 100%;
-        );
         padding: 0 0.3rem;
         display: flex;
         flex-direction: column;

front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue

@@ -90,6 +90,9 @@
   const applicationArea = ref('')
   // // 加入申购车
   const addShoppingCart = () => {
+    if (props.dataList.isInShoppingCart) {
+      message.error('已经加入申购车了')
+    } else {
       console.log('加入申购车==================>', props.dataList)
       sgcInsert({
         delFlag: '0',
@@ -99,8 +102,14 @@
         console.log(res)
         message.success('添加申购车成功！')
         mybus.emit('getSgcNum')
+        props.dataList.isInShoppingCart = true
+        console.log(
+          props.dataList.isInShoppingCart,
+          'props.dataList.isInShoppingCart'
+        )
       })
     }
+  }
   // // 立即申请
   function toView() {
     // window.open(newpage.href, '_blank')

front/src/views/detailsAll/components/Business/BusinessApplicationScenarios.vue

@@ -179,6 +179,7 @@
             -webkit-line-clamp: 1;
             -webkit-box-orient: vertical;
             word-break: break-all;
+            text-align: center;
           }
           .tab-top-down {
             min-width: 120px;

front/src/views/detailsAll/components/Business/BusinessFunctionIntorduction.vue

@@ -159,6 +159,7 @@
             -webkit-line-clamp: 1;
             -webkit-box-orient: vertical;
             word-break: break-all;
+            text-align: center;
           }
           .tab-top-down {
             min-width: 1.2rem;

front/src/views/detailsAll/components/Business/BusinessTopDetails.vue

@@ -87,6 +87,9 @@
   const componentType = ref('') //组件类型
   // // 加入申购车
   const addShoppingCart = () => {
+    if (props.dataList.isInShoppingCart) {
+      message.error('已经加入申购车了')
+    } else {
       console.log('加入申购车==================>', props.dataList)
       sgcInsert({
         delFlag: '0',
@@ -96,8 +99,14 @@
         console.log(res)
         message.success('添加申购车成功！')
         mybus.emit('getSgcNum')
+        props.dataList.isInShoppingCart = true
+        console.log(
+          props.dataList.isInShoppingCart,
+          'props.dataList.isInShoppingCart'
+        )
       })
     }
+  }
   // // 立即申请
   function toView() {
     // window.open(newpage.href, '_blank')

front/src/views/detailsAll/components/Developer/DeveloperApplicationScenarios.vue

@@ -179,6 +179,7 @@
             -webkit-line-clamp: 1;
             -webkit-box-orient: vertical;
             word-break: break-all;
+            text-align: center;
           }
           .tab-top-down {
             min-width: 120px;

front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue

@@ -60,7 +60,7 @@
         childrenTitle: '归属部门',
         childrenContent: [
           {
-            attrType: '归属部门名称',
+            attrType: '归属部门',
             attrValue: '------',
           },
           {
@@ -74,10 +74,10 @@
         ],
       },
       {
-        childrenTitle: '服务商信息',
+        childrenTitle: '服务商',
         childrenContent: [
           {
-            attrType: '服务商名称',
+            attrType: '服务商',
             attrValue: '------',
           },
           {
@@ -226,11 +226,10 @@
         height: 1.8rem;
         width: 6.6rem;
         border-radius: 0.2rem;
-        background: linear-gradient(
+        background: url('~@/assets/detailsAll/business/business_usage_mode_bg.png')
-          to right,
+          no-repeat;
-          rgba(113, 132, 252, 0.4),
+        background-position: center;
-          rgba(148, 163, 252, 0.4)
+        background-size: 100% 100%;
-        );
         padding: 0 0.3rem;
         display: flex;
         align-items: center;

front/src/views/detailsAll/components/Developer/DeveloperPresentation.vue

@@ -8,12 +8,29 @@
 <template>
   <div class="application-presentation" v-if="flag">
     <detals-title title="组件展示" type="IMAGE&VIDEO"></detals-title>
+    <div class="box">
+      <div class="left" @click="chagneShow()"></div>
       <div
         class="main"
         :style="`${img}background-position:center;background-size:cover;`"
+        v-if="
+          showArr.length > 0 && showArr[showFlag].attrType == '组件视频介绍'
+        "
       >
         <div class="play" @click="showModal"></div>
       </div>
+      <div
+        class="main2"
+        v-if="showArr.length > 0 && showArr[showFlag].attrType == '组件图片'"
+      >
+        <a-image
+          :width="700"
+          :height="340"
+          :src="showArr[showFlag].attrValue"
+        />
+      </div>
+      <div class="right" @click="chagneShow()"></div>
+    </div>
     <a-modal
       v-model:visible="visible"
       title="视频预览"
@@ -59,6 +76,13 @@
       'fullScreen',
     ], //显示所有按钮,
   })
+  const showFlag = ref(0)
+  const showArr = ref([])
+  const chagneShow = () => {
+    if (showArr.value.length > 1) {
+      showFlag.value = showFlag.value == 0 ? 1 : 0
+    }
+  }
   const showModal = () => {
     visible.value = true
   }
@@ -69,42 +93,63 @@
   const img = ref({})
   console.log('111111111111111111111,', props.dataList)
   if (props.dataList.infoList) {
+    showArr.value = props.dataList.infoList.filter(
+      (item) => item.attrType === '组件视频介绍' || item.attrType === '组件图片'
+    )
     let obj = props.dataList.infoList.filter(
       (item) => item.attrType === '组件视频介绍'
     )[0]
-    console.log('视频==============>', obj)
+    console.log('视频==============>', showArr.value)
-    if (!obj) {
+    if (showArr.value.length == 0) {
       flag.value = false
     } else {
-      let imgindex = props.dataList.infoList.filter(
+      if (obj) {
-        (item) => item.attrType === '组件图片'
-      )[0]
         options.src = obj.attrValue
-      if (imgindex) {
-        img.value = 'background:' + 'url(' + imgindex.attrValue + ') no-repeat;'
       }
     }
+    // if (!obj) {
+    //   flag.value = false
+    // } else {
+    //   let imgindex = props.dataList.infoList.filter(
+    //     (item) => item.attrType === '组件图片'
+    //   )[0]
+    //   options.src = obj.attrValue
+    //   if (imgindex) {
+    //     img.value = 'background:' + 'url(' + imgindex.attrValue + ') no-repeat;'
+    //   }
+    // }
   }
   watch(
     () => props.dataList,
     (val) => {
       if (val) {
+        showArr.value = props.dataList.infoList.filter(
+          (item) =>
+            item.attrType === '组件视频介绍' || item.attrType === '组件图片'
+        )
         let obj = val.infoList.filter(
           (item) => item.attrType === '组件视频介绍'
         )[0]
-        console.log('视频==============>', obj)
+        console.log('视频==============>', showArr.value)
-        if (!obj) {
+        if (showArr.value.length == 0) {
           flag.value = false
         } else {
-          let imgindex = props.dataList.infoList.filter(
+          if (obj) {
-            (item) => item.attrType === '组件图片'
-          )[0]
             options.src = obj.attrValue
-          if (imgindex) {
-            img.value =
-              'background:' + 'url(' + imgindex.attrValue + ') no-repeat;'
           }
         }
+        // if (!obj) {
+        //   flag.value = false
+        // } else {
+        //   let imgindex = props.dataList.infoList.filter(
+        //     (item) => item.attrType === '组件图片'
+        //   )[0]
+        //   options.src = obj.attrValue
+        //   if (imgindex) {
+        //     img.value =
+        //       'background:' + 'url(' + imgindex.attrValue + ') no-repeat;'
+        //   }
+        // }
       }
     }
   )
@@ -113,6 +158,7 @@
   .application-presentation {
     padding: 0.8rem 3rem 0;
     .main {
+      width: 13.14rem;
       height: 3.4rem;
       border-radius: 0.1rem;
       background: url('~@/assets/detailsAll/sf_video_bg.png') no-repeat;
@@ -129,5 +175,47 @@
         cursor: pointer;
       }
     }
+    .main2 {
+      width: 13.14rem;
+      height: 3.4rem;
+      border-radius: 0.1rem;
+      background-size: 100%;
+      margin-top: 0.4rem;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+  }
+  .box {
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    margin-bottom: 0.8rem;
+    .left {
+      width: 0.37rem;
+      height: 0.6rem;
+      cursor: pointer;
+      margin-right: 0.2rem;
+      background: url('~@/assets/detailsAll/business/business_previous.png')
+        no-repeat;
+      background-size: 100%;
+      background-position: center;
+    }
+    .right {
+      width: 0.37rem;
+      height: 0.6rem;
+      cursor: pointer;
+      margin-left: 0.2rem;
+      background: url('~@/assets/detailsAll/business/business_next.png')
+        no-repeat;
+      background-size: 100%;
+      background-position: center;
+    }
+  }
+
+  :deep(.ant-image-img) {
+    width: 100%;
+    height: 100%;
+    object-fit: contain;
   }
 </style>

front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue

@@ -82,6 +82,9 @@
   const deploymentLocation = ref('') //部署位置
   // 加入申购车
   const addShoppingCart = () => {
+    if (props.dataList.isInShoppingCart) {
+      message.error('已经加入申购车了')
+    } else {
       console.log('加入申购车==================>', props.dataList)
       sgcInsert({
         delFlag: '0',
@@ -91,8 +94,14 @@
         console.log(res)
         message.success('添加申购车成功！')
         mybus.emit('getSgcNum')
+        props.dataList.isInShoppingCart = true
+        console.log(
+          props.dataList.isInShoppingCart,
+          'props.dataList.isInShoppingCart'
+        )
       })
     }
+  }
   // 立即申请
   function toView() {
     // window.open(newpage.href, '_blank')

front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue

@@ -179,6 +179,7 @@
             -webkit-line-clamp: 1;
             -webkit-box-orient: vertical;
             word-break: break-all;
+            text-align: center;
           }
           .tab-top-down {
             min-width: 120px;

front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue

@@ -82,6 +82,9 @@
   const deploymentLocation = ref('') //部署位置
   // 加入申购车
   const addShoppingCart = () => {
+    if (props.dataList.isInShoppingCart) {
+      message.error('已经加入申购车了')
+    } else {
       console.log('加入申购车==================>', props.dataList)
       sgcInsert({
         delFlag: '0',
@@ -91,8 +94,14 @@
         console.log(res)
         message.success('添加申购车成功！')
         mybus.emit('getSgcNum')
+        props.dataList.isInShoppingCart = true
+        console.log(
+          props.dataList.isInShoppingCart,
+          'props.dataList.isInShoppingCart'
+        )
       })
     }
+  }
   // 立即申请
   function toView() {
     // window.open(newpage.href, '_blank')

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>
@@ -247,11 +247,10 @@
       .content-left {
         height: 1.8rem;
         width: 6.2rem;
-        background: linear-gradient(
+        background: url('~@/assets/detailsAll/business/business_usage_mode_bg.png')
-          to right,
+          no-repeat;
-          rgba(113, 132, 252, 0.4),
+        background-position: center;
-          rgba(148, 163, 252, 0.4)
+        background-size: 100% 100%;
-        );
         border-radius: 0.1rem;
         margin-right: 0.6rem;
         box-shadow: 0rem 0.05rem 0.15rem rgba(82, 106, 255, 0.4);
@@ -310,11 +309,10 @@
       .content-right {
         height: 1.8rem;
         width: 6.2rem;
-        background: linear-gradient(
+        background: url('~@/assets/detailsAll/business/business_usage_mode_bg.png')
-          to right,
+          no-repeat;
-          rgba(113, 132, 252, 0.4),
+        background-position: center;
-          rgba(148, 163, 252, 0.4)
+        background-size: 100% 100%;
-        );
         border-radius: 0.1rem;
         box-shadow: 0rem 0.05rem 0.15rem rgba(82, 106, 255, 0.4);
         display: flex;

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')

front/src/views/home/apply.vue

@@ -426,8 +426,17 @@
             }
             if (!applyAll) {
               let ids = []
+              let falgNum = 0
+              let sxt = true
               formName.system = []
               console.log('list==================', list.value)
+              list.value.map((val) => {
+                val.arr.map((item) => {
+                  if (item.type !== '基础设施') {
+                    falgNum++
+                  }
+                })
+              })
               list.value.map((val) => {
                 val.arr.map((item) => {
                   if (item.type !== '基础设施') {
@@ -435,6 +444,7 @@
                       resourceId: item.resourceId,
                       resourceName: item.resourceName,
                     })
+                    falgNum++
                     console.log(item.id)
                     if (item.id) {
                       ids.push(item.id)
@@ -456,8 +466,14 @@
                       // applySuccess.value = false
                       console.log('摄像头申请================>', res)
                       if (item.id) {
-                        sgcDel({ ids: [item.id] }).then((res) => {
+                        sgcDel({ ids: [item.id] }).then((res1) => {
-                          if (res.data.msg === 'success') {
+                          if (res1.data.msg === 'success') {
+                            if (falgNum == 0 && sxt) {
+                              message.success(
+                                '申请提交成功，请到消息中心查看！'
+                              )
+                              sxt = false
+                            }
                             mybus.emit('getSgcNum')
                             router.push({
                               path: '/DetailsPageconetent',
@@ -468,6 +484,10 @@
                           }
                         })
                       } else {
+                        if (res.data.msg === 'success' && falgNum == 0 && sxt) {
+                          message.success('申请提交成功，请到消息中心查看！')
+                          sxt = false
+                        }
                         router.push({
                           path: '/DetailsPageconetent',
                           query: {

front/src/views/home/components/header.vue

@@ -201,12 +201,12 @@
           path: '/capabilityCloud',
         })
         break
-      case '开发指南':
+      // case '技术文档':
-        router.push({
+      //   router.push({
-          path: '/developmentGuide',
+      //     path: '/developmentGuide',
-        })
+      //   })
-        break
+      //   break
-      case '指导手册':
+      case '技术文档':
         router.push({
           path: '/instructionManual',
         })
@@ -465,7 +465,7 @@
     border-radius: 0.05rem;
     position: absolute;
     top: 0.45rem;
-    right: 3.1rem;
+    right: 2.9rem;
     overflow-y: scroll;
     .bottom {
       cursor: pointer;

front/src/views/home/components/searchResultList.vue

@@ -293,7 +293,7 @@
                 "
               >
                 {{
-                  item.shareCondition == '免批申请' ? '立即申请' : '立即申请'
+                  item.shareCondition == '免批申请' ? '免批申请' : '立即申请'
                 }}
               </a-button>
             </div>

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 == '基础设施') {
+          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,10 +250,10 @@
       // }
       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)
+        if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
           getCameraAllOrgan({ parentId: val.id }).then((res) => {
             treeData.value.map((treeDataItem, index) => {
               if (item.id == treeDataItem.id) {
@@ -257,6 +267,24 @@
               }
             })
           })
+        } 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,6 +333,7 @@
       }
       const showBottom = (item) => {
         item.show = !item.show
+        if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
           getCameraAllOrgan({ parentId: item.id }).then((res) => {
             treeData.value.map((treeDataItem, index) => {
               if (item.id == treeDataItem.id) {
@@ -313,6 +342,18 @@
               }
             })
           })
+        } 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)

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"
@@ -93,7 +99,17 @@
       >
         <template #bodyCell="{ column, record }">
           <template v-if="column.dataIndex === 'operation'">
-            <a @click="openVideo(record.channelCode)">预览</a>
+            <a
+              @click="
+                openVideo(
+                  record.channelCode ||
+                    record.channelId ||
+                    record.channelCode.channelId
+                )
+              "
+            >
+              预览
+            </a>
           </template>
         </template>
       </a-table>
@@ -125,9 +141,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 +433,44 @@
   const getCamera = () => {
     console.log('初始化调用')
     console.log('不选左侧树的时候不调用接口', mapSearchParam.value)
-    // if (mapSearchParam.value.parentId) {
+    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.cameraName || '',
+        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 +518,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 +537,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 +546,7 @@
             (item) => item.idtCameraChannel !== val.idtCameraChannel
           )
           selectedRowKeys.value.splice(
-            selectedRowKeys.value.indexOf(val.channelCode),
+            selectedRowKeys.value.indexOf(val.channelCode || val.channelId),
             1
           )
         })
@@ -508,7 +557,7 @@
           (item) => item.idtCameraChannel !== val.idtCameraChannel
         )
         selectedRowKeys.value.splice(
-          selectedRowKeys.value.indexOf(val.channelCode),
+          selectedRowKeys.value.indexOf(val.channelCode || val.channelId),
           1
         )
       })
@@ -549,7 +598,8 @@
         padding: 0 0.08rem;
       }
       .leftType {
-        margin: 0.1rem 0;
+        margin: 0.2rem 0;
+        margin-right: 0.06rem;
       }
       .down {
         background: #0087ff;

front/src/views/home/videoSurveillance/index.vue

@@ -12,11 +12,19 @@
           v-model="address"
           placeholder="请输入地址"
           clearable
-                  :fetch-suggestions="((queryString,cb) =>{searchAddressByKeyWord(queryString,cb,i)})"
+          :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)})"
+          @select="
+            (addressItem) => {
+              selectedAddress(addressItem, i)
+            }
+          "
         />
         <!-- <el-autocomplete
           class="inline-input"
@@ -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: {
@@ -135,8 +145,8 @@
         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.addressMatchUrl = window.SITE_CONFIG.POI_URL
       // 初始化地址检索服务
       this.initAddressMatchService()
       this.getCameraAllLabel()
@@ -156,54 +166,95 @@
         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.tooltip.start = '请圈选区域'
-      L.drawLocal.draw.handlers.circle.radius = '半径';
+        L.drawLocal.draw.handlers.circle.radius = '半径'
-      L.drawLocal.draw.handlers.circle.tooltip.end = '松开绘制完成';
+        L.drawLocal.draw.handlers.circle.tooltip.end = '松开绘制完成'
 
-      this.hiMap.mapObj.map.off('draw:created');
+        this.hiMap.mapObj.map.off('draw:created')
-      this.hiMap.mapObj.drawCircle.enable();
+        this.hiMap.mapObj.drawCircle.enable()
         this.hiMap.mapObj.map.once('draw:created', (e) => {
-        const type = e.layerType;
+          const type = e.layerType
-        const circleLayer = e.layer;
+          const circleLayer = e.layer
           if (type === 'circle') {
-          const radius = (e.layer._mRadius)
+            const radius = e.layer._mRadius
             if (radius > 5000) {
               message.info('最大支持5km范围的圈选')
             } else {
-            const circlePloygonLayer = this.multiScreenFun.createCircleLayer(circleLayer);
+              const circlePloygonLayer =
-            this.hiMap.mapObj.featureGroup.addLayer(circlePloygonLayer);
+                this.multiScreenFun.createCircleLayer(circleLayer)
-            this.hiMap.mapObj.layerGroup.set('circlePloygonLayer', circlePloygonLayer);
+              this.hiMap.mapObj.featureGroup.addLayer(circlePloygonLayer)
-            console.log('查询图层为何发生了改变', e.layer);
+              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
+                radius: radius,
               }
               mybus.emit('getListByMap', params)
               this.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.cameraName || '',
+            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.L = window.L || {}
-        this.addressMatchService = L.supermap.addressMatchService(this.addressMatchUrl);
+        this.addressMatchService = L.supermap.addressMatchService(
+          this.addressMatchUrl
+        )
       },
       circleMode() {
         // 转换圈选模式
@@ -222,15 +273,14 @@
           const params = {
             gpsX: this.mapSearchParam.gpsX,
             gpsY: this.mapSearchParam.gpsY,
-              radius: this.mapSearchParam.radius
+            radius: this.mapSearchParam.radius,
           }
           mybus.emit('getListByMap', params)
         }
-
       },
       //查询地址建议匹配
       async searchAddressByKeyWord(queryString, cb, indexX) {
-        this.disasterPointIndex = indexX;
+        this.disasterPointIndex = indexX
         /* const res = await bdPlaceSearch({ searchKey: queryString });
         if (res.data) {
           for(var i=0;i<res.data.length;i++){
@@ -240,18 +290,18 @@
         }*/
         const match = function (obj) {
           //console.log('ooooo',obj);
-          obj.result.map(item => {
+          obj.result.map((item) => {
-            item.value = item.address;
+            item.value = item.address
-          });
+          })
-          cb(obj.result);
+          cb(obj.result)
-        };
+        }
         if (!queryString) {
-          cb([]);
+          cb([])
         } else {
           var geoCodeParam = new SuperMap.GeoCodingParameter({
-            'address': queryString,
+            address: queryString,
-          });
+          })
-          this.addressMatchService.code(geoCodeParam, match);
+          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 == '全部') {

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++

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',
         })

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

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-12 09:42:44
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-21 17:25:45
+ * @LastEditTime: 2022-07-25 15:07:05
  * @Description:我的申请 能力申请 查看详情
 -->
 <template>
@@ -132,8 +132,20 @@
                 </div>
               </div>
               <div class="ability-bottom">
-                <div class="dec">位置：{{ val.nodeName }}</div>
+                <div class="dec2">位置：{{ val.nodeName }}</div>
-                <!-- <div class="result">申请结果：{{ val.content || '--' }}</div> -->
+                <div class="result" v-if="item.approveStatus == '通过'">
+                  申请结果：{{
+                    '列表地址：' +
+                    backUrl +
+                    'resource/getApplyCameraList/' +
+                    item.instanceId +
+                    ';' +
+                    '视频流地址：' +
+                    backUrl +
+                    '/resource/hls/getHls/?channelId=' +
+                    val.channelId
+                  }}
+                </div>
               </div>
             </div>
           </div>
@@ -144,6 +156,7 @@
 </template>
 <script setup>
   import { ref, defineProps } from 'vue'
+  const backUrl = ref(window.SITE_CONFIG.apiURL + '/')
   const props = defineProps({
     refObj: { type: Object, default: null },
   })
@@ -334,6 +347,16 @@
                   -webkit-box-orient: vertical;
                   word-break: break-all;
                 }
+                .dec2 {
+                  width: 7rem;
+                  height: 0.22rem;
+                  overflow: hidden;
+                  text-overflow: ellipsis;
+                  display: -webkit-box;
+                  -webkit-line-clamp: 1;
+                  -webkit-box-orient: vertical;
+                  word-break: break-all;
+                }
                 .result:hover {
                   color: #0058e1;
                   cursor: pointer;

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('')

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

@@ -108,6 +108,8 @@
                 >
                   <template #title>
                     <div>
+                      <a-tooltip>
+                        <template #title>{{ item.resourceName }}</template>
                         <span
                           @click="
                             showItem(
@@ -122,6 +124,7 @@
                         >
                           {{ item.resourceName }}
                         </span>
+                      </a-tooltip>
                       <span class="type">{{ item.type }}</span>
                     </div>
                     <span class="time">
@@ -312,18 +315,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 (item.resourceId == '8888888880000000001') {
+                message.warning('摄像头无法添加收藏！')
+              } else {
                 scArr.push({ resourceId: item.resourceId })
               }
             }
@@ -338,7 +341,7 @@
           }
         })
       } else {
-        message.error('下架的数据无法收藏')
+        message.warning('下架的数据无法收藏')
       }
     }
   }
@@ -750,7 +753,7 @@
   // 删除按钮
   const delList = () => {
     if (checkedListAbility.value.length == 0) {
-      message.error('请先选择需要操作的数据！')
+      message.warning('请先选择需要操作的数据！')
     } else {
       sgcDel({
         ids: checkedListAbility.value,
@@ -807,25 +810,28 @@
   }
   // 一键申请
   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(
+        val.arr = val.children.filter((item) => {
-          (item) => checkedListAbility.value.indexOf(item.id) > -1
+          console.log('选择的数据=============>', 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)
+      if (delArr.length > 0) {
+        message.warning('已经下架的能力无法申请！')
+      }
+      if (arr.length > 0) {
         console.log('一键申请===================>', arr)
         localStorage.setItem('applyList', JSON.stringify(arr))
         router.push({
@@ -833,6 +839,7 @@
         })
       }
     }
+  }
 </script>
 <style lang="less" scoped>
   .ant-list {
@@ -969,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;
   }
@@ -1044,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>