Merge branch 'hi-ucs-dev' into release

# Conflicts:
#	front/public/static/config/basicConfig.js
#	front/public/static/config/location.js
#	front/src/App.vue
#	front/src/views/personalCenter/components/MyPublish.vue

.gitignore

@@ -1,13 +1,16 @@
 back/dist-西海岸-后台管理.zip
 back/public/index.html
+back/node_modules
 back/dist-西海岸-后台管理-带配置文件.zip
 back/dist-市局-后台管理-带配置文件.zip
 back/dist-包头-后台管理.zip
 back/dist-市局-后台管理.zip
 back/dist-市局-后台管理-v0.8.2.1.zip
 front/public/index.html
+front/node_modules
 back/dist-西海岸-后台管理-v0.8.2.1.zip
 back/dist-市局-后台管理-v0.8.2.3.zip
 back/dist-西海岸-后台管理-v0.8.2.4.d.zip
 *.zip
 front/public/static/config/basicConfig.js
+front/public/static/config/basicConfig.js

back/src/views/main-content.vue

@@ -65,75 +65,83 @@
 </template>
 
 <script>
-import { isURL } from "@/utils/validate";
+import { isURL } from '@/utils/validate'
 export default {
-  data() {
-    return {};
+  data () {
+    return {}
   },
   methods: {
     // tabs, 是否通过iframe展示
-    tabIsIframe(url) {
-      return isURL(url);
+    tabIsIframe (url) {
+      return isURL(url)
     },
     // tabs, 选中tab
-    tabSelectedHandle(tab) {
+    tabSelectedHandle (tab) {
       tab = this.$store.state.contentTabs.filter(
         (item) => item.name === tab.name
-      )[0];
+      )[0]
       if (tab) {
         this.$router.push({
-          name: /^iframe_.+/.test(tab.name) ? "iframe" : tab.name,
+          name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name,
           params: { ...tab.params },
-          query: { ...tab.query },
-        });
+          query: { ...tab.query }
+        })
       }
     },
     // tabs, 删除tab
-    tabRemoveHandle(tabName) {
-      if (tabName === "home") {
-        return false;
+    tabRemoveHandle (tabName) {
+      if (tabName === 'home') {
+        return false
       }
-      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
-        (item) => item.name !== tabName
-      );
-      if (this.$store.state.contentTabs.length <= 0) {
-        this.$store.state.sidebarMenuActiveName =
-          this.$store.state.contentTabsActiveName = "home";
-        return false;
+      console.log('删除', this.$store.state.contentTabs)
+      if (this.$store.state.contentTabs.length !== 1) {
+        this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
+          (item) => item.name !== tabName
+        )
+      } else {
+        this.$message({
+          message: '必须打开一个窗口！',
+          type: 'warning'
+        })
       }
+      // if (this.$store.state.contentTabs.length <= 0) {
+      //   this.$store.state.sidebarMenuActiveName =
+      //     this.$store.state.contentTabsActiveName = 'home'
+      //   return false
+      // }
       // 当前选中tab被删除
       if (tabName === this.$store.state.contentTabsActiveName) {
-        let tab =
+        const tab =
           this.$store.state.contentTabs[
             this.$store.state.contentTabs.length - 1
-          ];
+          ]
         this.$router.push({
-          name: /^iframe_.+/.test(tab.name) ? "iframe" : tab.name,
+          name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name,
           params: { ...tab.params },
-          query: { ...tab.query },
-        });
+          query: { ...tab.query }
+        })
       }
     },
     // tabs, 关闭其它
-    tabsCloseOtherHandle() {
+    tabsCloseOtherHandle () {
       this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
         (item) => {
           return (
-            item.name === "home" ||
+            item.name === 'home' ||
             item.name === this.$store.state.contentTabsActiveName
-          );
+          )
         }
-      );
+      )
     },
     // tabs, 关闭全部
-    tabsCloseAllHandle() {
+    tabsCloseAllHandle () {
       this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
-        (item) => item.name === "home"
-      );
-      this.$router.push({ name: "home" });
-    },
-  },
-};
+        (item) => item.name === 'home'
+      )
+      this.$router.push({ name: 'home' })
+    }
+  }
+}
 </script>
 <style scoped lang="scss">
 .aui-content {
@@ -152,4 +160,4 @@ export default {
     }
   }
 }
-</style>
+</style>

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

@@ -10,8 +10,8 @@
             end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
           </el-date-picker>
         </el-form-item>
-         
-         <!--上架部门-->  
+
+         <!--上架部门-->
         <el-form-item>
           <span v-if="this.departmentId === 1 ">上架部门：</span>
           <span v-else>申请部门：</span>
@@ -36,9 +36,9 @@
         <a class='export'
           :href="exportExcel + exportExcelType + '?' + exportExcelCondition + '&token=' + token">导出全部</a>
       </el-form>
-  
+
       <!--能力上架明细3 能力使用明细 4-->
-      <div v-else> 
+      <div v-else>
         <el-form  :inline="true"  >
           <!--日期-->
           <el-form-item>
@@ -47,7 +47,7 @@
             end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
           </el-date-picker>
         </el-form-item>
-        
+
         <!--审核状态-->
         <el-form-item v-if="this.departmentId === 3 || this.departmentId === 4">
           <span>审核状态：</span>
@@ -68,9 +68,9 @@
               v-bind="item"></el-option>
           </el-select>
         </el-form-item>
-  
+
          <!--能力使用统计明细--添加提供部门-->
-        
+
          <el-form-item v-if=" this.departmentId === 4">
           <span >提供部门：</span>
           <el-select v-model="provideDepartment" placeholder="请选择部门" filterable clearable>
@@ -80,9 +80,7 @@
           </el-select>
         </el-form-item>
         </el-form>
-      
-      
-  
+
         <el-form :inline="true" >
         <!--资源类型-->
         <el-form-item >
@@ -121,13 +119,11 @@
         <!-- 导出 -->
         <a class='export'
           :href="exportExcel + exportExcelType + '?' + exportExcelCondition + '&token=' + token">导出全部</a>
-        </el-form> 
+        </el-form>
   </div>
 
-
       <el-card shadow="never" class="aui-card--fill" v-if="homeIsShow">
         <div class="mod-demand__bsdemand">
-     
 
           <div class="second-title">
             <span style="margin-right: 30px" :class="[
@@ -157,7 +153,7 @@
                 明细
               </span>
             </template>
-            <span v-else class="detail-button" @click="goToBack()"> 返回 </span>
+            <span v-else class="detail-button" @click="goToBack()">统计</span>
           </div>
           <div class="line-style"></div>
           <!--统计表-->
@@ -267,7 +263,7 @@ export default {
   data () {
     return {
       checked: false,
-      provideSelects:[],
+      provideSelects: [],
       departmentSelects: [],
       exportExcel: CONFIGITEM.configData[CONFIGITEM.version].apiURL + '/census/center/export',
       exportExcelCondition: '',
@@ -374,7 +370,7 @@ export default {
       status: '',
       value1: [], // 起始时间
       abilityDepartment: '', // 上架部门或申请部门
-      provideDepartment:'',//提供部门
+      provideDepartment: '', // 提供部门
       abilityType: '', // 能力
       beginTime: '', // 开始时间
       endTime: '', // 结束时间
@@ -718,7 +714,7 @@ export default {
           })
         })
     },
-    // 能力使用明细 
+    // 能力使用明细
     getTwoDetail (page) {
       var passAndReview = '' // 转变"通过"字段为通过
       if (this.examineStatus == '-1') {
@@ -744,7 +740,7 @@ export default {
             startDate: this.startDate,
             endDate: this.endDate,
             resourceName: this.resourceName,
-            provideDept:this.provideDepartment
+            provideDept: this.provideDepartment
 
           }
         })
@@ -758,7 +754,7 @@ export default {
             startDate: this.startDate,
             endDate: this.endDate,
             resourceName: this.resourceName,
-            provideDept:this.provideDepartment
+            provideDept: this.provideDepartment
           })
         })
     },
@@ -873,7 +869,7 @@ export default {
           this.exportExcelType = 'SelectApplyDeptDetailTypeCountList'
           this.getSecondTree()
         } else {
- 
+
         }
       } else if (index === 3) {
         this.detailFlag = false
@@ -881,7 +877,7 @@ export default {
           this.exportExcelType = 'SelectCensusResourceTable'
           this.getOneDetail()
         } else {
-     
+
         }
       } else if (index === 4) {
         this.detailFlag = false
@@ -986,10 +982,10 @@ export default {
       this.endDate = ''
       this.examineStatus = ''
       this.abilityDepartment = ''
-      this.provideDepartment=''
+      this.provideDepartment = ''
       this.abilityType = ''
       this.approveStatus = ''
-      this.resourceName=''
+      this.resourceName = ''
       this.exportExcelCondition = qs.stringify({
         approveStatus: this.status,
         deptId: this.abilityDepartment,
@@ -997,14 +993,13 @@ export default {
         endDate: this.endDate,
         resourceName: this.resourceName
       })
-      if (this.departmentId === 1) {//能力上架统计
+      if (this.departmentId === 1) { // 能力上架统计
         this.handleChose(1)
-      } else if (this.departmentId === 2) {//能力使用统计
+      } else if (this.departmentId === 2) { // 能力使用统计
         this.handleChose(2)
-    
-      } else if (this.departmentId === 3) {//能力上架明细
+      } else if (this.departmentId === 3) { // 能力上架明细
         this.handleChose(3)
-      } else {//能力使用明细
+      } else { // 能力使用明细
         this.handleChose(4)
       }
     },

back/src/views/modules/activiti/my-work-dynamics.vue

@@ -508,45 +508,47 @@ export default {
     },
     // 删除数据
     deleteData (row) {
+      this.deleteDataArr.push(row.id)
       if (this.deleteDataArr.length < 1) {
         this.$message({
-            type: 'info',
-            message: '请选择要删除的数据'
-          })
-      }else{
-      this.$confirm('此操作将删除当前数据, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(async () => {
-          let ids = []
-          if(row.id && this.deleteDataArr.length==0){
-             ids = [row.id]
-          }else{
-            ids = this.deleteDataArr
-          }
-          this.$http
-            .delete('/workdynamics/delete', {
-              data: ids
-            })
-            .then(({ data: res }) => {
-              if (res.code !== 0) {
-                return this.$message.error(res.msg)
-              }
-              this.$message({
-                type: 'success',
-                message: '删除成功!'
-              })
-              this.getTableData()
-            })
+          type: 'info',
+          message: '请选择要删除的数据'
         })
-        .catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
+      } else {
+        this.$confirm('此操作将删除当前数据, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(async () => {
+            let ids = []
+            if (row.id && this.deleteDataArr.length == 0) {
+              ids = [row.id]
+            } else {
+              ids = this.deleteDataArr
+            }
+            this.$http
+              .delete('/workdynamics/delete', {
+                data: ids
+              })
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  return this.$message.error(res.msg)
+                }
+                this.$message({
+                  type: 'success',
+                  message: '删除成功!'
+                })
+                this.getTableData()
+              })
           })
-        })}
+          .catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消删除'
+            })
+          })
+      }
     },
     // 预览工作动态信息
     async openPreviewData (row) {

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: hisense.guoyue
- * @LastEditors: hisense.guoyue
- * @LastEditTime: 2022-09-27 14:23:29
+ * @LastEditors: Light
+ * @LastEditTime: 2022-11-25 17:24:25
  * @Description: 资金报表
 -->
 <template>
@@ -22,7 +22,7 @@
         style="
           text-align: center;
           font-size: 12px;
-     
+
           margin-bottom: 14px;
         "
       >
@@ -44,31 +44,18 @@
         >
         </el-date-picker>
       </el-form-item>
-      
-      <!--提供部门 传id-->
-
-      <el-form-item>
-        <span>提供部门：</span>
-        <el-select
-          v-model="dataForm.provideDept"
-          placeholder="请选择提供部门"
-          filterable
-          clearable
-        >
-          <el-option label="全部" value=""></el-option>
-          <el-option
-            v-for="item in offerDepartSelects"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-            v-bind="item"
-          ></el-option>
-        </el-select>
+       <!--审核状态-->
+       <el-form-item>
+        <span>审核状态：</span>
+        <el-select v-model="dataForm.applyResult" placeholder="请选审核状态" clearable>
+            <el-option label="全部" value=""></el-option>
+             <el-option label="通过" value="通过"></el-option>
+            <el-option label="审核中" value="审核中"></el-option>
+          </el-select>
       </el-form-item>
+       <!--申请部门 传汉字-->
 
-      <!--申请部门 传汉字-->
-   
-      <el-form-item>
+       <el-form-item>
         <span>申请部门：</span>
         <el-select
           v-model="dataForm.applyDept"
@@ -86,9 +73,32 @@
           ></el-option>
         </el-select>
       </el-form-item>
-    
-  
-      <!--资源类型-->
+      <!--提供部门 传id-->
+
+      <el-form-item>
+        <span>提供部门：</span>
+        <el-select
+          v-model="dataForm.provideDept"
+          placeholder="请选择提供部门"
+          filterable
+          clearable
+          :disabled='disabled'
+        >
+          <el-option label="全部" value=""></el-option>
+          <el-option
+            v-for="item in offerDepartSelects"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+            v-bind="item"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      </el-form>
+
+      <el-form :inline="true">
+        <!--资源类型-->
         <el-form-item>
         <span>资源类型：</span>
         <el-select
@@ -108,19 +118,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      </el-form>
-  
 
-      <el-form :inline="true">
-    <!--审核状态-->
-      <el-form-item>
-        <span>审核状态：</span>
-        <el-select v-model="dataForm.applyResult" placeholder="请选审核状态" clearable>
-            <el-option label="全部" value=""></el-option>
-             <el-option label="通过" value="通过"></el-option>
-            <el-option label="审核中" value="审核中"></el-option>  
-          </el-select>
-      </el-form-item>
         <!--资源名称-->
         <el-form-item>
         <span>资源名称：</span>
@@ -131,7 +129,7 @@
           clearable
         ></el-input>
       </el-form-item>
-    
+
        <!--操作按钮查询-->
        <el-form-item>
         <el-button type="primary" @click="init()">{{
@@ -155,10 +153,8 @@
         "
         >导出全部</a
       >
-      
+
     </el-form>
-    
-    
 
     <div class="mod-activiti__process">
       <el-table
@@ -228,105 +224,127 @@
     </div>
   </el-card>
 </template>
-  
+
 <script>
 
 import Cookies from 'js-cookie'
 import qs from 'qs'
 export default {
 
-  data() {
+  data () {
     return {
-      exportExcelCondition:'',
-        token: Cookies.get('ucsToken'),
-        //导出全部
+      disabled: true,
+      exportExcelCondition: '',
+      token: Cookies.get('ucsToken'),
+      // 导出全部
       exportExcel: CONFIGITEM.configData[CONFIGITEM.version].apiURL + '/processForm/tabilityapplication/exportFundStatementTable',
       saveMoney: 0.0,
       offerDepartSelects: [],
       applyDepartSelects: [],
       typeOptions: [
-        { name: "智能算法", value: 1 },
-        { name: "图层服务", value: 2 },
-        { name: "开发组件", value: 3 },
-        { name: "业务组件", value: 4 },
-        { name: "应用资源", value: 5 },
-        { name: "会客厅", value: 6 },
+        { name: '智能算法', value: 1 },
+        { name: '图层服务', value: 2 },
+        { name: '开发组件', value: 3 },
+        { name: '业务组件', value: 4 },
+        { name: '应用资源', value: 5 },
+        { name: '会客厅', value: 6 }
       ], // 类型备选列表
       tableData: [],
-      dateList: [],//时间
+      dateList: [], // 时间
       dataForm: {
         // date: '',
-        startDate: "",
-        endDate: "",
-        provideDept: "",
-        applyDept: "",
-        resourceType: "",
-        resourceName: "",
-        applyResult:"通过",
-        pageNum:1,
-        pageSize:10,
+        startDate: '',
+        endDate: '',
+        provideDept: '',
+        applyDept: '',
+        resourceType: '',
+        resourceName: '',
+        applyResult: '通过',
+        pageNum: 1,
+        pageSize: 10
       },
       currentPage: 1,
       pageSize: 10,
-      total: 0,
-    };
+      total: 0
+    }
   },
   methods: {
-    init() {
+    init () {
       if (this.dateList && this.dateList.length > 0) {
-        this.dataForm.startDate = this.dateList[0];
-        this.dataForm.endDate = this.dateList[1];
+        this.dataForm.startDate = this.dateList[0]
+        this.dataForm.endDate = this.dateList[1]
       } else {
-        this.dataForm.startDate = "";
-        this.dataForm.endDate = "";
+        this.dataForm.startDate = ''
+        this.dataForm.endDate = ''
       }
- 
-     this.dataForm.pageNum=this.currentPage
-      let params = this.dataForm;
+
+      this.dataForm.pageNum = this.currentPage
+      const params = this.dataForm
       this.$http
-        .get("/processForm/tabilityapplication/getFundStatement/", {
-          params,
+        .get('/processForm/tabilityapplication/getFundStatement/', {
+          params
         })
         .then((res) => {
-          this.tableData = res.data.data.list;
-          let price=Number(res.data.data.totalPrice);
-          price=price/ 10000;
-          this.saveMoney=price.toFixed(1)
-          this.total=Number(res.data.data.total);
+          this.tableData = res.data.data.list
+          let price = Number(res.data.data.totalPrice)
+          price = price / 10000
+          this.saveMoney = price.toFixed(1)
+          this.total = Number(res.data.data.total)
           this.exportExcelCondition = qs.stringify(this.dataForm)
-    })
-  },
-    handleCurrentChange(val) {
-      this.currentPage = val;
-      this.init();
+        })
     },
-    resetDataList() {
-      this.dateList = [];
-      this.dataForm.startDate = "";
-      this.dataForm.endDate = "";
-      this.dataForm.resourceType = "";
-      this.dataForm.resourceName = "";
-      this.dataForm.applyDept = "";
-      this.dataForm.provideDept = "";
-      this.dataForm.applyResult="";
-      this.currentPage = 1;
-      this.init();
+    handleCurrentChange (val) {
+      this.currentPage = val
+      this.init()
     },
+    resetDataList () {
+      this.dateList = []
+      this.dataForm.startDate = ''
+      this.dataForm.endDate = ''
+      this.dataForm.resourceType = ''
+      this.dataForm.resourceName = ''
+      this.dataForm.applyDept = ''
+      this.dataForm.provideDept = ''
+      this.dataForm.applyResult = ''
+      this.currentPage = 1
+      this.init()
+    }
   },
-  mounted() {
-    this.init();
+  mounted () {
+    // this.init()
   },
-  created() {
-    this.$http.get("/sys/dept/all").then((res) => {
-      this.applyDepartSelects = [];
-      this.offerDepartSelects = [];
+  created () {
+    this.$http.get('/sys/dept/all').then((res) => {
+      this.applyDepartSelects = []
+      this.offerDepartSelects = []
       res.data.data.map((val) => {
-        this.applyDepartSelects.push({ label: val.name, value: val.name });
-        this.offerDepartSelects.push({ label: val.name, value: val.id });
-      });
-    });
-  },
-};
+        this.applyDepartSelects.push({ label: val.name, value: val.name })
+        this.offerDepartSelects.push({ label: val.name, value: val.id })
+      })
+    })
+    this.$http.get('/sys/user/info').then(res => {
+      this.dataForm.provideDept = res.data.data.deptId
+      this.init()
+      if (res.data.data.superAdmin == 1) {
+        this.disabled = false
+        this.dataForm.provideDept = ''
+        this.init()
+        return
+      }
+      if (res.data.data.roleIdList) {
+        res.data.data.roleIdList.map(val => {
+          this.$http.get('/sys/role/' + val).then(res1 => {
+            if (res1.data.data.name === '运维管理员') {
+              this.disabled = false
+              this.dataForm.provideDept = ''
+              this.init()
+            }
+          })
+        })
+      }
+    })
+  }
+}
 </script>
 <style scoped>
 .demand-text {
@@ -363,4 +381,3 @@ export default {
   color: #fff;
 }
 </style>
-  

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

@@ -65,7 +65,8 @@
           header-align="center"
           align="center"
         ></el-table-column>
-        <el-table-column
+        <template v-if="dataList[0]">
+          <el-table-column
           v-for="(item, index) in dataList[0].infoList"
           :key="index"
           :label="item.attrType"
@@ -77,6 +78,7 @@
             {{ findValue(scope.row.infoList, item.attrType) }}
           </template>
         </el-table-column>
+        </template>
         <el-table-column
           :label="$t('handle')"
           fixed="right"
@@ -171,11 +173,11 @@ export default {
   },
   mounted () {
     window.addEventListener('resize', this.a)
-    this.fullScreen();
+    this.fullScreen()
     this.$nextTick(() => {
-    this.$refs.singleTable.doLayout(); // 解决表格错位
-    //:height="qp ? '810px' : '650px'"
-    });
+      this.$refs.singleTable.doLayout() // 解决表格错位
+    // :height="qp ? '810px' : '650px'"
+    })
   },
   methods: {
     reset () {

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

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-29 15:59:51
  * @LastEditors: Light
- * @LastEditTime: 2022-11-17 17:39:31
+ * @LastEditTime: 2022-11-28 11:28:43
  * @Description: 告诉大家这是什么
 -->
 <!--  流程业务表单   -->
@@ -35,10 +35,15 @@
             需求依据：<span>
               {{ dataForm.content.applicationBackground || '--' }}</span></span>
         </p>
-        <p>
+        <!-- <p>
           <div>
             <el-button type="primary" v-if="dataForm.content.attachment" size="small" @click="download(dataForm.content)">附件下载</el-button>
           </div>
+        </p> -->
+        <p>
+          <div>
+            <el-button type="primary" size="small" @click="download(dataForm.content)">附件下载</el-button>
+          </div>
         </p>
         <!-- <p>
           <span>
@@ -180,7 +185,7 @@ export default {
       })
     })
     // 将业务KEY赋值给表单
-    console.log('params=================>', this.$route, this.$route.params)
+    console.log('params=================>', this.$route, this.$route.params, this.dataForm)
     this.dataForm.taskId = this.$route.params.taskId
     this.dataForm.instanceId = this.$route.params.processInstanceId
     this.init()
@@ -262,6 +267,7 @@ export default {
     getInfo () {
       let params = ''
       if (this.dataForm.taskId) {
+        console.log('获取信息')
         params = `taskId=${this.dataForm.taskId}`
         this.$http
           .get(
@@ -277,7 +283,9 @@ export default {
               this.dataForm,
               'elas============================'
             )
-            this.deptName = res.data.tAbilityApplicationDTOList[0].resourceOwnerDept.name
+            if (res.data.tAbilityApplicationDTOList[0].resourceOwnerDept) {
+              this.deptName = res.data.tAbilityApplicationDTOList[0].resourceOwnerDept.name
+            }
             this.$http
               .get(
             `/act/task/getTaskVariables?${params}&variableName=allowEntrust`
@@ -297,6 +305,7 @@ export default {
                   }
                 }
               })
+            console.log('获取信息', res.data)
             if (res.data.tAbilityApplicationDTOList[0].applicationScene) {
               res.data.tAbilityApplicationDTOList[0].applicationSceneStr = ''
               res.data.tAbilityApplicationDTOList[0].applicationScene.map(
@@ -359,6 +368,7 @@ export default {
               this.dataForm,
               'elas============================'
             )
+            console.log('获取信息2', res.data)
             if (res.data[0].applicationScene) {
               res.data[0].applicationSceneStr = ''
               res.data[0].applicationScene.map((val, index) => {
@@ -416,7 +426,6 @@ export default {
     agreeOrNot: debounce(
       function (data, type) {
         if (type === '同意') {
-    
           const params = qs.stringify({
             taskId: this.dataForm.taskId,
             comment: this.input || '同意'
@@ -522,10 +531,66 @@ export default {
     // 任务处理出错回调
     taskHandleErrorCallback (data) { },
     download (data) {
-      const alink = document.createElement('a')
-      alink.download = '附件' // 文件名,大部分浏览器兼容,IE10及以下不兼容
-      alink.href = data.attachment // 创建 url地址
-      alink.click() // 自动点击
+      this.downloadFile(data.attachment, '感知资源申请表')
+      // const alink = document.createElement('a')
+      // alink.download = '附件' // 文件名,大部分浏览器兼容,IE10及以下不兼容
+      // // alink.href = data.attachment // 创建 url地址
+      // alink.href = 'http://10.134.135.92:8888/renren-admin/upload/2022/11/24/c1c2802f-b6d9-4eff-81c8-02965da1ba34.doc' // 创建 url地址
+      // alink.click() // 自动点击
+    },
+    /**
+ * 获取 blob
+ * url 目标文件地址
+ */
+    getBlob (url) {
+      return new Promise(resolve => {
+        const xhr = new XMLHttpRequest()
+
+        xhr.open('GET', url, true)
+        xhr.responseType = 'blob'
+        xhr.onload = () => {
+          if (xhr.status === 200) {
+            resolve(xhr.response)
+          }
+        }
+
+        xhr.send()
+      })
+    },
+    /**
+ * 保存 blob
+ * filename 想要保存的文件名称
+ */
+    saveAs (blob, filename) {
+      if (window.navigator.msSaveOrOpenBlob) {
+        navigator.msSaveBlob(blob, filename)
+      } else {
+        const link = document.createElement('a')
+        const body = document.querySelector('body')
+
+        link.href = window.URL.createObjectURL(blob)
+        link.download = filename
+
+        // fix Firefox
+        link.style.display = 'none'
+        body.appendChild(link)
+
+        link.click()
+        body.removeChild(link)
+
+        window.URL.revokeObjectURL(link.href)
+      }
+    },
+
+    /**
+   * 下载
+   * @param  {String} url 目标文件地址
+   * @param  {String} filename 想要保存的文件名称
+   */
+    downloadFile (url, filename) {
+      this.getBlob(url).then(blob => {
+        this.saveAs(blob, filename)
+      })
     }
   },
   mounted () {

back/src/views/modules/sys/user.vue

@@ -2,25 +2,25 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__user">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
+        <el-form-item label="用户名">
           <el-input v-model="dataForm.username" placeholder="用户名" clearable></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item label="真实姓名">
           <el-input v-model="dataForm.real_name" placeholder="真实姓名" clearable></el-input>
         </el-form-item>
-        <el-form-item>
-          <ren-select v-model="dataForm.gender" dict-type="gender" :placeholder="$t('user.gender')"></ren-select>
-        </el-form-item>
         <!-- <el-form-item>
-          <el-select v-model="dataForm.postId" :placeholder="$t('user.postIdList')" clearable>
-            <el-option :label="data.postName" v-for="data in postList" :key="data.id" :value="data.id">{{ data.postName
+          <ren-select v-model="dataForm.gender" dict-type="gender" :placeholder="$t('user.gender')"></ren-select>
+        </el-form-item> -->
+        <el-form-item label="所属部门">
+          <el-select v-model="dataForm.deptId" :placeholder="$t('infrastructure.department')" clearable>
+            <el-option :label="data.name" v-for="data in deptList" :key="data.id" :value="data.id">{{ data.name
             }}</el-option>
           </el-select>
-        </el-form-item> -->
-        <el-form-item>
+        </el-form-item>
+        <!-- <el-form-item>
           <ren-dept-tree v-model="dataForm.deptId" :placeholder="$t('dept.title')" :query="true" ref="renDeptTree">
           </ren-dept-tree>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item>
           <el-button type="primary" @click="getDataList()">{{
           $t('query')
@@ -97,7 +97,7 @@ import AddOrUpdate from './user-add-or-update'
 import qs from 'qs'
 export default {
   mixins: [mixinViewModule],
-  data() {
+  data () {
     return {
       mixinViewModuleOptions: {
         getDataListURL: '/sys/user/page',
@@ -106,7 +106,7 @@ export default {
         deleteIsBatch: true,
         exportURL: '/sys/user/export'
       },
-      postList: [],
+      deptList: [],
       dataForm: {
         username: '',
         deptId: '',
@@ -118,18 +118,18 @@ export default {
   components: {
     AddOrUpdate
   },
-  created() {
-    this.getPostList()
+  created () {
+    this.getDeptList()
   },
   methods: {
-    reset() {
+    reset () {
       this.dataForm.username = ''
       this.dataForm.real_name = ''
       this.dataForm.deptId = ''
       this.dataForm.postId = ''
       this.dataForm.gender = ''
       if (this.$refs.renDeptTree) {
-        this.$refs.renDeptTree.showDeptName = '';
+        this.$refs.renDeptTree.showDeptName = ''
       }
       this.$http
         .get(
@@ -165,16 +165,13 @@ export default {
           this.dataListLoading = false
         })
     },
-    getPostList() {
-      this.$http
-        .get('/sys/post/list')
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.postList = res.data
-        })
-        .catch(() => { })
+    getDeptList () {
+      this.$http.get('/sys/dept/list').then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.deptList = res.data
+      }).catch(() => { })
     }
   }
 }

front/.gitignore

@@ -4,7 +4,7 @@ dist
 package-lock.json
 yarn.lock
 *.zip
-
+/node_modules
 # local env files
 .env.local
 .env.*.local

front/public/static/config/basicConfig.js

@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
  * @LastEditors: Light
- * @LastEditTime: 2022-11-24 09:11:58
+ * @LastEditTime: 2022-11-28 17:32:57
  * @Description: 系统静态参数配置
  */
 var _global = {}
@@ -63,14 +63,14 @@ var CONFIGITEM = {
       },
       // 获取摄像头的后端接口地址
       camreaInfo: {
-        // cameraUrl: '10.134.135.92:9537', // 西海岸-测试环境
+        cameraUrl: '10.134.135.92:9537', // 西海岸-测试环境
         // cameraUrl: '10.134.135.9:9537', // 西海岸-生产环境
-        cameraUrl: '192.168.124.236:9537', // 远雄（不挂vpn可直接连）
+        // cameraUrl: '192.168.124.236:9537', // 远雄（不挂vpn可直接连）
       },
       backUrl: 'http://10.134.135.9:9797',
-      // apiURL: 'http://10.134.135.92:8888/renren-admin',
-      apiURL: 'http://192.168.124.233:8888/ucs-admin',
-      previewUrl: 'http://10.134.135.9:9796/',
+      apiURL: 'http://10.134.135.92:8888/renren-admin',
+      // apiURL: 'http://192.168.124.233:8888/ucs-admin',
+      // previewUrl: 'http://10.134.135.9:9796/',
       // websocketURL: '10.134.135.9:8888/ucs-admin', // 正式环境
       // websocketURL: '10.134.135.92:8888/ucs-admin', // 测试环境
       websocketURL: '192.168.124.254:8888/ucs-admin', // 李志成-远雄

front/public/static/config/location.js

@@ -1,491 +1,537 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-14 11:23:58
+ * @LastEditors: Light
+ * @LastEditTime: 2022-11-28 17:34:04
  * @Description: 数据资源参数配置
  */
 // eslint-disable-next-line no-undef
 const newLocation = CONFIGITEM.version
-    // const newLocation = 'baotou'
-    // const newLocation = 'xihaian'
+// const newLocation = 'baotou'
+// const newLocation = 'xihaian'
 
 // 数据资源数据
 const whoShow = {}
 const launchedDataNumObject = {}
-    // 导航数据
+// 导航数据
 const navListManagement = {}
-    // 无人机单兵数据
+// 无人机单兵数据
 const uavAndIndividualSoldier = {}
-    // 基础设施
+// 基础设施
 const infrastructure = {}
-    // 区市站点数据
+// 区市站点数据
 const mapTestNum = {}
-    // 底部数据
+// 底部数据
 const footerDataList = {}
-    // 西海岸--特殊用户
+// 西海岸--特殊用户
 const xhaHasPermissionUser = {}
-    // qingdao
+// qingdao
 if (newLocation !== 'baotou' && newLocation !== 'xihaian') {
-    whoShow.itShowQingDao = true
-    infrastructure.deptName = '青岛市大数据发展管理局'
-    infrastructure.deptId = '1067246875800000066'
-    navListManagement.navList = [
-        { name: '共享门户', key: 'home' },
-        { name: '能力集市', key: 'DetailsPageconetent', innerKey: 'algorithmCompare' },
-        // { name: '能力云图', key: 'capabilityCloud' },
-        { name: '能力统计', key: 'abilityStatistics' },
-        // { name: '开发指南', key: 'developmentGuide' },
-        { name: '新手指南', key: 'instructionManual' },
-        { name: '需求中心', key: 'demandCenter' },
-        // { name: '个人中心', key: 'personalCenter' },
-        // { name: '区市站点', key: 'mapTest' },
-        // { name: '后台管理', key: 'houtaiguanli' },
-        //  { name: '典型赋能案例', key: 'assignCase' },
-        { name: '融合服务', key: 'integrationServices' },
-        { name: 'CIM专区', key: 'cimSpecialArea' },
-    ]
-    footerDataList.footerList = {
-        company: {
-            left: '青岛市大数据发展管理局',
-            right: '政府标识码3702000106',
-        },
-        address: [{
-                name: '邮编: 266071',
-                value: 'Email: QDDSJJ@qingdao.shandong.cn',
-            },
-            {
-                name: '版权所有：青岛市大数据发展管理局',
-                value: '地址：山东省青岛市香港中路17号市级机关三号办公楼',
-            },
-            {
-                name: '电话：0532-85912587',
-                value: '传真：0532-85912181',
-            },
-        ],
-    }
-    mapTestNum.lsNum = [{
-            name: '基础设施',
-            key: 'lsjcss',
-            num: '20135个',
-        },
-        {
-            name: '数据资源',
-            key: 'lsjcss',
-            num: '857项',
-        },
-        {
-            name: '应用资源',
-            key: 'lsjcss',
-            num: '28个',
-        },
-    ]
-    mapTestNum.xhaNum = [{
-            name: '基础设施',
-            key: 'xhajcss',
-            num: '35282个',
-        },
-        {
-            name: '数据资源',
-            key: 'xhajcss',
-            num: '11项',
-        },
-        {
-            name: '应用资源',
-            key: 'xhajcss',
-            num: '23个',
-        },
-        {
-            name: '组件服务',
-            key: 'xhazjfw',
-            num: '8个',
-        },
-    ]
+  whoShow.itShowQingDao = true
+  infrastructure.deptName = '青岛市大数据发展管理局'
+  infrastructure.deptId = '1067246875800000066'
+  navListManagement.navList = [
+    { name: '共享门户', key: 'home' },
+    {
+      name: '能力集市',
+      key: 'DetailsPageconetent',
+      innerKey: 'algorithmCompare',
+    },
+    { name: '能力云图', key: 'capabilityCloud' },
+    { name: '能力统计', key: 'abilityStatistics' },
+    // { name: '开发指南', key: 'developmentGuide' },
+    { name: '新手指南', key: 'instructionManual' },
+    { name: '需求中心', key: 'demandCenter' },
+    // { name: '个人中心', key: 'personalCenter' },
+    // { name: '区市站点', key: 'mapTest' },
+    // { name: '后台管理', key: 'houtaiguanli' },
+    //  { name: '典型赋能案例', key: 'assignCase' },
+    { name: '融合服务', key: 'integrationServices' },
+    { name: 'CIM专区', key: 'cimSpecialArea' },
+  ]
+  footerDataList.footerList = {
+    company: {
+      left: '青岛市大数据发展管理局',
+      right: '政府标识码3702000106',
+    },
+    address: [
+      {
+        name: '邮编: 266071',
+        value: 'Email: QDDSJJ@qingdao.shandong.cn',
+      },
+      {
+        name: '版权所有：青岛市大数据发展管理局',
+        value: '地址：山东省青岛市香港中路17号市级机关三号办公楼',
+      },
+      {
+        name: '电话：0532-85912587',
+        value: '传真：0532-85912181',
+      },
+    ],
+  }
+  mapTestNum.lsNum = [
+    {
+      name: '基础设施',
+      key: 'lsjcss',
+      num: '20135个',
+    },
+    {
+      name: '数据资源',
+      key: 'lsjcss',
+      num: '857项',
+    },
+    {
+      name: '应用资源',
+      key: 'lsjcss',
+      num: '28个',
+    },
+  ]
+  mapTestNum.xhaNum = [
+    {
+      name: '基础设施',
+      key: 'xhajcss',
+      num: '35282个',
+    },
+    {
+      name: '数据资源',
+      key: 'xhajcss',
+      num: '11项',
+    },
+    {
+      name: '应用资源',
+      key: 'xhajcss',
+      num: '23个',
+    },
+    {
+      name: '组件服务',
+      key: 'xhazjfw',
+      num: '8个',
+    },
+  ]
 }
 // baotou
 else if (newLocation === 'baotou') {
-    whoShow.itShowBaoTou = true
-    launchedDataNumObject.launchedDataNum = [{
-            num: 10372,
-        },
-        {
-            num: 1080,
-        },
-        {
-            num: 976,
-        },
-    ]
-    navListManagement.navList = [
-        { name: '共享门户', key: 'home' },
-        { name: '能力集市', key: 'DetailsPageconetent' },
-        { name: '能力云图', key: 'capabilityCloud' },
-        { name: '能力统计', key: 'abilityStatistics' },
-        // { name: '开发指南', key: 'developmentGuide' },
-        { name: '需求中心', key: 'demandCenter' },
-        // { name: '个人中心', key: 'personalCenter' },
-        // { name: '区市站点', key: 'mapTest' },
-        // { name: '后台管理', key: 'houtaiguanli' },
-        { name: '赋能案例', key: 'assignCase' },
-    ]
-    footerDataList.footerList = {
-        company: {
-            left: '包头市工业和信息化局大数据中心建设',
-            right: '海信网络科技股份有限公司',
-        },
-        address: [{
-                name: '蒙ICP备05003330-1号',
-                value: '政府标识码1502000040',
-            },
-            {
-                name: '版权所有：包头市工业和信息化局大数据中心',
-                value: '地址：内蒙古自治区包头市九原区开元大街1号',
-            },
-            {
-                name: '电话：0472-5618235',
-                value: '传真：0472-5618235',
-            },
-        ],
-    }
+  whoShow.itShowBaoTou = true
+  launchedDataNumObject.launchedDataNum = [
+    {
+      num: 10372,
+    },
+    {
+      num: 1080,
+    },
+    {
+      num: 976,
+    },
+  ]
+  navListManagement.navList = [
+    { name: '共享门户', key: 'home' },
+    { name: '能力集市', key: 'DetailsPageconetent' },
+    { name: '能力云图', key: 'capabilityCloud' },
+    { name: '能力统计', key: 'abilityStatistics' },
+    // { name: '开发指南', key: 'developmentGuide' },
+    { name: '需求中心', key: 'demandCenter' },
+    // { name: '个人中心', key: 'personalCenter' },
+    // { name: '区市站点', key: 'mapTest' },
+    // { name: '后台管理', key: 'houtaiguanli' },
+    { name: '赋能案例', key: 'assignCase' },
+  ]
+  footerDataList.footerList = {
+    company: {
+      left: '包头市工业和信息化局大数据中心建设',
+      right: '海信网络科技股份有限公司',
+    },
+    address: [
+      {
+        name: '蒙ICP备05003330-1号',
+        value: '政府标识码1502000040',
+      },
+      {
+        name: '版权所有：包头市工业和信息化局大数据中心',
+        value: '地址：内蒙古自治区包头市九原区开元大街1号',
+      },
+      {
+        name: '电话：0472-5618235',
+        value: '传真：0472-5618235',
+      },
+    ],
+  }
 }
 // xihaian
 else if (newLocation === 'xihaian') {
-    whoShow.itShowXiHaiAn = true
-    infrastructure.deptName = '西海岸新区大数据发展'
-        // infrastructure.deptId = '1067246875800000066'
-    uavAndIndividualSoldier.num = 4
-    uavAndIndividualSoldier.uavList = [{
-            name: '经纬 M300 RTK-1',
-            url: '',
-            details: [{
-                    name: '飞行器',
-                    attribute: {
-                        尺寸: '尺寸（展开，不包含桨叶）：810×670×430 mm（长×宽×高）；尺寸（折叠，包含桨叶）：430×420×430 mm（长×宽×高）',
-                        对称电机轴距: '895 mm',
-                        '重量（含下置单云台支架）:空机重量（不含电池）': '3.6 kg；空机重量（含双电池）：6.3 kg',
-                        单云台减震球最大负重: '930g',
-                        最大起飞重量: '9 kg',
-                        工作频率: '2.4000-2.4835 GHz；5.725-5.850 GHz',
-                        '发射功率（EIRP）': '2.4000-2.4835 GHz：29.5 dBm（FCC）、18.5dBm（CE）、18.5 dBm（SRRC）、18.5dBm（MIC）；5.725-5.850 GHz：28.5 dBm（FCC）、12.5dBm（CE）、28.5 dBm（SRRC）',
-                        '悬停精度（P-GPS）': '垂直：±0.1 m（视觉定位正常工作时）、±0.5 m（GPS 正常工作时）、±0.1 m（RTK 定位正常工作时）；水平：±0.3 m（视觉定位正常工作时）、±1.5 m（GPS 正常工作时）、±0.1 m（RTK 定位正常工作时）',
-                        'RTK 位置精度': '在 RTK FIX 时：1 cm+1 ppm（水平）、1.5 cm + 1 ppm（垂直）',
-                        最大旋转角速度: '俯仰轴：300°/s、航向轴：100°/s',
-                        最大俯仰角度: '30° （P模式且前视视觉系统启用：25°）',
-                        最大上升速度: 'S 模式：6 m/s、P 模式：5 m/s',
-                        '最大下降速度（垂直）': 'S 模式：5 m/s、P 模式：4 m/s',
-                        最大倾斜下降速度: 'S 模式：7 m/s',
-                        最大水平飞行速度: 'S 模式：23 m/s、P 模式：17 m/s',
-                        最大飞行海拔高度: '5000 m（2110 桨叶，起飞重量≤7 kg）/ 7000 m（2195 高原静音桨叶，起飞重量≤7 kg）',
-                        最大可承受风速: '15m/s（起飞及降落阶段为12m/s）',
-                        最大飞行时间: '55 min',
-                        '适配 DJI 云台': '禅思 XT2、禅思 XT S、禅思 Z30、禅思 H20、禅思 H20T、DJI P1、DJI L1',
-                        支持云台安装方式: '下置单云台、上置单云台、下置双云台、下置单云台+上置单云台、下置双云台+上置单云台',
-                        'IP 防护等级': 'IP45',
-                        GNSS: 'GPS+GLONASS+BeiDou+Galileo',
-                        工作环境温度: '-20°C 至 50°C',
-                    },
-                },
-                {
-                    name: '遥控器',
-                    attribute: {
-                        工作频率: '2.4000-2.4835 GHz、5.725-5.850 GHz',
-                        '最大信号有效距离（无干扰、无遮挡）': 'NCC/FCC：15 km、CE/MIC：8 km、SRRC：8 km',
-                        '等效全向辐射功率（EIRP）': '2.4000-2.4835 GHz：29.5 dBm（FCC）；18.5dBm（CE）、18.5 dBm（SRRC）；18.5dBm（MIC）；5.725-5.850 GHz：28.5 dBm（FCC）；12.5dBm（CE）、20.5 dBm（SRRC）',
-                        外置电池: '名称：WB37 智能电池；容量：4920 mAh；电压：7.6 V；电池类型：LiPo；能量：37.39 Wh；充电时间（使用 BS60 智能电池箱）：70 分钟（15°C 至 45°C）；130 分钟（0°C 至 15°C）',
-                        内置电池: '类型：18650 锂离子电池 （5000 mAh @ 7.2 V）；充电方式：使用规格为 12V/2A 的 USB 充电器；额定功率：17 W；充电时间：2 小时 15 分钟（使用规格为12V/2A 的 USB 充电器）',
-                        续航时间: '内置电池：约 2.5 小时内置电池+外置电池：约 4.5 小时',
-                        'USB-A 接口供电电压/电流': '5 V / 1.5 A',
-                        工作环境温度: '-20° 至 40° C',
-                    },
-                },
-                {
-                    name: '视觉系统',
-                    attribute: {
-                        障碍物感知范围: '前后左右：0.7-40 m、上下：0.6-30 m',
-                        FOV: '前后下：65°（H），50°（V）、左右上：75°（H），60°（V）',
-                        使用环境: '表面有丰富纹理，光照条件充足（>15 lux，室内日光灯正常照射环境）',
-                    },
-                },
-                {
-                    name: '红外感知系统',
-                    attribute: {
-                        障碍物感知范围: '0.1-8 m',
-                        FOV: '30°（±15°）',
-                        使用环境: '漫反射，大尺寸，高反射率（反射率>10%）障碍物',
-                    },
-                },
-                {
-                    name: '上下补光灯',
-                    attribute: {
-                        有效照明距离: '5 m',
-                    },
-                },
-                {
-                    name: 'FPV摄像头',
-                    attribute: {
-                        分辨率: '960p',
-                        FOV: '145°',
-                        帧率: '30 fps',
-                    },
-                },
-                {
-                    name: '智能飞行电池',
-                    attribute: {
-                        型号: 'TB60',
-                        容量: '5935 mAh',
-                        电压: '52.8 V',
-                        电池类型: 'LiPo 12S',
-                        能量: '274 Wh',
-                        电池整体重量: '约 1.35 kg',
-                        工作环境温度: '-20℃ 至 50℃',
-                        理想存放环境温度: '22℃ 至 30℃',
-                        充电环境温度: '-20°C 至 40°C（当环境温度低于 5°C时，电池会启动自加热功能，在低温环境下充电有可能会降低电池使用寿命）',
-                        充电时间: '使用 BS60 智能电池箱时，使用 220 V 电源：完全充满两块 TB60 智能飞行电池约需 60 分钟，从 20% 充到 90% 约需 30 分钟；使用 110 V 电源：完全充满两块 TB60 智能飞行电池约需 70 分钟，从 20% 充到 90% 约需 40 分钟',
-                    },
-                },
-                {
-                    name: 'BS60智能电池箱',
-                    attribute: {
-                        外形尺寸: '501×403×252 mm',
-                        空箱重量: '8.37 kg',
-                        可放置物品: 'TB60 智能飞行电池 8 块、WB37 智能电池 4 块',
-                        输入电压: '100-120 VAC，50-60 Hz / 220-240 VAC，50-60 Hz',
-                        最大输入功率: '1070 W',
-                        输出功率: '100-120 V：750 W、220-240 V：992 W',
-                        工作环境温度: '-20℃ 至 40℃',
-                    },
-                },
-            ],
+  whoShow.itShowXiHaiAn = true
+  infrastructure.deptName = '西海岸新区大数据发展'
+  // infrastructure.deptId = '1067246875800000066'
+  uavAndIndividualSoldier.num = 4
+  uavAndIndividualSoldier.uavList = [
+    {
+      name: '经纬 M300 RTK-1',
+      url: '',
+      details: [
+        {
+          name: '飞行器',
+          attribute: {
+            尺寸: '尺寸（展开，不包含桨叶）：810×670×430 mm（长×宽×高）；尺寸（折叠，包含桨叶）：430×420×430 mm（长×宽×高）',
+            对称电机轴距: '895 mm',
+            '重量（含下置单云台支架）:空机重量（不含电池）':
+              '3.6 kg；空机重量（含双电池）：6.3 kg',
+            单云台减震球最大负重: '930g',
+            最大起飞重量: '9 kg',
+            工作频率: '2.4000-2.4835 GHz；5.725-5.850 GHz',
+            '发射功率（EIRP）':
+              '2.4000-2.4835 GHz：29.5 dBm（FCC）、18.5dBm（CE）、18.5 dBm（SRRC）、18.5dBm（MIC）；5.725-5.850 GHz：28.5 dBm（FCC）、12.5dBm（CE）、28.5 dBm（SRRC）',
+            '悬停精度（P-GPS）':
+              '垂直：±0.1 m（视觉定位正常工作时）、±0.5 m（GPS 正常工作时）、±0.1 m（RTK 定位正常工作时）；水平：±0.3 m（视觉定位正常工作时）、±1.5 m（GPS 正常工作时）、±0.1 m（RTK 定位正常工作时）',
+            'RTK 位置精度':
+              '在 RTK FIX 时：1 cm+1 ppm（水平）、1.5 cm + 1 ppm（垂直）',
+            最大旋转角速度: '俯仰轴：300°/s、航向轴：100°/s',
+            最大俯仰角度: '30° （P模式且前视视觉系统启用：25°）',
+            最大上升速度: 'S 模式：6 m/s、P 模式：5 m/s',
+            '最大下降速度（垂直）': 'S 模式：5 m/s、P 模式：4 m/s',
+            最大倾斜下降速度: 'S 模式：7 m/s',
+            最大水平飞行速度: 'S 模式：23 m/s、P 模式：17 m/s',
+            最大飞行海拔高度:
+              '5000 m（2110 桨叶，起飞重量≤7 kg）/ 7000 m（2195 高原静音桨叶，起飞重量≤7 kg）',
+            最大可承受风速: '15m/s（起飞及降落阶段为12m/s）',
+            最大飞行时间: '55 min',
+            '适配 DJI 云台':
+              '禅思 XT2、禅思 XT S、禅思 Z30、禅思 H20、禅思 H20T、DJI P1、DJI L1',
+            支持云台安装方式:
+              '下置单云台、上置单云台、下置双云台、下置单云台+上置单云台、下置双云台+上置单云台',
+            'IP 防护等级': 'IP45',
+            GNSS: 'GPS+GLONASS+BeiDou+Galileo',
+            工作环境温度: '-20°C 至 50°C',
+          },
         },
         {
-            name: '经纬 M300 RTK-2',
-            url: '',
-            details: [{
-                    name: '飞行器',
-                    attribute: {
-                        尺寸: '尺寸（展开，不包含桨叶）：810×670×430 mm（长×宽×高）；尺寸（折叠，包含桨叶）：430×420×430 mm（长×宽×高）',
-                        对称电机轴距: '895 mm',
-                        '重量（含下置单云台支架）:空机重量（不含电池）': '3.6 kg；空机重量（含双电池）：6.3 kg',
-                        单云台减震球最大负重: '930g',
-                        最大起飞重量: '9 kg',
-                        工作频率: '2.4000-2.4835 GHz；5.725-5.850 GHz',
-                        '发射功率（EIRP）': '2.4000-2.4835 GHz：29.5 dBm（FCC）、18.5dBm（CE）、18.5 dBm（SRRC）、18.5dBm（MIC）；5.725-5.850 GHz：28.5 dBm（FCC）、12.5dBm（CE）、28.5 dBm（SRRC）',
-                        '悬停精度（P-GPS）': '垂直：±0.1 m（视觉定位正常工作时）、±0.5 m（GPS 正常工作时）、±0.1 m（RTK 定位正常工作时）；水平：±0.3 m（视觉定位正常工作时）、±1.5 m（GPS 正常工作时）、±0.1 m（RTK 定位正常工作时）',
-                        'RTK 位置精度': '在 RTK FIX 时：1 cm+1 ppm（水平）、1.5 cm + 1 ppm（垂直）',
-                        最大旋转角速度: '俯仰轴：300°/s、航向轴：100°/s',
-                        最大俯仰角度: '30° （P模式且前视视觉系统启用：25°）',
-                        最大上升速度: 'S 模式：6 m/s、P 模式：5 m/s',
-                        '最大下降速度（垂直）': 'S 模式：5 m/s、P 模式：4 m/s',
-                        最大倾斜下降速度: 'S 模式：7 m/s',
-                        最大水平飞行速度: 'S 模式：23 m/s、P 模式：17 m/s',
-                        最大飞行海拔高度: '5000 m（2110 桨叶，起飞重量≤7 kg）/ 7000 m（2195 高原静音桨叶，起飞重量≤7 kg）',
-                        最大可承受风速: '15m/s（起飞及降落阶段为12m/s）',
-                        最大飞行时间: '55 min',
-                        '适配 DJI 云台': '禅思 XT2、禅思 XT S、禅思 Z30、禅思 H20、禅思 H20T、DJI P1、DJI L1',
-                        支持云台安装方式: '下置单云台、上置单云台、下置双云台、下置单云台+上置单云台、下置双云台+上置单云台',
-                        'IP 防护等级': 'IP45',
-                        GNSS: 'GPS+GLONASS+BeiDou+Galileo',
-                        工作环境温度: '-20°C 至 50°C',
-                    },
-                },
-                {
-                    name: '遥控器',
-                    attribute: {
-                        工作频率: '2.4000-2.4835 GHz、5.725-5.850 GHz',
-                        '最大信号有效距离（无干扰、无遮挡）': 'NCC/FCC：15 km、CE/MIC：8 km、SRRC：8 km',
-                        '等效全向辐射功率（EIRP）': '2.4000-2.4835 GHz：29.5 dBm（FCC）；18.5dBm（CE）、18.5 dBm（SRRC）；18.5dBm（MIC）；5.725-5.850 GHz：28.5 dBm（FCC）；12.5dBm（CE）、20.5 dBm（SRRC）',
-                        外置电池: '名称：WB37 智能电池；容量：4920 mAh；电压：7.6 V；电池类型：LiPo；能量：37.39 Wh；充电时间（使用 BS60 智能电池箱）：70 分钟（15°C 至 45°C）；130 分钟（0°C 至 15°C）',
-                        内置电池: '类型：18650 锂离子电池 （5000 mAh @ 7.2 V）；充电方式：使用规格为 12V/2A 的 USB 充电器；额定功率：17 W；充电时间：2 小时 15 分钟（使用规格为12V/2A 的 USB 充电器）',
-                        续航时间: '内置电池：约 2.5 小时内置电池+外置电池：约 4.5 小时',
-                        'USB-A 接口供电电压/电流': '5 V / 1.5 A',
-                        工作环境温度: '-20° 至 40° C',
-                    },
-                },
-                {
-                    name: '视觉系统',
-                    attribute: {
-                        障碍物感知范围: '前后左右：0.7-40 m、上下：0.6-30 m',
-                        FOV: '前后下：65°（H），50°（V）、左右上：75°（H），60°（V）',
-                        使用环境: '表面有丰富纹理，光照条件充足（>15 lux，室内日光灯正常照射环境）',
-                    },
-                },
-                {
-                    name: '红外感知系统',
-                    attribute: {
-                        障碍物感知范围: '0.1-8 m',
-                        FOV: '30°（±15°）',
-                        使用环境: '漫反射，大尺寸，高反射率（反射率>10%）障碍物',
-                    },
-                },
-                {
-                    name: '上下补光灯',
-                    attribute: {
-                        有效照明距离: '5 m',
-                    },
-                },
-                {
-                    name: 'FPV摄像头',
-                    attribute: {
-                        分辨率: '960p',
-                        FOV: '145°',
-                        帧率: '30 fps',
-                    },
-                },
-                {
-                    name: '智能飞行电池',
-                    attribute: {
-                        型号: 'TB60',
-                        容量: '5935 mAh',
-                        电压: '52.8 V',
-                        电池类型: 'LiPo 12S',
-                        能量: '274 Wh',
-                        电池整体重量: '约 1.35 kg',
-                        工作环境温度: '-20℃ 至 50℃',
-                        理想存放环境温度: '22℃ 至 30℃',
-                        充电环境温度: '-20°C 至 40°C（当环境温度低于 5°C时，电池会启动自加热功能，在低温环境下充电有可能会降低电池使用寿命）',
-                        充电时间: '使用 BS60 智能电池箱时，使用 220 V 电源：完全充满两块 TB60 智能飞行电池约需 60 分钟，从 20% 充到 90% 约需 30 分钟；使用 110 V 电源：完全充满两块 TB60 智能飞行电池约需 70 分钟，从 20% 充到 90% 约需 40 分钟',
-                    },
-                },
-                {
-                    name: 'BS60智能电池箱',
-                    attribute: {
-                        外形尺寸: '501×403×252 mm',
-                        空箱重量: '8.37 kg',
-                        可放置物品: 'TB60 智能飞行电池 8 块、WB37 智能电池 4 块',
-                        输入电压: '100-120 VAC，50-60 Hz / 220-240 VAC，50-60 Hz',
-                        最大输入功率: '1070 W',
-                        输出功率: '100-120 V：750 W、220-240 V：992 W',
-                        工作环境温度: '-20℃ 至 40℃',
-                    },
-                },
-            ],
-        },
-    ]
-    uavAndIndividualSoldier.individualSoldier = [{
-            name: 'T950天通-1',
-            type: '单兵设备',
-            details: {
-                基本信息: {
-                    外观设计: '172X81X15.7(不含天线)，336g',
-                    操作系统: 'Android P',
-                    CPU: '展锐 Makalu T7510;虎贲T710+春藤IVY510',
-                    存储: '标配:6GB ROM +128G RAM',
-                    显示屏: '6.52吋水滴屏;HD+，1600*720(20:9)',
-                    后置摄像头: '后置为4800万主摄+200万微距+200万红外三摄组合，支持闪光灯',
-                    前置摄像头: '1600万',
-                    传感器相关: '指纹|光线传感器|距离传感器|加速度传感器|地磁传感器|陀螺仪|气压传感器',
-                    WLAN: '802.11a/b/g/n/AC 支持MIMO',
-                    电池: '6000mAh@3.8V，内置不可拆卸，支持18W快充',
-                    工作时间: '待机时长180h，卫星通话时长16h',
-                },
-                制式频段: {
-                    卫星频段: '天通一号卫星',
-                    频段: '2G:GSM 850/900/1800/1900;3G:WCDMA850/900/1900/2100;4G:TD-LTE B38/39/40/41;4G:FDD-LTE B1/3/5/7/8;5G: N1，N28，N41, N78，N79',
-                    双卡: '双nano卡(卫星卡+运营商全网通卡)',
-                    CA: 'B1+B3 下行 2CA(电信);B40/41带内上下行 2CA',
-                    VOLTE: '支持',
-                },
-                IO接口: {
-                    USB接口类型: 'TYPE-C USB3.0，支持OTG功能',
-                    耳机接口: '3.5mm，美标',
-                    存储卡: '支持TF卡扩展',
-                },
-                其它功能: {
-                    蓝牙: 'V5.0',
-                    定位: 'GPS、北斗混合定位、单北斗模式',
-                    NFC: '支持',
-                    充电方式: '三种充电方式(线充、座充、磁吸充电)',
-                    按键: '开机键、音量+/-、 SOS(侧面)、PTT按键',
-                },
-                环境适应性: {
-                    工作温度: '-20°~ 60°',
-                    存储温度: '-40°~ 80°',
-                    高温高湿: '(95±3)%(≧40°)，24小时',
-                    防护等级: 'IP68',
-                },
-            },
+          name: '遥控器',
+          attribute: {
+            工作频率: '2.4000-2.4835 GHz、5.725-5.850 GHz',
+            '最大信号有效距离（无干扰、无遮挡）':
+              'NCC/FCC：15 km、CE/MIC：8 km、SRRC：8 km',
+            '等效全向辐射功率（EIRP）':
+              '2.4000-2.4835 GHz：29.5 dBm（FCC）；18.5dBm（CE）、18.5 dBm（SRRC）；18.5dBm（MIC）；5.725-5.850 GHz：28.5 dBm（FCC）；12.5dBm（CE）、20.5 dBm（SRRC）',
+            外置电池:
+              '名称：WB37 智能电池；容量：4920 mAh；电压：7.6 V；电池类型：LiPo；能量：37.39 Wh；充电时间（使用 BS60 智能电池箱）：70 分钟（15°C 至 45°C）；130 分钟（0°C 至 15°C）',
+            内置电池:
+              '类型：18650 锂离子电池 （5000 mAh @ 7.2 V）；充电方式：使用规格为 12V/2A 的 USB 充电器；额定功率：17 W；充电时间：2 小时 15 分钟（使用规格为12V/2A 的 USB 充电器）',
+            续航时间: '内置电池：约 2.5 小时内置电池+外置电池：约 4.5 小时',
+            'USB-A 接口供电电压/电流': '5 V / 1.5 A',
+            工作环境温度: '-20° 至 40° C',
+          },
         },
         {
-            name: 'T950天通-2',
-            type: '单兵设备',
-            details: {
-                基本信息: {
-                    外观设计: '172X81X15.7(不含天线)，336g',
-                    操作系统: 'Android P',
-                    CPU: '展锐 Makalu T7510;虎贲T710+春藤IVY510',
-                    存储: '标配:6GB ROM +128G RAM',
-                    显示屏: '6.52吋水滴屏;HD+，1600*720(20:9)',
-                    后置摄像头: '后置为4800万主摄+200万微距+200万红外三摄组合，支持闪光灯',
-                    前置摄像头: '1600万',
-                    传感器相关: '指纹|光线传感器|距离传感器|加速度传感器|地磁传感器|陀螺仪|气压传感器',
-                    WLAN: '802.11a/b/g/n/AC 支持MIMO',
-                    电池: '6000mAh@3.8V，内置不可拆卸，支持18W快充',
-                    工作时间: '待机时长180h，卫星通话时长16h',
-                },
-                制式频段: {
-                    卫星频段: '天通一号卫星',
-                    频段: '2G:GSM 850/900/1800/1900;3G:WCDMA850/900/1900/2100;4G:TD-LTE B38/39/40/41;4G:FDD-LTE B1/3/5/7/8;5G: N1，N28，N41, N78，N79',
-                    双卡: '双nano卡(卫星卡+运营商全网通卡)',
-                    CA: 'B1+B3 下行 2CA(电信);B40/41带内上下行 2CA',
-                    VOLTE: '支持',
-                },
-                IO接口: {
-                    USB接口类型: 'TYPE-C USB3.0，支持OTG功能',
-                    耳机接口: '3.5mm，美标',
-                    存储卡: '支持TF卡扩展',
-                },
-                其它功能: {
-                    蓝牙: 'V5.0',
-                    定位: 'GPS、北斗混合定位、单北斗模式',
-                    NFC: '支持',
-                    充电方式: '三种充电方式(线充、座充、磁吸充电)',
-                    按键: '开机键、音量+/-、 SOS(侧面)、PTT按键',
-                },
-                环境适应性: {
-                    工作温度: '-20°~ 60°',
-                    存储温度: '-40°~ 80°',
-                    高温高湿: '(95±3)%(≧40°)，24小时',
-                    防护等级: 'IP68',
-                },
-            },
+          name: '视觉系统',
+          attribute: {
+            障碍物感知范围: '前后左右：0.7-40 m、上下：0.6-30 m',
+            FOV: '前后下：65°（H），50°（V）、左右上：75°（H），60°（V）',
+            使用环境:
+              '表面有丰富纹理，光照条件充足（>15 lux，室内日光灯正常照射环境）',
+          },
         },
-    ]
-    navListManagement.navList = [
-        { name: '共享门户', key: 'home' },
-        { name: '能力集市', key: 'DetailsPageconetent' },
-        { name: '能力云图', key: 'capabilityCloud' },
-        { name: '能力统计', key: 'abilityStatistics' },
-        // { name: '开发指南', key: 'developmentGuide' },
-        { name: '需求中心', key: 'demandCenter' },
-        // { name: '个人中心', key: 'personalCenter' },
-        // { name: '区市站点', key: 'mapTest' },
-        // { name: '后台管理', key: 'houtaiguanli' },
-        { name: '赋能案例', key: 'assignCase' },
-    ]
-    footerDataList.footerList = {
-        company: {
-            left: '青岛西海岸新区大数据发展促进局建设',
-            // eslint-disable-next-line no-undef
-            right: CONFIGITEM.vNum,
+        {
+          name: '红外感知系统',
+          attribute: {
+            障碍物感知范围: '0.1-8 m',
+            FOV: '30°（±15°）',
+            使用环境: '漫反射，大尺寸，高反射率（反射率>10%）障碍物',
+          },
         },
-        address: [{
-                name: '鲁IC备00000000号',
-                value: '政府标识码3702000106',
-            },
-            {
-                name: '版权所有：青岛西海岸新区大数据发展促进局',
-                value: '地址：青岛市西海岸新区长江中路369号',
-            },
-            {
-                name: '电话：0532-86986596',
-                value: '传真：0532-86986596',
-            },
-        ],
-    }
-    xhaHasPermissionUser.list = [
-        'xihaian01',
-        'xihaian02',
-        'xihaian03',
-        'xihaian04',
-        'admin',
-    ]
-}
+        {
+          name: '上下补光灯',
+          attribute: {
+            有效照明距离: '5 m',
+          },
+        },
+        {
+          name: 'FPV摄像头',
+          attribute: {
+            分辨率: '960p',
+            FOV: '145°',
+            帧率: '30 fps',
+          },
+        },
+        {
+          name: '智能飞行电池',
+          attribute: {
+            型号: 'TB60',
+            容量: '5935 mAh',
+            电压: '52.8 V',
+            电池类型: 'LiPo 12S',
+            能量: '274 Wh',
+            电池整体重量: '约 1.35 kg',
+            工作环境温度: '-20℃ 至 50℃',
+            理想存放环境温度: '22℃ 至 30℃',
+            充电环境温度:
+              '-20°C 至 40°C（当环境温度低于 5°C时，电池会启动自加热功能，在低温环境下充电有可能会降低电池使用寿命）',
+            充电时间:
+              '使用 BS60 智能电池箱时，使用 220 V 电源：完全充满两块 TB60 智能飞行电池约需 60 分钟，从 20% 充到 90% 约需 30 分钟；使用 110 V 电源：完全充满两块 TB60 智能飞行电池约需 70 分钟，从 20% 充到 90% 约需 40 分钟',
+          },
+        },
+        {
+          name: 'BS60智能电池箱',
+          attribute: {
+            外形尺寸: '501×403×252 mm',
+            空箱重量: '8.37 kg',
+            可放置物品: 'TB60 智能飞行电池 8 块、WB37 智能电池 4 块',
+            输入电压: '100-120 VAC，50-60 Hz / 220-240 VAC，50-60 Hz',
+            最大输入功率: '1070 W',
+            输出功率: '100-120 V：750 W、220-240 V：992 W',
+            工作环境温度: '-20℃ 至 40℃',
+          },
+        },
+      ],
+    },
+    {
+      name: '经纬 M300 RTK-2',
+      url: '',
+      details: [
+        {
+          name: '飞行器',
+          attribute: {
+            尺寸: '尺寸（展开，不包含桨叶）：810×670×430 mm（长×宽×高）；尺寸（折叠，包含桨叶）：430×420×430 mm（长×宽×高）',
+            对称电机轴距: '895 mm',
+            '重量（含下置单云台支架）:空机重量（不含电池）':
+              '3.6 kg；空机重量（含双电池）：6.3 kg',
+            单云台减震球最大负重: '930g',
+            最大起飞重量: '9 kg',
+            工作频率: '2.4000-2.4835 GHz；5.725-5.850 GHz',
+            '发射功率（EIRP）':
+              '2.4000-2.4835 GHz：29.5 dBm（FCC）、18.5dBm（CE）、18.5 dBm（SRRC）、18.5dBm（MIC）；5.725-5.850 GHz：28.5 dBm（FCC）、12.5dBm（CE）、28.5 dBm（SRRC）',
+            '悬停精度（P-GPS）':
+              '垂直：±0.1 m（视觉定位正常工作时）、±0.5 m（GPS 正常工作时）、±0.1 m（RTK 定位正常工作时）；水平：±0.3 m（视觉定位正常工作时）、±1.5 m（GPS 正常工作时）、±0.1 m（RTK 定位正常工作时）',
+            'RTK 位置精度':
+              '在 RTK FIX 时：1 cm+1 ppm（水平）、1.5 cm + 1 ppm（垂直）',
+            最大旋转角速度: '俯仰轴：300°/s、航向轴：100°/s',
+            最大俯仰角度: '30° （P模式且前视视觉系统启用：25°）',
+            最大上升速度: 'S 模式：6 m/s、P 模式：5 m/s',
+            '最大下降速度（垂直）': 'S 模式：5 m/s、P 模式：4 m/s',
+            最大倾斜下降速度: 'S 模式：7 m/s',
+            最大水平飞行速度: 'S 模式：23 m/s、P 模式：17 m/s',
+            最大飞行海拔高度:
+              '5000 m（2110 桨叶，起飞重量≤7 kg）/ 7000 m（2195 高原静音桨叶，起飞重量≤7 kg）',
+            最大可承受风速: '15m/s（起飞及降落阶段为12m/s）',
+            最大飞行时间: '55 min',
+            '适配 DJI 云台':
+              '禅思 XT2、禅思 XT S、禅思 Z30、禅思 H20、禅思 H20T、DJI P1、DJI L1',
+            支持云台安装方式:
+              '下置单云台、上置单云台、下置双云台、下置单云台+上置单云台、下置双云台+上置单云台',
+            'IP 防护等级': 'IP45',
+            GNSS: 'GPS+GLONASS+BeiDou+Galileo',
+            工作环境温度: '-20°C 至 50°C',
+          },
+        },
+        {
+          name: '遥控器',
+          attribute: {
+            工作频率: '2.4000-2.4835 GHz、5.725-5.850 GHz',
+            '最大信号有效距离（无干扰、无遮挡）':
+              'NCC/FCC：15 km、CE/MIC：8 km、SRRC：8 km',
+            '等效全向辐射功率（EIRP）':
+              '2.4000-2.4835 GHz：29.5 dBm（FCC）；18.5dBm（CE）、18.5 dBm（SRRC）；18.5dBm（MIC）；5.725-5.850 GHz：28.5 dBm（FCC）；12.5dBm（CE）、20.5 dBm（SRRC）',
+            外置电池:
+              '名称：WB37 智能电池；容量：4920 mAh；电压：7.6 V；电池类型：LiPo；能量：37.39 Wh；充电时间（使用 BS60 智能电池箱）：70 分钟（15°C 至 45°C）；130 分钟（0°C 至 15°C）',
+            内置电池:
+              '类型：18650 锂离子电池 （5000 mAh @ 7.2 V）；充电方式：使用规格为 12V/2A 的 USB 充电器；额定功率：17 W；充电时间：2 小时 15 分钟（使用规格为12V/2A 的 USB 充电器）',
+            续航时间: '内置电池：约 2.5 小时内置电池+外置电池：约 4.5 小时',
+            'USB-A 接口供电电压/电流': '5 V / 1.5 A',
+            工作环境温度: '-20° 至 40° C',
+          },
+        },
+        {
+          name: '视觉系统',
+          attribute: {
+            障碍物感知范围: '前后左右：0.7-40 m、上下：0.6-30 m',
+            FOV: '前后下：65°（H），50°（V）、左右上：75°（H），60°（V）',
+            使用环境:
+              '表面有丰富纹理，光照条件充足（>15 lux，室内日光灯正常照射环境）',
+          },
+        },
+        {
+          name: '红外感知系统',
+          attribute: {
+            障碍物感知范围: '0.1-8 m',
+            FOV: '30°（±15°）',
+            使用环境: '漫反射，大尺寸，高反射率（反射率>10%）障碍物',
+          },
+        },
+        {
+          name: '上下补光灯',
+          attribute: {
+            有效照明距离: '5 m',
+          },
+        },
+        {
+          name: 'FPV摄像头',
+          attribute: {
+            分辨率: '960p',
+            FOV: '145°',
+            帧率: '30 fps',
+          },
+        },
+        {
+          name: '智能飞行电池',
+          attribute: {
+            型号: 'TB60',
+            容量: '5935 mAh',
+            电压: '52.8 V',
+            电池类型: 'LiPo 12S',
+            能量: '274 Wh',
+            电池整体重量: '约 1.35 kg',
+            工作环境温度: '-20℃ 至 50℃',
+            理想存放环境温度: '22℃ 至 30℃',
+            充电环境温度:
+              '-20°C 至 40°C（当环境温度低于 5°C时，电池会启动自加热功能，在低温环境下充电有可能会降低电池使用寿命）',
+            充电时间:
+              '使用 BS60 智能电池箱时，使用 220 V 电源：完全充满两块 TB60 智能飞行电池约需 60 分钟，从 20% 充到 90% 约需 30 分钟；使用 110 V 电源：完全充满两块 TB60 智能飞行电池约需 70 分钟，从 20% 充到 90% 约需 40 分钟',
+          },
+        },
+        {
+          name: 'BS60智能电池箱',
+          attribute: {
+            外形尺寸: '501×403×252 mm',
+            空箱重量: '8.37 kg',
+            可放置物品: 'TB60 智能飞行电池 8 块、WB37 智能电池 4 块',
+            输入电压: '100-120 VAC，50-60 Hz / 220-240 VAC，50-60 Hz',
+            最大输入功率: '1070 W',
+            输出功率: '100-120 V：750 W、220-240 V：992 W',
+            工作环境温度: '-20℃ 至 40℃',
+          },
+        },
+      ],
+    },
+  ]
+  uavAndIndividualSoldier.individualSoldier = [
+    {
+      name: 'T950天通-1',
+      type: '单兵设备',
+      details: {
+        基本信息: {
+          外观设计: '172X81X15.7(不含天线)，336g',
+          操作系统: 'Android P',
+          CPU: '展锐 Makalu T7510;虎贲T710+春藤IVY510',
+          存储: '标配:6GB ROM +128G RAM',
+          显示屏: '6.52吋水滴屏;HD+，1600*720(20:9)',
+          后置摄像头:
+            '后置为4800万主摄+200万微距+200万红外三摄组合，支持闪光灯',
+          前置摄像头: '1600万',
+          传感器相关:
+            '指纹|光线传感器|距离传感器|加速度传感器|地磁传感器|陀螺仪|气压传感器',
+          WLAN: '802.11a/b/g/n/AC 支持MIMO',
+          电池: '6000mAh@3.8V，内置不可拆卸，支持18W快充',
+          工作时间: '待机时长180h，卫星通话时长16h',
+        },
+        制式频段: {
+          卫星频段: '天通一号卫星',
+          频段: '2G:GSM 850/900/1800/1900;3G:WCDMA850/900/1900/2100;4G:TD-LTE B38/39/40/41;4G:FDD-LTE B1/3/5/7/8;5G: N1，N28，N41, N78，N79',
+          双卡: '双nano卡(卫星卡+运营商全网通卡)',
+          CA: 'B1+B3 下行 2CA(电信);B40/41带内上下行 2CA',
+          VOLTE: '支持',
+        },
+        IO接口: {
+          USB接口类型: 'TYPE-C USB3.0，支持OTG功能',
+          耳机接口: '3.5mm，美标',
+          存储卡: '支持TF卡扩展',
+        },
+        其它功能: {
+          蓝牙: 'V5.0',
+          定位: 'GPS、北斗混合定位、单北斗模式',
+          NFC: '支持',
+          充电方式: '三种充电方式(线充、座充、磁吸充电)',
+          按键: '开机键、音量+/-、 SOS(侧面)、PTT按键',
+        },
+        环境适应性: {
+          工作温度: '-20°~ 60°',
+          存储温度: '-40°~ 80°',
+          高温高湿: '(95±3)%(≧40°)，24小时',
+          防护等级: 'IP68',
+        },
+      },
+    },
+    {
+      name: 'T950天通-2',
+      type: '单兵设备',
+      details: {
+        基本信息: {
+          外观设计: '172X81X15.7(不含天线)，336g',
+          操作系统: 'Android P',
+          CPU: '展锐 Makalu T7510;虎贲T710+春藤IVY510',
+          存储: '标配:6GB ROM +128G RAM',
+          显示屏: '6.52吋水滴屏;HD+，1600*720(20:9)',
+          后置摄像头:
+            '后置为4800万主摄+200万微距+200万红外三摄组合，支持闪光灯',
+          前置摄像头: '1600万',
+          传感器相关:
+            '指纹|光线传感器|距离传感器|加速度传感器|地磁传感器|陀螺仪|气压传感器',
+          WLAN: '802.11a/b/g/n/AC 支持MIMO',
+          电池: '6000mAh@3.8V，内置不可拆卸，支持18W快充',
+          工作时间: '待机时长180h，卫星通话时长16h',
+        },
+        制式频段: {
+          卫星频段: '天通一号卫星',
+          频段: '2G:GSM 850/900/1800/1900;3G:WCDMA850/900/1900/2100;4G:TD-LTE B38/39/40/41;4G:FDD-LTE B1/3/5/7/8;5G: N1，N28，N41, N78，N79',
+          双卡: '双nano卡(卫星卡+运营商全网通卡)',
+          CA: 'B1+B3 下行 2CA(电信);B40/41带内上下行 2CA',
+          VOLTE: '支持',
+        },
+        IO接口: {
+          USB接口类型: 'TYPE-C USB3.0，支持OTG功能',
+          耳机接口: '3.5mm，美标',
+          存储卡: '支持TF卡扩展',
+        },
+        其它功能: {
+          蓝牙: 'V5.0',
+          定位: 'GPS、北斗混合定位、单北斗模式',
+          NFC: '支持',
+          充电方式: '三种充电方式(线充、座充、磁吸充电)',
+          按键: '开机键、音量+/-、 SOS(侧面)、PTT按键',
+        },
+        环境适应性: {
+          工作温度: '-20°~ 60°',
+          存储温度: '-40°~ 80°',
+          高温高湿: '(95±3)%(≧40°)，24小时',
+          防护等级: 'IP68',
+        },
+      },
+    },
+  ]
+  navListManagement.navList = [
+    { name: '共享门户', key: 'home' },
+    { name: '能力集市', key: 'DetailsPageconetent' },
+    { name: '能力云图', key: 'capabilityCloud' },
+    { name: '能力统计', key: 'abilityStatistics' },
+    // { name: '开发指南', key: 'developmentGuide' },
+    { name: '需求中心', key: 'demandCenter' },
+    // { name: '个人中心', key: 'personalCenter' },
+    // { name: '区市站点', key: 'mapTest' },
+    // { name: '后台管理', key: 'houtaiguanli' },
+    { name: '赋能案例', key: 'assignCase' },
+  ]
+  footerDataList.footerList = {
+    company: {
+      left: '青岛西海岸新区大数据发展促进局建设',
+      // eslint-disable-next-line no-undef
+      right: CONFIGITEM.vNum,
+    },
+    address: [
+      {
+        name: '鲁IC备00000000号',
+        value: '政府标识码3702000106',
+      },
+      {
+        name: '版权所有：青岛西海岸新区大数据发展促进局',
+        value: '地址：青岛市西海岸新区长江中路369号',
+      },
+      {
+        name: '电话：0532-86986596',
+        value: '传真：0532-86986596',
+      },
+    ],
+  }
+  xhaHasPermissionUser.list = [
+    'xihaian01',
+    'xihaian02',
+    'xihaian03',
+    'xihaian04',
+    'admin',
+  ]
+}

front/public/static/config/mapConfig.js

@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-11-21 20:41:44
+ * @LastEditTime: 2022-11-24 17:33:36
  * @Description: 地图静态参数配置
  */
 var _mapConfig = {}
@@ -19,10 +19,10 @@ var _mapConfig = {}
       base: 'xihaian',
       CURRENT_MAP_OPTIONS: {
         // crs: CRS_4490,
-        center: [36.17, 120.13],
+        center: [36.017043, 119.922772],
         maxZoom: 17,
         minZoom: 0,
-        zoom: 5,
+        zoom: 10,
       },
     },
     qingdao: {

front/src/App.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-05-06 11:12:0011-18 19:07:53
  * @LastEditors: Light
- * @LastEditTime: 2022-11-24 09:13:27
+ * @LastEditTime: 2022-11-28 17:33:32
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -86,10 +86,10 @@
       }
       onWholeWaterMark(
         [realName, moment().format('YYYY-MM-DD')],
-        600,
-        300,
-        30,
-        50
+        800,
+        200,
+        24,
+        40
       )
       getCategoryTreePage({
         page: 1,

front/src/api/assertReport.js

@@ -0,0 +1,72 @@
+import request from '@/utils/request'
+//获取中间地图
+export function getDistrictFundStatement() {
+  return request({
+    url: '/processForm/tabilityapplication/getDistrictFundStatement',
+    method: 'get',
+  })
+}
+//左侧获取组件资源节约资金列表
+export function getComponentFundStatement() {
+    return request({
+      url: '/processForm/tabilityapplication/getComponentFundStatement',
+      method: 'get',
+    })
+  }
+//左侧获取应用资源列表
+export function getResourceFundStatement() {
+    return request({
+      url: '/processForm/tabilityapplication/getResourceFundStatement',
+      method: 'get',
+    })
+  }
+//左侧基础设施
+export function getInfrastructureFundStatement() {
+    return request({
+      url: '/processForm/tabilityapplication/getInfrastructureFundStatement',
+      method: 'get',
+    })
+  }
+  //右侧市级部门共享排行
+export function getProvideDeptFundStatement() {
+    return request({
+      url: '/processForm/tabilityapplication/getProvideDeptFundStatement',
+      method: 'get',
+    })
+  }
+  //右侧市级部门申请排行
+  export function getApplyDeptFundStatement() {
+    return request({
+      url: '/processForm/tabilityapplication/getApplyDeptFundStatement',
+      method: 'get',
+    })
+  }
+//右侧区市提供排行
+export function getProvideDistrictFundStatement() {
+        return request({
+          url: '/processForm/tabilityapplication/getProvideDistrictFundStatement',
+          method: 'get',
+        })
+      }
+//右侧区市申请排行
+export function getApplyDistrictFundStatement() {
+        return request({
+          url: '/processForm/tabilityapplication/getApplyDistrictFundStatement',
+          method: 'get',
+        })
+      }
+//右侧资源汇聚总量
+export function selectTotal() {
+    return request({
+      url: '/resource/selectTotal',
+      method: 'get',
+    })
+  }
+  //首页 获取总节省资金
+  //右侧资源汇聚总量
+export function getApplyPriceCount() {
+    return request({
+      url: '/processForm/tabilityapplication/getApplyPriceCount',
+      method: 'get',
+    })
+  }

front/src/api/file.js

@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-20 17:16:35
- * @LastEditors: Light
- * @LastEditTime: 2022-11-21 10:51:25
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-11-24 20:32:27
  * @Description: 告诉大家这是什么
  */
 import request from '@/utils/request'
@@ -10,161 +10,162 @@ import axios from 'axios'
 import store from '@/store'
 
 const config = {
-    headers: {
-        token: store.getters['user/accessToken'],
-        'Content-Type': 'multipart/form-data',
-    },
+  headers: {
+    token: store.getters['user/accessToken'],
+    'Content-Type': 'multipart/form-data',
+  },
 }
 const config2 = {
-    headers: {
-        'Content-Type': 'application/json; charset-utf-8',
-    },
+  headers: {
+    'Content-Type': 'application/json; charset-utf-8',
+  },
 }
 export function getDevelopmentFile(params) {
-    return request({
-        url: '/developmentGuide/getDevelopmentFile',
-        method: 'get',
-        params,
-    })
+  return request({
+    url: '/developmentGuide/getDevelopmentFile',
+    method: 'get',
+    params,
+  })
 }
 export function updateDevelopmentFile(params) {
-    return axios.post(
-        window.SITE_CONFIG.apiURL + '/developmentGuide/uploadDevelopmentFile',
-        params,
-        config
-    )
+  return axios.post(
+    window.SITE_CONFIG.apiURL + '/developmentGuide/uploadDevelopmentFile',
+    params,
+    config
+  )
 }
 export function test() {
-    return axios.post(
-        'http://15.72.158.81/zyjk/ZywMessage.asmx/ZywMessagePort',
-        config2
-    )
+  return axios.post(
+    'http://15.72.158.81/zyjk/ZywMessage.asmx/ZywMessagePort',
+    config2
+  )
 }
 export function correct(params) {
-    return axios.post('http://15.72.183.90:7008/correct', params, config2)
+  return axios.post('http://15.72.183.90:7008/correct', params, config2)
 }
 export function paddleocr(params) {
-    return axios.post('http://15.72.183.90:7008/paddleocr', params, config2)
+  return axios.post('http://15.72.183.90:7008/paddleocr', params, config2)
 }
 // 算法总接口
 export function algo(params) {
-    return axios.post('http://15.72.184.10:8888/api/algo', params, config2)
+  return axios.post('http://15.72.184.10:8888/api/algo', params, config2)
 }
 
 // 能力云图-数据资源
 export function count() {
-    return axios.post(
-        'http://10.134.135.24:30058/share-portal/platform/index/abilityMarket/count',
-        config2
-    )
+  return axios.post(
+    'http://10.134.135.24:30058/share-portal/platform/index/abilityMarket/count',
+    config2
+  )
 }
 export function getVideoList(params) {
-    return axios.get(
-        'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraListByName?name=' +
-        params.name +
-        '&pageNo=' +
-        params.pageNo +
-        '&pageSize=' +
-        params.pageSize,
-        config2
-    )
+  return axios.get(
+    'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraListByName?name=' +
+      params.name +
+      '&pageNo=' +
+      params.pageNo +
+      '&pageSize=' +
+      params.pageSize,
+    config2
+  )
 }
 // 能力云图-数据资源-总数据数
 export function getRecord(params) {
-    return axios.get(
-        'http://10.134.135.24:30090/api/share-portal/platform/catalogue/query?serviceName=' +
-        params.serviceName +
-        '&orderField=' +
-        params.orderField +
-        '&orderType=' +
-        params.orderType +
-        '&pageNum=' +
-        params.pageNum +
-        '&pageSize=' +
-        params.pageSize +
-        '&serviceType=' +
-        params.serviceType,
-        config2
-    )
+  return axios.get(
+    'http://10.134.135.24:30090/api/share-portal/platform/catalogue/query?serviceName=' +
+      params.serviceName +
+      '&orderField=' +
+      params.orderField +
+      '&orderType=' +
+      params.orderType +
+      '&pageNum=' +
+      params.pageNum +
+      '&pageSize=' +
+      params.pageSize +
+      '&serviceType=' +
+      params.serviceType,
+    config2
+  )
 }
 
 export function getHls(params) {
-    return axios.get(
-        'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraLiveStreamByCode?cameraCode=' +
-        params.cameraId +
-        '&protocol=' +
-        params.protocol,
-        config2
-    )
+  return axios.get(
+    'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraLiveStreamByCode?cameraCode=' +
+      params.cameraId +
+      '&protocol=' +
+      params.protocol,
+    config2
+  )
 }
 // 西海岸 POI搜索
 export function getListForPOI(params) {
-    return axios.get(
-        'http://10.134.135.3:21009/service/lbs/coder/geocoding2?appKey=675d95594136456bb7b1434dda31953f&city=青岛&keywords=' +
-        params.keywords,
-        config2
-    )
+  return axios.get(
+    'http://10.134.135.3:21009/service/lbs/coder/geocoding2?appKey=675d95594136456bb7b1434dda31953f&city=青岛&keywords=' +
+      params.keywords,
+    config2
+  )
 }
 
 //西海岸 获取左侧标签树
 export function getPlaceType() {
-    return axios.get(
-        `http://${_cameraUrl}/data_service/placeTypes/getPlaceType`,
-        config2
-    )
+  return axios.get(
+    `http://${_cameraUrl}/data_service/placeTypes/getPlaceType`,
+    config2
+  )
 }
 
 //西海岸 根据标签树查询视频列表
 export function CameraConditionPlaceType(params) {
-    return axios.post(
-        `http://${_cameraUrl}/data_service/getCamera/CameraConditionPlaceType'`,
-        params,
-        config2
-    )
+  return axios.post(
+    `http://${_cameraUrl}/data_service/getCamera/CameraConditionPlaceType`,
+    params,
+    config2
+  )
 }
 
 // 西海岸视频wss流获取
 export function getCameraLiveStream(params) {
-    return axios.get(
-        `http://${_cameraUrl}/data_service/getCamera/getCameraLiveStream?cameraIndexCode=` +
-        params.channelId +
-        '&protocol=' +
-        'wss' + '&transmode=1&streamType=1',
-        config2
-    )
+  return axios.get(
+    `http://${_cameraUrl}/data_service/getCamera/getCameraLiveStream?cameraIndexCode=` +
+      params.channelId +
+      '&protocol=' +
+      'wss' +
+      '&transmode=1&streamType=1',
+    config2
+  )
 }
 // 西海岸--获取摄像头列表的后台地址 (测试环境地址：10.134.135.92:9537)
 let _cameraUrl =
-    (_global &&
-        _global.config &&
-        _global.config.camreaInfo &&
-        _global.config.camreaInfo.cameraUrl) ||
-    '10.134.135.92:9537'
-    //能力集市基础设施-左侧列表
+  (_global &&
+    _global.config &&
+    _global.config.camreaInfo &&
+    _global.config.camreaInfo.cameraUrl) ||
+  '10.134.135.92:9537'
+//能力集市基础设施-左侧列表
 export function getCameraInfoByAreaId(params) {
-    return axios.get(
-        `http://${_cameraUrl}/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}`,
-        config2
-    )
+  return axios.get(
+    `http://${_cameraUrl}/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}`,
+    config2
+  )
 }
 //能力集市基础设施-摄像头
 export function getCameraByCondition(params) {
-    return axios.post(
-        `http://${_cameraUrl}/data_service/getCamera/getCameraByCondition`,
-        params,
-        config2
-    )
+  return axios.post(
+    `http://${_cameraUrl}/data_service/getCamera/getCameraByCondition`,
+    params,
+    config2
+  )
 }
 
 export function initiateMeet(data) {
-    // return request({
-    //   url: '/enke/initiateMeet',
-    //   method: 'post',
-    //   data: data,
-    // })
-    return axios.post(
-        'http://10.134.135.92:8888/renren-admin/enke/initiateMeet',
-        data,
-        config2
-    )
-}
+  // return request({
+  //   url: '/enke/initiateMeet',
+  //   method: 'post',
+  //   data: data,
+  // })
+  return axios.post(
+    'http://10.134.135.92:8888/renren-admin/enke/initiateMeet',
+    data,
+    config2
+  )
+}

front/src/router/index.js

@@ -425,6 +425,16 @@ export const constantRoutes = [
       icon: 'error-warning-line',
     },
   },
+    // 资金报表
+    {
+      path: '/assertReport',
+      name: 'assertReport',
+      component: () => import('@/views/assertReport'),
+      meta: {
+        title: '能力云图',
+        icon: 'error-warning-line',
+      },
+    },
   // 赋能案例详情
   {
     path: '/AssignCaseDetailPage',

front/src/supermap/advance-init.js

@@ -74,7 +74,7 @@ export function MapFun(mapObj) {
      * @param layerName {String} 图层名
      */
     const _removeLayerByLayerName = function(layerName) {
-            const layer = layerGroup.get(layerName)
+            const layer = layerGroup.get(layerName) ||
                 // const feature = featureGroup;
                 // map.popupclose();
                 // debugger;
@@ -2099,4 +2099,4 @@ export function MapFun(mapObj) {
         thermodynamic: _thermodynamic,
         addPathToMap: _addPathToMap,
     }
-}
+}

front/src/supermap/map-showResource.js

@@ -66,15 +66,6 @@ function createMarkerClusterLayer(layerClassName, mapObj) {
     } else {
         // 使用默认图标
         markerClusterLayer = L.markerClusterGroup({
-            // iconCreateFunction(cluster) {
-            //     const markers = cluster.getAllChildMarkers()
-            //     let n = 0
-            //     for (let i = 0; i < markers.length; i++) {
-            //         n += markers[i].number
-            //     }
-            //     return L.divIcon({ html: markers.length, className: "topic-marker-cluster-video" })
-            // },
-            // 是否允许指定 PolylineOptions 样式 spider
             spiderfyOnMaxZoom: false,
             // 是否显示标记的边界
             showCoverageOnHover: true,
@@ -84,18 +75,11 @@ function createMarkerClusterLayer(layerClassName, mapObj) {
         })
         markerClusterLayer.on('clusterclick', function(a) {
             let clusterList = [];
-            //console.log('cluster ' + a.layer.getAllChildMarkers());
-            if (a.layer.getAllChildMarkers().length < 50) {
+            if (mapObj.getZoom() == mapObj.getMaxZoom()) {
                 for (var i = 0; i < a.layer.getAllChildMarkers().length; i++) {
-                    //console.log('yyyyyyyyy', a.layer.getAllChildMarkers()[i].resourceData);
-                    //console.log('yyyyyyyyy', a.layer.getAllChildMarkers()[i].fData);
                     clusterList.push(a.layer.getAllChildMarkers()[i].resourceData);
                 }
-                //console.log('clusterList ' + a.layer.getAllChildMarkers(array, true));
-                //console.log('zzzzzzzzz', mapObj.getZoom(), mapObj.getMaxZoom());
-                if (mapObj.getZoom() == mapObj.getMaxZoom()) {
                     mybus.emit('openOperationPopup', clusterList);
-                }
             }
         });
     }
@@ -194,13 +178,14 @@ function addPointOnMap({
                 .openOn(mapObj.map)
         })
     }
-
-    return isOpenPopup ?
-        marker
-        .addTo(mapObj.map)
-        .bindPopup(elementHtml, { className: popupClassName })
-        .openPopup() :
-        marker.addTo(mapObj.map)
+    const layer = marker.addTo(mapObj.map);
+    featureGroup.addLayer(layer)
+    layerGroup.set('potcon', layer)
+        // marker
+        // .addTo(mapObj.map)
+        // .bindPopup(elementHtml, { className: popupClassName })
+        // .openPopup() :
+        // marker.addTo(mapObj.map)
 }
 
 /**

front/src/utils/arrayMethod.js

@@ -0,0 +1,150 @@
+/*
+ * @Author: hisense.wuhongjian
+ * @Date: 2021-08-12 10:50:17
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2021-08-12 14:20:07
+ * @Description: 数组公共方法
+ */
+/**
+ * @description: 根据属性名过滤数组，支持一维属性及二维属性
+ * @param {*} arr 待过滤的数组
+ * @param {*} param 一维属性 'param' 二维属性 'param1[param2]'
+ * @return {*} 过滤之后的数组
+ */
+export function arrFilterByParam(arr, param) {
+  const res = new Map();
+  const paramArr = param.split('[');
+  if (paramArr.length > 1) {
+    const first = paramArr[0];
+    const second = paramArr[1].split(']')[0];
+    return arr.filter(
+      (list) => !res.has(list[first][second]) && res.set(list[first][second], 1));
+  } else {
+    return arr.filter(
+      (list) => !res.has(list[param]) && res.set(list[param], 1));
+  }
+}
+//获取时间戳转换为日期格式 或者 2021-09-24 19:53:01:765 转化为正常时间。
+// filters: {
+//     formatDate(time) {
+//         var date = new Date(time);
+//         return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
+//     }
+// },
+//{{ 输入时间 | formatDate }}
+export function formatDate (date, fmt) {
+    if (/(y+)/.test(fmt)) {
+        fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
+    }
+    let o = {
+        'M+': date.getMonth() + 1,
+        'd+': date.getDate(),
+        'h+': date.getHours(),
+        'm+': date.getMinutes(),
+        's+': date.getSeconds()
+    };
+    for (let k in o) {
+        if (new RegExp(`(${k})`).test(fmt)) {
+            let str = o[k] + '';
+            fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : padLeftZero(str));
+        }
+    }
+    return fmt;
+};
+
+function padLeftZero (str) {
+    return ('00' + str).substr(str.length);
+};
+
+// 把数字改成数组。
+export function NumbersConvertedToArrays(inNum) {
+    const str = inNum.toString();
+    const arr = str.split("");
+    const arrlenght = arr.length;
+    if (arrlenght == 2) {
+        arr.unshift(0);
+    }
+    if (arrlenght == 1) {
+        arr.unshift(0);
+        arr.unshift(0);
+    }
+    return arr;
+};
+// var lon = 107.631131;
+// var lat = 29.2331231;
+// var lonDMS = transformDMS(lon, "lon");
+// var latDMS = transformDMS(lat, "lat");
+
+// console.log(lonDMS); // 107°44′35″E
+// console.log(latDMS); // 29°14′17″N
+ // 经纬度转度分秒
+ export function transformDMS(degree, direction) {
+    var D = plusZeroAtHead(Math.floor(degree));
+  var M = plusZeroAtHead(Math.floor((degree - D) * 60));
+  var S = plusZeroAtHead(Math.floor(((degree - D) * 60 - M) * 60));
+  var result = D + "°" + M + "′" + S + "″";
+
+  // 如果是个位数， 则在首位加 0
+  function plusZeroAtHead(num) {
+      if (num > -10 && num < 0) {
+          num = "-0" + Math.abs(num)
+      }
+      if (num > 0 && num < 10) {
+          return "0" + num
+      }
+      return num;
+  }
+
+  if (direction === "lon") {
+      D > 0 ? result += "E" : result += "W";
+      return result;
+  }
+  if (direction === "lat") {
+      D > 0 ? result += "N" : result += "S";
+      return result;
+  }
+  return result;
+};
+export function getBlob(url,cb) {
+    var xhr = new XMLHttpRequest();
+    let that=this;
+    xhr.open('GET', url, true);
+    xhr.responseType = 'blob';
+    xhr.onload = function() {
+        if (xhr.status === 200) {
+            cb(xhr.response);
+        }
+    };
+    xhr.send();
+};
+/**
+ * 保存
+ * @param  {Blob} blob
+ * @param  {String} filename 想要保存的文件名称
+ */
+export function saveAs(blob, filename) {
+    if (window.navigator.msSaveOrOpenBlob) {
+        navigator.msSaveBlob(blob, filename);
+    } else {
+        var link = document.createElement('a');
+        var body = document.querySelector('body');
+
+        link.href = window.URL.createObjectURL(blob);
+        link.download = filename;
+
+        // fix Firefox
+        link.style.display = 'none';
+        body.appendChild(link);
+
+        link.click();
+        body.removeChild(link);
+
+        window.URL.revokeObjectURL(link.href);
+    }
+};
+
+//获取天气图标logo  公共部分
+
+
+
+

front/src/utils/request.js

@@ -92,9 +92,9 @@ instance.interceptors.request.use(
  */
 instance.interceptors.response.use(
   (response) => {
-    console.log('接口返回', response)
-    console.log('接口返回headers', response.headers)
-    console.log('接口返回REDIRECT', response.headers.redirect)
+    // console.log('接口返回', response)
+    // console.log('接口返回headers', response.headers)
+    // console.log('接口返回REDIRECT', response.headers.redirect)
     response['Access-Control-Expose-Headers'] = 'redirect'
     const { code, message } = response.data
 
@@ -154,14 +154,14 @@ instance.interceptors.response.use(
     // }
   },
   (error) => {
-    console.log('接口error', error)
+    // console.log('接口error', error)
     if (loadingInstance) loadingInstance.close()
 
     const { response, myMessage } = error
     if (error.response) {
-      console.log('接口返回', response)
-      console.log('接口返回headers', response.headers)
-      console.log('接口返回REDIRECT', response.headers.redirect)
+      // console.log('接口返回', response)
+      // console.log('接口返回headers', response.headers)
+      // console.log('接口返回REDIRECT', response.headers.redirect)
       const { status, data } = response
 
       handleCode(status, data.msg || myMessage, response.headers.redirect)

front/src/utils/waterMark.js

@@ -2,7 +2,7 @@
  * @Author: Light
  * @Date: 2022-11-14 15:01:54
  * @LastEditors: Light
- * @LastEditTime: 2022-11-16 09:57:28
+ * @LastEditTime: 2022-11-24 10:53:20
  * @Description: 水印
  */
 const watermark = {
@@ -20,12 +20,12 @@ const setWatermark = (str, width, height, size, top, index) => {
   can.height = height
 
   const cans = can.getContext('2d')
-  cans.rotate((-20 * Math.PI) / 180)
+  cans.rotate((-13 * Math.PI) / 180)
   cans.font = size + 'px Microsoft YaHei'
   cans.fillStyle = 'rgba(200, 200, 200, 0.4)'
-  cans.textAlign = 'left'
+  cans.textAlign = 'center'
   cans.textBaseline = 'middle'
-  cans.fillText(str, can.width / 3, can.height / 2)
+  cans.fillText(str, can.width / 2 - 30, can.height - 10)
 
   const WATER_MARK = document.createElement('div')
   const ALL_WIDTH = document.documentElement.clientWidth + 'px'
@@ -35,7 +35,7 @@ const setWatermark = (str, width, height, size, top, index) => {
   WATER_MARK.style.cssText = `
     position: fixed;
     top: ${index * top}px;
-    left: 0;
+    left:  ${(index * top) / 4}px;
     zIndex: 99999999;
     pointer-events: none;
     width: ${ALL_WIDTH};

front/src/views/assertReport/components/ReservoirBottom.vue

@@ -0,0 +1,151 @@
+
+<template>
+    <div class="right-survey">
+  
+      <div class="platform-overview-bottom">
+        <div class="top"><span class="title">资源汇聚总量</span></div>
+        <div class="bottom">
+          <div
+            v-for="(item, index) in servicesNum"
+            :key="index"
+            class="component-services-content-right-left-content-son"
+          >
+            <p>{{ item.type }}</p>
+            <p class="num">{{ item.count }}</p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </template>
+  
+  <script>
+    import {
+      selectTotal
+    } from '@/api/assertReport'
+  export default {
+   
+    components: {},
+  
+    mounted() {
+      this.selectAllTotal()
+    },
+    data() {
+      //这里存放数据
+      return {
+       
+        servicesNum: [],
+      }
+    },
+  
+    methods: {
+
+      selectAllTotal(){
+        selectTotal().then((res) => {
+         this.servicesNum=res.data.data.total
+        })
+      }
+  }
+  }
+  </script>
+  <style lang='less' scoped>
+    @keyframes turn {
+    0% {
+      border-image: linear-gradient(to right, #003194, #00ffea) 1;
+    }
+    25% {
+      border-image: linear-gradient(to bottom, #003194, #00ffea) 1;
+    }
+    50% {
+      border-image: linear-gradient(to left, #003194, #00ffea) 1;
+    }
+    75% {
+      border-image: linear-gradient(to top, #003194, #00ffea) 1;
+    }
+    100% {
+      border-image: linear-gradient(to right, #003194, #00ffea) 1;
+    }
+  }
+  .top5-content::-webkit-scrollbar {
+    width: 6px;
+    /*height: 4px;*/
+  }
+  
+  .top5-content::-webkit-scrollbar-thumb {
+    background-color: #00deff;
+  }
+  .map-search-result::-webkit-scrollbar-track,
+  .top5-content::-webkit-scrollbar-track {
+    background-color: #424748;
+  }
+  @keyframes topup50 {
+    from {
+      top: 50%;
+    }
+    to {
+      top: -100%;
+    }
+  }
+  .right-survey {
+  
+    height: 100%;
+    color: #f0fafa;
+    font-size: 18px;
+    display: flex;
+    flex-direction: column;
+  
+  
+    .platform-overview-bottom {
+      margin-top: 20px;
+      width: 100%;
+      height: 1.7rem;
+      background: rgba(0, 108, 188, 0.2);
+      border-radius: 2px;
+      border: 1px solid rgba(0, 108, 188, 0.7);
+      text-decoration: none;
+      outline: none;
+      -webkit-transition: all 100ms ease-out;
+      -moz-transition: all 100ms ease-out;
+      transition: all 100ms ease-out;
+      .top {
+        font-size: 24px;
+        background: url('~@/assets/capabilityCloud/infrastructure_title.png') no-repeat;
+        background-size: 100% 100%;
+        text-align: center;
+  
+      }
+      .bottom {
+        margin-top: 20px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding:0rem  0.2rem;
+        .component-services-content-right-left-content-son {
+          background: url('~@/assets/capabilityCloud/Component_services_snum.png')
+            no-repeat;
+          background-size: 1.1rem 0.59rem;
+          background-position: center;
+          text-align: center;
+       
+          & > p:first-child {
+            color: #ffffff;
+            font-size: 0.16rem;
+            line-height: 0.16rem;
+            margin-bottom: 0.12rem;
+          }
+          & > p:last-child {
+            color: #1ef6f5;
+            font-size: 0.28rem;
+            line-height: 0.28rem;
+            padding-bottom: 0.24rem;
+            margin: 10px 45px;
+          }
+        }
+      }
+    }
+    .platform-overview-bottom:hover {
+    border: 2px solid;
+    animation: turn 5s linear infinite;
+  }
+  }
+  </style>
+  

front/src/views/assertReport/components/ReservoirLeft.vue

@@ -0,0 +1,453 @@
+
+<template>
+  <div class="reservoir-survey">
+
+    <!-- 最上面 组件资源 -->
+    <div class="platform-overview-top">
+    <div class="top"><span class="title">组件资源</span></div>
+    <div class="bottom">
+      <div class="jiesheng"> <img src="../image/xing1.png" /><span style="padding-left:2px;">共节省{{componetsData.total}}万元 </span><img src="../image/xing1.png" /></div>
+      <div class="left">
+        <div class="item" v-for="item in componetsData.list">
+          <div class="content1">
+          <div class="img"> </div>
+            <div class="num">{{item.resourceType}}</div> 
+        </div>
+          <div class="content">
+            <div class="name">节省</div>
+            <div claSS="num">{{item.applyPrice }}万元</div>
+          </div>
+          <div class="content">
+            <div class="name">数量</div>
+            <div claSS="num">{{item.resourceAmount}}个</div>
+          </div>
+          <div class="content">
+            <div class="name">共申请</div>
+            <div claSS="num">{{item.applyCount}}次</div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+
+    <!-- 中间 应用资源-->
+    <div class="platform-overview-mid">
+    <div class="top"><span class="title">应用资源</span></div>
+    <div class="bottom">
+    <div class="jiesheng"> <img src="../image/xing1.png" /><span style="padding-left:2px;">共节省{{resoureData.total}}万元 </span><img src="../image/xing1.png" /></div>
+    <div class="component-services-content-right-right-bottom-right">
+              <div>
+                <span>排行</span>
+                <span>资源名称</span>
+                <span >提供部门</span>
+                <span >次数</span>
+                <span >贡献金额</span>
+              </div>
+              <div v-for="(item, index) in resoureData.list" :key="index">
+                <span>{{ index + 1 }}</span>
+                <a-tooltip>
+                  <template #title>{{ item.resourceName }}</template>
+                  <span>{{ item.resourceName }}</span>
+                </a-tooltip>
+                <a-tooltip>
+                  <template #title>{{ item.deptName}}</template>
+                  <span>{{ item.deptName  }}</span>
+                </a-tooltip>
+                <span>{{ item.applyCount || 0 }}</span>
+                <span>{{ item.applyPrice || 0 }}</span>
+              </div>
+            </div>
+    </div>
+  </div>
+
+    <!-- 最下方 基础设施 -->
+    <div class="platform-overview-bottom">
+    <div class="top"><span class="title">基础设施</span></div>
+    <div class="bottom">
+      <div class="jiesheng"> <img src="../image/xing1.png" /><span style="padding-left:2px;">共节省{{infrastructureData.total}}万元 </span><img src="../image/xing1.png" /></div>
+    <div class="huiketing">
+      <div style="float:left;width:30%">
+      <img :src="leftImg" alt="" /> 
+    </div>
+    <div style="float:left;width:70%;margin-top: 30px;" v-for="item in infrastructureData.list">
+      <span style="font-size:22x">{{item.resourceName}}</span> 
+      <span style="font-size:22px">节省 </span>
+      <span style="margin-right:10px;font-size:24px;  color: #1ef6f5;">{{item.applyPrice}}</span>
+        <span style="font-size:20px"> 万元</span>
+      </div>
+    </div>
+    </div>
+    
+    </div>
+
+
+  </div>
+</template>
+
+<script>
+  import {
+    getComponentFundStatement,
+    getResourceFundStatement,
+    getInfrastructureFundStatement
+  } from '@/api/assertReport'
+import ResourceOverviewAnimation from "@/views/assertReport/components/ResourceOverviewAnimation.vue";
+export default {
+  components: {
+    ResourceOverviewAnimation
+  },
+  created() {
+   
+  },
+
+  mounted() {
+//组件资源
+  this.getComponent()
+  //应用资源
+  this.getResource()
+  //基础设施
+  this.getInfrastructure()
+  },
+  data() {
+
+    return {
+      componetsData:{
+        total:'',
+        list:[]
+    },
+    resoureData:{
+      total:'',
+        list:[]  
+    },
+    infrastructureData:{
+       total:'',
+        list:'',
+    },
+      leftImg:require('@/assets/capabilityCloud/resources-left.png'),
+      dataList:[{name:'第一个',count:43},{name:'第二个',count:43},
+      {name:'第三个',count:43},{name:'第四个',count:43},{name:'第五个',count:43}]
+
+    };
+  },
+
+  methods: {
+    getComponent(){
+      getComponentFundStatement().then((res) => {
+       this.componetsData.total=res.data.data.total
+       this.componetsData.list=res.data.data.list
+      })
+    },
+    getResource(){
+      getResourceFundStatement().then((res) => {
+       this.resoureData.total=res.data.data.total
+       this.resoureData.list=res.data.data.list
+      })
+    },
+    getInfrastructure(){
+      getInfrastructureFundStatement().then((res) => {
+      this.infrastructureData.total=res.data.data.total
+       this.infrastructureData.list=res.data.data.list
+      })
+    }
+
+  },
+
+ 
+};
+</script>
+<style lang='less' scoped>
+
+@keyframes topup50 {
+  from {
+    top: 50%;
+  }
+  to {
+    top: -100%;
+  }
+}
+.jiesheng{
+       text-align: center;
+    margin-bottom: 5px;
+    color: #f4fcfe; border-color: #107bb0;
+      box-shadow: 1px 1px 5px 1px RGB(16, 123, 176, 0.8) inset
+      }
+
+  @keyframes turn {
+    0% {
+      border-image: linear-gradient(to right, #003194, #00ffea) 1;
+    }
+    25% {
+      border-image: linear-gradient(to bottom, #003194, #00ffea) 1;
+    }
+    50% {
+      border-image: linear-gradient(to left, #003194, #00ffea) 1;
+    }
+    75% {
+      border-image: linear-gradient(to top, #003194, #00ffea) 1;
+    }
+    100% {
+      border-image: linear-gradient(to right, #003194, #00ffea) 1;
+    }
+  }
+.reservoir-survey {
+
+
+  width: 520px;
+  height: 100%;
+  color: #f0fafa;
+  font-size: 18px;
+  display: flex;
+  flex-direction: column;
+
+
+.platform-overview-top {
+   width: 100%;
+    height: 3.8rem;
+    background: rgba(0, 108, 188, 0.2);
+    border-radius: 2px;
+    border: 1px solid rgba(0, 108, 188, 0.7);
+    text-decoration: none;
+    outline: none;
+    -webkit-transition: all 100ms ease-out;
+    -moz-transition: all 100ms ease-out;
+    transition: all 100ms ease-out;
+    .top {
+      font-size: 24px;
+      background:  url('~@/assets/capabilityCloud/infrastructure_title.png') no-repeat;
+      background-size: 100% 100%;
+      text-align: center;
+    }
+    .bottom {
+    
+   
+      padding: 0.1rem;
+      .left {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        .item {
+          width: 100%;
+          height: 0.6rem;
+          background: linear-gradient(
+            to bottom,
+            rgba(33, 54, 88, 0.5),
+            rgba(33, 54, 88, 0)
+          );
+          margin-top: 0.14rem;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          .content1 {
+            width: 1.8rem;
+            .img {
+            width: 0.36rem;
+            height: 0.36rem;
+            margin-left: 0.2rem;
+            margin-right: 0.2rem;
+            text-decoration: none;
+            outline: none;
+            -webkit-transition: all 800ms ease-out;
+            -moz-transition: all 800ms ease-out;
+            transition: all 800ms ease-out;
+          }
+          .img:hover {
+            width: 0.4rem;
+            height: 0.4rem;
+            -webkit-transform: rotateY(180deg);
+            -moz-transform: rotateY(180deg);
+            transform: rotateY(180deg);
+            -webkit-transition-delay: 0.2s;
+            -moz-transition-delay: 0.2s;
+            transition-delay: 0.2s;
+          }
+            .num {
+              font-size: 18px;
+              color: #1ef6f5;
+              margin-left: 10px;
+            }
+          }
+        
+          .content {
+            width: 1.5rem;
+            .name {
+              font-size: 14px;
+              color: #fff;
+            }
+            .num {
+              font-size: 18px;
+              color: #1ef6f5;
+            }
+          }
+        }
+        .item:hover {
+         background: linear-gradient(
+            to bottom,
+            rgba(33, 54, 88, 0.7),
+            rgba(33, 54, 88, 0.9)
+          );
+        }
+        .item:nth-of-type(1) {
+          margin-top: 10px;
+          .img {
+            background: url('~@/assets/capabilityCloud/zyys.png') no-repeat;
+            background-size: 100% 100%;
+          }
+        }
+        .item:nth-of-type(2) .img {
+          background: url('~@/assets/capabilityCloud/jszyys.png') no-repeat;
+          background-size: 100% 100%;
+        }
+        .item:nth-of-type(3) .img {
+          background: url('~@/assets/capabilityCloud/tyyys.png') no-repeat;
+          background-size: 100% 100%;
+        }
+        .item:nth-of-type(4) .img {
+          background: url('~@/assets/capabilityCloud/jszyys.png') no-repeat;
+          background-size: 100% 100%;
+        }
+      }
+    }
+  }
+  .platform-overview-top:hover {
+    border: 2px solid;
+    animation: turn 5s linear infinite;
+  }
+  .platform-overview-mid {
+    margin-top:20px;
+    width: 100%;
+    height: 3.9rem;
+    background: rgba(0, 108, 188, 0.2);
+    border-radius: 2px;
+    border: 1px solid rgba(0, 108, 188, 0.7);
+    text-decoration: none;
+    outline: none;
+    -webkit-transition: all 100ms ease-out;
+    -moz-transition: all 100ms ease-out;
+    transition: all 100ms ease-out;
+    .top {
+      font-size: 24px;
+      background: url('~@/assets/capabilityCloud/infrastructure_title.png') no-repeat;
+      background-size: 100% 100%;
+      text-align: center;
+      margin-bottom: 8px;
+    }
+    .bottom {
+      
+      
+      align-items: center;
+      padding: 0rem  0.1rem;
+      .component-services-content-right-right-bottom-right {
+              width: 100%;
+              font-size: 0.16rem;
+              border: 0.01rem rgba(0, 108, 188, 0.7) solid;
+              color: rgba(255, 255, 255, 0.8);
+              height: 2.9rem;
+               overflow-y: auto;
+              & > div {
+                height: 0.32rem;
+                & > span {
+                  display: inline-block;
+                  height: 0.32rem;
+                  line-height: 0.32rem;
+                  border-right: 0.01rem rgba(0, 108, 188, 0.7) solid;
+                  border-bottom: 0.01rem rgba(0, 108, 188, 0.7) solid;
+                  overflow: hidden;
+                  text-overflow: ellipsis;
+                  white-space: nowrap;
+                  -webkit-line-clamp: 1;
+                  -webkit-box-orient: vertical;
+                  word-break: break-all;
+                }
+                & > span:first-child {
+                  width: 0.47rem;
+                  text-align: center;
+                }
+                & > span:nth-child(2) {
+                  width: 1.57rem;
+                  padding-left: 0.05rem;
+                  //text-align: center;
+                }
+                & > span:nth-child(3) {
+                  width: 1.47rem;
+                  padding-left: 0.05rem;
+                 // text-align: center;
+                }
+                & > span:nth-child(4) {
+                  width: 0.5rem;
+                  padding-left: 0.05rem;
+                  text-align: center;
+                }
+                & > span:last-child {
+                  width: 0.7rem;
+                  color: #1ffefd;
+                  text-align: center;
+                  border-right: 0;
+                  text-align: center;
+                }
+              }
+              & > div:first-child {
+                color: #1ffefd;
+                background: #27528c;
+              }
+            }
+    }
+  }
+
+  .platform-overview-mid:hover {
+    border: 2px solid;
+    animation: turn 5s linear infinite;
+  }
+  .platform-overview-bottom {
+    margin-top:20px;
+    width: 100%;
+    height: 1.8rem;
+    background: rgba(0, 108, 188, 0.2);
+    border-radius: 2px;
+    border: 1px solid rgba(0, 108, 188, 0.7);
+    text-decoration: none;
+    outline: none;
+    -webkit-transition: all 100ms ease-out;
+    -moz-transition: all 100ms ease-out;
+    transition: all 100ms ease-out;
+    .top {
+      font-size: 24px;
+      background: url('~@/assets/capabilityCloud/infrastructure_title.png') no-repeat;
+      background-size: 100% 100%;
+      text-align: center;
+    }
+    .bottom {
+     
+      align-items: center;
+      padding: 0.1rem;
+      .huiketing{
+        display: flex;
+    
+        img {
+          width: 90px;
+          width: 90px;
+          position: absolute;
+          // left: 50%;
+          // bottom: -1.38rem;
+          // margin-left: -45%;
+          animation: move 5s linear 0s infinite;
+          @keyframes move {
+            from {
+              transform: rotateY(360deg);
+            }
+            to {
+              transform: rotateY(0deg);
+            }
+          }
+        }
+
+      }
+   
+    }
+  }
+  .platform-overview-bottom:hover {
+    border: 2px solid;
+    animation: turn 5s linear infinite;
+  }
+}
+
+</style>

front/src/views/assertReport/components/ReservoirRight.vue

@@ -0,0 +1,543 @@
+
+<template>
+  <div class="right-survey">
+    <!--最上面 部门排行榜-->
+    <div class="platform-overview-top">
+      <div class="top"><span class="title">部门排行榜</span></div>
+      <div class="bottom1">
+        <div class="bottom-item">
+          <div class="inner-title">
+            <p style="width: 220px">市级部门共享贡献资金排行</p>
+          </div>
+          <div class="left-list">
+            <div class="left-list1">排行</div>
+            <div class="left-list2">部门名称</div>
+            <div class="left-list1">应用数</div>
+            <div class="left-list1" style="color: #1ffefd">贡献金额</div>
+          </div>
+          <div class="left-list" v-for="(item, index) in top5DistrictList">
+            <div class="left-list1" v-if="item.img">
+              <img :src="item.img" />
+            </div>
+            <div class="left-list1" v-else>{{ index + 1 }}</div>
+            <a-tooltip>
+              <template #title>{{ item.deptName }}</template>
+              <div class="left-list2">{{ item.deptName }}</div>
+            </a-tooltip>
+
+            <div class="left-list1">{{ item.resourceCount }}</div>
+            <div class="left-list1" style="color: #1ffefd">
+              {{ item.applyPrice }}
+            </div>
+          </div>
+        </div>
+        <!-- <div class="bottom-item">
+          <div class="inner-title">
+            <p style="width: 220px">市级部门审评节省资金排行</p>
+          </div>
+          <div class="left-list">
+            <div class="left-list1">排行</div>
+            <div class="left-list2">部门名称</div>
+            <div class="left-list1">应用数</div>
+            <div class="left-list1" style="color: #1ffefd">贡献金额</div>
+          </div>
+          <div class="left-list" v-for="(item, index) in top5DeptFundList">
+            <div class="left-list1" v-if="item.img">
+              <img :src="item.img" />
+            </div>
+            <div class="left-list1" v-else>{{ index + 1 }}</div>
+            <a-tooltip>
+              <template #title>{{ item.deptName }}</template>
+              <div class="left-list2">{{ item.deptName }}</div>
+            </a-tooltip>
+
+            <div class="left-list1">{{ item.applyCount }}</div>
+            <div class="left-list1" style="color: #1ffefd">
+              {{ item.applyPrice }}
+            </div>
+          </div>
+        </div> -->
+      </div>
+      <div class="bottom1">
+        <!-- <div class="bottom-item">
+          <div class="inner-title">
+            <p style="width: 220px">市级部门共享贡献资金排行</p>
+          </div>
+          <div class="left-list">
+            <div class="left-list1">排行</div>
+            <div class="left-list2">部门名称</div>
+            <div class="left-list1">应用数</div>
+            <div class="left-list1" style="color: #1ffefd">贡献金额</div>
+          </div>
+          <div class="left-list" v-for="(item, index) in top5DistrictList">
+            <div class="left-list1" v-if="item.img">
+              <img :src="item.img" />
+            </div>
+            <div class="left-list1" v-else>{{ index + 1 }}</div>
+            <a-tooltip>
+              <template #title>{{ item.deptName }}</template>
+              <div class="left-list2">{{ item.deptName }}</div>
+            </a-tooltip>
+
+            <div class="left-list1">{{ item.resourceCount }}</div>
+            <div class="left-list1" style="color: #1ffefd">
+              {{ item.applyPrice }}
+            </div>
+          </div>
+        </div> -->
+        <div class="bottom-item">
+          <div class="inner-title">
+            <p style="width: 220px">市级部门审评节省资金排行</p>
+          </div>
+          <div class="left-list">
+            <div class="left-list1">排行</div>
+            <div class="left-list2">部门名称</div>
+            <div class="left-list1">应用数</div>
+            <div class="left-list1" style="color: #1ffefd">贡献金额</div>
+          </div>
+          <div class="left-list" v-for="(item, index) in top5DeptFundList">
+            <div class="left-list1" v-if="item.img">
+              <img :src="item.img" />
+            </div>
+            <div class="left-list1" v-else>{{ index + 1 }}</div>
+            <a-tooltip>
+              <template #title>{{ item.deptName }}</template>
+              <div class="left-list2">{{ item.deptName }}</div>
+            </a-tooltip>
+
+            <div class="left-list1">{{ item.applyCount }}</div>
+            <div class="left-list1" style="color: #1ffefd">
+              {{ item.applyPrice }}
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bottom2">
+        <div class="bottom-item">
+          <div class="inner-title">
+            <p style="width: 220px">区市部门共享贡献资金排行</p>
+          </div>
+          <div class="left-list">
+            <div class="left-list1">序号</div>
+            <div class="left-list2">部门名称</div>
+            <div class="left-list1">应用数</div>
+            <div class="left-list1" style="color: #1ffefd">贡献金额</div>
+          </div>
+          <div style="height: 300px; overfolw-y: auto">
+            <div
+              class="left-list"
+              v-for="(item, index) in top5eDistrictFundList"
+            >
+              <div class="left-list1" v-if="item.img">
+                <img :src="item.img" />
+              </div>
+              <div class="left-list1" v-else>{{ index + 1 }}</div>
+              <a-tooltip>
+                <template #title>{{ item.districtName }}</template>
+                <div class="left-list2">{{ item.districtName }}</div>
+              </a-tooltip>
+
+              <div class="left-list1">{{ item.applyCount }}</div>
+              <div class="left-list1" style="color: #1ffefd">
+                {{ item.applyPrice }}
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="bottom-item">
+          <div class="inner-title">
+            <p style="width: 220px">区市部门申请节省资金排行</p>
+          </div>
+          <div class="left-list">
+            <div class="left-list1">序号</div>
+            <div class="left-list2">部门名称</div>
+            <div class="left-list1">应用数</div>
+            <div class="left-list1" style="color: #1ffefd">贡献金额</div>
+          </div>
+          <div style="height: 200px; overfolw-y: auto">
+            <div
+              class="left-list"
+              v-for="(item, index) in top5ApplyDistrictList"
+            >
+              <div class="left-list1" v-if="item.img">
+                <img :src="item.img" />
+              </div>
+              <div class="left-list1" v-else>{{ index + 1 }}</div>
+              <a-tooltip>
+                <template #title>{{ item.districtName }}</template>
+                <div class="left-list2">{{ item.districtName }}</div>
+              </a-tooltip>
+
+              <div class="left-list1">{{ item.applyCount }}</div>
+              <div class="left-list1" style="color: #1ffefd">
+                {{ item.applyPrice }}
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- <div class="platform-overview-bottom">
+      <div class="top"><span class="title">资源汇聚总量</span></div>
+      <div class="bottom">
+        <div
+          v-for="(item, index) in servicesNum"
+          :key="index"
+          class="component-services-content-right-left-content-son"
+        >
+          <p>{{ item.type }}</p>
+          <p class="num">{{ item.count }}</p>
+        </div>
+      </div>
+    </div> -->
+  </div>
+</template>
+
+<script>
+import {
+  getProvideDeptFundStatement,
+  getApplyDeptFundStatement,
+  getProvideDistrictFundStatement,
+  getApplyDistrictFundStatement,
+  selectTotal,
+} from '@/api/assertReport'
+export default {
+  components: {},
+  created() {},
+  destroyed() {},
+
+  mounted() {
+    this.getgetProvideDeptFund()
+    this.getApplyDeptFund()
+    this.getProvideDistrict()
+    this.getApplyDistrictFund()
+    this.selectAllTotal()
+  },
+  data() {
+    //这里存放数据
+    return {
+      //市级部门共享排行
+      top5DistrictList: [],
+      //市级部门申请排行
+      top5DeptFundList: [],
+      //区市提供排行
+      top5eDistrictFundList: [],
+      //区市申请排行
+      top5ApplyDistrictList: [],
+      servicesNum: [],
+    }
+  },
+
+  methods: {
+    getgetProvideDeptFund() {
+      getProvideDeptFundStatement().then((res) => {
+        let result = res.data.data
+        if (result.length > 0) {
+          for (let i = 0; i < result.length; i++) {
+            if (i === 0) {
+              result[i].img = require('../image/one.png')
+            }
+            if (i === 1) {
+              result[i].img = require('../image/two.png')
+            }
+            if (i === 2) {
+              result[i].img = require('../image/three.png')
+            }
+          }
+        }
+        this.top5DistrictList = result
+      })
+    },
+    getApplyDeptFund() {
+      getApplyDeptFundStatement().then((res) => {
+        let result = res.data.data
+        if (result.length > 0) {
+          for (let i = 0; i < result.length; i++) {
+            if (i === 0) {
+              result[i].img = require('../image/one.png')
+            }
+            if (i === 1) {
+              result[i].img = require('../image/two.png')
+            }
+            if (i === 2) {
+              result[i].img = require('../image/three.png')
+            }
+          }
+        }
+        this.top5DeptFundList = result
+      })
+    },
+    getProvideDistrict() {
+      getProvideDistrictFundStatement().then((res) => {
+        let result = res.data.data
+        // if(result.length>0){
+        //  for(let i=0;i<result.length;i++){
+        //    if(i===0){
+        //     result[i].img=require('../image/one.png')
+        //    }
+        //     if(i===1){
+        //      result[i].img=require('../image/two.png')
+        //    }
+        //  if(i===2){
+        //      result[i].img= require('../image/three.png')
+        //    }
+        //  }
+        // }
+        this.top5eDistrictFundList = result
+      })
+    },
+    getApplyDistrictFund() {
+      getApplyDistrictFundStatement().then((res) => {
+        let result = res.data.data
+        // if(result.length>0){
+        //  for(let i=0;i<result.length;i++){
+        //    if(i===0){
+        //     result[i].img=require('../image/one.png')
+        //    }
+        //     if(i===1){
+        //      result[i].img=require('../image/two.png')
+        //    }
+        //  if(i===2){
+        //      result[i].img= require('../image/three.png')
+        //    }
+        //  }
+        // }
+        this.top5ApplyDistrictList = result
+      })
+    },
+    selectAllTotal() {
+      selectTotal().then((res) => {
+        this.servicesNum = res.data.data.total
+      })
+    },
+  },
+}
+</script>
+<style lang='less' scoped>
+  @keyframes turn {
+    0% {
+      border-image: linear-gradient(to right, #003194, #00ffea) 1;
+    }
+    25% {
+      border-image: linear-gradient(to bottom, #003194, #00ffea) 1;
+    }
+    50% {
+      border-image: linear-gradient(to left, #003194, #00ffea) 1;
+    }
+    75% {
+      border-image: linear-gradient(to top, #003194, #00ffea) 1;
+    }
+    100% {
+      border-image: linear-gradient(to right, #003194, #00ffea) 1;
+    }
+  }
+.top5-content::-webkit-scrollbar {
+  width: 6px;
+  /*height: 4px;*/
+}
+
+.top5-content::-webkit-scrollbar-thumb {
+  background-color: #00deff;
+}
+.map-search-result::-webkit-scrollbar-track,
+.top5-content::-webkit-scrollbar-track {
+  background-color: #424748;
+}
+@keyframes topup50 {
+  from {
+    top: 50%;
+  }
+  to {
+    top: -100%;
+  }
+}
+.right-survey {
+  width: 620px;
+  height: 100%;
+  color: #f0fafa;
+  font-size: 18px;
+  display: flex;
+  flex-direction: column;
+
+  .platform-overview-top {
+    width: 100%;
+    height: 9.9rem;
+    background: rgba(0, 108, 188, 0.2);
+    border-radius: 2px;
+    border: 1px solid rgba(0, 108, 188, 0.7);
+    text-decoration: none;
+    outline: none;
+    -webkit-transition: all 100ms ease-out;
+    -moz-transition: all 100ms ease-out;
+    transition: all 100ms ease-out;
+    .top {
+      font-size: 24px;
+      background: url('~@/assets/capabilityCloud/infrastructure_title.png')  no-repeat;
+      background-size: 100% 100%;
+      text-align: center;
+    }
+    .bottom1 {
+      margin-top: 10px;
+      width: 100%;
+      display: table;
+      justify-content: space-between;
+      align-items: center;
+      height: 1.8rem;
+      .bottom-item {
+        width: 98%;
+      }
+    }
+    .bottom2 {
+      margin-top: 10px;
+      // margin-top:10px;
+      width: 100%;
+      display: table;
+      justify-content: space-between;
+      align-items: center;
+      height: 4.0rem;
+      .bottom-item {
+        width: 48%;
+      }
+    }
+
+    :hover.bottom-item {
+      background: rgba(0, 108, 188, 0.5);
+    }
+    .bottom-item {
+      height: 100%;
+      overflow-y: auto;
+      background: rgba(0, 108, 188, 0.2);
+      border-radius: 2px;
+      margin: 2px 5px;
+      border: 1px solid #10496f;
+     
+      .inner-title {
+        margin-top: 10px;
+        margin-bottom: 10px;
+        margin-right: 5px;
+
+        font-weight: bold;
+        color: #ffffff;
+        p {
+          font-size: 16px;
+          line-height: 27px;
+          background: linear-gradient(
+            90deg,
+            #041d2f 0,
+            rgba(8, 115, 193, 0) 90%
+          );
+          color: #1ffefd;
+          width: auto;
+          padding-left: 5px;
+        }
+      }
+
+      display: inline-table;
+
+      .left-list {
+        text-align: center;
+        color: #fff;
+        width: 100%;
+        height: 26px;
+        margin-right: 10px;
+        margin-top: 5px;
+        font-size: 16px;
+        .left-list1 {
+          font-size: 16x;
+          float: left;
+          width: 22%;
+          height: 0.32rem;
+          line-height: 0.32rem;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          -webkit-line-clamp: 1;
+          -webkit-box-orient: vertical;
+          word-break: break-all;
+        }
+        .left-list2 {
+          height: 0.32rem;
+          line-height: 0.32rem;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          -webkit-line-clamp: 1;
+          -webkit-box-orient: vertical;
+          word-break: break-all;
+          cursor: pointer;
+          font-size: 16px;
+          float: left;
+          width: 30%;
+          &:hover {
+            color: rgb(0 255 255);
+          }
+        }
+        .active-item {
+          cursor: pointer;
+          font-size: 14px;
+          float: left;
+          width: 40%;
+          color: rgb(0 255 255);
+          font-weight: bold;
+          text-decoration: underline;
+        }
+      }
+    }
+  }
+  .platform-overview-top:hover {
+    border: 2px solid;
+    animation: turn 5s linear infinite;
+  }
+  .platform-overview-bottom {
+    margin-top: 20px;
+    width: 100%;
+    height: 1.7rem;
+    background: rgba(0, 108, 188, 0.2);
+    border-radius: 2px;
+    border: 1px solid rgba(0, 108, 188, 0.7);
+    text-decoration: none;
+    outline: none;
+    -webkit-transition: all 100ms ease-out;
+    -moz-transition: all 100ms ease-out;
+    transition: all 100ms ease-out;
+    .top {
+      font-size: 24px;
+      background: url('~@/assets/capabilityCloud/infrastructure_title.png')  no-repeat;
+      background-size: 100% 100%;
+      text-align: center;
+    }
+    .bottom {
+      margin-top: 20px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 0rem 0.2rem;
+      .component-services-content-right-left-content-son {
+        background: url('~@/assets/capabilityCloud/Component_services_snum.png')
+          no-repeat;
+        background-size: 1.1rem 0.59rem;
+        background-position: center;
+        text-align: center;
+        & > p:first-child {
+          color: #ffffff;
+          font-size: 0.16rem;
+          line-height: 0.16rem;
+          margin-bottom: 0.12rem;
+        }
+        & > p:last-child {
+          color: #1ef6f5;
+          font-size: 0.28rem;
+          line-height: 0.28rem;
+          padding-bottom: 0.24rem;
+          margin: 0;
+        }
+      }
+    }
+  }
+  .platform-overview-bottom:hover {
+    border: 2px solid;
+    animation: turn 5s linear infinite;
+  }
+}
+</style>

front/src/views/assertReport/components/ReservoirThumbnail.vue

@@ -0,0 +1,528 @@
+<!--
+* @Author: hisense.xiaoshangqing
+* @Date: 2022-7-26 10:00:48
+* @LastEditors: xiaoshangqing
+* @LastEditTime: 2022-07-27 16:56:55
+* @Description: 水库专题首页缩略图 -->
+<template>
+  <div class="river-course-view">
+    <div ref="qdCityMap" class="city-map-content-echarts"></div>
+    <div class="topic-animation1 display-animation1"></div>
+    <div class="topic-animation2 display-animation2"></div>
+    <div class="topic-animation3 display-animation3"></div>
+    <div class="topic-animation4 display-animation4"></div>
+    <div class="topic-animation5 display-animation5"></div>
+    <div class="topic-animation6 display-animation6"></div>
+
+
+  </div>
+</template>
+
+<script>
+  import {
+    getDistrictFundStatement
+  } from '@/api/assertReport'
+import axios from 'axios'
+const echarts = require("echarts");
+export default {
+//import引入的组件需要注入到对象中才能使用
+  components: {},
+  data() {
+//这里存放数据
+    return {
+
+      districtData: [
+        {
+          name: "市南区",
+          value: [120.395966, 36.000892],
+        },
+        {
+          name: "市北区",
+          value: [120.355026, 36.083819],
+  
+        },
+        {
+          name: "李沧区",
+          value: [120.421236, 36.188023],
+    
+        },
+        {
+          name: "崂山区",
+          value: [120.587393, 36.199569],
+        },
+        {
+          name: "城阳区",
+          value: [120.369135, 36.266833],
+    
+        },
+        {
+          name: "即墨区",
+          value: [120.517352, 36.490847],
+    
+        },
+        {
+          name: "莱西市",
+          value: [120.426226, 36.86009],
+      
+        },
+        {
+          name: "胶州市",
+          value: [120.010202, 36.235878],
+    
+        },
+        {
+          name: "平度市",
+          value: [119.959012, 36.788828],
+   
+        },
+        {
+          name: "西海岸",
+          value: [119.895518, 35.875138],
+        
+        },
+      ],
+    
+    
+    };
+  },
+
+  mounted() {
+    this.findAllInfo();
+  },
+//方法集合
+  methods: {
+    findAllInfo(){
+      getDistrictFundStatement().then((res) => {
+        
+        let districtData=this.districtData
+        let resulrtData=res.data.data
+        for(let i=0;i<resulrtData.length;i++){
+          for(let j=0;j<districtData.length;j++){
+            if(resulrtData[i].districtName=districtData[j].name){
+              
+              districtData[j].num=resulrtData[i].applyPrice
+            }
+          }
+        }
+     
+        this.initMap(districtData)
+      })
+
+     
+},
+    initMap(data) {
+      this.loadedDataUrl = "./static/qingdao.json";
+       let _this=this
+      axios.get(_this.loadedDataUrl, {}) .then(geoJson =>{
+
+        _this.myChart = echarts.init(_this.$refs.qdCityMap);
+        echarts.registerMap("qingdao", geoJson.data);
+        const imgBack = new Image();
+        imgBack.src = "./static/assets/map-back.png";
+        const img = new Image();
+        img.src = "./static/assets/echarts-map-bak.png";
+        const typeImg = new Image();
+        typeImg.src = "./static/assets/reservoir-type-bak.png";
+
+        _this.option = {
+          visualMap: {
+            show: false,
+            max: 100,
+            seriesIndex: 1,
+            inRange: {
+              color: ["#000000", "yellow", "pink"],
+            },
+          },
+          geo: [
+            {
+              map: "qingdao",
+              roam: true, // 是否允许缩放
+              aspectScale: 0.8,
+              zoom: 1.1, // 默认显示级别
+              top: 100,
+              z: 6,
+              label: {
+                show: true, //是否显示市
+                textStyle: {
+                  color: "#ffffff", //文字颜色
+                  fontSize: 16, //文字大小
+                  fontFamily: "微软雅黑",
+                  backgroundColor: "rgba(0,0,0,0)", //透明度0清空文字背景
+                },
+              },
+              itemStyle: {
+                borderColor: "#25e8ff",
+                borderWidth: 2,
+                /* areaColor: "#004d8e", //rgba设置透明度0
+                  shadowColor: "#10daff",
+                shadowBlur: 10,
+                shadowOffsetX: 10,
+                opacity: 0.53, */
+                areaColor: {
+                  image: img,
+                  repeat: "repeat",
+                },
+              },
+              emphasis: {
+                disabled: false,
+                focus: "none",
+                itemStyle: {
+                  color: null,
+                },
+                label: {
+                  show: true,
+                  //color: "#fff",
+                },
+              },
+            },
+            {
+              map: "qingdao",
+              aspectScale: 0.8,
+              roam: true, // 是否允许缩放
+              zoom: 1.1, // 默认显示级别
+              top: 105,
+              z: 4,
+              itemStyle: {
+                areaColor: "#1864a5",
+                borderColor: "transparent",
+              },
+              silent: true,
+              tooltip: {
+                show: false,
+              },
+            },
+            {
+              map: "qingdao",
+              aspectScale: 0.8,
+              roam: true, // 是否允许缩放
+              zoom: 1.1, // 默认显示级别
+              top: 110,
+              z: 3,
+              itemStyle: {
+                areaColor: "#1864a5",
+                borderColor: "transparent",
+                borderWidth: 2,
+              },
+              silent: true,
+              tooltip: {
+                show: false,
+              },
+            },
+            {
+              map: "qingdao",
+              aspectScale: 0.8,
+              roam: true, // 是否允许缩放
+              zoom: 1.1, // 默认显示级别
+              top: 115,
+              z: 2,
+              itemStyle: {
+                areaColor: "#1864a5",
+                //borderColor: "#0f3866",
+                borderColor: "transparent",
+                borderWidth: 1,
+                shadowColor: "#808080", // 外部阴影
+                shadowBlur: "10",
+              },
+              silent: true,
+              tooltip: {
+                show: false,
+              },
+            },
+          ],
+          series: [
+            // {
+            //   tooltip: {
+            //     show: false,
+            //   },
+            //   type: "effectScatter",
+            //   coordinateSystem: "geo",
+            //   rippleEffect: {
+            //     scale: 3,
+            //     brushType: "stroke",
+            //   },
+            //   showEffectOn: "render",
+            //   itemStyle: {
+            //     normal: {
+            //       shadowColor: "#ffffff",
+            //       shadowBlur: 10,
+            //       shadowOffsetX: 0,
+            //       shadowOffsetY: 0,
+            //       color: "#df1818",
+            //     },
+            //   },
+            //   label: {
+            //     normal: {
+            //       color: "#fff",
+            //     },
+            //   },
+            //   symbol: "circle",
+            //   symbolSize: [10, 5],
+            //   data:data,  //地标闪烁小圆点
+            //   zlevel: 1,
+            // },
+            // {
+            //   type: "scatter",
+            //   coordinateSystem: "geo",
+            //   symbol: function (value, params) {
+            //     return    'image://static/assets/warning-reservoir.png';
+            //   },
+            //   symbolSize: [25, 35],
+            //   symbolOffset: [0, -20],
+            //   z: 9999,
+            //   data:data, //企业图片
+            // },
+            {
+              type: 'scatter',
+              coordinateSystem: 'geo',
+              label: {
+                normal: {
+                  show: true,
+                  formatter: function (params) {
+                    var name = params.data.num;
+                    var text = `{fline|${name}}`;
+                    return text;
+                  },
+                  color: '#fff',
+                  rich: {
+                    fline: {
+                      padding: [0, 25],
+                      color: '#dcc52f',
+                      textShadowColor: '#030615',
+                      textShadowBlur: '0',
+                      textShadowOffsetX: 1,
+                      textShadowOffsetY: 1,
+                      fontSize: 14,
+                      fontWeight: 400,
+                    },
+                    tline: {
+                      padding: [0, 27],
+                      color: '#afd31d',
+                      fontSize: 12,
+                    },
+                  },
+                },
+                emphasis: {
+                  show: true,
+                },
+              },
+              itemStyle: {
+                color: '#e3e00a',
+              },
+              symbol: "image://static/assets/reservoir-type-bak.png",
+              symbolSize: [84, 28],
+              symbolOffset: [0, -30],
+              z: 999,
+              data: data,   //企业名称
+            },
+
+
+
+          ],
+        };
+        _this.myChart.setOption(_this.option);
+        _this.myChart.on("click", (params) => {
+         //  console.log("点的是什么", params);
+          // //进入对应区的三维地图
+          // //跟右下角菜单切换触发调用方法一样，但是要传递区划参数，区划name
+          // const index = _this.districtData.findIndex((item) => {
+          //   return item.name === params.name ;
+          // });
+          // //console.log('rrrrrrrr5555',index);
+          // let districtObject = {
+          //   name:params.name,
+          //   longitude:_this.districtData[index].value[0],
+          //   latitude:_this.districtData[index].value[1],
+          // };
+          // _this.$emit('jumpIntoMap',districtObject);
+        });
+      });
+    },
+
+
+
+  },
+
+  beforeCreate() {}, //生命周期 - 创建之前
+  beforeMount() {}, //生命周期 - 挂载之前
+  beforeUpdate() {}, //生命周期 - 更新之前
+  updated() {}, //生命周期 - 更新之后
+  beforeDestroy() {}, //生命周期 - 销毁之前
+  destroyed() {}, //生命周期 - 销毁完成
+  activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
+};
+</script>
+<style lang='less' scoped>
+//@import url(); 引入公共css类
+
+.river-course-view {
+  position: relative;
+  width:100%;
+  height: 100%;
+  background: url("~@/assets/common/homePage/big-bak.png") no-repeat;
+  background-size: 100% 100%;
+  .city-map-content-echarts {
+    width: 10rem;
+    height: 7.9rem;
+    top: 10px;
+    left: 500px;
+    bottom: 2rem;
+    position: absolute;
+    z-index: 1000;
+  }
+  .map-menu {
+    position: absolute;
+    right: 486px;
+    bottom: 10px;
+    display: flex;
+    flex-direction: column;
+    align-items:flex-end;
+    pointer-events: none;
+    z-index:99999;
+    .map-tab {
+      // 1、菜单切换功能
+      display: flex;
+      pointer-events: auto;
+      .tab-item {
+        flex: 1;
+        cursor: pointer;
+        min-width: 1.4rem;
+        height: 30px;
+        line-height: 30px;
+        text-align: center;
+        border: 1px solid #2ab1e9;
+        border-left: 0;
+        font-size: 16px;
+        padding: 0px 20px;
+        background-color: #0d284f;
+        color: #35cffc;
+        &.active {
+          color: #fefefe;
+          background: linear-gradient(to bottom, rgba(0, 0, 0, 0), #1eafda);
+        }
+        &:first-child {
+          border-left: 1px solid #2ab1e9;
+        }
+      }
+    }
+  }
+  .reservoirType-list{
+    position: absolute;
+    right: 486px;
+    width: 122px;
+    height: 100px;
+    top: 164px;
+    padding: 10px 0 0 10px;
+    display: flex;
+    flex-direction: column;
+    background-color: rgba(13,40,79,0.5);
+    border:1px solid #0d284f;
+    padding-top:22px;
+    .type-legend{
+      margin-bottom:20px;
+      margin-left: 10px;
+      display:flex;
+      flex-direction:row;
+      .legend-color{
+        width:12px;
+        height:12px;
+        border-radius: 50%;
+        text-align: center;
+        line-height: 12px;
+      }
+      .color-normal{
+        background-color:#00ebac ;
+      }
+      .color-warning{
+        background-color:#ff3537 ;
+      }
+      .legend-text{
+        margin-left: 10px;
+        span{
+          color:#ffffff;
+          font-size: 16px;
+        }
+      }
+    }
+  }
+  .topic-animation1 {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+
+    margin: 0px auto;
+    background-image: url("~@/assets/common/homePage/animation1.png");
+    background-size: cover;
+  }
+  .display-animation1 {
+    animation: topup1 5s linear 1s infinite;
+  }
+  .topic-animation2 {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+
+    margin: 0px auto;
+    background-image: url("~@/assets/common/homePage/animation2.png");
+    background-size: cover;
+  }
+  .display-animation2 {
+    animation: topup1 5s linear 2s infinite;
+  }
+  .topic-animation3 {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+
+    margin: 0px auto;
+    background-image: url("~@/assets/common/homePage/animation3.png");
+    background-size: cover;
+  }
+  .display-animation3 {
+    animation: topup1 5s linear 3s infinite;
+  }
+  .topic-animation4 {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+
+    margin: 0px auto;
+    background-image: url("~@/assets/common/homePage/animation4.png");
+    background-size: cover;
+  }
+  .display-animation4 {
+    animation: topup1 5s linear infinite;
+  }
+  .topic-animation5 {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+
+    margin: 0px auto;
+    background-image: url("~@/assets/common/homePage/animation5.png");
+    background-size: cover;
+  }
+  .display-animation5 {
+    animation: topup1 5s linear 4s infinite;
+  }
+  .topic-animation6 {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+
+    margin: 0px auto;
+    background-image: url("~@/assets/common/homePage/animation6.png");
+    background-size: cover;
+  }
+  .display-animation6 {
+    animation: topup1 5s linear infinite;
+  }
+  @keyframes topup1 {
+    from {
+      top: 0%;
+    }
+    to {
+      top: -100%;
+    }
+  }
+}
+</style>

front/src/views/assertReport/components/ResourceOverviewAnimation.vue

@@ -0,0 +1,675 @@
+<!--
+ * @Author: hisense.fanchunxiang
+ * @Date: 2021-10-26 15:16:59
+ * @LastEditors: hisense.fanchunxiang
+ * @LastEditTime: 2021-10-29 17:38:29
+ * @Description: file mountainData
+-->
+<template>
+  <div class="team-distribution-ball">
+    <div class="bg-ball" />
+    <div class="rotating-ring" />
+    <div class="sum-ball">
+      <div class="top">
+      </div>
+      <div class="bottom">企业</div>
+    </div>
+    <div class="num-wrap">
+      <div
+        v-for="(item, index) in resourceTypeData"
+        :key="index"
+        @click="handleClick(item, index)"
+      >
+        <p>{{item.typeNum}}个</p>
+        <p class="num-wrap-bottom">{{item.typeName}}</p>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+
+export default {
+  components: {},
+  props: {
+    // 选择查询的时间段
+    selectedPeriod: {
+      type: Number,
+      default: '',
+    },
+  },
+  data() {
+    return {
+      nums: 0,
+      stationList: [],
+      // startTime: moment().subtract(12, "h").format("YYYY-MM-DD HH:mm:ss"),
+      // endTime: moment().format("YYYY-MM-DD HH:mm:ss"),
+      resourceType: ["石油化工", "有机化工", "精细化工", "化肥农药"],
+      detailTimer: null,
+      arr: [],
+      animationLock: true,
+      resourceTypeData: [
+        {
+          typeName: "石油化工",
+          typeNum: "17",
+        },
+        {
+          typeName: "有机化工",
+          typeNum: "329",
+        },
+        {
+          typeName: "精细化工",
+          typeNum: "432",
+        },
+        {
+          typeName: "化肥农药",
+          typeNum: "20",
+        }
+      ],
+      resourceData:{}
+    };
+  },
+  computed: {},
+  watch: {},
+  created() {},
+  mounted() {
+    this.arr.push(document.querySelectorAll(".num-wrap div"));
+    console.log("===============>", this.arr);
+    this.setTimer();
+    this.setRotateTimer();
+    this.getResourceTypeData();
+  },
+  destroyed() {
+    // 每次离开当前界面时，清除定时器
+    clearInterval(this.detailTimer);
+    this.detailTimer = null;
+  },
+  methods: {
+    handleClick(item, index) {
+      if (this.animationLock) {
+        // console.log(item);
+        if(item.typeName == "应急专家"){
+          bus.$emit('refreshChartData', 'expert', this.resourceData.expertData.expertDistribution);
+        }
+        else if(item.typeName == "物资储备库"){
+          bus.$emit('refreshChartData', 'storage', this.resourceData.storageData.storageDistribution);
+        }
+        else if(item.typeName == "应急预案") {
+          bus.$emit('refreshChartData', 'plan', this.resourceData.planData);
+        }
+        else {
+          bus.$emit('refreshChartData', 'resource', this.resourceData.planData);
+        }
+        if (index > 0 && this.resourceTypeData.length - index >= 1) {
+          let i = 1;
+          clearInterval(this.rotateTimer);
+          this.animationFun2();
+          if (this.resourceTypeData.length - index === 1) {
+            this.setRotateTimer();
+            return;
+          }
+          this.rotateTimer2 = setInterval(() => {
+            this.animationFun2();
+            i++;
+            // console.log(i, this.mountainData.length - index)
+            if (i === (this.resourceTypeData.length - index)) {
+              clearInterval(this.rotateTimer2);
+              this.setRotateTimer();
+            }
+          }, 1050);
+        }
+      }
+    },
+    //进入页面获取资源类别各自的总数,得到所有的统计数据，应急物资选中之后下面的图表显示什么？？？
+    getResourceTypeData(){
+      // Promise.all([
+      //   this.getExpertStatisticsData(),
+      //   this.getResourceStatisticsData(),
+      //   this.getStorageStatisticsData(),
+      //   this.getPlanStatisticsData(),
+      // ]).then((result)=>{
+      //   //给球赋值、给图表赋值//调用父页面显示某一个图表数据
+      //   //console.log('this.resourceData',this.resourceData);
+      //   this.resourceTypeData.forEach(item => {
+      //     if(item.typeName == "应急专家")
+      //     {item.typeNum = this.resourceData.expertData.expertNum
+      //     }
+      //     else if(item.typeName=="物资储备库"){
+      //       item.typeNum = this.resourceData.storageData.storageNum
+      //     }
+      //     else if(item.typeName=="应急预案"){
+      //       item.typeNum = this.resourceData.planData.city.length + this.resourceData.planData.country.length + this.resourceData.planData.province.length;
+      //     }
+      //     else {
+      //       item.typeNum = 540;
+      //     }
+
+        // });
+        // bus.$emit('refreshChartData', 'expert', this.resourceData.expertData.expertDistribution);
+   //   })
+    },
+
+    // 每五分钟获取一次资源数据
+    setTimer() {
+      this.clearTimer();
+      this.timer = setInterval(() => {
+        this.getResourceTypeData();
+      }, 5 * 60 * 1000);
+    },
+    animationFun() {
+      // console.log(this.arr[0][0].classList)
+      if (this.animationLock) {
+        this.animationLock = !this.animationLock;
+        this.arr[0][0].classList.add("animation1");
+        this.arr[0][1].classList.add("animation2");
+        this.arr[0][2].classList.add("animation3");
+        this.arr[0][3].classList.add("animation4");
+        setTimeout(() => {
+          for (var i = 0; i < this.resourceTypeData.length - 1; i++) {
+            // 改变展示点击的山体
+            this.resourceTypeData.push(this.resourceTypeData.shift());
+            this.resourceTypeData.push(this.resourceTypeData.shift());
+          }
+          this.arr[0][0].classList.remove("animation1");
+          this.arr[0][1].classList.remove("animation2");
+          this.arr[0][2].classList.remove("animation3");
+          this.arr[0][3].classList.remove("animation4");
+          //更新图表数据  bus.$emit('refreshChartData', val);
+          // if(this.resourceTypeData[0].typeName == '应急专家'){
+          //   bus.$emit('refreshChartData', 'expert', this.resourceData.expertData.expertDistribution);
+          // }else if(this.resourceTypeData[0].typeName == '物资储备库'){
+          //   bus.$emit('refreshChartData', 'storage', this.resourceData.storageData.storageDistribution);
+          //
+          // }else if(this.resourceTypeData[0].typeName == '应急预案'){
+          //   bus.$emit('refreshChartData', 'plan', this.resourceData.planData);
+          // }else{
+          // }
+          this.animationLock = !this.animationLock;
+        }, 2000);
+      }
+    },
+    animationFun2() {
+      // console.log(this.arr[0][0].classList)
+      this.animationLock = !this.animationLock;
+      this.arr[0][0].classList.add("animation2-1");
+      this.arr[0][1].classList.add("animation2-2");
+      this.arr[0][2].classList.add("animation2-3");
+      this.arr[0][3].classList.add("animation2-4");
+      setTimeout(() => {
+        for (var i = 0; i < this.resourceTypeData.length - 1; i++) {
+          // 改变展示点击的山体
+          let selectedData={};
+          bus.$emit('refreshChartData',selectedData);
+          this.resourceTypeData.push(this.resourceTypeData.shift());
+        }
+        this.arr[0][0].classList.remove("animation2-1");
+        this.arr[0][1].classList.remove("animation2-2");
+        this.arr[0][2].classList.remove("animation2-3");
+        this.arr[0][3].classList.remove("animation2-4");
+        this.animationLock = !this.animationLock;
+      }, 1000);
+    },
+    //每8秒旋转一次
+    setRotateTimer() {
+      this.clearTimer();
+      // this.animationFun();
+      this.rotateTimer = setInterval(() => {
+        this.animationFun();
+      },8*1000);
+    },
+    clearTimer() {
+      clearInterval(this.timer);
+      clearInterval(this.rotateTimer);
+      this.timer = null;
+      this.rotateTimer = null;
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.team-distribution-ball {
+  width: 466px;
+  height: 230px;
+  position: relative;
+  left: -10px;
+  .bg-ball {
+    width: 466px;
+    height: 230px;
+    position: absolute;
+    left: 60%;
+    margin-left: -210px;
+    margin-top: 30px;
+    background: url("~@/assets/common/homePage/bg_ball.png")
+    no-repeat;
+    background-size: 70%;
+  }
+  .rotating-ring {
+    width: 230px;
+    height: 230px;
+    position: absolute;
+    border-radius: 50%;
+    background: url("~@/assets/common/homePage/rotating-ring2.png");
+    background-size: 100%;
+    transform: rotateX(30deg);
+    animation: spin1 3s linear infinite;
+    top: -5%;
+    left: 25%;
+  }
+  .sum-ball {
+    width: 150px;
+    height: 75px;
+    position: absolute;
+    left: 50%;
+    margin-left: -70px;
+    top: 50px;
+    text-align: center;
+    display: flex;
+    flex-direction: column;
+    .top {
+      width: 36px;
+      height: 36px;
+      background-image: url("~@/assets/common/homePage/ball-bak.png");
+      margin-left: 55px;
+      font-size: 16px;
+      color: #fff;
+      span {
+        font-size: 60px;
+        color: #fff;
+      }
+    }
+    .bottom {
+      font-size: 18px;
+      color: #fff;
+    }
+  }
+  @keyframes spin1 {
+    0% {
+      transform: rotateX(65deg) rotateZ(0deg);
+    }
+    50% {
+      transform: rotateX(65deg) rotateZ(180deg);
+    }
+    100% {
+      transform: rotateX(65deg) rotateZ(360deg);
+    }
+  }
+  .num-wrap {
+    z-index: 1002;
+    width: 100%;
+    height: 100%;
+    position: relative;
+
+    & > div {
+      position: absolute;
+      text-align: center;
+      cursor: pointer;
+    }
+    & > div:nth-child(1) {
+      background: url("~@/assets/common/homePage/ball-active.png");
+      background-size: 99%;
+      background-repeat: no-repeat;
+      background-position: center;
+      position: absolute;
+      width: 125px;
+      height: 190px;
+      right: 96px;
+      bottom: -23px;
+      p:nth-child(1) {
+        font-size: 24px;
+        color: #fff;
+        margin: 60px 0px 12px 0px;
+        padding-top: 20px;
+      }
+      p:nth-child(2) {
+        font-size: 16px;
+        color: #fff;
+        margin: 5px 0px 12px 0px;
+        padding-top: 12px;
+      }
+    }
+    & > div:nth-child(2) {
+      background: url("~@/assets/common/homePage/ball-front.png");
+      background-size: 70%;
+      background-repeat: no-repeat;
+      background-position: center;
+      width: 106px;
+      height: 132px;
+      left: 55px;
+      bottom: 45%;
+      margin-bottom: -80px;
+      p:nth-child(1) {
+        font-size: 20px;
+        color: #fff;
+        margin: 32px 0px 0px 0px;
+        padding-top: 20px;
+      }
+      p:nth-child(2) {
+        font-size: 14px;
+        color: #fff;
+        margin: 15px 0px 0px 0px;
+        padding-top: 12px;
+      }
+    }
+    & > div:nth-child(3) {
+      background: url("~@/assets/common/homePage/ball-back.png");
+      background-size: 70%;
+      background-repeat: no-repeat;
+      background-position: center;
+      width: 76px;
+      color: #53ceff;
+      height: 96px;
+      left: 95px;
+      top: 15px;
+      p:nth-child(1) {
+        font-size: 18px;
+        margin: 32px 0px 0px 0px;
+        color: #53ceff;
+      }
+      p:nth-child(2) {
+        font-size: 14px;
+        margin: 12px 0px 0px 0px;
+        color: #53ceff;
+      }
+    }
+    & > div:nth-child(4) {
+      background: url("~@/assets/common/homePage/ball-back.png");
+      background-size: 70%;
+      background-repeat: no-repeat;
+      background-position: center;
+      width: 76px;
+      color: #53ceff;
+      height: 96px;
+      right: 70px;
+      top: 20px;
+      p:nth-child(1) {
+        margin: 32px 0px 0px 0px;
+        font-size: 18px;
+        color: #53ceff;
+      }
+      p:nth-child(2) {
+        margin: 12px 0px 0px 0px;
+        font-size: 16px;
+        color: #53ceff;
+      }
+    }
+    & > div:nth-child(5) {
+      background: url("~@/assets/common/homePage/ball-front.png");
+      background-size: 70%;
+      background-repeat: no-repeat;
+      background-position: center;
+      width: 106px;
+      height: 132px;
+      right: 120px;
+      bottom: 43%;
+      margin-bottom: -80px;
+      p:nth-child(1) {
+        margin: 32px 0px 0px 0px;
+        padding-top: 12px;
+        color: #d9eeff;
+        font-size: 20px;
+      }
+      p:nth-child(2) {
+        margin: 12px 0px 0px 0px;
+        padding-top: 12px;
+        color: #d9eeff;
+        font-size: 16px;
+      }
+    }
+    /*依次设置图像盒子中每个图像旋转后位置*/
+    .animation1 {
+      animation: run1 2s linear both;
+      p:nth-child(1) {
+        animation: run1-test1 2s linear both;
+      }
+      p:nth-child(2) {
+        animation: run1-test 2s linear both;
+      }
+    }
+    .animation2 {
+      animation: run2 2s linear both;
+      p:nth-child(1) {
+        animation: run1-test2 2s linear both;
+      }
+      p:nth-child(2) {
+        animation: run2-test 2s linear both;
+      }
+    }
+    .animation3 {
+      animation: run3 2s linear both;
+      p:nth-child(1) {
+        animation: run1-test3 2s linear both;
+      }
+      p:nth-child(2) {
+        animation: run3-test 2s linear both;
+      }
+    }
+    .animation4 {
+      animation: run4 2s linear both;
+      p:nth-child(1) {
+        animation: run1-test4 2s linear both;
+      }
+      p:nth-child(2) {
+        animation: run4-test 2s linear both;
+      }
+    }
+    .animation5 {
+      animation: run5 2s linear both;
+      p:nth-child(1) {
+        animation: run1-test5 2s linear both;
+      }
+      p:nth-child(2) {
+        animation: run5-test 2s linear both;
+      }
+    }
+    .animation2-1 {
+      animation: run1 1s linear both;
+      p:nth-child(1) {
+        animation: run1-test1 2s linear both;
+      }
+      p:nth-child(2) {
+        animation: run1-test 1s linear both;
+      }
+    }
+    .animation2-2 {
+      animation: run2 1s linear both;
+      p:nth-child(1) {
+        animation: run1-test2 2s linear both;
+      }
+      p:nth-child(2) {
+        animation: run2-test 1s linear both;
+      }
+    }
+    .animation2-3 {
+      animation: run3 1s linear both;
+      p:nth-child(1) {
+        animation: run1-test3 2s linear both;
+      }
+      p :nth-child(2) {
+        animation: run3-test 1s linear both;
+      }
+    }
+    .animation2-4 {
+      animation: run4 1s linear both;
+      p:nth-child(1) {
+        animation: run1-test4 2s linear both;
+      }
+      p:nth-child(2) {
+        animation: run4-test 1s linear both;
+      }
+    }
+    .animation2-5 {
+      animation: run5 1s linear both;
+      p:nth-child(1) {
+        animation: run1-test5 2s linear both;
+      }
+      p:nth-child(2) {
+        animation: run5-test 1s linear both;
+      }
+    }
+  }
+}
+/*采用@keyframes 规则创建run动画。*/
+@keyframes run1 {
+  0% {
+    transform: translateX(0px) translateY(0px);
+  }
+  25% {
+    transform: translateX(-37px) translateY(-4px);
+  }
+  50% {
+    transform: translateX(-93px) translateY(-21px);
+  }
+  75% {
+    transform: translateX(-120px) translateY(-34px);
+  }
+  100% {
+    transform: translateX(-150px) translateY(-52px);
+    background: url("~@/assets/common/homePage/ball-front.png");
+    background-size: 70%;
+    background-repeat: no-repeat;
+    background-position: center;
+    width: 106px;
+    height: 132px;
+  }
+}
+@keyframes run1-test1 {
+  0% {
+  }
+  100% {
+    font-size: 20px;
+    margin: 37px 0px 0px 0px;
+    color: #fff;
+  }
+}
+@keyframes run1-test {
+  0% {
+  }
+  100% {
+    font-size: 14px;
+    color: #fff;
+    margin: 10px 0px 0px 0px;
+  }
+}
+@keyframes run2 {
+  0% {
+    transform: translateX(0px) translateY(0px);
+  }
+  25% {
+    transform: translateX(-15px) translateY(-8px);
+  }
+  50% {
+    transform: translateX(-30px) translateY(-36px);
+  }
+  75% {
+    transform: translateX(-15px) translateY(-64px);
+  }
+  100% {
+    transform: translateX(5px) translateY(-102px);
+    background: url("~@/assets/common/homePage/ball-back.png");
+    background-size: 70%;
+    background-repeat: no-repeat;
+    background-position: center;
+    width: 76px;
+    height: 96px;
+  }
+}
+@keyframes run1-test2 {
+  0% {
+  }
+  100% {
+    font-size: 20px;
+    margin: 17px 0px 0px 0px;
+    color: #53ceff;
+  }
+}
+@keyframes run2-test {
+  0% {
+  }
+  100% {
+    font-size: 14px;
+    margin: 12px 0px 0px 0px;
+    color: #53ceff;
+  }
+}
+@keyframes run3 {
+  0% {
+    transform: translateX(-100px) translateY(0px);
+  }
+  25% {
+    transform: translateX(-20px) translateY(-15px);
+  }
+  50% {
+    transform: translateX(60.5px) translateY(-30px);
+  }
+  75% {
+    transform: translateX(240.75px) translateY(-15px);
+  }
+  100% {
+    transform: translateX(200px) translateY(5px);
+    background: url("~@/assets/common/homePage/ball-back.png");
+    background-size: 70%;
+    background-repeat: no-repeat;
+  }
+}
+@keyframes run1-test3 {
+  0% {
+  }
+  100% {
+    font-size: 20px;
+    margin: 17px 0px 0px 0px;
+    color: #53ceff;
+  }
+}
+@keyframes run3-test {
+  0% {
+  }
+  100% {
+    margin: 12px 0px 0px 0px;
+    font-size: 16px;
+    color: #53ceff;
+  }
+}
+@keyframes run4 {
+  0% {
+    transform: translateX(0px) translateY(0px);
+  }
+  25% {
+    transform: translateX(5px) translateY(18px);
+  }
+  50% {
+    transform: translateX(0px) translateY(36px);
+  }
+  75% {
+    transform: translateX(-5px) translateY(54px);
+  }
+  100% {
+    transform: translateX(-10px) translateY(78px);
+    background: url("~@/assets/common/homePage/ball-front.png");
+    background-size: 70%;
+    background-repeat: no-repeat;
+    background-position: center;
+    width: 106px;
+    height: 132px;
+  }
+}
+@keyframes run1-test4 {
+  0% {
+  }
+  100% {
+    font-size: 20px;
+    margin: 37px 0px 0px 0px;
+    color: #fff;
+  }
+}
+@keyframes run4-test {
+  0% {
+  }
+  100% {
+    margin: 22px 0px 0px 0px;
+    padding-top: 12px;
+    color: #d9eeff;
+    font-size: 16px;
+  }
+}
+</style>

front/src/views/assertReport/index.vue

@@ -0,0 +1,290 @@
+<!--  -->
+<template>
+
+
+ <div class="capability-cloud">
+
+    <div class="header">
+      <span class="title" @click="goHome">城市云脑通用能力服务平台</span>
+    </div>
+    <div class="header1">
+      <div style=" color:#bed1df; font-size: 32px">累计节省财政资金</div>
+            <div class="area-right">
+              <!-- <div class="mianJi">累计节省财政资金</div> -->
+              <template v-for="(item, index) in saveMonmy">
+                <p v-if="item == '.'" :key="index">
+                  {{ item }}
+                </p>
+                <span v-else >{{ item }}</span>
+              </template>
+              <div class="mianJi">万元</div>
+            </div>
+      <div style="  color: #bed1df; font-size: 16px">注：资源参考价格由部门提供或参考市场价格设定</div>
+
+      </div>
+    <!--左侧-->
+    <div class="reservoir-left">
+      <!-- 左侧内容 -->
+    <reservoir-left />
+    </div>
+     <!--右侧-->
+    <div class="reservoir-right">
+      <reservoir-right />
+    </div>
+    <!--中间地图-->
+    <div class="reservoir-map">
+      <reservoir-thumbnail
+                           @changeThumbnailMap="changeThumbnailMap"
+                           @jumpIntoMap="jumpIntoMap"
+      />
+    </div>
+ <!--下方-->
+ <div class="bottom">
+  <reservoir-bottom />
+
+      </div>
+  </div>
+
+</template>
+
+<script>
+import {
+  getApplyPriceCount
+  } from '@/api/assertReport'
+  import ReservoirThumbnail from "./components/ReservoirThumbnail.vue";
+import ReservoirLeft from "./components/ReservoirLeft";
+  import ReservoirRight from "./components/ReservoirRight";
+  import ReservoirBottom from "./components/ReservoirBottom";
+  import { NumbersConvertedToArrays } from "@/utils/arrayMethod.js";
+export default {
+  //import引入的组件需要注入到对象中才能使用
+  components: {
+    ReservoirThumbnail,
+    ReservoirLeft,
+    ReservoirRight,
+    ReservoirBottom
+
+  },
+  data() {
+    //这里存放数据
+    return {
+      saveMonmy:[],
+      model: "common",
+      dialogTitle: "周边视频",
+      videoAnalysisDialogVisible: false, //视频分析弹窗显示标志位
+      riverCourseHistoryDialogVisible: false, //河道历史弹窗
+      riverDetailInfo: {}, //河道具体信息用于历史弹窗显示数据
+      dialogType: "add",
+      dialogData: {},
+      dangerReportDialogVisible: false,
+      positionInfo: null,
+      reservoirDialogVisible: false, //新增修改积水点弹窗显示标志位
+      districtOptions: [], //区划数组
+      isThumbnail:true,    //是否为地图缩略图
+      tabindex:0,      //3d地图选中的tab。
+      listType:"",//水库列表的类型，普通列表 “”，预警列表 warnig
+      basicInfo: {},  //水库详情信息
+      type: '',
+      callSource:"indexPage",
+    };
+  },
+  //监听属性 类似于data概念
+  computed: {},
+  //监控data中的数据变化
+  watch: {},
+  //方法集合
+  methods: {
+    getSaveMoney(){
+      getApplyPriceCount().then((res) => {
+     
+      this.saveMonmy=NumbersConvertedToArrays(res.data.data)
+      })
+    }
+  },
+
+  mounted() {
+   this.getSaveMoney()
+  },
+
+};
+</script>
+<style lang="less">
+  @font-face {
+    font-family: 'SourceHanSansCN-Regular';
+    src: url('~@/assets/capabilityCloud/font/SourceHanSansCN-Regular.otf');
+  }
+  @font-face {
+    font-family: 'DIN-Bold';
+    src: url('~@/assets/capabilityCloud/font/DIN-Bold.otf');
+  }
+  @font-face {
+    font-family: 'ZhiheiJ-W5.ttf';
+    src: url('~@/assets/capabilityCloud/font/ZhiheiJ-W5.ttf');
+  }
+  .capability-cloud {
+    font-family: SourceHanSansCN-Regular;
+    .title {
+      font-family: ZhiheiJ-W5;
+      background: -webkit-linear-gradient(90deg, #99a8d0, #fff);
+      font-weight: 600;
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+    }
+    .num {
+      font-family: DIN-Bold;
+    }
+  }
+</style>
+<style lang='less' scoped>
+// 此处去掉scoped为修改date-picker背景色，所以业务样式都应放在reservoir层级中，避免影响
+//@import url(); 引入公共css类
+.module-header-container {
+  position: absolute;
+  z-index: 1000;
+  top: 0px;
+  width: 100%;
+  pointer-events: none;
+}
+.capability-cloud {
+    height: 10.8rem;
+    background: url('~@/assets/capabilityCloud/bg.png') no-repeat;
+    background-size: 100% 100%;
+    overflow: hidden;
+   
+    & > .header {
+      height: 1.04rem;
+      text-align: center;
+      background: url('~@/assets/capabilityCloud/header.png') no-repeat;
+      font-size: 0.46rem;
+    }
+    .bottom{
+      bottom: 12px;
+    position: absolute;
+    left: 545px;
+    width: 732px;
+    align-items: center;
+    z-index: 1004;
+    text-align: center;
+  
+    height: 1.8rem;
+
+    }
+    .header1 {
+      top: 78px;
+      position: absolute;
+    left: 795px;
+    align-items: center;
+    z-index: 1004;
+    text-align: center;
+    .area-right {
+          display: flex;
+          align-items: center;
+          justify-items: flex-end;
+          padding-right: 20px;
+          color: #bed1df;
+          margin-left: 100px;
+          span {
+            width: 36px;
+            // height: 45px;
+            // line-height: 45px;
+            color: #fed93f;
+            font-weight: bold;
+            background: url("~@/assets/capabilityCloud/num_bg.png") 
+            100% 100% no-repeat;
+            background-size: 100%;
+            text-align: center;
+            font-size: 34px;
+            margin-right: 3px;
+
+            font-family: DinPro-Bold;
+          }
+          .mianJi {
+            margin-top: 6px;;
+              margin-right: 3px;
+         font-size: 22px;
+         float:right;
+          }
+          p {
+            height: 44px;
+            display: flex;
+            align-items: flex-end;
+            justify-items: center;
+            font-size: 34px;
+          }
+        }
+    }
+ 
+  //position: relative;
+  .reservoir-left {
+    position: absolute;
+    left: 0.1rem;
+    z-index: 1000;
+    top: 0.8rem;
+    height: calc(100% - 0.8rem);
+  }
+  .reservoir-right {
+    position: absolute;
+    z-index: 1001;
+    right: 0.1rem;
+    top: 0.8rem;
+    height: calc(100% - 0.8rem);
+  }
+  .reservoir-map {
+    position: absolute;
+    width: 100%;
+  //  height: 100%;
+   // bottom:2rem;
+  }
+}
+// 日期时间组件
+.phone-date-picker {
+  color: #fff;
+  //border: 1px solid #e4e7ed;
+  border: 1px solid #008fbb;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  //background: #000;
+  background: #123d68;
+  //background:rgba(0, 0, 0, 0);
+  line-height: 30px;
+  margin: 5px 0;
+  .el-date-table td.disabled div {
+    background: #305156 !important;
+  }
+  .el-picker-panel__footer {
+    //background-color: rgba(0, 0, 0, 0.8);
+    background: #123d68;
+    color: #fff;
+    .el-picker-panel__link-btn:first-of-type {
+      display: none;
+    }
+  }
+  .el-date-table td.in-range div {
+    background: #009ab3;
+  }
+  .el-input__inner {
+    //background-color: rgba(0, 0, 0, 0.8);
+    background: #123d68;
+    color: #fff;
+  }
+  .el-date-picker__header > button,
+  span {
+    color: #fff;
+  }
+  .el-picker-panel__content > .el-date-table > tbody > tr > th {
+    color: #fff;
+  }
+  .el-button.is-plain:hover,
+  .el-button.is-plain:focus {
+    background: #009ab3;
+  }
+  .el-button--default {
+    border-radius: 0;
+    background: #009ab3;
+    //border: 1px solid #dcdfe6;
+    border: 1px solid #008fbb;
+    border-color: #009ab3;
+  }
+}
+
+
+</style>

front/src/views/components/upload/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-09 15:41:19
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-08-02 11:30:50
+ * @LastEditors: Light
+ * @LastEditTime: 2022-11-28 17:05:33
  * @Description: 上传组件
 -->
 <template>
@@ -92,6 +92,7 @@
     }
     if (!isLt10M) {
       message.error(`${file.name} 超出100M的大小`)
+      flag = false
     }
     return flag || Upload.LIST_IGNORE
   }

front/src/views/home/DetailsPageconetent.vue

@@ -88,7 +88,7 @@
               </span>
               <div
                 class="leixingsumfather"
-                :class="!item.shrinkFlag ? 'shrink' : ''"
+                :class="!item.shrinkFlag ? 'shrink' : 'shrink'"
               >
                 <div
                   v-for="(item2, index2) in item.typeList"
@@ -108,7 +108,7 @@
                   </a-checkable-tag>
                 </div>
               </div>
-              <div
+              <!-- <div
                 class="shrinkTag"
                 v-if="item.showShrink"
                 :key="item.shrinkFlag"
@@ -121,7 +121,7 @@
                   v-show="item.shrinkFlag"
                   @click="changeShrink(item.name)"
                 />
-              </div>
+              </div> -->
             </div>
           </div>
         </template>
@@ -143,7 +143,7 @@
           show-size-changer
           show-less-items
           show-quick-jumper
-          :showTotal="total => `共 ${total} 项`"
+          :showTotal="(total) => `共 ${total} 项`"
           :total="resourceTotal"
           :page-size-options="pageSizeOptions"
           @change="pageChange"
@@ -306,7 +306,7 @@
       <detailsPageconetentTree />
     </div>
     <div class="details-pageconetent-left" style="left: 0.16rem" v-else>
-      <detailsPageInfrastructureTreeXha />
+      <detailsPageInfrastructureTreeXha v-show="showFlag" />
     </div>
     <div class="top" v-if="Cardsname != '知识库' && Cardsname != '基础设施'">
       <div class="top-title">
@@ -511,10 +511,14 @@
         :resourceTotal="resourceTotal"
       ></KnowledgeBase>
     </div>
-    <template v-if="Cardsname == '基础设施'">
+    <div v-if="Cardsname == '基础设施'" v-show="showFlag">
       <infrastructureApplication></infrastructureApplication>
-    </template>
-    <div class="talk-monitor" @click="openMonitor">
+    </div>
+    <div
+      class="talk-monitor"
+      @click="openMonitor"
+      v-if="Cardsname != '基础设施'"
+    >
       <a-tooltip>
         <template #title>问答机器人</template>
         <i></i>
@@ -915,9 +919,14 @@
       const setTitle = () => {
         let title = titleNameArray
         let whoShow1 = ref(whoShow)
-        if (whoShow1 && whoShow1.value.itShowXiHaiAn) {
-          title[0] = title.splice(2, 1, title[0])[0]
+        if (
+          whoShow1 &&
+          whoShow1.value.itShowXiHaiAn &&
+          title[0].name !== '基础设施'
+        ) {
+          ;[title[0], title[2]] = [title[2], title[0]]
         }
+        debugger
         titleName.value = title
       }
       // 查询
@@ -1641,10 +1650,16 @@
           resourceList.data = list
         })
       }
-      mybus.on('getCameraByParentId', (ids) => {
-        paramsGetResources2.value.regionId = ids
+      const showFlag = ref(true)
+      mybus.on('getCameraByParentId', (val) => {
+        console.log('倒腾位置2')
+        paramsGetResources2.value.regionId = val.id
         getAppResources()
       })
+      mybus.on('changeShowFlag', (flag) => {
+        console.log('改变')
+        showFlag.value = flag
+      })
       mybus.on('changeSearchValue', (val) => {
         searchValue.value = val
       })
@@ -1951,6 +1966,7 @@
         saveSearchCodition,
         searchResultListDom,
         handleSetSearchData, // todo
+        showFlag,
       }
     },
     components: {
@@ -1970,6 +1986,7 @@
     },
     beforeUnmount() {
       mybus.off('getCameraByParentId')
+      mybus.off('changeShowFlag')
       mybus.off('changeSearchValue')
       mybus.off('selectCardsitem')
       mybus.off('paramsGetResources')
@@ -2066,7 +2083,11 @@
     background: rgba(245, 243, 243, 0.3);
 
     .details-pageconetent-left {
-      max-height: 8.5rem;
+      // max-height: 8.5rem;
+      height: 100%;
+      height: -moz-available; /* WebKit-based browsers will ignore this. */
+      height: -webkit-fill-available; /* Mozilla-based browsers will ignore this. */
+      height: fill-available;
       position: absolute;
       width: 2.5rem;
       top: 0.17rem;

front/src/views/home/apply.vue

@@ -296,17 +296,29 @@
       const num = ref(0)
       // 过期时间
       const expireDateOptions = [
+        {
+          value: moment().add(7, 'days').format('YYYY-MM-DD HH:mm:ss'),
+          label: '7天',
+        },
         {
           value: moment().add(30, 'days').format('YYYY-MM-DD HH:mm:ss'),
-          label: '30天',
+          label: '1个月',
         },
         {
-          value: moment().add(60, 'days').format('YYYY-MM-DD HH:mm:ss'),
-          label: '60天',
+          value: moment().add(180, 'days').format('YYYY-MM-DD HH:mm:ss'),
+          label: '6个月',
         },
         {
-          value: moment().add(90, 'days').format('YYYY-MM-DD HH:mm:ss'),
-          label: '90天',
+          value: moment().add(365, 'days').format('YYYY-MM-DD HH:mm:ss'),
+          label: '1年',
+        },
+        {
+          value: moment().add(730, 'days').format('YYYY-MM-DD HH:mm:ss'),
+          label: '2年',
+        },
+        {
+          value: moment().add(1095, 'days').format('YYYY-MM-DD HH:mm:ss'),
+          label: '3年',
         },
       ]
       const apiURL = window.SITE_CONFIG.apiURL

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

@@ -2,12 +2,13 @@
 海康H5Player
 -->
 <template>
-  <div id="player" style="width: 800px; height: 600px; z-index: 9999"></div>
+  <div :id="videoId" style="width: 800px; height: 600px; z-index: 9999"></div>
 </template>
 <script>
-  const IS_MOVE_DEVICE = document.body.clientWidth < 992 // 是否移动设备
+  // const IS_MOVE_DEVICE = document.body.clientWidth < 992 // 是否移动设备
   const MSE_IS_SUPPORT = !!window.MediaSource // 是否支持mse
   import { message } from 'ant-design-vue'
+  import mybus from '@/myplugins/mybus'
   export default {
     name: 'H5Player',
     props: {
@@ -15,6 +16,10 @@
         type: String,
         default: '',
       },
+      videoId: {
+        type: String,
+        default: 'player',
+      },
       index: {
         type: Number,
         default: 0,
@@ -23,11 +28,16 @@
         type: Boolean,
         default: false,
       },
+      unStopable: {
+        type: Boolean,
+        default: false,
+      },
     },
     data() {
       return {
         player: null,
         splitNum: 1,
+        realTime: true,
         mseSupport: MSE_IS_SUPPORT,
         // tabActive: MSE_IS_SUPPORT ? 'mse' : 'decoder',
         tabActive: 'decoder',
@@ -61,10 +71,16 @@
     created() {},
     mounted() {
       this.init()
+      mybus.emit('closeLoading', true)
       this.createPlayer()
       this.arrangeWindow()
+      if (this.unStopable) {
+        this.videoPlay(this.videoUrl, 0)
+      } else {
+        this.realplay(this.videoUrl, 0)
+      }
       //videoUrl this.realplay(this.videoUrl,0);//循环传过来的数组进行播放，index根据选中的个数
-      this.realplay(this.videoUrl, 0)
+
       //this.realplay('wss://10.134.135.44:6014/proxy/10.10.20.14:559/openUrl/y3mFfcA',0);
     },
     watch: {
@@ -74,7 +90,16 @@
           console.log('oldVal:', oldVal)
           console.log('newVal:', newVal)
           if (newVal) {
-            this.realplay(newVal, 0)
+            if (!this.player) {
+              setTimeout(() => {
+                this.init()
+                this.createPlayer()
+                this.arrangeWindow()
+                this.realplay(newVal, 0)
+              }, 1000)
+            } else {
+              this.realplay(newVal, 0)
+            }
           }
         },
         // 立即处理 进入页面就触发
@@ -90,12 +115,13 @@
         })
       },
       createPlayer() {
-        //console.log('this.index',this.index);
+        console.log('初始化id', this.videoId)
         this.player = new window.JSPlugin({
           //szId: 'player'+this.index,
-          szId: 'player',
+          szId: this.videoId,
           szBasePath: '/util/', //引入静态资源地址，我这里静态资源在public/js文件存放，所以设置为js
           iMaxSplit: 4,
+          iWidth: '800px',
           iCurrentSplit: 4,
           openDebug: true,
           oStyle: {
@@ -113,6 +139,7 @@
             //插件错误回调
             console.log('pluginError callback: ', iWndIndex, iErrorCode, oError)
             message.error('取流异常,请稍后尝试')
+            mybus.emit('closeLoading', false)
           },
           windowEventOver: function (iWndIndex) {
             //鼠标移过回调
@@ -138,8 +165,11 @@
               iWidth,
               iHeight
             )
-            // 首帧绘制完成后停止
-            that.pausePlay(iWndIndex)
+            // 如果是录像播放，首帧绘制完成后停止
+            if (!that.realTime) {
+              that.pausePlay(iWndIndex)
+            }
+            mybus.emit('closeLoading', false)
           },
           performanceLack: function () {
             //性能不足回调
@@ -161,9 +191,13 @@
       // 初始化结束
       // 视频预览
       realplay(playURL, index1) {
-        this.mode = 1 //解码方式：0普通模式 1高级模式
-        const { player, mode, urls } = this,
-          index = player.currentWindowIndex
+        this.realTime = false
+        mybus.emit('closeLoading', true)
+        setTimeout(() => {
+          mybus.emit('closeLoading', false)
+        }, 3000)
+        this.mode = 0 //解码方式：0普通模式 1高级模式
+        const { player, mode, urls } = this
         // playURL = this.realplay
         console.log('视频播放地址', playURL)
         // const startTime = {
@@ -190,13 +224,48 @@
             }
           )
       },
+      // 实时播放
+      videoPlay(playURL, index1) {
+        let that = this
+        this.realTime = true
+        mybus.emit('closeLoading', true)
+        setTimeout(() => {
+          mybus.emit('closeLoading', false)
+        }, 3000)
+        if (!that.unStopable) {
+          message.warning('预览将在约6s后停止')
+          setTimeout(() => {
+            that.stopAllPlay()
+          }, 6000)
+        }
+        this.mode = 0 //解码方式：0普通模式 1高级模式
+        const { player, mode, urls } = this
+        // playURL = this.realplay
+        console.log('视频播放地址', playURL)
+        // const startTime = {
+        //   startTime: ,
+        // }
+        // const endTime = {
+        //   endTime: ,
+        // }
+        player.JS_Play(playURL, { playURL, mode }, index1).then(
+          () => {
+            console.log('realplay success')
+            // 预览时6s停止播放
+          },
+          (e) => {
+            console.error(e)
+            // message.error('错误代码:' + e)
+          }
+        )
+      },
       // 关闭所有视频
       stopAllPlay() {
         this.player.JS_StopRealPlayAll().then(
           () => {
             this.playback.rate = 0
             console.log('stopAllPlay success')
-            this.closeVideoTree()
+            // this.closeVideoTree()
           },
           (e) => {
             console.error(e)
@@ -205,12 +274,15 @@
       },
       // 暂停单个视频
       pausePlay(index) {
+        let that = this
         this.player.JS_Pause(index).then(
           () => {
             console.log('暂停成功')
           },
           (e) => {
             console.error(e)
+            // 暂停失败切换为实时播放
+            that.videoPlay(that.videoUrl, 0)
           }
         )
       },

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

@@ -17,9 +17,17 @@
     <div
       v-for="item in navList"
       :key="item.key"
-      @click="jumpPage(item,'headerClick')"
+      @click="jumpPage(item, 'headerClick')"
       class="nav"
-      :class="[{'select':item.key == select},{'select-inner':(item.key == 'DetailsPageconetent' && item.innerKey && props.targetFlag)}]"
+      :class="[
+        { select: item.key == select },
+        {
+          'select-inner':
+            item.key == 'DetailsPageconetent' &&
+            item.innerKey &&
+            props.targetFlag,
+        },
+      ]"
     >
       {{ item.name }}
     </div>
@@ -54,6 +62,7 @@
         p-id="2187"
         width="0.35rem"
         height="0.35rem"
+        @click="goToView()"
       >
         <path
           d="M544 161.536a330.666667 330.666667 0 0 1 298.666667 329.130667h-0.341334c0.213333 1.493333 0.341333 2.986667 0.341334 4.565333v219.434667h39.68a32 32 0 0 1 0 64h-212.053334a160 160 0 0 1-316.586666 0H141.909333a32 32 0 1 1 0-64h39.424v-219.434667c0-1.578667 0.128-3.072 0.341334-4.565333H181.333333a330.666667 330.666667 0 0 1 298.666667-329.130667V128a32 32 0 1 1 64 0v33.536z m-298.666667 553.130667h533.333334v-219.434667c0-1.578667 0.128-3.072 0.341333-4.565333h-0.341333a266.666667 266.666667 0 1 0-533.333334 0h-0.341333c0.213333 1.493333 0.341333 2.986667 0.341333 4.565333v219.434667z m359.765334 64H418.901333a96 96 0 0 0 186.197334 0z"
@@ -90,14 +99,18 @@
         </template>
         <span
           class="name"
-          @click="jumpPage({ name: '个人中心', key: 'personalCenter' },'headerClick')"
+          @click="
+            jumpPage({ name: '个人中心', key: 'personalCenter' }, 'headerClick')
+          "
         >
           {{ user.realName }}
         </span>
       </a-tooltip>
       <span @click="logout" class="out">退出</span>
       <i
-        @click="jumpPage({ name: '后台管理', key: 'houtaiguanli' },'headerClick')"
+        @click="
+          jumpPage({ name: '后台管理', key: 'houtaiguanli' }, 'headerClick')
+        "
         class="iconTo"
         v-show="backFlag"
       ></i>
@@ -135,19 +148,19 @@
   const mynoticeFlag = ref(false)
   const mynoticeData = ref([])
   const navList = ref(navListManagement.navList)
-  const targetRouter= ref('')
+  const targetRouter = ref('')
   const backFlag = ref(false)
   getUserInfo().then((res) => {
-    if(res.data.data.superAdmin =='1'){
+    if (res.data.data.superAdmin == '1') {
       backFlag.value = true
     } else {
-    res.data.data.roleIdList.map((val) => {
-      getRole(val).then((role) => {
-        if (role.data.data.name === '后台管理员') {
-          backFlag.value = true
-        }
+      res.data.data.roleIdList.map((val) => {
+        getRole(val).then((role) => {
+          if (role.data.data.name === '后台管理员') {
+            backFlag.value = true
+          }
+        })
       })
-    })
     }
   })
   console.log('navList------------>', navList)
@@ -188,140 +201,145 @@
     window.open('http://15.72.177.175:18460/analystrunner/tonglan', '_blank')
   }
   // 跳转页面
-  const jumpPage = (item,type) => {
-    if(type == 'headerClick'){
-       // 西海岸
-    if (itShowXiHaiAn.value) {
-      let _arr = ['共享门户', '能力云图', '能力统计', '需求中心', '赋能案例']
-      if (
-        _arr.includes(item.name) &&
-        !xhaHasPermissionUser.list.includes(user.value.username)
-      ) {
-        return message.warn('暂无权限')
+  const jumpPage = (item, type) => {
+    if (type == 'headerClick') {
+      // 西海岸
+      if (itShowXiHaiAn.value) {
+        let _arr = ['共享门户', '能力云图', '能力统计', '需求中心', '赋能案例']
+        if (
+          _arr.includes(item.name) &&
+          !xhaHasPermissionUser.list.includes(user.value.username)
+        ) {
+          return message.warn('暂无权限')
+        }
+      }
+      select.value = item.key
+      switch (item.name) {
+        case '个人中心':
+          window.sessionStorage.setItem(
+            'type',
+            JSON.stringify('PurchaseVehicle')
+          )
+          router.push({
+            path: '/personalCenter',
+          })
+          break
+        case '能力统计':
+          router.push({
+            path: '/abilityStatistics',
+          })
+          break
+        case '能力集市':
+          router.push({
+            path: '/DetailsPageconetent',
+            query: {
+              select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
+            },
+          })
+          break
+        case '能力云图':
+          router.push({
+            path: '/capabilityCloud',
+          })
+          break
+        // case '技术文档':
+        //   router.push({
+        //     path: '/developmentGuide',
+        //   })
+        //   break
+        case '新手指南':
+          router.push({
+            path: '/instructionManual',
+          })
+          break
+        case '需求中心':
+          router.push({
+            path: '/demandCenter',
+          })
+          break
+        case '区市站点':
+          router.push({
+            path: '/mapTest',
+          })
+          break
+        case '后台管理':
+          Cookies.remove('JSESSIONID')
+          window.open(window.SITE_CONFIG.backUrl + '/#/workBench-workBench')
+          // window.reload('http://15.2.21.238:9797')
+          break
+        case '赋能案例':
+          router.push({
+            path: '/assignCase',
+          })
+          break
+        case '典型赋能案例':
+          router.push({
+            path: '/assignCase',
+          })
+          break
+        case '融合服务':
+          router.push({
+            path: '/integrationServices',
+          })
+          break
+        case 'CIM专区':
+          router.push({
+            path: '/cimSpecialArea',
+          })
+          break
+        default:
+          router.push('/home')
+          break
+      }
+    } else if (type == 'innerClick') {
+      //select.value = item.key
+      switch (item.name) {
+        case '个人中心':
+          window.sessionStorage.setItem(
+            'type',
+            JSON.stringify('PurchaseVehicle')
+          )
+          router.push({
+            path: '/personalCenter',
+          })
+          break
+        case '能力统计':
+          router.push({
+            path: '/abilityStatistics',
+          })
+          break
+        case '能力集市':
+          router.push({
+            path: targetRouter.value.path,
+            query: {
+              id: targetRouter.value.id,
+            },
+          })
+          break
+        case '能力云图':
+          router.push({
+            path: '/capabilityCloud',
+          })
+          break
+        case '后台管理':
+          Cookies.remove('JSESSIONID')
+          window.open(window.SITE_CONFIG.backUrl + '/#/workBench-workBench')
+          // window.reload('http://15.2.21.238:9797')
+          break
+        case '融合服务':
+          router.push({
+            path: '/integrationServices',
+          })
+          break
+        case 'CIM专区':
+          router.push({
+            path: '/cimSpecialArea',
+          })
+          break
+        default:
+          router.push('/home')
+          break
       }
-    }
-    select.value = item.key
-    switch (item.name) {
-      case '个人中心':
-        window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle'))
-        router.push({
-          path: '/personalCenter',
-        })
-        break
-      case '能力统计':
-        router.push({
-          path: '/abilityStatistics',
-        })
-        break
-      case '能力集市':
-        router.push({
-          path: '/DetailsPageconetent',
-          query: {
-            select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
-          },
-        })
-        break
-      case '能力云图':
-        router.push({
-          path: '/capabilityCloud',
-        })
-        break
-      // case '技术文档':
-      //   router.push({
-      //     path: '/developmentGuide',
-      //   })
-      //   break
-      case '新手指南':
-        router.push({
-          path: '/instructionManual',
-        })
-        break
-      case '需求中心':
-        router.push({
-          path: '/demandCenter',
-        })
-        break
-      case '区市站点':
-        router.push({
-          path: '/mapTest',
-        })
-        break
-      case '后台管理':
-        Cookies.remove('JSESSIONID')
-        window.open(window.SITE_CONFIG.backUrl + '/#/workBench-workBench')
-        // window.reload('http://15.2.21.238:9797')
-        break
-      case '赋能案例':
-        router.push({
-          path: '/assignCase',
-        })
-        break
-      case '典型赋能案例':
-        router.push({
-          path: '/assignCase',
-        })
-        break
-      case '融合服务':
-        router.push({
-          path: '/integrationServices',
-        })
-        break
-      case 'CIM专区':
-        router.push({
-          path: '/cimSpecialArea',
-        })
-        break
-      default:
-        router.push('/home')
-        break
-    }
-    }else if(type == 'innerClick'){
-    //select.value = item.key
-    switch (item.name) {
-      case '个人中心':
-        window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle'))
-        router.push({
-          path: '/personalCenter',
-        })
-        break
-      case '能力统计':
-        router.push({
-          path: '/abilityStatistics',
-        })
-        break
-      case '能力集市':
-         router.push({
-           path: targetRouter.value.path,
-           query: {
-             id: targetRouter.value.id,
-           },
-         });
-        break
-      case '能力云图':
-        router.push({
-          path: '/capabilityCloud',
-        })
-        break
-      case '后台管理':
-        Cookies.remove('JSESSIONID')
-        window.open(window.SITE_CONFIG.backUrl + '/#/workBench-workBench')
-        // window.reload('http://15.2.21.238:9797')
-        break
-      case '融合服务':
-        router.push({
-          path: '/integrationServices',
-        })
-        break
-      case 'CIM专区':
-        router.push({
-          path: '/cimSpecialArea',
-        })
-        break
-      default:
-        router.push('/home')
-        break
-    }
-    
     }
   }
   const scrollTop = ref(0)
@@ -403,24 +421,32 @@
 
     mybus.on('changeMenuStyle', (data) => {
       debugger
-      targetRouter.value = data;
-      if(data.path=='/algorithmCompare'){
-        jumpPage({
-        "name": "能力集市",
-        "key": "DetailsPageconetent",
-        "innerKey":"algorithmCompare"
-       },'innerClick');
-      } else if(data.path =='/DetailsPageconetent'){
-        jumpPage({ name: '能力集市', key: 'DetailsPageconetent' },'headerClick')
-      } else if(data.path =='/details'){
-         jumpPage({
-        "name": "能力集市",
-        "key": "DetailsPageconetent",
-        "innerKey":"details"
-       },'innerClick');
+      targetRouter.value = data
+      if (data.path == '/algorithmCompare') {
+        jumpPage(
+          {
+            name: '能力集市',
+            key: 'DetailsPageconetent',
+            innerKey: 'algorithmCompare',
+          },
+          'innerClick'
+        )
+      } else if (data.path == '/DetailsPageconetent') {
+        jumpPage(
+          { name: '能力集市', key: 'DetailsPageconetent' },
+          'headerClick'
+        )
+      } else if (data.path == '/details') {
+        jumpPage(
+          {
+            name: '能力集市',
+            key: 'DetailsPageconetent',
+            innerKey: 'details',
+          },
+          'innerClick'
+        )
       }
     })
-
   })
   onBeforeUnmount(() => {
     mybus.off('getSgcNum')
@@ -507,7 +533,7 @@
       background: #0058e1;
       color: #fff !important;
     }
-      .select-inner {
+    .select-inner {
       background: #0058e1;
       color: #fff !important;
     }

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

@@ -62,6 +62,55 @@
               item.infoList.filter((val) => val.attrType == '应用图片')[0]
                 .attrValue
             "
+            :fallback="imgSrcYyzy"
+          />
+        </div>
+        <div
+          class="left"
+          style="display: flex; align-items: center"
+          v-else-if="
+            (item.type === '组件服务' &&
+              item.infoList &&
+              item.infoList.filter((val) => val.attrType == '图层缩略图')[0]) ||
+            item.infoList.filter((val) => val.attrType == '组件图片')[0] ||
+            item.infoList.filter((val) => val.attrType == '算法效果图片')[0]
+          "
+        >
+          <a-image
+            v-if="
+              item.infoList.filter((val) => val.attrType == '图层缩略图')[0]
+            "
+            :width="106"
+            :preview="false"
+            :src="
+              item.infoList.filter((val) => val.attrType == '图层缩略图')[0]
+                .attrValue
+            "
+            :fallback="imgSrcTcfw"
+          />
+          <a-image
+            v-else-if="
+              item.infoList.filter((val) => val.attrType == '组件图片')[0]
+            "
+            :width="106"
+            :preview="false"
+            :src="
+              item.infoList.filter((val) => val.attrType == '组件图片')[0]
+                .attrValue
+            "
+            :fallback="item.type == '开发组件' ? imgSrcKfzj : imgSrcYwzj"
+          />
+          <a-image
+            v-else-if="
+              item.infoList.filter((val) => val.attrType == '算法效果图片')[0]
+            "
+            :width="106"
+            :preview="false"
+            :src="
+              item.infoList.filter((val) => val.attrType == '算法效果图片')[0]
+                .attrValue
+            "
+            :fallback="imgSrcZnsf"
           />
         </div>
         <div
@@ -253,6 +302,18 @@
             </div>
           </div>
           <div class="dec">
+            <div
+              v-if="
+                item.infoList.filter((val) => val.attrType == '组件类型')[0]
+              "
+            >
+              <span>
+                {{
+                  item.infoList.filter((val) => val.attrType == '组件类型')[0]
+                    .attrValue
+                }}
+              </span>
+            </div>
             <div
               v-if="
                 selectCardsname !== '融合服务' &&
@@ -615,12 +676,12 @@
             //     id: item.id,
             //   },
             // });
-                 //修改顶部菜单的样式
-        let pathData = {
-          path: '/details',
-          id: item.id,
-        };
-         mybus.emit('changeMenuStyle',pathData);
+            //修改顶部菜单的样式
+            let pathData = {
+              path: '/details',
+              id: item.id,
+            }
+            mybus.emit('changeMenuStyle', pathData)
           }
         }
       }
@@ -766,7 +827,11 @@
             integrationServiceOrderDom.value.reset()
         }
       })
-
+      const imgSrcYyzy = ref(require('@/assets/home/yyzy_square.png'))
+      const imgSrcTcfw = ref(require('@/assets/home/tcfw_square.png'))
+      const imgSrcZnsf = ref(require('@/assets/home/znsf_square.png'))
+      const imgSrcKfzj = ref(require('@/assets/home/kfzj_square.png'))
+      const imgSrcYwzj = ref(require('@/assets/home/ywzj_square.png'))
       let videoUrl = ref('')
       const options = reactive({
         width: '700px', //播放器宽度
@@ -821,8 +886,8 @@
         let pathData = {
           path: '/algorithmCompare',
           id: item.id,
-        };
-         mybus.emit('changeMenuStyle',pathData);
+        }
+        mybus.emit('changeMenuStyle', pathData)
       }
       return {
         onSearch,
@@ -847,6 +912,11 @@
         integrationServiceOrderDom,
         orderObj,
         getTagList,
+        imgSrcYyzy,
+        imgSrcTcfw,
+        imgSrcZnsf,
+        imgSrcKfzj,
+        imgSrcYwzj,
       }
     },
     beforeUnmount() {
@@ -857,7 +927,7 @@
 </script>
 <style scoped lang="less">
   #search-result-list-container {
-   // width: 1088px;
+    // width: 1088px;
     padding: 0 18px;
     background: #f3f5f9;
 
@@ -1043,7 +1113,7 @@
 
           .header-right:last-child {
             div {
-           //   margin-right: 10px;
+              //   margin-right: 10px;
             }
           }
 
@@ -1225,7 +1295,7 @@
 
   .description {
     max-width: 990px;
-   // height: 52px;
+    // height: 52px;
     font-size: 14px;
     line-height: 18px;
     display: -webkit-box;

front/src/views/home/detailBack.vue

@@ -1,77 +1,82 @@
+<!--
+ * @Author: Light
+ * @Date: 2022-11-24 09:07:50
+ * @LastEditors: Light
+ * @LastEditTime: 2022-11-25 09:56:50
+ * @Description: 告诉大家这是什么
+-->
 <template>
-  <div>
-   <div class="nav-box">
-        <a-breadcrumb>
+  <div class="detail-back" @click="goToDetailsPageconetent">
+    <!-- <div class="nav-box"> -->
+    <!-- <a-breadcrumb>
           <a-breadcrumb-item @click="goToDetailsPageconetent" class="bread-crumb-span">能力集市</a-breadcrumb-item>
           <a-breadcrumb-item>{{detailName}}</a-breadcrumb-item>
-        </a-breadcrumb>
-      </div>
+        </a-breadcrumb> -->
+    <!-- </div> -->
   </div>
 </template>
 
 <script setup>
-import { reactive, ref, watch, defineProps } from 'vue'
-import { useRouter } from 'vue-router'
-import { useStore } from 'vuex'
-import mybus from '@/myplugins/mybus'
-const router = useRouter()
-const oldValue1= ref('')
-const props = defineProps({
-  textColor: { type: String, default: '' },
-})
-
-const previousPage = () => {
-  if (window.history.state.back){
-    window.history.go(-1)
-  } else{
-   router.push({
-   path: '/integrationServices',
+  import { reactive, ref, watch, defineProps } from 'vue'
+  import { useRouter } from 'vue-router'
+  import { useStore } from 'vuex'
+  import mybus from '@/myplugins/mybus'
+  const router = useRouter()
+  const oldValue1 = ref('')
+  const props = defineProps({
+    textColor: { type: String, default: '' },
   })
+
+  const previousPage = () => {
+    if (window.history.state.back) {
+      window.history.go(-1)
+    } else {
+      router.push({
+        path: '/integrationServices',
+      })
+    }
   }
 
-}
-
-const detailName = ref("应用资源")
-
-const goToDetailsPageconetent = () =>{
-   let pathData =  {
-          path: '/DetailsPageconetent',
-        };
-     mybus.emit('changeMenuStyle',pathData);
-}
+  const detailName = ref('应用资源')
 
+  const goToDetailsPageconetent = () => {
+    let pathData = {
+      path: '/DetailsPageconetent',
+    }
+    mybus.emit('changeMenuStyle', pathData)
+  }
 </script>
 
 <style scoped lang="less">
-.detail-back {
-  position: absolute;
-  top: 0.6rem;
-  left: 100px;
-  font-size:  0.18rem;
-  color: #fff;
-  cursor: pointer;
-  width: 50px;
-  height: 50px;
-  //background-image: url('~@/assets/detailsAll/back.png');
-  background-size: 100% 100%;
-}
+  .detail-back {
+    position: absolute;
+    top: 1rem;
+    left: 100px;
+    font-size: 0.18rem;
+    color: #fff;
+    cursor: pointer;
+    width: 50px;
+    height: 50px;
+    background-image: url('~@/assets/detailsAll/back.png');
+    background-size: 100% 100%;
+  }
   .nav-box {
     position: absolute;
     top: 0.6rem;
-  //left: 100px;
-  font-size:  0.18rem;
-  color: #fff;
-      height: 30px;
-      line-height:30px;
-      width: 100%;
-      font-size: 14px;
-      display: flex;
-      align-items: center;
-      background: rgba(244, 245, 248, 0.8);
-      padding-left: 145px;
-      padding-top: 5px;
-      .bread-crumb-span{
-         cursor: pointer;
-      }
+    left: 100px;
+    font-size: 0.18rem;
+    color: #fff;
+    height: 30px;
+    line-height: 30px;
+    width: 100%;
+    font-size: 14px;
+    display: flex;
+    align-items: center;
+    background: rgba(244, 245, 248, 0.8);
+    padding-left: 145px;
+    padding-top: 5px;
+    .bread-crumb-span {
+      cursor: pointer;
     }
-</style>
+  }
+</style>

front/src/views/home/detailsPageInfrastructureTree.vue

@@ -2,7 +2,11 @@
   <div class="wrapper">
     <div class="wrapper-title-left-tree" :key="showKey">
       <div v-for="item in treeData" :key="item.id" class="primaryNode">
-        <div class="top" @click="showBottom(item)" :class="item.show ? 'topSelect' : ''">
+        <div
+          class="top"
+          @click="showBottom(item)"
+          :class="item.show ? 'topSelect' : ''"
+        >
           {{ item.name }}
           ({{ item.channelCount }})
           <DownOutlined v-show="!item.show" />
@@ -10,13 +14,28 @@
         </div>
         <div class="bottom" v-show="item.show">
           <div v-for="val in item.children" :key="val.id" class="item">
-            <div class="up" :class="selectId == val.id ? 'select' : ''"
-              @click="showDown(item, val), onSelect(item, val)">
+            <div
+              class="up"
+              :class="selectId == val.id ? 'select' : ''"
+              @click="showDown(item, val), onSelect(item, val)"
+            >
               <div>
-                <svg t="1654068878091" class="icon" viewBox="0 0 1024 1024" version="1.1"
-                  xmlns="http://www.w3.org/2000/svg" p-id="2156" width="0.25rem" height="0.25rem"
-                  v-show="selectId == val.id">
-                  <path d="M512 624a112 112 0 1 0 0-224 112 112 0 0 0 0 224z" p-id="2157" fill="#0058e1"></path>
+                <svg
+                  t="1654068878091"
+                  class="icon"
+                  viewBox="0 0 1024 1024"
+                  version="1.1"
+                  xmlns="http://www.w3.org/2000/svg"
+                  p-id="2156"
+                  width="0.25rem"
+                  height="0.25rem"
+                  v-show="selectId == val.id"
+                >
+                  <path
+                    d="M512 624a112 112 0 1 0 0-224 112 112 0 0 0 0 224z"
+                    p-id="2157"
+                    fill="#0058e1"
+                  ></path>
                 </svg>
                 <span class="name">{{ val.name }}({{ val.channelCount }})</span>
               </div>
@@ -27,13 +46,30 @@
               </span>
             </div>
             <div class="down" v-show="val.show">
-              <div v-for="child in val.children" :key="child.id" class="child"
-                :class="selectId == child.id ? 'select2' : ''" @click="onSelect(item, child, child)">
+              <div
+                v-for="child in val.children"
+                :key="child.id"
+                class="child"
+                :class="selectId == child.id ? 'select2' : ''"
+                @click="onSelect(item, child, child)"
+              >
                 <div>
-                  <svg t="1654068878091" class="icon" viewBox="0 0 1024 1024" version="1.1"
-                    xmlns="http://www.w3.org/2000/svg" p-id="2156" width="0.25rem" height="0.25rem"
-                    v-show="selectId == child.id">
-                    <path d="M512 624a112 112 0 1 0 0-224 112 112 0 0 0 0 224z" p-id="2157" fill="#0058e1"></path>
+                  <svg
+                    t="1654068878091"
+                    class="icon"
+                    viewBox="0 0 1024 1024"
+                    version="1.1"
+                    xmlns="http://www.w3.org/2000/svg"
+                    p-id="2156"
+                    width="0.25rem"
+                    height="0.25rem"
+                    v-show="selectId == child.id"
+                  >
+                    <path
+                      d="M512 624a112 112 0 1 0 0-224 112 112 0 0 0 0 224z"
+                      p-id="2157"
+                      fill="#0058e1"
+                    ></path>
                   </svg>
                   <span class="name">
                     {{ child.name }}
@@ -49,247 +85,198 @@
   </div>
 </template>
 <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'
-import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
+  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'
+  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
 
-export default defineComponent({
-  setup() {
-    const router = useRouter()
-    const whoShow1 = ref(whoShow)
-    const showKey = ref(0)
-    const treeData = ref([])
-    const selectId = ref('')
+  export default defineComponent({
+    setup() {
+      const router = useRouter()
+      const whoShow1 = ref(whoShow)
+      const showKey = ref(0)
+      const treeData = ref([])
+      const selectId = ref('')
 
-    // 初始化
-    const init = async () => {
-      treeData.value = []
-      console.log(
-        'router.currentRoute.value.query.select',
-        router.currentRoute.value.query.select
-      )
-      let select = router.currentRoute.value.query.select || DETAIL_PAGE_CONTENT_DEFAULT_TAB
-      if (select === '123') {
-        select = ''
+      // 初始化
+      const init = async () => {
+        treeData.value = []
+        console.log(
+          'router.currentRoute.value.query.select',
+          router.currentRoute.value.query.select
+        )
+        let select =
+          router.currentRoute.value.query.select ||
+          DETAIL_PAGE_CONTENT_DEFAULT_TAB
+        if (select === '123') {
+          select = ''
+        }
+        console.log(
+          '获取url中的select=====================>',
+          router.currentRoute.value.query.select
+        )
+        if (select == '基础设施') {
+          let res = {}
+          if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
+            res = await getCameraAllOrgan({
+              parentId: 'S4NbecfYB1DBH8HNULGS34',
+            })
+          } else {
+            // 西海岸
+            res = await getCameraInfoByAreaId({
+              areaId: '70be8c5b664f4bcf869d82f2e8335051',
+            })
+          }
+          treeData.value = (res.data && res.data.data) || []
+          // 只有一个，默认展开到二级菜单
+          if (res.data && res.data.data.length == 1) {
+            showBottom(treeData.value[0])
+          }
+        }
       }
-      console.log(
-        '获取url中的select=====================>',
-        router.currentRoute.value.query.select
-      )
-      if (select == '基础设施') {
-        let res = {};
+      mybus.on('getDeptList', () => {
+        init()
+      })
+
+      const onSelect = async (item, val, child) => {
+        console.log('item--------onSelect---->', item)
+        console.log('val------onSelect------>', val)
+        console.log('child-----onSelect------->', child)
+        mybus.emit('getCameraByParentId', {
+          id: val.id,
+        })
+        mybus.emit('getListByParentId', val.id)
+        let res = {}
         if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
-          res = await getCameraAllOrgan({ parentId: 'S4NbecfYB1DBH8HNULGS34' })
+          res = await getCameraAllOrgan({ parentId: val.id })
         } else {
           // 西海岸
-          res = await getCameraInfoByAreaId({
-            areaId: '70be8c5b664f4bcf869d82f2e8335051',
-          })
+          res = await getCameraInfoByAreaId({ areaId: val.id })
         }
-        treeData.value = res.data && res.data.data || []
-        // 只有一个，默认展开到二级菜单
-        if(res.data && res.data.data.length == 1) {
-          showBottom(treeData.value[0])
+        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
+              }
+            })
+          }
+        })
+        if (child) {
+          selectId.value = child.id
         }
       }
-    }
-    mybus.on('getDeptList', () => {
-      init()
-    })
 
-    const onSelect = async (item, val, child) => {
-      console.log('item--------onSelect---->', item);
-      console.log('val------onSelect------>', val);
-      console.log('child-----onSelect------->', child);
-      mybus.emit('getCameraByParentId', val.id)
-      mybus.emit('getListByParentId', val.id)
-      let res = {}
-      if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
-        res = await getCameraAllOrgan({ parentId: val.id })
-      } else {
-        // 西海岸
-        res = await getCameraInfoByAreaId({ areaId: val.id })
-      }
-      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
-            }
+      watch(selectId, (newVal) => {
+        if (newVal == '') {
+          mybus.emit('getCameraByParentId', {
+            id: '',
           })
+          mybus.emit('getListByParentId', '')
         }
       })
-      if (child) {
-        selectId.value = child.id
-      }
-    }
 
-    watch(selectId, (newVal) => {
-      if (newVal == '') {
-        mybus.emit('getCameraByParentId', '')
-        mybus.emit('getListByParentId', '')
-      }
-    })
-
-    const showBottom = async (item) => {
-      item.show = !item.show;
-      let res = {};
-      if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
-        res = await getCameraAllOrgan({ parentId: item.id })
-      } else {
-        // 西海岸
-        res = await getCameraInfoByAreaId({ areaId: item.id })
-      }
-
-      treeData.value.map((treeDataItem, index) => {
-        if (item.id == treeDataItem.id) {
-          treeData.value[index].children = res.data && res.data.data || []
-          console.log('treeData.value.[index]', treeData.value[index])
+      const showBottom = async (item) => {
+        item.show = !item.show
+        let res = {}
+        if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
+          res = await getCameraAllOrgan({ parentId: item.id })
+        } else {
+          // 西海岸
+          res = await getCameraInfoByAreaId({ areaId: item.id })
         }
-      })
-    }
-    const showDown = (item, val) => {
-      selectId.value = val.id
-      console.log('item---showDown--------->', item);
-      console.log('val----showDown-------->', val);
-      if (item.children) {
-        val.show = !val.show;
-        // 取消选中
-        if (!val.show) {
-          selectId.value = ''
+
+        treeData.value.map((treeDataItem, index) => {
+          if (item.id == treeDataItem.id) {
+            treeData.value[index].children = (res.data && res.data.data) || []
+            console.log('treeData.value.[index]', treeData.value[index])
+          }
+        })
+      }
+      const showDown = (item, val) => {
+        selectId.value = val.id
+        console.log('item---showDown--------->', item)
+        console.log('val----showDown-------->', val)
+        if (item.children) {
+          val.show = !val.show
+          // 取消选中
+          if (!val.show) {
+            selectId.value = ''
+          }
         }
       }
-    }
-    return {
-      treeData,
-      showKey,
-      onSelect,
-      showBottom,
-      showDown,
-      selectId,
-    }
-  },
-  beforeUnmount() {
-    mybus.off('getDeptList')
-    console.log('getDeptList销毁~~~~~~~~~~~~~~~~~~~')
-  },
-  components: {
-    UpOutlined,
-    DownOutlined,
-  },
-})
+      return {
+        treeData,
+        showKey,
+        onSelect,
+        showBottom,
+        showDown,
+        selectId,
+      }
+    },
+    beforeUnmount() {
+      mybus.off('getDeptList')
+      console.log('getDeptList销毁~~~~~~~~~~~~~~~~~~~')
+    },
+    components: {
+      UpOutlined,
+      DownOutlined,
+    },
+  })
 </script>
 <style lang="less" scoped>
-.primaryNode {
-  .top {
-    width: 100%;
-    height: 0.4rem;
-    background: rgba(0, 135, 225, 0.1);
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 0 0.1rem;
-    margin-top: 0.08rem;
-  }
-
-  .top:hover {
-    cursor: pointer;
-    // 0058e1 透明度 0.5
-    background: rgba(0, 88, 225, 0.8);
-    color: white;
-
-    :deep(.anticon) {
-      color: white;
-    }
-  }
-
-  .topSelect {
-    background: #0058e1;
-    color: white;
-
-    :deep(.anticon) {
-      color: white;
-    }
-  }
-
-  .bottom {
-    width: 100%;
-    background: rgba(244, 245, 248, 0.8);
-    padding: 0 0.1rem;
-
-    // margin-bottom: .08rem;
-    .up {
-      cursor: pointer;
+  .primaryNode {
+    .top {
+      width: 100%;
       height: 0.4rem;
+      background: rgba(0, 135, 225, 0.1);
       display: flex;
       justify-content: space-between;
       align-items: center;
-      border-top: 0.01rem solid #ccc;
+      padding: 0 0.1rem;
+      margin-top: 0.08rem;
+    }
+
+    .top:hover {
+      cursor: pointer;
+      // 0058e1 透明度 0.5
+      background: rgba(0, 88, 225, 0.8);
+      color: white;
+
+      :deep(.anticon) {
+        color: white;
+      }
+    }
+
+    .topSelect {
+      background: #0058e1;
+      color: white;
+
+      :deep(.anticon) {
+        color: white;
+      }
+    }
+
+    .bottom {
+      width: 100%;
+      background: rgba(244, 245, 248, 0.8);
       padding: 0 0.1rem;
 
-      &>div {
-        display: flex;
-        justify-content: flex-start;
-      }
-
-      .name {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        display: -webkit-box;
-        -webkit-line-clamp: 1;
-        -webkit-box-orient: vertical;
-        word-break: break-all;
-      }
-    }
-
-    .up:hover {
-      .name {
-        color: #0058e1;
-        font-weight: 600;
-      }
-
-      span {
-        color: #0058e1;
-        font-weight: 600;
-      }
-    }
-
-    .select {
-      padding: 0 0.1rem 0 0;
-
-      .name {
-        width: 1.7rem;
-        color: #0058e1 !important;
-        font-weight: 600;
-      }
-
-      span {
-        color: #0058e1;
-        font-weight: 600;
-      }
-    }
-
-    .item:nth-of-type(1) .up {
-      border-top: none;
-    }
-
-    .down {
-      width: 100%;
-
-      .child {
+      // margin-bottom: .08rem;
+      .up {
         cursor: pointer;
         height: 0.4rem;
         display: flex;
         justify-content: space-between;
         align-items: center;
+        border-top: 0.01rem solid #ccc;
         padding: 0 0.1rem;
 
-        &>div {
+        & > div {
           display: flex;
           justify-content: flex-start;
         }
@@ -304,7 +291,7 @@ export default defineComponent({
         }
       }
 
-      .child:hover {
+      .up:hover {
         .name {
           color: #0058e1;
           font-weight: 600;
@@ -316,10 +303,12 @@ export default defineComponent({
         }
       }
 
-      .select2 {
+      .select {
+        padding: 0 0.1rem 0 0;
+
         .name {
           width: 1.7rem;
-          color: #0058e1;
+          color: #0058e1 !important;
           font-weight: 600;
         }
 
@@ -327,10 +316,65 @@ export default defineComponent({
           color: #0058e1;
           font-weight: 600;
         }
+      }
 
-        padding: 0 0.1rem 0 0;
+      .item:nth-of-type(1) .up {
+        border-top: none;
+      }
+
+      .down {
+        width: 100%;
+
+        .child {
+          cursor: pointer;
+          height: 0.4rem;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          padding: 0 0.1rem;
+
+          & > div {
+            display: flex;
+            justify-content: flex-start;
+          }
+
+          .name {
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-line-clamp: 1;
+            -webkit-box-orient: vertical;
+            word-break: break-all;
+          }
+        }
+
+        .child:hover {
+          .name {
+            color: #0058e1;
+            font-weight: 600;
+          }
+
+          span {
+            color: #0058e1;
+            font-weight: 600;
+          }
+        }
+
+        .select2 {
+          .name {
+            width: 1.7rem;
+            color: #0058e1;
+            font-weight: 600;
+          }
+
+          span {
+            color: #0058e1;
+            font-weight: 600;
+          }
+
+          padding: 0 0.1rem 0 0;
+        }
       }
     }
   }
-}
 </style>

front/src/views/home/detailsPageInfrastructureTreeXha.vue

@@ -109,373 +109,317 @@
         <div class="titleName">{{ item.placeTypeName }}</div>
         <div class="glgkmk" v-for="(child, index) in item.children">
           <a-tooltip placement="topLeft">
-              <template #title>{{ child.placeTypeName }}</template>
-              <div
-            class="glgknum"
-            :class="{ active: child.placeTypeCode == chooseId }"
-            @click="tabClick(child.placeTypeCode)"
-          >
-            {{ child.placeTypeName }}
-          </div>
-            </a-tooltip>
-          
+            <template #title>{{ child.placeTypeName }}</template>
+            <div
+              class="glgknum"
+              :class="{ active: child.placeTypeCode == chooseId }"
+              @click="tabClick(child.placeTypeCode)"
+            >
+              {{ child.placeTypeName }}
+            </div>
+          </a-tooltip>
         </div>
       </div>
     </div>
   </div>
 </template>
 <script>
-import { defineComponent, ref, watch } from 'vue'
-import { getCameraAllOrgan } from '@/api/videoSurveillance'
+  import { defineComponent, ref, watch } from 'vue'
+  import { getCameraAllOrgan } from '@/api/videoSurveillance'
 
-import { getCameraInfoByAreaId ,getPlaceType} from '@/api/file'
-import mybus from '@/myplugins/mybus'
-import { useRouter } from 'vue-router'
-import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
-import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
+  import { getCameraInfoByAreaId, getPlaceType } from '@/api/file'
+  import mybus from '@/myplugins/mybus'
+  import { useRouter } from 'vue-router'
+  import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
+  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
 
-export default defineComponent({
-  setup() {
-    const biaoqianList = ref([])
-    const bumenImg = require('@/assets/newHome/bumen.png')
-    const biaoqianImg = require('@/assets/newHome/biaoqian.png')
-    const router = useRouter()
-    const showKey = ref(0)
-    const treeData = ref([])
-    const selectId = ref('')
-    let itemIndex = ref(1)
-    let chooseId = ref('')
-    //切换tab
-    const btnClick = (index) => {
-      itemIndex.value = index
-    if(index===2){
-      if(chooseId.value !==''){
-        let placeTypeCode =[]
-      placeTypeCode.push(chooseId.value)
-      mybus.emit('CameraConditionPlaceType', placeTypeCode)
-    }else{
-      mybus.emit('clearLeftSelect')
-    }
-    }else{
-      if(selectId.value!==''){
-        mybus.emit('getCameraByParentId', selectId.value)
-      }else{
-      mybus.emit('clearLeftSelect')
+  export default defineComponent({
+    setup() {
+      const biaoqianList = ref([])
+      const bumenImg = require('@/assets/newHome/bumen.png')
+      const biaoqianImg = require('@/assets/newHome/biaoqian.png')
+      const router = useRouter()
+      const showKey = ref(0)
+      const treeData = ref([])
+      const selectId = ref('')
+      let itemIndex = ref(1)
+      let chooseId = ref('')
+      //切换tab
+      const btnClick = (index) => {
+        itemIndex.value = index
+        if (index === 2) {
+          if (chooseId.value !== '') {
+            let placeTypeCode = []
+            placeTypeCode.push(chooseId.value)
+            mybus.emit('CameraConditionPlaceType', placeTypeCode)
+          } else {
+            mybus.emit('clearLeftSelect')
+          }
+        } else {
+          if (selectId.value !== '') {
+            mybus.emit('getCameraByParentId', {
+              id: selectId.value,
+            })
+          } else {
+            mybus.emit('clearLeftSelect')
+          }
+        }
       }
-    }
-     
-  
-   
-    }
-    //选择标签内容
-    const tabClick = (id) => {
-      if(chooseId.value === id){
-        chooseId.value = ''
-        mybus.emit('clearLeftSelect')
-      }else{
-  
-        chooseId.value = id
-      let placeTypeCode =[]
-      placeTypeCode.push(id)
-      mybus.emit('CameraConditionPlaceType', placeTypeCode)
+      //选择标签内容
+      const tabClick = (id) => {
+        if (chooseId.value === id) {
+          chooseId.value = ''
+          // mybus.emit('clearLeftSelect')
+          mybus.emit('CameraConditionPlaceType', [])
+        } else {
+          chooseId.value = id
+          let placeTypeCode = []
+          placeTypeCode.push(id)
+          mybus.emit('CameraConditionPlaceType', placeTypeCode)
+        }
       }
-     
-    }
-    // 初始化
-    const init = async () => {
-      treeData.value = []
-      let select =
-        router.currentRoute.value.query.select ||
-        DETAIL_PAGE_CONTENT_DEFAULT_TAB
-      if (select === '123') {
-        select = ''
-      }
-      if (select == '基础设施') {
-  
-        let res = {}
-   
+      // 初始化
+      const init = async () => {
+        treeData.value = []
+        let select =
+          router.currentRoute.value.query.select ||
+          DETAIL_PAGE_CONTENT_DEFAULT_TAB
+        if (select === '123') {
+          select = ''
+        }
+        if (select == '基础设施') {
+          let res = {}
+
           res = await getCameraInfoByAreaId({
             areaId: '70be8c5b664f4bcf869d82f2e8335051',
           })
-        treeData.value = (res.data && res.data.data) || []
-        let tabs={}
-        tabs = await getPlaceType()
-        //获取标签列表=========
-        biaoqianList.value =(tabs.data && tabs.data.data) || []
-        // 只有一个，默认展开到二级菜单
-        if (res.data && res.data.data.length == 1) {
-          showBottom(treeData.value[0])
+          treeData.value = (res.data && res.data.data) || []
+          let tabs = {}
+          tabs = await getPlaceType()
+          //获取标签列表=========
+          biaoqianList.value = (tabs.data && tabs.data.data) || []
+          // 只有一个，默认展开到二级菜单
+          if (res.data && res.data.data.length == 1) {
+            showBottom(treeData.value[0])
+          }
         }
       }
-    }
-    mybus.on('getDeptList', () => {
-      init()
-    })
-    mybus.on('clearChoose', () => {
-      selectId.value=''
-      chooseId.value=''
-    })
-    const onSelect = async (item, val, child) => {
-
-        let res = {}  
+      mybus.on('getDeptList', () => {
+        init()
+      })
+      mybus.on('clearChoose', () => {
+        selectId.value = ''
+        chooseId.value = ''
+      })
+      const onSelect = async (item, val, child) => {
+        let res = {}
+        console.log('点击', item, val, child)
         res = await getCameraInfoByAreaId({ areaId: val.id })
-      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
+        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
+              }
+            })
+          }
+        })
+        if (child) {
+          if (selectId.value === child.id) {
+            selectId.value = ''
+          } else {
+            selectId.value = child.id
+            // 查询数据并上图
+            const param = {
+              id: val.id,
+              reset: true,
             }
+            mybus.emit('getCameraByParentId', param)
+          }
+        }
+      }
+
+      watch(selectId, (newVal) => {
+        if (newVal == '') {
+          mybus.emit('getCameraByParentId', {
+            id: '70be8c5b664f4bcf869d82f2e8335051',
           })
         }
       })
-      if (child) {
-          if(selectId.value===child.id){
-           selectId.value=''    
-      }else{
-        selectId.value = child.id
-        mybus.emit('getCameraByParentId', val.id)
-      }
-      
-      }
- 
-     
-    }
 
-    watch(selectId, (newVal) => {
-      if (newVal == '') { 
-          mybus.emit('clearLeftSelect')
-      }
-    })
-
-    const showBottom = async (item) => {
-      item.show = !item.show
-      let res = {}
+      const showBottom = async (item) => {
+        item.show = !item.show
+        let res = {}
         // 西海岸
         res = await getCameraInfoByAreaId({ areaId: item.id })
-      treeData.value.map((treeDataItem, index) => {
-        if (item.id == treeDataItem.id) {
-          treeData.value[index].children = (res.data && res.data.data) || []
-          console.log('treeData.value.[index]', treeData.value[index])
-        }
-      })
-    }
-    const showDown = (item, val) => {
-      
-      selectId.value = val.id
-      //mybus.emit('getCameraByParentId', val.id)
-      if (item.children) {
-        val.show = !val.show
-        // 取消选中
-        if (!val.show) {
-          selectId.value = ''
-         // mybus.emit('clearLeftSelect')
-        }else{
-          mybus.emit('getCameraByParentId', val.id)
+        treeData.value.map((treeDataItem, index) => {
+          if (item.id == treeDataItem.id) {
+            treeData.value[index].children = (res.data && res.data.data) || []
+            console.log('treeData.value.[index]', treeData.value[index])
+          }
+        })
+      }
+      const showDown = (item, val) => {
+        selectId.value = val.id
+        //mybus.emit('getCameraByParentId', val.id)
+        if (item.children) {
+          val.show = !val.show
+          // 取消选中
+          if (!val.show) {
+            selectId.value = ''
+            // mybus.emit('clearLeftSelect')
+          } else {
+            mybus.emit('getCameraByParentId', {
+              id: val.id,
+            })
+          }
         }
       }
-    }
-    return {
-      btnClick,
-      tabClick,
-      treeData,
-      showKey,
-      onSelect,
-      showBottom,
-      showDown,
-      selectId,
-      itemIndex,
-      bumenImg,
-      biaoqianImg,
-      biaoqianList,
-      chooseId,
-    }
-  },
-  beforeUnmount() {
-    mybus.off('getDeptList')
-    mybus.off('clearChoose')
-  },
-  components: {
-    UpOutlined,
-    DownOutlined,
-  },
-})
+      return {
+        btnClick,
+        tabClick,
+        treeData,
+        showKey,
+        onSelect,
+        showBottom,
+        showDown,
+        selectId,
+        itemIndex,
+        bumenImg,
+        biaoqianImg,
+        biaoqianList,
+        chooseId,
+      }
+    },
+    beforeUnmount() {
+      mybus.off('getDeptList')
+      mybus.off('clearChoose')
+    },
+    components: {
+      UpOutlined,
+      DownOutlined,
+    },
+  })
 </script>
 <style lang="less" scoped>
-.titleName {
-  font-size: 18px;
+  .titleName {
+    font-size: 18px;
     color: #7e7676;
     margin-bottom: 10px;
     padding-left: 6px;
     border-left: 6px solid #1296db;
     margin-left: 10px;
-}
-.glgkmk {
-  cursor: pointer;
-  text-align: left;
-  position: relative;
-  display: inline-block;
-  width: 45%;
-  margin-bottom: 10px;
-  margin-left: 10px;
- 
-  .glgknum {
-    // width: 100px;
-    // color: #000000;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    -webkit-line-clamp: 1;
-    -webkit-box-orient: vertical;
-    word-break: break-all;
   }
-  .active {
-    color: #0058e1;
-    font-weight: bold;
-  }
-}
-
-.glgkmk :hover {
-  color: #0058e1;
-}
-.nav {
-  display: flex;
-  justify-content: space-between;
-   margin-right: 20px;
-  align-items: center;
-  font-size: 18px;
-  font-family: 'Alibaba PuHuiTi';
-  color: #000000;
-  line-height: 0.32rem;
-  margin-bottom: 24px;
-
-  .photo {
-    display: inline-block;
-    height: 0.3rem;
-    width: 0.3rem;
-    margin-right: 0.1rem;
-  }
-
-  div {
-    padding: 0 0.1rem;
+  .glgkmk {
     cursor: pointer;
-    display: flex;
-    align-items: center;
+    text-align: left;
+    position: relative;
+    display: inline-block;
+    width: 45%;
+    margin-bottom: 10px;
+    margin-left: 10px;
+
+    .glgknum {
+      // width: 100px;
+      // color: #000000;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 1;
+      -webkit-box-orient: vertical;
+      word-break: break-all;
+    }
+    .active {
+      color: #0058e1;
+      font-weight: bold;
+    }
   }
 
-  div:hover {
-    color: #1296db;
+  .glgkmk :hover {
+    color: #0058e1;
   }
-
-  .active {
-    font-weight: 600;
-    color: #1296db;
-    border-bottom: 0.02rem solid #1296db;
-  }
-}
-
-.primaryNode {
-  .top {
-    width: 100%;
-    height: 0.4rem;
-    background: rgba(0, 135, 225, 0.1);
+  .nav {
     display: flex;
     justify-content: space-between;
+    margin-right: 20px;
     align-items: center;
-    padding: 0 0.1rem;
-    margin-top: 0.08rem;
-  }
+    font-size: 18px;
+    font-family: 'Alibaba PuHuiTi';
+    color: #000000;
+    line-height: 0.32rem;
+    margin-bottom: 24px;
 
-  .top:hover {
-    cursor: pointer;
-    // 0058e1 透明度 0.5
-    background: rgba(0, 88, 225, 0.8);
-    color: white;
-
-    :deep(.anticon) {
-      color: white;
+    .photo {
+      display: inline-block;
+      height: 0.3rem;
+      width: 0.3rem;
+      margin-right: 0.1rem;
     }
-  }
 
-  .topSelect {
-    background: #0058e1;
-    color: white;
-
-    :deep(.anticon) {
-      color: white;
-    }
-  }
-
-  .bottom {
-    width: 100%;
-    background: rgba(244, 245, 248, 0.8);
-    padding: 0 0.1rem;
-
-    // margin-bottom: .08rem;
-    .up {
+    div {
+      padding: 0 0.1rem;
       cursor: pointer;
+      display: flex;
+      align-items: center;
+    }
+
+    div:hover {
+      color: #1296db;
+    }
+
+    .active {
+      font-weight: 600;
+      color: #1296db;
+      border-bottom: 0.02rem solid #1296db;
+    }
+  }
+
+  .primaryNode {
+    .top {
+      width: 100%;
       height: 0.4rem;
+      background: rgba(0, 135, 225, 0.1);
       display: flex;
       justify-content: space-between;
       align-items: center;
-      border-top: 0.01rem solid #ccc;
+      padding: 0 0.1rem;
+      margin-top: 0.08rem;
+    }
+
+    .top:hover {
+      cursor: pointer;
+      // 0058e1 透明度 0.5
+      background: rgba(0, 88, 225, 0.8);
+      color: white;
+
+      :deep(.anticon) {
+        color: white;
+      }
+    }
+
+    .topSelect {
+      background: #0058e1;
+      color: white;
+
+      :deep(.anticon) {
+        color: white;
+      }
+    }
+
+    .bottom {
+      width: 100%;
+      background: rgba(244, 245, 248, 0.8);
       padding: 0 0.1rem;
 
-      & > div {
-        display: flex;
-        justify-content: flex-start;
-      }
-
-      .name {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        display: -webkit-box;
-        -webkit-line-clamp: 1;
-        -webkit-box-orient: vertical;
-        word-break: break-all;
-      }
-    }
-
-    .up:hover {
-      .name {
-        color: #0058e1;
-        font-weight: 600;
-      }
-
-      span {
-        color: #0058e1;
-        font-weight: 600;
-      }
-    }
-
-    .select {
-      padding: 0 0.1rem 0 0;
-
-      .name {
-        width: 1.7rem;
-        color: #0058e1 !important;
-        font-weight: 600;
-      }
-
-      span {
-        color: #0058e1;
-        font-weight: 600;
-      }
-    }
-
-    .item:nth-of-type(1) .up {
-      border-top: none;
-    }
-
-    .down {
-      width: 100%;
-
-      .child {
+      // margin-bottom: .08rem;
+      .up {
         cursor: pointer;
         height: 0.4rem;
         display: flex;
         justify-content: space-between;
         align-items: center;
+        border-top: 0.01rem solid #ccc;
         padding: 0 0.1rem;
 
         & > div {
@@ -493,7 +437,7 @@ export default defineComponent({
         }
       }
 
-      .child:hover {
+      .up:hover {
         .name {
           color: #0058e1;
           font-weight: 600;
@@ -505,10 +449,12 @@ export default defineComponent({
         }
       }
 
-      .select2 {
+      .select {
+        padding: 0 0.1rem 0 0;
+
         .name {
           width: 1.7rem;
-          color: #0058e1;
+          color: #0058e1 !important;
           font-weight: 600;
         }
 
@@ -516,10 +462,65 @@ export default defineComponent({
           color: #0058e1;
           font-weight: 600;
         }
+      }
 
-        padding: 0 0.1rem 0 0;
+      .item:nth-of-type(1) .up {
+        border-top: none;
+      }
+
+      .down {
+        width: 100%;
+
+        .child {
+          cursor: pointer;
+          height: 0.4rem;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          padding: 0 0.1rem;
+
+          & > div {
+            display: flex;
+            justify-content: flex-start;
+          }
+
+          .name {
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-line-clamp: 1;
+            -webkit-box-orient: vertical;
+            word-break: break-all;
+          }
+        }
+
+        .child:hover {
+          .name {
+            color: #0058e1;
+            font-weight: 600;
+          }
+
+          span {
+            color: #0058e1;
+            font-weight: 600;
+          }
+        }
+
+        .select2 {
+          .name {
+            width: 1.7rem;
+            color: #0058e1;
+            font-weight: 600;
+          }
+
+          span {
+            color: #0058e1;
+            font-weight: 600;
+          }
+
+          padding: 0 0.1rem 0 0;
+        }
       }
     }
   }
-}
 </style>

front/src/views/home/infrastructureApplication.vue

@@ -2,11 +2,11 @@
  * @Author: Light
  * @Date: 2022-11-18 11:53:43
  * @LastEditors: Light
- * @LastEditTime: 2022-11-23 10:32:10
+ * @LastEditTime: 2022-11-28 16:45:50
  * @Description: 告诉大家这是什么
 -->
 <template>
-  <div class="infrastructureApplication" v-if="showFlag">
+  <div class="infrastructureApplication" v-show="showFlag">
     <div class="top">
       <a-list size="small" bordered :data-source="dataList.toBeApplied">
         <template #renderItem="{ item }">
@@ -31,7 +31,7 @@
           <div class="title">待申请列表</div>
         </template>
         <template #footer>
-          <a-button type="primary" @click="apply">一键申请</a-button>
+          <a-button type="primary" @click="showApply">一键申请</a-button>
         </template>
       </a-list>
     </div>
@@ -47,10 +47,16 @@
             </div>
             <a-tag
               color="cyan"
-              style="margin-right: 0"
+              style="margin-right: 0; cursor: pointer"
               @click="selectItem(item)"
             >
-              {{ item.approveStatus == '通过' ? '预览' : item.approveStatus }}
+              {{
+                item.approveStatus == '通过'
+                  ? '预览'
+                  : item.backToFirst == 'true'
+                  ? '被驳回'
+                  : item.approveStatus
+              }}
             </a-tag>
             <a-popconfirm
               v-if="item.approveStatus == '通过'"
@@ -82,6 +88,7 @@
     </div>
   </div>
   <a-modal
+    v-if="!dataList.selectItem.cameraInfo"
     :width="800"
     v-model:visible="visible"
     title="撤销申请"
@@ -104,30 +111,51 @@
     </a-table>
   </a-modal>
   <a-modal
-    v-if="dataList.selectItem.cameraInfo"
+    v-else
     v-model:visible="showVisible"
     :title="dataList.selectItem.cameraInfo.channelName"
     :footer="null"
+    :width="845"
+    destroyOnClose
     @cancel="clear"
   >
-    <div style="width: 100%; display: flex; justify-content: center">
-      <div style="width: 100%; height: 100%; position: relative">
-        <div class="waterMark waterMark-left-top">
-          {{ userInfo.usernameShow }}
-        </div>
-        <div class="waterMark waterMark-right-top">
-          {{ userInfo.realNameShow }}
-        </div>
-        <div class="waterMark waterMark-left-bottom">
-          {{ userInfo.usernameShow }}
-        </div>
-        <div class="waterMark waterMark-right-bottom">
-          {{ userInfo.realNameShow }}
-        </div>
-        <h5-player :video-url="videoUrl"></h5-player>
-      </div>
+    <div
+      style="
+        width: 800px;
+        height: 600px;
+        display: flex;
+        justify-content: center;
+      "
+    >
+      <h5-player
+        videoId="preview"
+        unStopable="true"
+        :video-url="videoUrl"
+      ></h5-player>
     </div>
   </a-modal>
+  <a-modal
+    :width="800"
+    v-model:visible="visibleApply"
+    title="视频监控申请"
+    @ok="apply"
+    @cancel="clear"
+  >
+    <p>本次申请的视频监控包含以下{{ showArrApply.length }}个，是否提交申请？</p>
+    <a-table
+      :columns="columns"
+      :data-source="showArrApply"
+      :pagination="{
+        pageSize: 5,
+      }"
+    >
+      <template #bodyCell="{ column, text }">
+        <template v-if="column.dataIndex === 'name'">
+          <a>{{ text }}</a>
+        </template>
+      </template>
+    </a-table>
+  </a-modal>
 </template>
 <script setup>
   import {
@@ -152,8 +180,10 @@
   const delWacFlag = ref(true)
   const delApply = ref(true)
   const visible = ref(false)
+  const visibleApply = ref(false)
   const instanceId = ref('')
-  const showArr = ref({})
+  const showArr = ref([])
+  const showArrApply = ref([])
   const columns = [
     {
       title: '名称',
@@ -187,6 +217,18 @@
       })
     }
   })
+  const showApply = () => {
+    if (dataList.toBeApplied.length === 0) {
+      message.warning('待申请列表为空!')
+      return
+    }
+    if (dataList.toBeApplied.length + dataList.requested.length > 10) {
+      message.warning('最多只能申请10个视频监控!')
+      return
+    }
+    visibleApply.value = true
+    showArrApply.value = dataList.toBeApplied
+  }
   const delWillApplyCamera = (id) => {
     console.log('撤销===>', id)
     if (delWacFlag.value) {
@@ -194,10 +236,11 @@
       willApplyCameraBatchDelete([id]).then((res) => {
         if (res.data.code == 0) {
           message.success('移出成功')
+          init()
         } else {
           message.warning('移出失败')
+          init()
         }
-        init()
       })
     }
   }
@@ -255,10 +298,11 @@
           delApplyCamera([item.id]).then((res) => {
             if (res.data.code == 0) {
               message.success('撤销成功')
+              initApply()
             } else {
               message.warning('撤销失败')
+              initApply()
             }
-            initApply()
           })
           break
       }
@@ -278,17 +322,20 @@
       getVideoUrl(item.cameraInfo)
     } else {
       dataList.selectItem = {}
+      message.info('请耐心等待审核通过')
       showVisible.value = false
     }
   }
   const handleOk = () => {
+    console.log('id', instanceId.value)
     endProcess({ instanceId: instanceId.value }).then((res) => {
       if (res.data.code == 0) {
         message.success('撤销成功')
+        initApply()
       } else {
         message.warning('撤销失败')
+        initApply()
       }
-      initApply()
       visible.value = false
     })
   }
@@ -296,10 +343,13 @@
     console.log('清空')
     instanceId.value = ''
     showArr.value = []
+    showArrApply.value = []
     visible.value = false
+    visibleApply.value = false
     delApply.value = true
     dataList.selectItem = {}
     showVisible.value = false
+    showVisible.value = false
   }
   const init = () => {
     willApplyCameraSelect().then((res) => {
@@ -337,13 +387,15 @@
       //console.log('555555rrrrr',res)
       if (res.data.data) {
         videoUrl.value = res.data.data.url
+        showVisible.value = true
+      } else {
+        message.warning('申请内容已失效，请撤销后重新进行申请！')
       }
-      showVisible.value = true
     })
   }
   mybus.on('selectCamera', (obj) => {
-    // 判断最多10条
-    if (dataList.toBeApplied.length + dataList.requested.length >= 10) {
+    // 判断最多10条 + dataList.requested.length
+    if (dataList.toBeApplied.length >= 10) {
       message.warning('最多只能申请10个视频监控！')
       return
     }
@@ -382,7 +434,7 @@
 <style lang="less" scoped>
   .infrastructureApplication {
     background: #fff;
-    position: fixed;
+    position: absolute;
     top: 50%;
     right: 0.16rem;
     margin-top: -3.9rem;

front/src/views/home/infrastructurePage.vue

@@ -128,19 +128,19 @@
             预约
           </a-button>
         </div>
-        
+
         <!-- <div class="flex-space" style="justify-content: center;display:flex;height:40px;align-items:center;"> -->
         <a-pagination
           v-model:current="roomPage"
           v-model:pageSize="roomLimit"
           show-quick-jumper
-          :showTotal="total => `共 ${total} 项`"
+          :showTotal="(total) => `共 ${total} 项`"
           :total="roomTotal"
           :page-size-options="pageSizeOptions"
           @change="onRoomChange"
           @showSizeChange="onShowSizeChange"
           show-size-changer
-        /> 
+        />
         <!-- <el-button @click="onOkChange" class="queding" >确认</el-button>
 </div> -->
       </div>
@@ -266,7 +266,6 @@
         <a-form
           :model="formState"
           name="basic"
-       
           autocomplete="off"
           @finish="onFinish"
           @finishFailed="onFinishFailed"
@@ -2185,8 +2184,8 @@
       let params = {
         regionId:
           mapSearchParam.value.parentId || '70be8c5b664f4bcf869d82f2e8335051',
-        pageNum: mapSearchParam.value.pageNum,
-        pageSize: mapSearchParam.value.pageSize,
+        // pageNum: mapSearchParam.value.pageNum,
+        // pageSize: mapSearchParam.value.pageSize,
         longitude: mapSearchParam.value.gpsX || '',
         latitude: mapSearchParam.value.gpsY || '',
         radius: mapSearchParam.value.radius || '',
@@ -2479,8 +2478,8 @@
   })
 </script>
 <style lang="less" scoped>
-.queding{
-  margin-left: 16px;
+  .queding {
+    margin-left: 16px;
     cursor: pointer;
     background: #0058e1;
     color: #ffffff;
@@ -2821,8 +2820,6 @@
       }
     }
 
-
-
     // :deep(.ant-pagination) {
     //   text-align: end;
     // }

front/src/views/home/infrastructurePageXha.vue

@@ -403,7 +403,14 @@
     </div>
     <div v-if="room">
       <!-- 地图 -->
-      <div class="map-contain" v-if="showMap">
+      <div
+        class="map-contain"
+        v-if="showMap"
+        v-loading="spinningHome"
+        element-loading-text="Loading..."
+        element-loading-svg-view-box="-10, -10, 50, 50"
+        element-loading-background="rgba(122, 122, 122, 0.8)"
+      >
         <video-surveillance></video-surveillance>
       </div>
       <!-- 表格 -->
@@ -618,12 +625,17 @@
         wrapClassName="camera-popup"
         v-model:visible="operationPopupFlag"
         :width="1000"
-        :title="'视频监控点选择'"
         destroyOnClose
         footer="{null}"
         @cancel="handleCancel"
       >
-       <div style="width: 100%; display: flex; justify-content: center">
+        <template #title>
+          <span>视频预览</span>
+          <span style="color: #ff4d4f; margin-left: 10px">
+            {{ `(请申请后观看视频)` }}
+          </span>
+        </template>
+        <div style="width: 100%; display: flex; justify-content: center">
           <div
             style="width: 100%; height: 100%; position: relative"
             v-show="isXiHaiAn"
@@ -642,11 +654,15 @@
             <div class="waterMark waterMark-right-bottom">
               {{ userInfo.realNameShow }}
             </div>
-         <!--地图上点击之后弹出的操作弹窗-->
-        <camera-popup-on-map :camera-Data-List="cameraDataList"  :reset-flag="resetFlag"></camera-popup-on-map>
+            <!--地图上点击之后弹出的操作弹窗-->
+            <a-spin size="large" :spinning="spinning">
+              <camera-popup-on-map
+                :camera-Data-List="cameraDataList"
+                :reset-flag="resetFlag"
+              ></camera-popup-on-map>
+            </a-spin>
           </div>
         </div>
-      
       </a-modal>
     </div>
   </div>
@@ -682,6 +698,8 @@
   import { Form } from 'ant-design-vue'
   import moment from 'moment'
   import { useStore } from 'vuex'
+  import debounce from 'lodash/debounce'
+  import { stubFalse } from 'lodash'
   const store = useStore()
   const username = store.getters['user/username']
   const props = defineProps({
@@ -689,9 +707,11 @@
     searchValue: { type: String, default: '' },
     searchType: { type: String, default: '' },
   })
+  const spinningHome = ref(false)
   const current = ref(1)
   const videoTotal = ref(0)
   const router = useRouter()
+  const spinning = ref(true)
   const whoShow1 = ref(whoShow)
   const isXiHaiAn = whoShow1.value.itShowXiHaiAn
   const options = reactive({
@@ -949,6 +969,10 @@
       mapSearchParam.value.parentId = parentId
       getCamera()
     })
+    mybus.off('closeLoading')
+    mybus.on('closeLoading', (val) => {
+      spinning.value = val
+    })
     mybus.off('changeRoomInput')
     mybus.on('changeRoomInput', (val) => {
       console.log('更改=======》')
@@ -1455,6 +1479,7 @@
           tabList.value[1].title = '视频标签'
         }
         selectType.value = '视频资源'
+        mybus.emit('changeShowFlag', true)
         console.log('444------------>', 444)
       } else if (name == '政务云资源') {
         room.value = true
@@ -1511,6 +1536,7 @@
         dataSource.value = []
         dataSource2.value = []
         room.value = true
+        mybus.emit('changeShowFlag', true)
         getCameraAllLabel().then((res) => {
           res.data.data.forEach((val) => {
             if (tabList.value[1]) {
@@ -1604,9 +1630,11 @@
         emits('add', 3)
       } else if (name == '无人机') {
         pagination.value.current = 1
+        mybus.emit('changeShowFlag', false)
         getSoldierData(indexFather, name)
       } else if (name == '单兵设备') {
         pagination.value.current = 1
+        mybus.emit('changeShowFlag', false)
         getSoldierData(indexFather, name)
       } else if (name == '城市云脑会客厅') {
         showMap.value = false
@@ -1953,22 +1981,76 @@
   const wrjFlag = ref(false)
   // 西海岸-视频资源loading
   const loadingCamera = ref(false)
-  const getCamera = (flag, str) => {
-    loadingCamera.value = true
-    if (flag) {
-      mapSearchParam.value.cameraName = str
-    }
-    console.log('初始化调用', flag)
-    console.log(
-      '不选左侧树的时候不调用接口',
-      mapSearchParam.value,
-      selectType.value
-    )
-    if (!whoShow1.value.itShowXiHaiAn) {
-      if (selectType.value == '视频资源') {
-        getCameraByParentId(mapSearchParam.value)
+  const getCamera = debounce(
+    function (flag, str) {
+      loadingCamera.value = true
+      if (flag) {
+        mapSearchParam.value.cameraName = str
+      }
+      console.log('初始化调用', flag)
+      console.log(
+        '不选左侧树的时候不调用接口',
+        mapSearchParam.value,
+        selectType.value
+      )
+      if (!whoShow1.value.itShowXiHaiAn) {
+        if (selectType.value == '视频资源') {
+          getCameraByParentId(mapSearchParam.value)
+            .then((res) => {
+              console.log('res--查询摄像头---------->', res)
+              loadingCamera.value = false
+              dataSource.value = res.data.data
+              pagination.value.total = res.data.count
+            })
+            .catch((err) => {
+              loadingCamera.value = false
+              message.error(err)
+            })
+        } else {
+          loadingCamera.value = false
+        }
+      } else {
+        let params = {
+          regionId:
+            mapSearchParam.value.parentId || '70be8c5b664f4bcf869d82f2e8335051',
+          // pageNum: mapSearchParam.value.pageNum,
+          // pageSize: mapSearchParam.value.pageSize,
+          longitude: mapSearchParam.value.gpsX || '',
+          latitude: mapSearchParam.value.gpsY || '',
+          radius: mapSearchParam.value.radius || '',
+          name: mapSearchParam.value.cameraName,
+          type: mapSearchParam.value.type,
+          borderPolygonList: mapSearchParam.value.borderPolygonList || [],
+        }
+        // todo-临时放开
+        // if (
+        //   params.regionId === '70be8c5b664f4bcf869d82f2e8335051' &&
+        //   !params.name &&
+        //   !params.longitude
+        // ) {
+        //   params.status = ''
+        // }
+        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
+            }
+          }
+        }
+        console.log('位置1')
+        spinningHome.value = true
+        getCameraByCondition(params)
           .then((res) => {
             console.log('res--查询摄像头---------->', res)
+            spinningHome.value = false
             loadingCamera.value = false
             dataSource.value = res.data.data
             pagination.value.total = res.data.count
@@ -1977,58 +2059,11 @@
             loadingCamera.value = false
             message.error(err)
           })
-      } else {
-        loadingCamera.value = false
       }
-    } else {
-      let params = {
-        regionId:
-          mapSearchParam.value.parentId || '70be8c5b664f4bcf869d82f2e8335051',
-        pageNum: mapSearchParam.value.pageNum,
-        pageSize: mapSearchParam.value.pageSize,
-        longitude: mapSearchParam.value.gpsX || '',
-        latitude: mapSearchParam.value.gpsY || '',
-        radius: mapSearchParam.value.radius || '',
-        name: mapSearchParam.value.cameraName,
-        type: mapSearchParam.value.type,
-        borderPolygonList: mapSearchParam.value.borderPolygonList || [],
-      }
-      // todo-临时放开
-      // if (
-      //   params.regionId === '70be8c5b664f4bcf869d82f2e8335051' &&
-      //   !params.name &&
-      //   !params.longitude
-      // ) {
-      //   params.status = ''
-      // }
-      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(params)
-        .then((res) => {
-          console.log('res--查询摄像头---------->', res)
-          loadingCamera.value = false
-          dataSource.value = res.data.data
-          pagination.value.total = res.data.count
-        })
-        .catch((err) => {
-          loadingCamera.value = false
-          message.error(err)
-        })
-    }
-  }
+    },
+    1000,
+    { leading: true, trailing: false }
+  )
   defineExpose({
     getCamera,
     reSetSearch,
@@ -2267,14 +2302,14 @@
   }
 
   //地图视频操作弹窗
-  const operationPopupFlag = ref(false)//地图操作弹窗显示标志位
+  const operationPopupFlag = ref(false) //地图操作弹窗显示标志位
   //关闭地图弹窗重新弹窗数字显示标志位
   const resetFlag = ref(false)
 
   //地图弹窗右上角按钮关闭事件
   const handleCancel = () => {
     //console.log('是否关');
-     resetFlag.value = true
+    resetFlag.value = true
   }
 </script>
 <style lang="less" scoped>
@@ -2741,7 +2776,7 @@
     cursor: pointer;
   }
 
-   .video-cover-new {
+  .video-cover-new {
     width: 798px;
     height: 600px;
     position: absolute;

front/src/views/home/videoSurveillance/components/CameraPopupOnMap.vue

@@ -24,15 +24,19 @@
               </div>
             </a-carousel>
           <div class="operation-content" style="position:ab">
+            <div class="text-label">
+                <span>{{defaultIndex+1}}</span>/<span>{{cameraDataList.length}}</span>
+              </div>
               <div class="video-content">
               <h5-player :video-url="videoUrl" :stop-flag="selectedFlag"></h5-player>
               </div>
-              <div class="text-label">
-                <span>{{defaultIndex+1}}</span>/<span>{{cameraDataList.length}}</span>
+              <div class="text-label des-label">
+                <span>监控名称: {{cameraDataList[defaultIndex].channelName}}</span>
+                <span>监控编码: {{cameraDataList[defaultIndex].channelId}}</span>
               </div>
               <div class="footer-button" v-if="showFlag">
                 <a-button type="primary" @click="applyNow(cameraDataList[defaultIndex])">立即申请</a-button>
-                <a-button type="primary" style="margin-left:20px" @click="addIntoCart(cameraDataList[defaultIndex])">加入申购车</a-button>
+                <a-button type="primary" style="margin-left:20px" @click="addIntoCart(cameraDataList[defaultIndex])">加入申请列表</a-button>
               </div>
       </div>
     </div>
@@ -133,17 +137,26 @@
         getApplyCameraListXha().then(res => {
           let flag = true
           if (res.data.code == 0) {
-            res.data.data.map((val) => {
-              val.cameraInfo = JSON.parse(val.cameraInfo)
-              console.log('applyNowapplyNow',val.cameraInfo);
-              if(flag && val.cameraInfo.channelId == item.channelId){
-                flag = false
-              }
-            })
+            if(res.data.data.length >=10 ){
+              message.warning('最多只能申请10个感知资源！')
+              return
+            }else{
+              res.data.data.map((val) => {
+                val.cameraInfo = JSON.parse(val.cameraInfo)
+                console.log('applyNowapplyNow',val.cameraInfo);
+                if(flag && val.cameraInfo.channelId == item.channelId){
+                  flag = false
+                }
+              })
+            }
             if(flag){
-              willApplyCameraSelect().then(res => {
-                if (res.data.code == 0) {
-                  res.data.data.map(val => {
+              willApplyCameraSelect().then(res1 => {
+                if (res1.data.code == 0) {
+                  if(res.data.data.length+res1.data.data.length>=10){
+                    message.warning('最多只能申请10个感知资源！')
+                    return
+                  }
+                  res1.data.data.map(val => {
                     if(item.channelId == val.channelId){
                       item.id = val.id
                     }
@@ -180,7 +193,7 @@
                 }
               })
             }else{
-              message.warning('该摄像头已申请！')
+              message.warning('该感知资源已申请！')
             }
           }
         })
@@ -306,9 +319,16 @@
       .text-label{
       width:800px;
       height:30px;
-      margin-top:10px;
+      margin-top:-20px;
       text-align:center;
       font-size: 18px;
+      // color: #1eacd6;
+      }
+      .des-label {
+        color: #000;
+        margin-top:10px;
+        display: flex;
+        justify-content: space-around;
       }
         .video-content{
      width: 750px;
@@ -317,10 +337,12 @@
      padding: 5px;
     }
     .footer-button{
-       width: 750px;
-       //height:50px;
-       text-align: center;
-       padding-top:5px;
+      display: flex;
+      justify-content: center;
+      // width: 750px;
+      //height:50px;
+      text-align: center;
+      padding-top:5px;
     }
     }
     .ant-carousel {

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

@@ -1,10 +1,19 @@
 <template>
   <div class="ucs-leaflet-map">
-    <div id="contain">
-      <div class="map-box">
+
+    <div id="contain" >
+
+      <div class="map-box" >
+
         <div :id="mapId" class="normal-map-content">
-          <tiled-map :hi-map="hiMap" :map-id="mapId" />
+
+          <tiled-map v-loading="spinning" element-loading-text="Loading..."
+    element-loading-svg-view-box="-10, -10, 50, 50"
+    element-loading-background="rgba(122, 122, 122, 0.8)"
+     :hi-map="hiMap" :map-id="mapId" />
+
         </div>
+
       </div>
 
       <div class="searchPoint">
@@ -32,8 +41,8 @@
         </el-autocomplete> -->
         <!-- 第二版 -->
         <el-select class="input-with-select" v-model="addressType" style="width: 115px" @change="address=''">
-          <el-option label="兴趣点" value="1" />
-          <el-option label="点位" value="2" />
+          <el-option label="地点名称" value="1" />
+          <el-option label="监控名称" value="2" />
         </el-select>
         <el-autocomplete
           v-if="addressType==1"
@@ -41,6 +50,7 @@
             :fetch-suggestions="querySearch"
             clearable
             class="input-with-select"
+            @change = "changeComplete"
             placeholder="请输入关键字"
             @select="
               (addressItem) => {
@@ -92,7 +102,7 @@
           data-spm-anchor-id="a313x.7781069.0.i0"
         ></path>
       </svg>
-      <img class="icon-poylon" @click="areaMode()" src="~@/supermap/image/icon-poylon.png">
+     <img class="icon-poylon" @click="areaMode()" src="~@/supermap/image/icon-poylon.png">
 
     </div>
     <video-play
@@ -104,7 +114,7 @@
 </template>
 
 <script>
-import { ElMessage } from 'element-plus'
+  import { ElMessage, ElLoading } from 'element-plus'
   import { message } from 'ant-design-vue'
   import { HieimpMap } from '@/supermap/map-init'
   import TiledMap from './components/tiledMap'
@@ -121,6 +131,7 @@ import { ElMessage } from 'element-plus'
     selectByChannelName,
   } from '@/api/videoSurveillance'
   import { getCameraByCondition,getListForPOI,CameraConditionPlaceType } from '@/api/file'
+  import debounce from 'lodash/debounce'
   import mybus from '@/myplugins/mybus'
   import * as turf from '@turf/turf';
 
@@ -133,6 +144,7 @@ import { ElMessage } from 'element-plus'
         checkboxGroup: [],
         tabList: [],
         state: '',
+        spinning: false,
         timeout: null,
         camreaTree: [],
         camreaTreeIsShow: true,
@@ -192,9 +204,14 @@ import { ElMessage } from 'element-plus'
       // this.getMapPoint()
       // 点击左侧根据parentId查询摄像头列表
       mybus.off('getCameraByParentId')
-      mybus.on('getCameraByParentId', (parentId) => {
+      mybus.on('getCameraByParentId', (val) => {
         debugger
-        this.mapSearchParam.parentId = parentId
+        console.log('倒腾位置1')
+        // 判断是否重置位置
+        if (val.reset) {
+          this.hiMapFun.mapFlyTo({lat:'36.017043',lng: '119.922772'}, 9)
+        }
+        this.mapSearchParam.parentId = val.id
         this.mapSearchParam.type = "1"
         this.mapSearchParam.pageSize = 10000
         this.getCameraByParentId('','department')
@@ -233,12 +250,16 @@ import { ElMessage } from 'element-plus'
       })
     },
     methods: {
+      changeComplete(val) {
+        if (val === '') {
+          // console.log('触发清空点位')
+          this.hiMapFun.removeLayerByLayerName('potcon');
+        }
+      },
       //查询标签视频
       queryCameraConditionPlace(data) {
           let params = {
         placeTypeCode: data,
-        pageNum: "1",
-        pageSize: 40000,
         }
       CameraConditionPlaceType(params).then((res) => {
           this.addResourceTomap('videoMap', res.data.data)
@@ -246,7 +267,7 @@ import { ElMessage } from 'element-plus'
       },
       // 查询
        querySearch (queryString, cb) {
-        console.log('querySearch',queryString, cb,this.restaurants)
+        console.log('querySearch',queryString)
         if(queryString){
           getListForPOI({keywords:queryString}).then(res => {
             if(res.data.data.rows[0]){
@@ -260,7 +281,7 @@ import { ElMessage } from 'element-plus'
             }else{
               ElMessage({
                 showClose: true,
-                message: '未查询到兴趣点！',
+                message: '未查询到相关地点！',
                 type: 'warning',
               })
             }
@@ -280,31 +301,6 @@ import { ElMessage } from 'element-plus'
           )
         }
       },
-      // 查询
-      handleEnter(queryString, cb){
-        console.log('查询',this.address,this.addressType)
-        if(this.address){
-          getListForPOI({keywords:this.address}).then(res => {
-            console.log('POI=========>',res.data.data)
-            if(res.data.data.rows[0]){
-              let arr = res.data.data.rows[0].location.split(',')
-              this.selectedAddress({location:{y:arr[1],x:arr[0]}})
-            }else{
-              ElMessage({
-                showClose: true,
-                message: '未查询到兴趣点！',
-                type: 'warning',
-              })
-            }
-          })
-        }else{
-          ElMessage({
-            showClose: true,
-            message: '请输入兴趣点！',
-            type: 'warning',
-          })
-        }
-      },
       selectedAddress(item, index) {
         mybus.emit('clearChoose')
         this.getCameraAllPage()
@@ -313,10 +309,16 @@ import { ElMessage } from 'element-plus'
         const latLng = {
           lat: item.location.y,
           lng: item.location.x,
+          lon: item.location.x,
         }
         this.hiMapFun.mapFlyTo(latLng)
         if(this.addressType=='2'){
           mybus.emit('openOperationPopup', [item]);
+        }else{
+          this.hiMapFun.removeLayerByLayerName('potcon');
+          // this.hiMapFun.clearAllLayers();
+          // this.getCameraAllPage()
+          this.hiMapFun.addPointOnMap({feature:latLng,iconUrl:'poi-red.png',layerName:'potcon'})
         }
       },
       //框选
@@ -387,32 +389,24 @@ import { ElMessage } from 'element-plus'
               this.mapSearchParam.gpsY = e.layer._latlng.lat
               this.mapSearchParam.radius = radius
               this.mapSearchParam.type = 1
-              const params = {
-                gpsX: this.mapSearchParam.gpsX,
-                gpsY: this.mapSearchParam.gpsY,
-                radius: radius,
-                type: this.mapSearchParam.type,
-              }
-              // mybus.emit('getListByMap', params)
               this.getCameraByParentId('map')
             }
           }
         })
       },
-      getCameraByParentId(type,dataName) {
+      getCameraByParentId : debounce(function(type,dataName) {
         if (!this.whoShow1.itShowXiHaiAn) {
           getCameraByParentId(this.mapSearchParam).then((res) => {
             console.log('根据parent查询摄像头', res.data.data)
+
             this.addResourceTomap('videoMap', res.data.data)
           })
         } else {
-            console.log('根据parent查询摄像头111111',this.mapSearchParam)
+          // this.hiMapFun.mapFlyTo({lat:'36.017043',lng: '119.922772'}, 9)
           let params = {
             regionId:
               this.mapSearchParam.parentId ||
               '70be8c5b664f4bcf869d82f2e8335051',
-            pageNum: this.mapSearchParam.pageNum,
-            pageSize: this.mapSearchParam.type!=0?this.mapSearchParam.pageSize:10,
             name: this.mapSearchParam.cameraName || '',
             longitude: this.mapSearchParam.gpsX || '',
             latitude: this.mapSearchParam.gpsY || '',
@@ -438,8 +432,11 @@ import { ElMessage } from 'element-plus'
           if(dataName){
               params.type='0';
           }
+          console.log('位置2')
+          this.spinning = true;
           getCameraByCondition(params).then((res) => {
             //console.log('根据parent查询摄像头44444', res.data.data)
+            this.spinning = false;
             if(type=='map'){
               let params = this.mapSearchParam;
               params.dataSource = res.data.data||0;
@@ -447,15 +444,15 @@ import { ElMessage } from 'element-plus'
               mybus.emit('getListByMap', params);
             }
             this.pointAllData = res.data.data;
-            if(this.mapSearchParam.type!=0)
+            // if(this.mapSearchParam.type!=0)
               this.addResourceTomap('videoMap', res.data.data)
 
-            else
-            this.addResourceTomap('videoMap', [])  //查询全部时不打点}
+            // else
+            // this.addResourceTomap('videoMap', [])  //查询全部时不打点}
 
           })
         }
-      },
+      }, 1000, { 'leading': true, 'trailing': false }),
       // 初始化地址匹配服务
       initAddressMatchService() {
         this.L = window.L || {}
@@ -527,9 +524,10 @@ import { ElMessage } from 'element-plus'
       async searchAddressByKeyWord(queryString, cb, indexX) {
         console.log('querySearch',queryString, cb,this.restaurants)
         if(queryString){
+          console.log('位置3')
           getCameraByCondition({
-            pageNum: 1,
-            pageSize: 40000,
+            // pageNum: 1,
+            // pageSize: 40000,
             regionId: "70be8c5b664f4bcf869d82f2e8335051",
             type: "0",
             name:queryString,
@@ -553,12 +551,9 @@ import { ElMessage } from 'element-plus'
           cb([])
         }
       },
-      getCameraAllPage(page) {
+      getCameraAllPage: debounce(function(page) {
         let params = {
         regionId: "70be8c5b664f4bcf869d82f2e8335051",
-        pageNum: "1",
-        pageSize: 40000,
-        type: 0,
         borderPolygonList: []
         }
         getCameraByCondition(params).then((res) => {
@@ -568,7 +563,7 @@ import { ElMessage } from 'element-plus'
           // let t2 = new Date().getTime();
           // console.log("时间#############" + (t2 - t1));
         })
-      },
+      },1000, { 'leading': true, 'trailing': false }),
       getCameraAllLabel() {},
       tabChange(item) {
         if (this.checkboxGroup.indexOf(item.labelName) !== -1) {
@@ -800,7 +795,7 @@ import { ElMessage } from 'element-plus'
     .leaflet-control-attribution {
       display: none;
     }
-    svg,.icon-poylon {
+    .icon, .icon-poylon {
       position: absolute;
       bottom: 0.1rem;
       right: 0.1rem;

front/src/views/instructionManual/components/menuBook.vue

@@ -257,7 +257,7 @@
         path: '/DetailsPageconetent',
         query: {
           // select: '组件服务',
-          select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
+          select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
         },
       })
       window.location.href = newpage.href

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

@@ -125,7 +125,7 @@
     if (abilityToTypeFunctionData.value == '组件服务') {
       if (!componentTypeValue.value || componentTypeValue.value == '') {
         message.error('请选择组件类型！')
-        componentTypeValueOld.value=''
+        componentTypeValueOld.value = ''
         return
       } else if (
         componentTypeValue.value === '智能算法' ||

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

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-12 09:42:44
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-26 18:15:01
+ * @LastEditTime: 2022-11-26 14:47:12
  * @Description:我的申请 能力申请 查看详情
 -->
 <template>
@@ -146,12 +146,12 @@
                 </div>
                 <div></div>
                 <a-button
-                    type="primary"
-                    v-if="item.approveStatus === '通过'"
-                    @click.stop="switchFunction(item)"
-                  >
-                    查看详情
-                  </a-button>
+                  type="primary"
+                  v-if="item.approveStatus === '通过'"
+                  @click.stop="switchFunction(item)"
+                >
+                  查看详情
+                </a-button>
                 <!-- <div class="btn" v-if="val.type == '组件服务'">技术文档</div> -->
               </div>
               <div class="ability-bottom">
@@ -172,7 +172,6 @@
                   >
                     附件下载
                   </a-button>
-                  
                 </div>
               </div>
             </div>
@@ -225,50 +224,56 @@
                     style="cursor: pointer"
                     @click="
                       openView(
-                        'http://10.134.135.92:9537/data_service/getCamera/getCameraLiveStream?cameraIndexCode=' + val.channelCode+'&protocol=wss&transmode=1&streamType=1'
+                        'http://10.134.135.92:9537/data_service/getCamera/getCameraLiveStream?cameraIndexCode=' +
+                          val.channelCode +
+                          '&protocol=wss&transmode=1&streamType=1'
                       )
                     "
                   >
-                    {{ 'http://10.134.135.92:9537/data_service/getCamera/getCameraLiveStream?cameraIndexCode=' + val.channelCode+'&protocol=wss&transmode=1&streamType=1' }}
+                    {{
+                      'http://10.134.135.92:9537/data_service/getCamera/getCameraLiveStream?cameraIndexCode=' +
+                      val.channelCode +
+                      '&protocol=wss&transmode=1&streamType=1'
+                    }}
                   </span>
                 </div>
               </div>
               <div class="button-bottom" v-if="item.approveStatus == '通过'">
-                  <a
-            style="
-              display: inline-block;
-              width: 88px;
-              height: 32px;
-              line-height: 32px;
-              text-align: center;
-              background: #40a9ff;
-              border-radius: 5px;
-              font-size: 14px;
-              color: #fff;
-              cursor:pointer;
-            "
-            href="/static/download/InstallRootCert.exe"
-          >
-            证书下载
-          </a>
-           <span
-            style="
-              display: inline-block;
-              width: 88px;
-              height: 32px;
-              line-height: 32px;
-              text-align: center;
-              background: #40a9ff;
-              border-radius: 5px;
-              font-size: 14px;
-              color: #fff;
-              margin-left:40px;
-              cursor:pointer;
-            "
-            @click="downLoadClient()"
-          >
-            客户端下载
-          </span>
+                <a
+                  style="
+                    display: inline-block;
+                    width: 88px;
+                    height: 32px;
+                    line-height: 32px;
+                    text-align: center;
+                    background: #40a9ff;
+                    border-radius: 5px;
+                    font-size: 14px;
+                    color: #fff;
+                    cursor: pointer;
+                  "
+                  href="/static/download/InstallRootCert.exe"
+                >
+                  证书下载
+                </a>
+                <span
+                  style="
+                    display: inline-block;
+                    width: 88px;
+                    height: 32px;
+                    line-height: 32px;
+                    text-align: center;
+                    background: #40a9ff;
+                    border-radius: 5px;
+                    font-size: 14px;
+                    color: #fff;
+                    margin-left: 40px;
+                    cursor: pointer;
+                  "
+                  @click="downLoadClient()"
+                >
+                  客户端下载
+                </span>
               </div>
             </div>
           </div>
@@ -280,7 +285,7 @@
       wrapClassName="single-preview-modal"
       v-model:visible="visible"
       title="视频预览"
-      :width="1000"
+      :width="850"
       destroyOnClose
     >
       <template #footer></template>
@@ -300,7 +305,11 @@
             {{ userInfo.realNameShow }}
           </div>
           <!-- <vue3VideoPlay v-bind="options" /> -->
-          <h5-player :video-url="videoUrl"></h5-player>
+          <h5-player
+            unStopable="true"
+            :video-id="videoId"
+            :video-url="videoUrl"
+          ></h5-player>
         </div>
       </div>
     </a-modal>
@@ -315,7 +324,7 @@
   import { getStreamByChannelCode } from '@/api/videoSurveillance'
   import { getUser } from '@/api/home'
   import H5Player from '@/views/home/components/H5Player.vue'
-  import {getCameraLiveStream} from '@/api/file'
+  import { getCameraLiveStream } from '@/api/file'
   const router = useRouter()
   const backUrl = ref(window.SITE_CONFIG.apiURL + '/')
   const props = defineProps({
@@ -323,6 +332,7 @@
   })
   const whoShow1 = ref(whoShow)
   let visible = ref(false)
+  const videoId = ref('111111111111')
   const options = reactive({
     width: '912px', //播放器宽度
     height: '513px', //播放器高度
@@ -359,7 +369,7 @@
     dept.deptName = infrastructure.deptName
   }
   const showThis = () => {
-    console.log('props.refObj.enclosure',props.refObj);
+    console.log('props.refObj.enclosure', props.refObj)
     window.open(
       window.SITE_CONFIG.previewUrl +
         'hisense_office/onlinePreview?url=' +
@@ -367,9 +377,10 @@
     )
   }
   //下载海康客户端
-    const downLoadClient = () => {
-      let url = "https://open.hikvision.com/download/5c67f1e2f05948198c909700?type=10";
-    window.open( url, '_blank')
+  const downLoadClient = () => {
+    let url =
+      'https://open.hikvision.com/download/5c67f1e2f05948198c909700?type=10'
+    window.open(url, '_blank')
   }
   const showArr = ref([])
   console.log(props.refObj, '=====================================')
@@ -515,19 +526,19 @@
     }
   }
 
-   const videoUrl = ref('')
+  const videoUrl = ref('')
   //获取视频控件所需播放地址
-   const getVideoUrl = (data) =>{
+  const getVideoUrl = (data) => {
     debugger
-      let param = data;
-      getCameraLiveStream(param).then((res) => {
+    let param = data
+    getCameraLiveStream(param).then((res) => {
       //console.log('555555rrrrr',res)
-      if(res.data.data){
-        videoUrl.value = res.data.data.url;
-      }
-         visible.value = true
-      })
+      if (res.data.data) {
+        videoUrl.value = res.data.data.url
       }
+      visible.value = true
+    })
+  }
   // 视频预览
   const openVideo = (item) => {
     console.log('打开视频', item)
@@ -578,7 +589,7 @@
       })
   }
   const openView = (url) => {
-    console.log('valval',url);
+    console.log('valval', url)
     //http://10.134.135.92:9537/data_service/getCamera/getCameraLiveStream?cameraIndexCode=37021100421318000090&protocol=wss&transmode=1&streamType=1
     window.open(url, '_blank')
   }
@@ -628,9 +639,9 @@
           width: 2.5rem;
         }
       }
-      .downButton{
-         display: flex;
-         justify-content: normal;
+      .downButton {
+        display: flex;
+        justify-content: normal;
       }
     }
   }
@@ -658,7 +669,7 @@
         .box {
           margin-left: 0.1rem;
           .ability {
-            height: 2.0rem;
+            height: 2rem;
             display: flex;
             border-bottom: 1px #eee solid;
             padding: 0.1rem 0;
@@ -766,7 +777,7 @@
                   position: relative;
                 }
               }
-              .button-bottom{
+              .button-bottom {
                 margin-top: 0;
                 margin-bottom: 10px;
               }

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

@@ -484,6 +484,10 @@
       yaweiApproveDetails({ applyGuid: item.GUID })
         .then((res) => {
           console.log('详情===========>', res.data.data)
+          if (res.data.code !== 0) {
+            message.error('数据请求失败！')
+            return
+          }
           res.data.data.map((val) => {
             val.clsj = moment(val.clsj).format('YYYY-MM-DD HH:mm:ss')
           })
@@ -495,7 +499,8 @@
           refObj.value.jslxr = item.jslxr // 技术联系人X
           refObj.value.jslxrdh = item.jslxrdh // 技术联系人电话
           refObj.value.miaoshu = item.miaoshu // 共享数据必要性法分析
-          refObj.value.zt = item.zt // 办结结果
+          // refObj.value.zt = item.zt // 办结结果
+          refObj.value.LEVEL = item.LEVEL // 办结结果ZBM": 区市管理员办理中 BM":部门办理中 SZQ": 市级管理员办理中 QZS":区级管理员办理中
           refObj.value.resourceApplication = {
             dataSource: [
               {
@@ -716,6 +721,14 @@
     } else if (typeName.value == '数据资源申请') {
       yaweiApproveStatus({ page: page.value, size: 4, title: '' }).then(
         (res) => {
+          if (res.data.code !== 0) {
+            num.value = []
+            total.value = 0
+            contentList.data = []
+            contentList2.data = []
+            showType.value = ''
+            return
+          }
           console.log('数据资源申请===============>', res.data.data)
           contentList.data = res.data.data.data
           num.value = []
@@ -726,6 +739,14 @@
     } else if (typeName.value == '云资源申请') {
       getResourceBusinessList({ userAccount: userName.value }).then((res) => {
         console.log('数据资源申请===============>', res.data.data)
+        if (res.data.code !== 0) {
+          num.value = []
+          total.value = 0
+          contentList.data = []
+          contentList2.data = []
+          showType.value = ''
+          return
+        }
         contentList.data = res.data.data
         contentList2.data = res.data.data
         num.value = []
@@ -734,6 +755,14 @@
       })
     } else if (typeName.value == '云视频申请') {
       getVideoBusinessList({ userAccount: userName.value }).then((res) => {
+        if (res.data.code !== 0) {
+          num.value = []
+          total.value = 0
+          contentList.data = []
+          contentList2.data = []
+          showType.value = ''
+          return
+        }
         console.log('数据资源申请===============>', res.data.data)
         contentList.data = res.data.data
         contentList2.data = res.data.data

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

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-12 09:42:44
  * @LastEditors: Light
- * @LastEditTime: 2022-11-11 14:38:06
+ * @LastEditTime: 2022-11-24 13:50:54
  * @Description:我的申请 能力申请 查看详情
 -->
 <template>
@@ -25,9 +25,9 @@
         <p>
           <span>共享数据必要性法分析：{{ props.refObj.miaoshu }}</span>
         </p>
-        <p class="item">
+        <!-- <p class="item">
           <span>办结结果：{{ props.refObj.zt }}</span>
-        </p>
+        </p> -->
       </div>
     </div>
   </div>

front/vue.config.js

@@ -29,8 +29,8 @@ const productionGzipExtensions = [
   'ico',
 ]
 // 是否开启gzip压缩
-// const isPro = process.env.NODE_ENV === 'production'
-const isPro = false
+const isPro = process.env.NODE_ENV === 'production'
+// const isPro = false
 if (donation) donationConsole()
 const { version, author } = require('./package.json')
 const Webpack = require('webpack')

node_modules/.package_versions.json

@@ -1 +0,0 @@
-{}

node_modules/_animate.css@4.1.1@animate.css/LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2020 Daniel Eden
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

node_modules/_animate.css@4.1.1@animate.css/README.md

@@ -1,48 +0,0 @@
-# Animate.css
-
-[![GitHub Version](https://img.shields.io/github/release/daneden/animate.css.svg?style=for-the-badge)](https://github.com/daneden/animate.css) [![Github Star](https://img.shields.io/github/stars/daneden/animate.css.svg?style=for-the-badge)](https://github.com/daneden/animate.css) [![Github Fork](https://img.shields.io/github/forks/daneden/animate.css.svg?style=for-the-badge)](https://github.com/daneden/animate.css) [![License](https://img.shields.io/github/license/daneden/animate.css.svg?style=for-the-badge)](https://github.com/daneden/animate.css)
-
-> If you need the old docs - v3.x.x and under - you can find it [here](https://github.com/animate-css/animate.css/tree/a8d92e585b1b302f7749809c3308d5e381f9cb17).
-
-## _Just-add-water CSS animation_
-
-## Installation
-
-Install with npm:
-
-```shell
-npm install animate.css --save
-```
-
-Install with yarn:
-
-```shell
-yarn add animate.css
-```
-
-## Getting started
-
-You can find the Animate.css documentation on the [website](https://animate.style/).
-
-## Accessibility
-
-Animate.css supports the [`prefers-reduced-motion` media query](https://webkit.org/blog/7551/responsive-design-for-motion/) so that users with motion sensitivity can opt out of animations. On supported platforms (currently all the majors browsers and OS), users can select "reduce motion" on their operating system preferences and it will turn off CSS transitions for them without any further work required.
-
-## Core team
-
-| ![](https://avatars2.githubusercontent.com/u/439365?s=460&u=512b4cc5324938ae40bbb8f3b7769d335953cd3a&v=4) | ![](https://avatars2.githubusercontent.com/u/5007208?s=460&u=418401ee605824272e5dcb955fd64ea24546a857&v=4) | ![](https://avatars1.githubusercontent.com/u/15052701?s=460&u=9e58364978379536d3f26c4ce5cae1a2a449a0e4&v=4) |
-| --- | --- | --- |
-| [Daniel Eden](https://github.com/daneden) | [Elton Mesquita](https://github.com/eltonmesquita) | [Waren Gonzaga](https://github.com/WarenGonzaga) |
-| Animate.css creator | Maintainer | Core contributor |
-
-## License
-
-Animate.css is licensed under the MIT license. <https://opensource.org/licenses/MIT>
-
-## Code of Conduct
-
-This project and everyone participating in it is governed by the [Contributor Covenant Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [callmeelton@gmail.com](mailto:callmeelton@gmail.com).
-
-## Contributing
-
-Pull requests are the way to go here. We only have two rules for submitting a pull request: match the naming convention (camelCase, categorised [fades, bounces, etc]) and let us see a demo of submitted animations in a [pen](https://codepen.io). That **last one is important**.

node_modules/_animate.css@4.1.1@animate.css/package.json

@@ -1,78 +0,0 @@
-{
-  "name": "animate.css",
-  "version": "4.1.1",
-  "main": "animate.css",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/animate-css/animate.css.git"
-  },
-  "author": {
-    "name": "Animate.css"
-  },
-  "homepage": "https://animate.style/",
-  "license": "MIT",
-  "animateConfig": {
-    "prefix": "animate__"
-  },
-  "scripts": {
-    "start": "npm-run-all raw prod compat",
-    "compat": "npx postcss source/animate.css -o animate.compat.css --no-map --env compat",
-    "dev": "npx postcss source/animate.css -o animate.css --no-map --env development -w",
-    "raw": "npx postcss source/animate.css -o animate.css --no-map --env development",
-    "prod": "npx postcss source/animate.css -o animate.min.css --no-map --env production",
-    "format": "prettier --write \"**/*.{js,json,md,css}\"",
-    "precommit": "lint-staged",
-    "docs:library": "npx postcss source/animate.css -o ./docs/animate.min.css --no-map --env production",
-    "docs:pages": "node ./docsSource/index.js",
-    "docs": "npm-run-all docs:library docs:pages",
-    "version": "npm-run-all start docs && git add -A docs animate.css animate.min.css animate.compat.css",
-    "postversion": "git push && git push --tags"
-  },
-  "browserslist": [
-    "> 3%",
-    "last 2 versions"
-  ],
-  "style": "./animate.css",
-  "jspm": {
-    "main": "animate.css!",
-    "format": "global",
-    "directories": {
-      "lib": "./"
-    }
-  },
-  "devDependencies": {
-    "autoprefixer": "^9.7.6",
-    "cssnano": "^4.1.10",
-    "eslint": "^7.8.1",
-    "husky": "^4.2.5",
-    "lint-staged": "^10.3.0",
-    "markdown-it": "^11.0.0",
-    "npm-run-all": "^4.1.5",
-    "postcss": "^7.0.27",
-    "postcss-cli": "^7.1.2",
-    "postcss-header": "^2.0.0",
-    "postcss-import": "^12.0.1",
-    "postcss-prefixer": "^2.1.2",
-    "postcss-preset-env": "^6.7.0",
-    "prettier": "^2.1.1"
-  },
-  "lint-staged": {
-    "*.{js,json,md,css}": [
-      "prettier --write"
-    ]
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "npm-run-all start precommit"
-    }
-  },
-  "files": [
-    "animate.compat.css",
-    "animate.min.css",
-    "animate.css",
-    "source/**/*.css"
-  ],
-  "__npminstall_done": true,
-  "_from": "animate.css@4.1.1",
-  "_resolved": "https://registry.npmmirror.com/animate.css/-/animate.css-4.1.1.tgz"
-}

node_modules/_animate.css@4.1.1@animate.css/source/_base.css

@@ -1,68 +0,0 @@
-.animated {
-  animation-duration: var(--animate-duration);
-  animation-fill-mode: both;
-}
-
-.animated.infinite {
-  animation-iteration-count: infinite;
-}
-
-.animated.repeat-1 {
-  animation-iteration-count: var(--animate-repeat);
-}
-
-.animated.repeat-2 {
-  animation-iteration-count: calc(var(--animate-repeat) * 2);
-}
-
-.animated.repeat-3 {
-  animation-iteration-count: calc(var(--animate-repeat) * 3);
-}
-
-.animated.delay-1s {
-  animation-delay: var(--animate-delay);
-}
-
-.animated.delay-2s {
-  animation-delay: calc(var(--animate-delay) * 2);
-}
-
-.animated.delay-3s {
-  animation-delay: calc(var(--animate-delay) * 3);
-}
-
-.animated.delay-4s {
-  animation-delay: calc(var(--animate-delay) * 4);
-}
-
-.animated.delay-5s {
-  animation-delay: calc(var(--animate-delay) * 5);
-}
-
-.animated.faster {
-  animation-duration: calc(var(--animate-duration) / 2);
-}
-
-.animated.fast {
-  animation-duration: calc(var(--animate-duration) * 0.8);
-}
-
-.animated.slow {
-  animation-duration: calc(var(--animate-duration) * 2);
-}
-
-.animated.slower {
-  animation-duration: calc(var(--animate-duration) * 3);
-}
-
-@media print, (prefers-reduced-motion: reduce) {
-  .animated {
-    animation-duration: 1ms !important;
-    transition-duration: 1ms !important;
-    animation-iteration-count: 1 !important;
-  }
-
-  .animated[class*='Out'] {
-    opacity: 0;
-  }
-}

node_modules/_animate.css@4.1.1@animate.css/source/_vars.css

@@ -1,5 +0,0 @@
-:root {
-  --animate-duration: 1s;
-  --animate-delay: 1s;
-  --animate-repeat: 1;
-}

node_modules/_animate.css@4.1.1@animate.css/source/animate.css

@@ -1,131 +0,0 @@
-@import '_vars.css';
-@import '_base.css';
-
-/* Attention seekers  */
-@import 'attention_seekers/bounce.css';
-@import 'attention_seekers/flash.css';
-@import 'attention_seekers/pulse.css';
-@import 'attention_seekers/rubberBand.css';
-@import 'attention_seekers/shakeX.css';
-@import 'attention_seekers/shakeY.css';
-@import 'attention_seekers/headShake.css';
-@import 'attention_seekers/swing.css';
-@import 'attention_seekers/tada.css';
-@import 'attention_seekers/wobble.css';
-@import 'attention_seekers/jello.css';
-@import 'attention_seekers/heartBeat.css';
-
-/* Back entrances */
-@import 'back_entrances/backInDown.css';
-@import 'back_entrances/backInLeft.css';
-@import 'back_entrances/backInRight.css';
-@import 'back_entrances/backInUp.css';
-
-/* Back exits */
-@import 'back_exits/backOutDown.css';
-@import 'back_exits/backOutLeft.css';
-@import 'back_exits/backOutRight.css';
-@import 'back_exits/backOutUp.css';
-
-/* Bouncing entrances  */
-@import 'bouncing_entrances/bounceIn.css';
-@import 'bouncing_entrances/bounceInDown.css';
-@import 'bouncing_entrances/bounceInLeft.css';
-@import 'bouncing_entrances/bounceInRight.css';
-@import 'bouncing_entrances/bounceInUp.css';
-
-/* Bouncing exits  */
-@import 'bouncing_exits/bounceOut.css';
-@import 'bouncing_exits/bounceOutDown.css';
-@import 'bouncing_exits/bounceOutLeft.css';
-@import 'bouncing_exits/bounceOutRight.css';
-@import 'bouncing_exits/bounceOutUp.css';
-
-/* Fading entrances  */
-@import 'fading_entrances/fadeIn.css';
-@import 'fading_entrances/fadeInDown.css';
-@import 'fading_entrances/fadeInDownBig.css';
-@import 'fading_entrances/fadeInLeft.css';
-@import 'fading_entrances/fadeInLeftBig.css';
-@import 'fading_entrances/fadeInRight.css';
-@import 'fading_entrances/fadeInRightBig.css';
-@import 'fading_entrances/fadeInUp.css';
-@import 'fading_entrances/fadeInUpBig.css';
-@import 'fading_entrances/fadeInTopLeft.css';
-@import 'fading_entrances/fadeInTopRight.css';
-@import 'fading_entrances/fadeInBottomLeft.css';
-@import 'fading_entrances/fadeInBottomRight.css';
-
-/* Fading exits */
-@import 'fading_exits/fadeOut.css';
-@import 'fading_exits/fadeOutDown.css';
-@import 'fading_exits/fadeOutDownBig.css';
-@import 'fading_exits/fadeOutLeft.css';
-@import 'fading_exits/fadeOutLeftBig.css';
-@import 'fading_exits/fadeOutRight.css';
-@import 'fading_exits/fadeOutRightBig.css';
-@import 'fading_exits/fadeOutUp.css';
-@import 'fading_exits/fadeOutUpBig.css';
-@import 'fading_exits/fadeOutTopLeft.css';
-@import 'fading_exits/fadeOutTopRight.css';
-@import 'fading_exits/fadeOutBottomRight.css';
-@import 'fading_exits/fadeOutBottomLeft.css';
-
-/* Flippers */
-@import 'flippers/flip.css';
-@import 'flippers/flipInX.css';
-@import 'flippers/flipInY.css';
-@import 'flippers/flipOutX.css';
-@import 'flippers/flipOutY.css';
-
-/* Lightspeed */
-@import 'lightspeed/lightSpeedInRight.css';
-@import 'lightspeed/lightSpeedInLeft.css';
-@import 'lightspeed/lightSpeedOutRight.css';
-@import 'lightspeed/lightSpeedOutLeft.css';
-
-/* Rotating entrances */
-@import 'rotating_entrances/rotateIn.css';
-@import 'rotating_entrances/rotateInDownLeft.css';
-@import 'rotating_entrances/rotateInDownRight.css';
-@import 'rotating_entrances/rotateInUpLeft.css';
-@import 'rotating_entrances/rotateInUpRight.css';
-
-/* Rotating exits */
-@import 'rotating_exits/rotateOut.css';
-@import 'rotating_exits/rotateOutDownLeft.css';
-@import 'rotating_exits/rotateOutDownRight.css';
-@import 'rotating_exits/rotateOutUpLeft.css';
-@import 'rotating_exits/rotateOutUpRight.css';
-
-/* Specials */
-@import 'specials/hinge.css';
-@import 'specials/jackInTheBox.css';
-@import 'specials/rollIn.css';
-@import 'specials/rollOut.css';
-
-/* Zooming entrances */
-@import 'zooming_entrances/zoomIn.css';
-@import 'zooming_entrances/zoomInDown.css';
-@import 'zooming_entrances/zoomInLeft.css';
-@import 'zooming_entrances/zoomInRight.css';
-@import 'zooming_entrances/zoomInUp.css';
-
-/* Zooming exits */
-@import 'zooming_exits/zoomOut.css';
-@import 'zooming_exits/zoomOutDown.css';
-@import 'zooming_exits/zoomOutLeft.css';
-@import 'zooming_exits/zoomOutRight.css';
-@import 'zooming_exits/zoomOutUp.css';
-
-/* Sliding entrances */
-@import 'sliding_entrances/slideInDown.css';
-@import 'sliding_entrances/slideInLeft.css';
-@import 'sliding_entrances/slideInRight.css';
-@import 'sliding_entrances/slideInUp.css';
-
-/* Sliding exits */
-@import 'sliding_exits/slideOutDown.css';
-@import 'sliding_exits/slideOutLeft.css';
-@import 'sliding_exits/slideOutRight.css';
-@import 'sliding_exits/slideOutUp.css';

node_modules/_animate.css@4.1.1@animate.css/source/attention_seekers/bounce.css

@@ -1,34 +0,0 @@
-@keyframes bounce {
-  from,
-  20%,
-  53%,
-  to {
-    animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
-    transform: translate3d(0, 0, 0);
-  }
-
-  40%,
-  43% {
-    animation-timing-function: cubic-bezier(0.755, 0.05, 0.855, 0.06);
-    transform: translate3d(0, -30px, 0) scaleY(1.1);
-  }
-
-  70% {
-    animation-timing-function: cubic-bezier(0.755, 0.05, 0.855, 0.06);
-    transform: translate3d(0, -15px, 0) scaleY(1.05);
-  }
-
-  80% {
-    transition-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
-    transform: translate3d(0, 0, 0) scaleY(0.95);
-  }
-
-  90% {
-    transform: translate3d(0, -4px, 0) scaleY(1.02);
-  }
-}
-
-.bounce {
-  animation-name: bounce;
-  transform-origin: center bottom;
-}

node_modules/_animate.css@4.1.1@animate.css/source/attention_seekers/flash.css

@@ -1,16 +0,0 @@
-@keyframes flash {
-  from,
-  50%,
-  to {
-    opacity: 1;
-  }
-
-  25%,
-  75% {
-    opacity: 0;
-  }
-}
-
-.flash {
-  animation-name: flash;
-}

node_modules/_animate.css@4.1.1@animate.css/source/attention_seekers/headShake.css

@@ -1,30 +0,0 @@
-@keyframes headShake {
-  0% {
-    transform: translateX(0);
-  }
-
-  6.5% {
-    transform: translateX(-6px) rotateY(-9deg);
-  }
-
-  18.5% {
-    transform: translateX(5px) rotateY(7deg);
-  }
-
-  31.5% {
-    transform: translateX(-3px) rotateY(-5deg);
-  }
-
-  43.5% {
-    transform: translateX(2px) rotateY(3deg);
-  }
-
-  50% {
-    transform: translateX(0);
-  }
-}
-
-.headShake {
-  animation-timing-function: ease-in-out;
-  animation-name: headShake;
-}

node_modules/_animate.css@4.1.1@animate.css/source/attention_seekers/heartBeat.css

@@ -1,27 +0,0 @@
-@keyframes heartBeat {
-  0% {
-    transform: scale(1);
-  }
-
-  14% {
-    transform: scale(1.3);
-  }
-
-  28% {
-    transform: scale(1);
-  }
-
-  42% {
-    transform: scale(1.3);
-  }
-
-  70% {
-    transform: scale(1);
-  }
-}
-
-.heartBeat {
-  animation-name: heartBeat;
-  animation-duration: calc(var(--animate-duration) * 1.3);
-  animation-timing-function: ease-in-out;
-}

node_modules/_animate.css@4.1.1@animate.css/source/attention_seekers/jello.css

@@ -1,40 +0,0 @@
-@keyframes jello {
-  from,
-  11.1%,
-  to {
-    transform: translate3d(0, 0, 0);
-  }
-
-  22.2% {
-    transform: skewX(-12.5deg) skewY(-12.5deg);
-  }
-
-  33.3% {
-    transform: skewX(6.25deg) skewY(6.25deg);
-  }
-
-  44.4% {
-    transform: skewX(-3.125deg) skewY(-3.125deg);
-  }
-
-  55.5% {
-    transform: skewX(1.5625deg) skewY(1.5625deg);
-  }
-
-  66.6% {
-    transform: skewX(-0.78125deg) skewY(-0.78125deg);
-  }
-
-  77.7% {
-    transform: skewX(0.390625deg) skewY(0.390625deg);
-  }
-
-  88.8% {
-    transform: skewX(-0.1953125deg) skewY(-0.1953125deg);
-  }
-}
-
-.jello {
-  animation-name: jello;
-  transform-origin: center;
-}

node_modules/_animate.css@4.1.1@animate.css/source/attention_seekers/pulse.css

@@ -1,20 +0,0 @@
-/* originally authored by Nick Pettit - https://github.com/nickpettit/glide */
-
-@keyframes pulse {
-  from {
-    transform: scale3d(1, 1, 1);
-  }
-
-  50% {
-    transform: scale3d(1.05, 1.05, 1.05);
-  }
-
-  to {
-    transform: scale3d(1, 1, 1);
-  }
-}
-
-.pulse {
-  animation-name: pulse;
-  animation-timing-function: ease-in-out;
-}

node_modules/_animate.css@4.1.1@animate.css/source/attention_seekers/rubberBand.css

@@ -1,33 +0,0 @@
-@keyframes rubberBand {
-  from {
-    transform: scale3d(1, 1, 1);
-  }
-
-  30% {
-    transform: scale3d(1.25, 0.75, 1);
-  }
-
-  40% {
-    transform: scale3d(0.75, 1.25, 1);
-  }
-
-  50% {
-    transform: scale3d(1.15, 0.85, 1);
-  }
-
-  65% {
-    transform: scale3d(0.95, 1.05, 1);
-  }
-
-  75% {
-    transform: scale3d(1.05, 0.95, 1);
-  }
-
-  to {
-    transform: scale3d(1, 1, 1);
-  }
-}
-
-.rubberBand {
-  animation-name: rubberBand;
-}

node_modules/_animate.css@4.1.1@animate.css/source/attention_seekers/shake.css

@@ -1,25 +0,0 @@
-@keyframes shake {
-  from,
-  to {
-    transform: translate3d(0, 0, 0);
-  }
-
-  10%,
-  30%,
-  50%,
-  70%,
-  90% {
-    transform: translate3d(-10px, 0, 0);
-  }
-
-  20%,
-  40%,
-  60%,
-  80% {
-    transform: translate3d(10px, 0, 0);
-  }
-}
-
-.shake {
-  animation-name: shake;
-}

node_modules/_animate.css@4.1.1@animate.css/source/attention_seekers/shakeX.css

@@ -1,25 +0,0 @@
-@keyframes shakeX {
-  from,
-  to {
-    transform: translate3d(0, 0, 0);
-  }
-
-  10%,
-  30%,
-  50%,
-  70%,
-  90% {
-    transform: translate3d(-10px, 0, 0);
-  }
-
-  20%,
-  40%,
-  60%,
-  80% {
-    transform: translate3d(10px, 0, 0);
-  }
-}
-
-.shakeX {
-  animation-name: shakeX;
-}

node_modules/_animate.css@4.1.1@animate.css/source/attention_seekers/shakeY.css

@@ -1,25 +0,0 @@
-@keyframes shakeY {
-  from,
-  to {
-    transform: translate3d(0, 0, 0);
-  }
-
-  10%,
-  30%,
-  50%,
-  70%,
-  90% {
-    transform: translate3d(0, -10px, 0);
-  }
-
-  20%,
-  40%,
-  60%,
-  80% {
-    transform: translate3d(0, 10px, 0);
-  }
-}
-
-.shakeY {
-  animation-name: shakeY;
-}

node_modules/_animate.css@4.1.1@animate.css/source/attention_seekers/swing.css

@@ -1,26 +0,0 @@
-@keyframes swing {
-  20% {
-    transform: rotate3d(0, 0, 1, 15deg);
-  }
-
-  40% {
-    transform: rotate3d(0, 0, 1, -10deg);
-  }
-
-  60% {
-    transform: rotate3d(0, 0, 1, 5deg);
-  }
-
-  80% {
-    transform: rotate3d(0, 0, 1, -5deg);
-  }
-
-  to {
-    transform: rotate3d(0, 0, 1, 0deg);
-  }
-}
-
-.swing {
-  transform-origin: top center;
-  animation-name: swing;
-}

node_modules/_animate.css@4.1.1@animate.css/source/attention_seekers/tada.css

@@ -1,31 +0,0 @@
-@keyframes tada {
-  from {
-    transform: scale3d(1, 1, 1);
-  }
-
-  10%,
-  20% {
-    transform: scale3d(0.9, 0.9, 0.9) rotate3d(0, 0, 1, -3deg);
-  }
-
-  30%,
-  50%,
-  70%,
-  90% {
-    transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, 3deg);
-  }
-
-  40%,
-  60%,
-  80% {
-    transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, -3deg);
-  }
-
-  to {
-    transform: scale3d(1, 1, 1);
-  }
-}
-
-.tada {
-  animation-name: tada;
-}

node_modules/_animate.css@4.1.1@animate.css/source/attention_seekers/wobble.css

@@ -1,35 +0,0 @@
-/* originally authored by Nick Pettit - https://github.com/nickpettit/glide */
-
-@keyframes wobble {
-  from {
-    transform: translate3d(0, 0, 0);
-  }
-
-  15% {
-    transform: translate3d(-25%, 0, 0) rotate3d(0, 0, 1, -5deg);
-  }
-
-  30% {
-    transform: translate3d(20%, 0, 0) rotate3d(0, 0, 1, 3deg);
-  }
-
-  45% {
-    transform: translate3d(-15%, 0, 0) rotate3d(0, 0, 1, -3deg);
-  }
-
-  60% {
-    transform: translate3d(10%, 0, 0) rotate3d(0, 0, 1, 2deg);
-  }
-
-  75% {
-    transform: translate3d(-5%, 0, 0) rotate3d(0, 0, 1, -1deg);
-  }
-
-  to {
-    transform: translate3d(0, 0, 0);
-  }
-}
-
-.wobble {
-  animation-name: wobble;
-}