Merge branch 'hi-ucs-dev' into release

# Conflicts:
#	front/public/static/config/basicConfig.js
#	front/src/App.vue

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

@@ -79,6 +79,18 @@
           header-align="center"
           align="center"
         ></el-table-column>
+        <el-table-column
+          prop="resoureType"
+          label="资源类型"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="provideDept"
+          label="提供部门"
+          header-align="center"
+          align="center"
+        ></el-table-column>
         <!-- <el-table-column prop="startTime" :label="$t('process.startTime')" header-align="center" align="center"></el-table-column> -->
         <el-table-column
           prop="createTime"

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

@@ -168,7 +168,7 @@
                 >
                   <i class="el-icon-plus"></i>
                 </el-upload>
-                <el-dialog :visible.sync="dialogVisible">
+                <el-dialog :visible.sync="dialogVisible" append-to-body>
                   <img width="100%" :src="picImg" alt="" />
                 </el-dialog>
                 <div
@@ -294,7 +294,8 @@ export default {
       this.fileList = []
     },
     handlePictureCardPreview (file) {
-      this.dialogImageUrl = file.url
+
+      this.picImg = file.url
       this.dialogVisible = true
     },
     // 上传个数限制

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-28 11:28:43
+ * @LastEditTime: 2022-11-30 15:45:35
  * @Description: 告诉大家这是什么
 -->
 <!--  流程业务表单   -->
@@ -41,7 +41,7 @@
           </div>
         </p> -->
         <p>
-          <div>
+          <div v-if="version == 'xihaian'">
             <el-button type="primary" size="small" @click="download(dataForm.content)">附件下载</el-button>
           </div>
         </p>
@@ -149,6 +149,7 @@ export default {
       input: '',
       visible: true,
       showKey: 0,
+      version: CONFIGITEM.version,
       // 表单属性是否可编辑
       // fieldDisabled: false,
       // dataForm: {

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

@@ -0,0 +1,170 @@
+<template>
+    <el-dialog
+      :visible.sync="visible"
+      title="审核权限配置检查"
+      :footer="false"
+      @close="onClose"
+
+    >
+    <el-tabs v-model="tab" type="card" >
+    <el-tab-pane label="未配置部门管理员权限部门" name="first">
+      <div style="float: left;margin-bottom: 8px;font-size: 16px;">检测结果：共{{deptTotal}}个</div>
+        <el-table
+        :data="deptData"
+        :header-cell-style="{ textAlign: 'center', height: '40px' }"
+        :cell-style="{ textAlign: 'center' }"
+        style="width: 100%"
+      >
+      <el-table-column   width="80px" label="序号" align="center">
+        <template slot-scope="scop">
+          {{scop.$index+1}}
+        </template>
+      </el-table-column>
+        <el-table-column
+          prop="name"
+          label="部门名称"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="type"
+          label="类型"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+      </el-table>
+      <div class="block" >
+      <el-pagination
+        @current-change="handleCurrentChange1"
+        layout=" prev, pager, next"
+         :total="deptTotal"
+        :page-size="pageSize"
+        :current-page="currentPageDept"
+      >
+      </el-pagination>
+      </div>
+    </el-tab-pane>
+    <el-tab-pane label="未配置区市审核人权限区市" name="second">
+      <div style="float: left;margin-bottom: 8px;font-size: 16px;">检测结果：共{{districtTotal}}个</div>
+        <el-table
+        :data="districtData"
+        :header-cell-style="{ textAlign: 'center', height: '40px' }"
+        :cell-style="{ textAlign: 'center' }"
+        style="width: 100%"
+      >
+      <el-table-column   width="80px" label="序号" align="center">
+        <template slot-scope="scop">
+          {{scop.$index+1}}
+        </template>
+      </el-table-column>
+        <el-table-column
+          prop="NAME"
+          label="区市名称"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <!-- <el-table-column
+          prop="type"
+          label="类型"
+          header-align="center"
+          align="center"
+        ></el-table-column> -->
+        
+      </el-table>
+      <div class="block" >
+      <el-pagination
+        @current-change="handleCurrentChange2"
+        layout="prev, pager, next"
+         :total="deptTotal"
+        :page-size="pageSize"
+        :current-page="currentPageDistrict"
+      >
+      </el-pagination>
+      </div>
+    </el-tab-pane>
+    </el-tabs>
+    </el-dialog>
+  </template>
+  
+  <script>
+
+  export default {
+    data () {
+      return {
+        visible:false,
+        tab:'first',
+        deptTotal:0,
+        districtTotal:0,
+        deptData:[],
+        districtData:[],
+        currentPageDistrict:1,
+        currentPageDept:1,
+        pageSize:10,
+      }
+    },
+ watch:{
+
+},
+    methods: {
+      handleCurrentChange1 (val) {
+      this.currentPageDept = val
+      this.getDeptList()
+    },
+    handleCurrentChange2 (val) {
+      this.currentPageDistrict = val
+      this.getDistrinctList()
+    },
+      getDeptList(){
+        let params = {
+          pageNum:this.currentPageDept,
+          pageSize:this.pageSize
+
+        }
+        this.$http
+        .get('/sys/user/getApproverUnconfiguredDepartment/', {params
+         
+        })
+        .then((res) => {
+          this.deptData = res.data.data.list
+          this.deptTotal = Number(res.data.data.total)
+        })
+      },
+      getDistrinctList(){
+        let params = {
+          pageNum:this.currentPageDistrict,
+          pageSize:this.pageSize
+
+        }
+        this.$http
+        .get('/sys/user/getApproverUnconfiguredRegion', {params
+         
+        })
+        .then((res) => {
+          this.districtData = res.data.data
+          this.districtTotal = Number(res.data.data.length)
+        })
+      },
+        onClose(){
+    this.visible=false;
+    this.$emit("refreshCheck",false)
+        },
+      init(){
+        this.visible = true   
+        this.getDeptList()
+        this.getDistrinctList()
+      }
+    }
+    
+}
+     
+ 
+  
+  </script>
+  
+  <style lang="scss" scoped>
+
+  ::v-deep .aui-content   .el-tabs__header {
+    left: 0px;
+  }
+  </style>
+  

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

@@ -41,6 +41,9 @@
         <el-form-item>
           <el-button type="primary"  @click="reset()">重置</el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button type="primary"  @click="check()">审核权限配置检查</el-button>
+        </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
         @sort-change="dataListSortChangeHandle" style="width: 100%">
@@ -87,6 +90,8 @@
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+        <!-- 审核权限配置检查 -->
+        <check v-if="checkVisible" ref="check" @refreshCheck="refreshCheck"></check>
     </div>
   </el-card>
 </template>
@@ -94,11 +99,14 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './user-add-or-update'
+import Check from './check'
 import qs from 'qs'
 export default {
   mixins: [mixinViewModule],
   data () {
     return {
+      //审核权限配置检查
+      checkVisible:false,
       mixinViewModuleOptions: {
         getDataListURL: '/sys/user/page',
         getDataListIsPage: true,
@@ -116,12 +124,22 @@ export default {
     }
   },
   components: {
-    AddOrUpdate
+    AddOrUpdate,
+    Check
   },
   created () {
     this.getDeptList()
   },
   methods: {
+    check(){
+      this.checkVisible=true
+      this.$nextTick(() => {    
+        this.$refs.check.init()
+      })
+    },
+    refreshCheck(val){
+      this.checkVisible=val
+    },
     reset () {
       this.dataForm.username = ''
       this.dataForm.real_name = ''

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-28 17:32:57
+ * @LastEditTime: 2022-12-01 12:32:58
  * @Description: 系统静态参数配置
  */
 var _global = {}

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-28 17:33:32
+ * @LastEditTime: 2022-12-01 12:33:18
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -19,13 +19,14 @@
   import { getCategoryTreePage } from '@/api/personalCenter'
   import zhCN from 'ant-design-vue/es/locale/zh_CN'
   import Cookies from 'js-cookie'
-  import { onBeforeUnmount, onMounted, watch, nextTick } from 'vue'
+  import { onBeforeUnmount, onMounted, watch, ref } from 'vue'
   import { useRouter } from 'vue-router'
   import mybus from '@/myplugins/mybus'
   const router = useRouter()
 
   const locale = zhCN
   const token = Cookies.get('ucsToken')
+  const whoShow1 = ref(whoShow)
   console.log('token=================>', token)
   let ws = new WebSocket(
     `ws://${window.SITE_CONFIG['websocketURL']}/websocket?token=${token}`
@@ -39,6 +40,13 @@
     if (router.currentRoute.value.name === 'mynoticeView') {
       mybus.emit('noticeListInit')
     }
+    // 判断当前路由是否是待办列表
+    if (
+      router.currentRoute.value.name === 'DetailsPageconetent' &&
+      whoShow1.value.itShowXiHaiAn
+    ) {
+      mybus.emit('initDetailsPageconetent')
+    }
   }
   ws.onerror = function (e) {
     console.log('WebSocket连接异常============================>', e)

front/src/api/assertReport.js

@@ -1,3 +1,10 @@
+/*
+ * @Author: hisense.wuhongjian
+ * @Date: 2022-11-28 16:43:10
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-11-29 11:35:36
+ * @Description: 告诉大家这是什么
+ */
 import request from '@/utils/request'
 //获取中间地图
 export function getDistrictFundStatement() {
@@ -12,61 +19,61 @@ export function getComponentFundStatement() {
     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() {
+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/store/modules/user.js

@@ -2,7 +2,7 @@
  * @author chuzhixin 1204505056@qq.com
  * @description 登录、获取用户信息、退出登录、清除accessToken逻辑，不建议修改
  */
-import { getUserInfo, login, logout } from '@/api/user'
+import { getUserInfo, login, logout, getRole } from '@/api/user'
 import {
   getAccessToken,
   removeAccessToken,
@@ -20,6 +20,7 @@ const state = () => ({
   userId: '',
   avatar: '',
   role: 0, // 用户管理员权限
+  roleList: [], // 用户管理员权限
 })
 const getters = {
   accessToken: (state) => state.accessToken,
@@ -27,6 +28,7 @@ const getters = {
   realName: (state) => state.realName,
   avatar: (state) => state.avatar,
   role: (state) => state.role,
+  roleList: (state) => state.roleList,
   userId: (state) => state.userId,
   deptName: (state) => state.deptName,
   deptId: (state) => state.deptId,
@@ -64,6 +66,9 @@ const mutations = {
   setRole(state, role) {
     state.role = role
   },
+  setRoleList(state, role) {
+    state.roleList = role
+  },
   // 设置用户userId
   setUserId(state, id) {
     state.userId = id
@@ -146,6 +151,14 @@ const actions = {
     commit('setUsername', res.data.data.username)
     commit('setRealname', res.data.data.realName)
     commit('setRole', res.data.data.roleIdList.length)
+    // 获取角色数据
+    const roleArr = []
+    res.data.data.roleIdList.map((val) => {
+      getRole(val).then((role) => {
+        roleArr.push(role.data.data.name)
+      })
+    })
+    commit('setRoleList', roleArr)
     commit('setUserId', res.data.data.id)
     commit('setDeptName', res.data.data.deptName)
     commit('setDeptId', res.data.data.deptId)
@@ -181,7 +194,6 @@ const actions = {
    * @param {*} { commit, dispatch }
    */
   async resetAll({ dispatch }) {
- 
     await dispatch('setAccessToken', '')
     await dispatch('acl/setFull', false, {
       root: true,

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

@@ -687,7 +687,7 @@
               }
             }
           }
-          .item:nth-child(2n) {
+          .item:nth-(2n) {
             margin-left: 0.4rem;
           }
         }

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

@@ -33,8 +33,12 @@
       </div>
       <a-empty
         v-else
-        style="margin-top: 160px; margin-bottom: 60px"
+        style="
-        :imageStyle="{ color: '#0058e1' }"
+          margin-top: 160px;
+          margin-bottom: 60px;
+          color: rgba(255, 255, 255, 0.5);
+        "
+        :image="empty"
       />
     </div>
   </div>
@@ -51,6 +55,7 @@
     require('../../../assets/newHome/popular-yy.png'),
     require('../../../assets/newHome/popular-zs.png'),
   ])
+  const empty = ref(require('@/assets/newHome/empty.png'))
   //查看详情方法
   function viewDetails(id) {
     console.log('id=========>', id)

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

@@ -1,10 +1,11 @@
-
 <template>
   <div class="right-survey">
 
     <div class="platform-overview-bottom">
       <div class="top"><span class="title">资源汇聚总量</span></div>
+      <div class="jiesheng"> <img src="../image/xing2.png" /><span style="padding-left:2px;">共{{total}}项 </span><img src="../image/xing2.png" /></div>
       <div class="bottom">
+       
         <div
           v-for="(item, index) in servicesNum"
           :key="index"
@@ -16,13 +17,13 @@
       </div>
     </div>
   </div>
-  </template>
+</template>
 
-  <script>
+<script>
   import {
     selectTotal
   } from '@/api/assertReport'
-  export default {
+export default {
  
   components: {},
 
@@ -32,7 +33,7 @@
   data() {
     //这里存放数据
     return {
-       
+     total:'',
       servicesNum: [],
     }
   },
@@ -41,13 +42,23 @@
 
     selectAllTotal(){
       selectTotal().then((res) => {
-         this.servicesNum=res.data.data.total
+        let result=res.data.data.total
+        let now=[]
+        let num=0;  
+        for(let i=0;i<result.length;i++){
+          if(result[i].type!=='知识库'){
+            now.push(result[i])
+            num=num+Number(result[i].count)
+          }
+        } 
+       this.servicesNum=now
+       this.total=num
       })
     }
-  }
+}
-  }
+}
-  </script>
+</script>
-  <style lang='less' scoped>
+<style lang='less' scoped>
   @keyframes turn {
   0% {
     border-image: linear-gradient(to right, #003194, #00ffea) 1;
@@ -64,28 +75,34 @@
   100% {
     border-image: linear-gradient(to right, #003194, #00ffea) 1;
   }
+}
+.jiesheng{
+  margin:8px 8px;
+    text-align: center;
+  color: #f4fcfe; border-color: #107bb0;
+    box-shadow: 1px 1px 5px 1px RGB(16, 123, 176, 0.8) inset
     }
-  .top5-content::-webkit-scrollbar {
+.top5-content::-webkit-scrollbar {
   width: 6px;
   /*height: 4px;*/
-  }
+}
 
-  .top5-content::-webkit-scrollbar-thumb {
+.top5-content::-webkit-scrollbar-thumb {
   background-color: #00deff;
-  }
+}
-  .map-search-result::-webkit-scrollbar-track,
+.map-search-result::-webkit-scrollbar-track,
-  .top5-content::-webkit-scrollbar-track {
+.top5-content::-webkit-scrollbar-track {
   background-color: #424748;
-  }
+}
-  @keyframes topup50 {
+@keyframes topup50 {
   from {
     top: 50%;
   }
   to {
     top: -100%;
   }
-  }
+}
-  .right-survey {
+.right-survey {
 
   height: 100%;
   color: #f0fafa;
@@ -95,9 +112,9 @@
 
 
   .platform-overview-bottom {
-      margin-top: 20px;
+    margin-top: 5px;
     width: 100%;
-      height: 1.7rem;
+    height: 1.78rem;
     background: rgba(0, 108, 188, 0.2);
     border-radius: 2px;
     border: 1px solid rgba(0, 108, 188, 0.7);
@@ -118,7 +135,7 @@
       display: flex;
       justify-content: space-between;
       align-items: center;
-        padding:0rem  0.2rem;
+      padding: 0px 10px;
       .component-services-content-right-left-content-son {
         background: url('~@/assets/capabilityCloud/Component_services_snum.png')
           no-repeat;
@@ -145,7 +162,6 @@
   .platform-overview-bottom:hover {
   border: 2px solid;
   animation: turn 5s linear infinite;
-  }
+}
-  }
+}
-  </style>
+</style>
-  

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

@@ -1,4 +1,3 @@
-
 <template>
   <div class="right-survey">
     <!--最上面 部门排行榜-->
@@ -7,7 +6,7 @@
       <div class="bottom1">
         <div class="bottom-item">
           <div class="inner-title">
-            <p style="width: 220px">市级部门共享贡献资金排行</p>
+            <p style="width: 220px">市级部门共享节省资金排行</p>
           </div>
           <div class="left-list">
             <div class="left-list1">排行</div>
@@ -15,6 +14,7 @@
             <div class="left-list1">应用数</div>
             <div class="left-list1" style="color: #1ffefd">贡献金额</div>
           </div>
+         <div style="    height: 1.7rem; overflow-y: auto;overflow-x: hidden;width: 100%;">
           <div class="left-list" v-for="(item, index) in top5DistrictList">
             <div class="left-list1" v-if="item.img">
               <img :src="item.img" />
@@ -31,63 +31,14 @@
             </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>
+            <p style="width: 220px">市级部门申请节省资金排行</p>
           </div>
           <div class="left-list">
             <div class="left-list1">排行</div>
@@ -95,6 +46,7 @@
             <div class="left-list1">应用数</div>
             <div class="left-list1" style="color: #1ffefd">贡献金额</div>
           </div>
+          <div style="    height: 1.7rem; overflow-y: auto;overflow-x: hidden;width: 100%;">
           <div class="left-list" v-for="(item, index) in top5DeptFundList">
             <div class="left-list1" v-if="item.img">
               <img :src="item.img" />
@@ -112,10 +64,11 @@
             </div>
           </div>
         </div>
+      </div>
       <div class="bottom2">
         <div class="bottom-item">
           <div class="inner-title">
-            <p style="width: 220px">区市部门共享贡献资金排行</p>
+            <p style="width: 220px">区市部门共享节省资金</p>
           </div>
           <div class="left-list">
             <div class="left-list1">序号</div>
@@ -146,7 +99,7 @@
         </div>
         <div class="bottom-item">
           <div class="inner-title">
-            <p style="width: 220px">区市部门申请节省资金排行</p>
+            <p style="width: 220px">区市部门申请节省资金</p>
           </div>
           <div class="left-list">
             <div class="left-list1">序号</div>
@@ -195,17 +148,17 @@
 </template>
 
 <script>
-import {
+  import {
     getProvideDeptFundStatement,
     getApplyDeptFundStatement,
     getProvideDistrictFundStatement,
     getApplyDistrictFundStatement,
     selectTotal,
-} from '@/api/assertReport'
+  } from '@/api/assertReport'
-export default {
+  export default {
     components: {},
     created() {},
-  destroyed() {},
+    unmounted() {},
 
     mounted() {
       this.getgetProvideDeptFund()
@@ -312,9 +265,9 @@ export default {
         })
       },
     },
-}
+  }
 </script>
-<style lang='less' scoped>
+<style lang="less" scoped>
   @keyframes turn {
     0% {
       border-image: linear-gradient(to right, #003194, #00ffea) 1;
@@ -332,27 +285,27 @@ export default {
       border-image: linear-gradient(to right, #003194, #00ffea) 1;
     }
   }
-.top5-content::-webkit-scrollbar {
+  .top5-content::-webkit-scrollbar {
     width: 6px;
     /*height: 4px;*/
-}
+  }
 
-.top5-content::-webkit-scrollbar-thumb {
+  .top5-content::-webkit-scrollbar-thumb {
     background-color: #00deff;
-}
+  }
-.map-search-result::-webkit-scrollbar-track,
+  .map-search-result::-webkit-scrollbar-track,
-.top5-content::-webkit-scrollbar-track {
+  .top5-content::-webkit-scrollbar-track {
     background-color: #424748;
-}
+  }
-@keyframes topup50 {
+  @keyframes topup50 {
     from {
       top: 50%;
     }
     to {
       top: -100%;
     }
-}
+  }
-.right-survey {
+  .right-survey {
     width: 620px;
     height: 100%;
     color: #f0fafa;
@@ -373,17 +326,19 @@ export default {
       transition: all 100ms ease-out;
       .top {
         font-size: 24px;
-      background: url('~@/assets/capabilityCloud/infrastructure_title.png')  no-repeat;
+        background: url('~@/assets/capabilityCloud/infrastructure_title.png')
+          no-repeat;
         background-size: 100% 100%;
         text-align: center;
       }
       .bottom1 {
         margin-top: 10px;
         width: 100%;
-      display: table;
+        // display: flex;
         justify-content: space-between;
         align-items: center;
-      height: 1.8rem;
+        height: 2.5rem;
+        // overflow-y: auto;
         .bottom-item {
           width: 98%;
         }
@@ -395,7 +350,7 @@ export default {
         display: table;
         justify-content: space-between;
         align-items: center;
-      height: 4.0rem;
+        height: 4rem;
         .bottom-item {
           width: 48%;
         }
@@ -406,7 +361,7 @@ export default {
       }
       .bottom-item {
         height: 100%;
-      overflow-y: auto;
+        // overflow-y: auto;
         background: rgba(0, 108, 188, 0.2);
         border-radius: 2px;
         margin: 2px 5px;
@@ -503,7 +458,8 @@ export default {
       transition: all 100ms ease-out;
       .top {
         font-size: 24px;
-      background: url('~@/assets/capabilityCloud/infrastructure_title.png')  no-repeat;
+        background: url('~@/assets/capabilityCloud/infrastructure_title.png')
+          no-repeat;
         background-size: 100% 100%;
         text-align: center;
       }
@@ -539,5 +495,5 @@ export default {
       border: 2px solid;
       animation: turn 5s linear infinite;
     }
-}
+  }
 </style>

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

@@ -1,8 +1,8 @@
 <!--
 * @Author: hisense.xiaoshangqing
 * @Date: 2022-7-26 10:00:48
-* @LastEditors: xiaoshangqing
+ * @LastEditors: hisense.wuhongjian
-* @LastEditTime: 2022-07-27 16:56:55
+ * @LastEditTime: 2022-11-29 11:47:26
 * @Description: 水库专题首页缩略图 -->
 <template>
   <div class="river-course-view">
@@ -13,116 +13,96 @@
     <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 {
+  import { getProvideDistrictFundStatement } from '@/api/assertReport'
-    getDistrictFundStatement
+  import axios from 'axios'
-  } from '@/api/assertReport'
+  const echarts = require('echarts')
-import axios from 'axios'
+  export default {
-const echarts = require("echarts");
+    //import引入的组件需要注入到对象中才能使用
-export default {
-//import引入的组件需要注入到对象中才能使用
     components: {},
     data() {
-//这里存放数据
+      //这里存放数据
       return {
-
         districtData: [
           {
-          name: "市南区",
+            name: '市南区',
-          value: [120.395966, 36.000892],
+            value: [120.435966, 35.980892],
           },
           {
-          name: "市北区",
+            name: '市北区',
             value: [120.355026, 36.083819],
-  
           },
           {
-          name: "李沧区",
+            name: '李沧区',
             value: [120.421236, 36.188023],
-    
           },
           {
-          name: "崂山区",
+            name: '崂山区',
             value: [120.587393, 36.199569],
           },
           {
-          name: "城阳区",
+            name: '城阳区',
             value: [120.369135, 36.266833],
-    
           },
           {
-          name: "即墨区",
+            name: '即墨区',
             value: [120.517352, 36.490847],
-    
           },
           {
-          name: "莱西市",
+            name: '莱西市',
             value: [120.426226, 36.86009],
-      
           },
           {
-          name: "胶州市",
+            name: '胶州市',
             value: [120.010202, 36.235878],
-    
           },
           {
-          name: "平度市",
+            name: '平度市',
             value: [119.959012, 36.788828],
-   
           },
           {
-          name: "西海岸",
+            name: '西海岸新区',
             value: [119.895518, 35.875138],
-        
           },
         ],
-    
+      }
-    
-    };
     },
 
     mounted() {
-    this.findAllInfo();
+      this.findAllInfo()
     },
-//方法集合
+    //方法集合
     methods: {
-    findAllInfo(){
+      findAllInfo() {
-      getDistrictFundStatement().then((res) => {
+        getProvideDistrictFundStatement().then((res) => {
-        
+          let districtData = this.districtData
-        let districtData=this.districtData
+          let resulrtData = res.data.data
-        let resulrtData=res.data.data
+          for (let i = 0; i < resulrtData.length; i++) {
-        for(let i=0;i<resulrtData.length;i++){
+            for (let j = 0; j < districtData.length; j++) {
-          for(let j=0;j<districtData.length;j++){
+              if (resulrtData[i].districtName === districtData[j].name) {
-            if(resulrtData[i].districtName=districtData[j].name){
+                districtData[j].num = resulrtData[i].applyPrice + '万'
-              
-              districtData[j].num=resulrtData[i].applyPrice
               }
             }
           }
-     
+          console.log('上图数据', districtData)
           this.initMap(districtData)
         })
-
+      },
-     
-},
       initMap(data) {
-      this.loadedDataUrl = "./static/qingdao.json";
+        this.loadedDataUrl = './static/qingdao.json'
-       let _this=this
+        let _this = this
-      axios.get(_this.loadedDataUrl, {}) .then(geoJson =>{
+        axios.get(_this.loadedDataUrl, {}).then((geoJson) => {
-
+          _this.myChart = echarts.init(_this.$refs.qdCityMap)
-        _this.myChart = echarts.init(_this.$refs.qdCityMap);
+          echarts.registerMap('qingdao', geoJson.data)
-        echarts.registerMap("qingdao", geoJson.data);
+          const imgBack = new Image()
-        const imgBack = new Image();
+          imgBack.src = './static/assets/map-back.png'
-        imgBack.src = "./static/assets/map-back.png";
+          const img = new Image()
-        const img = new Image();
+          img.src = './static/assets/echarts-map-bak.png'
-        img.src = "./static/assets/echarts-map-bak.png";
+          const typeImg = new Image()
-        const typeImg = new Image();
+          typeImg.src = './static/assets/reservoir-type-bak.png'
-        typeImg.src = "./static/assets/reservoir-type-bak.png";
 
           _this.option = {
             visualMap: {
@@ -130,12 +110,12 @@ export default {
               max: 100,
               seriesIndex: 1,
               inRange: {
-              color: ["#000000", "yellow", "pink"],
+                color: ['#000000', 'yellow', 'pink'],
               },
             },
             geo: [
               {
-              map: "qingdao",
+                map: 'qingdao',
                 roam: false, // 是否允许缩放
                 aspectScale: 0.8,
                 zoom: 1.1, // 默认显示级别
@@ -144,47 +124,47 @@ export default {
                 label: {
                   show: true, //是否显示市
                   textStyle: {
-                  color: "#ffffff", //文字颜色
+                    color: '#ffffff', //文字颜色
                     fontSize: 16, //文字大小
-                  fontFamily: "微软雅黑",
+                    fontFamily: '微软雅黑',
-                  backgroundColor: "rgba(0,0,0,0)", //透明度0清空文字背景
+                    backgroundColor: 'rgba(0,0,0,0)', //透明度0清空文字背景
                   },
                 },
                 itemStyle: {
-                borderColor: "#25e8ff",
+                  borderColor: '#25e8ff',
                   borderWidth: 2,
-                /* areaColor: "#004d8e", //rgba设置透明度0
+          
-                  shadowColor: "#10daff",
-                shadowBlur: 10,
-                shadowOffsetX: 10,
-                opacity: 0.53, */
                   areaColor: {
                     image: img,
-                  repeat: "repeat",
+                    repeat: 'repeat',
                   },
+                  
                 },
                 emphasis: {
-                disabled: false,
+                  //disabled: false,
-                focus: "none",
+                  //areaColor: '#3066ba',
+                  focus: 'none',
                   itemStyle: {
-                  color: null,
+                  //  color: '#3066ba',//鼠标滑过区域颜色
+                    color: '#1ef6f5',//鼠标滑过区域颜色
                   },
                   label: {
                     show: true,
-                  //color: "#fff",
+                    color: "#ff934a",
+                    fontWeight:'bold'
                   },
                 },
               },
               {
-              map: "qingdao",
+                map: 'qingdao',
                 aspectScale: 0.8,
                 roam: false, // 是否允许缩放
                 zoom: 1.1, // 默认显示级别
                 top: 105,
                 z: 4,
                 itemStyle: {
-                areaColor: "#1864a5",
+                  areaColor: '#1864a5',
-                borderColor: "transparent",
+                  borderColor: 'transparent',
                 },
                 silent: true,
                 tooltip: {
@@ -192,15 +172,15 @@ export default {
                 },
               },
               {
-              map: "qingdao",
+                map: 'qingdao',
                 aspectScale: 0.8,
                 roam: false, // 是否允许缩放
                 zoom: 1.1, // 默认显示级别
                 top: 110,
                 z: 3,
                 itemStyle: {
-                areaColor: "#1864a5",
+                  areaColor: '#1864a5',
-                borderColor: "transparent",
+                  borderColor: 'transparent',
                   borderWidth: 2,
                 },
                 silent: true,
@@ -209,19 +189,19 @@ export default {
                 },
               },
               {
-              map: "qingdao",
+                map: 'qingdao',
                 aspectScale: 0.8,
-              roam: true, // 是否允许缩放
+                roam: false, // 是否允许缩放
                 zoom: 1.1, // 默认显示级别
                 top: 115,
                 z: 2,
                 itemStyle: {
-                areaColor: "#1864a5",
+                  areaColor: '#1864a5',
                   //borderColor: "#0f3866",
-                borderColor: "transparent",
+                  borderColor: 'transparent',
                   borderWidth: 1,
-                shadowColor: "#808080", // 外部阴影
+                  shadowColor: '#808080', // 外部阴影
-                shadowBlur: "10",
+                  shadowBlur: '10',
                 },
                 silent: true,
                 tooltip: {
@@ -230,47 +210,7 @@ export default {
               },
             ],
             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',
@@ -278,9 +218,9 @@ export default {
                   normal: {
                     show: true,
                     formatter: function (params) {
-                    var name = params.data.num;
+                      var name = params.data.num
-                    var text = `{fline|${name}}`;
+                      var text = `{fline|${name}}`
-                    return text;
+                      return text
                     },
                     color: '#fff',
                     rich: {
@@ -308,19 +248,16 @@ export default {
                 itemStyle: {
                   color: '#e3e00a',
                 },
-              symbol: "image://static/assets/reservoir-type-bak.png",
+                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.setOption(_this.option)
-        _this.myChart.on("click", (params) => {
+          _this.myChart.on('click', (params) => {
             //  console.log("点的是什么", params);
             // //进入对应区的三维地图
             // //跟右下角菜单切换触发调用方法一样，但是要传递区划参数，区划name
@@ -334,36 +271,33 @@ export default {
             //   latitude:_this.districtData[index].value[1],
             // };
             // _this.$emit('jumpIntoMap',districtObject);
-        });
+          })
-      });
+        })
       },
-
-
-
     },
 
     beforeCreate() {}, //生命周期 - 创建之前
     beforeMount() {}, //生命周期 - 挂载之前
     beforeUpdate() {}, //生命周期 - 更新之前
     updated() {}, //生命周期 - 更新之后
-  beforeDestroy() {}, //生命周期 - 销毁之前
+    beforeUnmount() {}, //生命周期 - 销毁之前
-  destroyed() {}, //生命周期 - 销毁完成
+    unmounted() {}, //生命周期 - 销毁完成
     activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
-};
+  }
 </script>
-<style lang='less' scoped>
+<style lang="less" scoped>
-//@import url(); 引入公共css类
+  //@import url(); 引入公共css类
 
-.river-course-view {
+  .river-course-view {
     position: relative;
-  width:100%;
+    width: 100%;
     height: 100%;
-  background: url("~@/assets/common/homePage/big-bak.png") no-repeat;
+    background: url('~@/assets/common/homePage/big-bak.png') no-repeat;
     background-size: 100% 100%;
     .city-map-content-echarts {
       width: 10rem;
-    height: 7.9rem;
+      height: 7.8rem;
-    top: 10px;
+      top: 20px;
       left: 500px;
       bottom: 2rem;
       position: absolute;
@@ -375,9 +309,9 @@ export default {
       bottom: 10px;
       display: flex;
       flex-direction: column;
-    align-items:flex-end;
+      align-items: flex-end;
       pointer-events: none;
-    z-index:99999;
+      z-index: 99999;
       .map-tab {
         // 1、菜单切换功能
         display: flex;
@@ -405,7 +339,7 @@ export default {
         }
       }
     }
-  .reservoirType-list{
+    .reservoirType-list {
       position: absolute;
       right: 486px;
       width: 122px;
@@ -414,31 +348,31 @@ export default {
       padding: 10px 0 0 10px;
       display: flex;
       flex-direction: column;
-    background-color: rgba(13,40,79,0.5);
+      background-color: rgba(13, 40, 79, 0.5);
-    border:1px solid #0d284f;
+      border: 1px solid #0d284f;
-    padding-top:22px;
+      padding-top: 22px;
-    .type-legend{
+      .type-legend {
-      margin-bottom:20px;
+        margin-bottom: 20px;
         margin-left: 10px;
-      display:flex;
+        display: flex;
-      flex-direction:row;
+        flex-direction: row;
-      .legend-color{
+        .legend-color {
-        width:12px;
+          width: 12px;
-        height:12px;
+          height: 12px;
           border-radius: 50%;
           text-align: center;
           line-height: 12px;
         }
-      .color-normal{
+        .color-normal {
-        background-color:#00ebac ;
+          background-color: #00ebac;
         }
-      .color-warning{
+        .color-warning {
-        background-color:#ff3537 ;
+          background-color: #ff3537;
         }
-      .legend-text{
+        .legend-text {
           margin-left: 10px;
-        span{
+          span {
-          color:#ffffff;
+            color: #ffffff;
             font-size: 16px;
           }
         }
@@ -450,7 +384,7 @@ export default {
       position: absolute;
 
       margin: 0px auto;
-    background-image: url("~@/assets/common/homePage/animation1.png");
+      background-image: url('~@/assets/common/homePage/animation1.png');
       background-size: cover;
     }
     .display-animation1 {
@@ -462,7 +396,7 @@ export default {
       position: absolute;
 
       margin: 0px auto;
-    background-image: url("~@/assets/common/homePage/animation2.png");
+      background-image: url('~@/assets/common/homePage/animation2.png');
       background-size: cover;
     }
     .display-animation2 {
@@ -474,7 +408,7 @@ export default {
       position: absolute;
 
       margin: 0px auto;
-    background-image: url("~@/assets/common/homePage/animation3.png");
+      background-image: url('~@/assets/common/homePage/animation3.png');
       background-size: cover;
     }
     .display-animation3 {
@@ -486,7 +420,7 @@ export default {
       position: absolute;
 
       margin: 0px auto;
-    background-image: url("~@/assets/common/homePage/animation4.png");
+      background-image: url('~@/assets/common/homePage/animation4.png');
       background-size: cover;
     }
     .display-animation4 {
@@ -498,7 +432,7 @@ export default {
       position: absolute;
 
       margin: 0px auto;
-    background-image: url("~@/assets/common/homePage/animation5.png");
+      background-image: url('~@/assets/common/homePage/animation5.png');
       background-size: cover;
     }
     .display-animation5 {
@@ -510,7 +444,7 @@ export default {
       position: absolute;
 
       margin: 0px auto;
-    background-image: url("~@/assets/common/homePage/animation6.png");
+      background-image: url('~@/assets/common/homePage/animation6.png');
       background-size: cover;
     }
     .display-animation6 {
@@ -524,5 +458,5 @@ export default {
         top: -100%;
       }
     }
-}
+  }
 </style>

front/src/views/assertReport/index.vue

@@ -1,26 +1,24 @@
 <!--  -->
 <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 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>
+          <span v-else>{{ item }}</span>
         </template>
         <div class="mianJi">万元</div>
       </div>
-      <div style="  color: #bed1df; font-size: 16px">注：资源参考价格由部门提供或参考市场价格设定</div>
+      <div style="color: #bed1df; font-size: 16px">
-
+        注：资源参考价格由部门提供或参考市场价格设定
+      </div>
     </div>
     <!--左侧-->
     <div class="reservoir-left">
@@ -41,52 +39,47 @@
     <!--下方-->
     <div class="bottom">
       <reservoir-bottom />
-
     </div>
   </div>
-
 </template>
 
 <script>
-import {
+  import { getApplyPriceCount } from '@/api/assertReport'
-  getApplyPriceCount
+  import ReservoirThumbnail from './components/ReservoirThumbnail.vue'
-  } from '@/api/assertReport'
+  import ReservoirLeft from './components/ReservoirLeft'
-  import ReservoirThumbnail from "./components/ReservoirThumbnail.vue";
+  import ReservoirRight from './components/ReservoirRight'
-import ReservoirLeft from "./components/ReservoirLeft";
+  import ReservoirBottom from './components/ReservoirBottom'
-  import ReservoirRight from "./components/ReservoirRight";
+  import { NumbersConvertedToArrays } from '@/utils/arrayMethod.js'
-  import ReservoirBottom from "./components/ReservoirBottom";
+  export default {
-  import { NumbersConvertedToArrays } from "@/utils/arrayMethod.js";
-export default {
     //import引入的组件需要注入到对象中才能使用
     components: {
       ReservoirThumbnail,
       ReservoirLeft,
       ReservoirRight,
-    ReservoirBottom
+      ReservoirBottom,
-
     },
     data() {
       //这里存放数据
       return {
-      saveMonmy:[],
+        saveMonmy: [],
-      model: "common",
+        model: 'common',
-      dialogTitle: "周边视频",
+        dialogTitle: '周边视频',
         videoAnalysisDialogVisible: false, //视频分析弹窗显示标志位
         riverCourseHistoryDialogVisible: false, //河道历史弹窗
         riverDetailInfo: {}, //河道具体信息用于历史弹窗显示数据
-      dialogType: "add",
+        dialogType: 'add',
         dialogData: {},
         dangerReportDialogVisible: false,
         positionInfo: null,
         reservoirDialogVisible: false, //新增修改积水点弹窗显示标志位
         districtOptions: [], //区划数组
-      isThumbnail:true,    //是否为地图缩略图
+        isThumbnail: true, //是否为地图缩略图
-      tabindex:0,      //3d地图选中的tab。
+        tabindex: 0, //3d地图选中的tab。
-      listType:"",//水库列表的类型，普通列表 “”，预警列表 warnig
+        listType: '', //水库列表的类型，普通列表 “”，预警列表 warnig
         basicInfo: {}, //水库详情信息
         type: '',
-      callSource:"indexPage",
+        callSource: 'indexPage',
-    };
+      }
     },
     //监听属性 类似于data概念
     computed: {},
@@ -94,19 +87,17 @@ export default {
     watch: {},
     //方法集合
     methods: {
-    getSaveMoney(){
+      getSaveMoney() {
         getApplyPriceCount().then((res) => {
-     
+          this.saveMonmy = NumbersConvertedToArrays(res.data.data)
-      this.saveMonmy=NumbersConvertedToArrays(res.data.data)
         })
-    }
+      },
     },
 
     mounted() {
       this.getSaveMoney()
     },
-
+  }
-};
 </script>
 <style lang="less">
   @font-face {
@@ -135,17 +126,17 @@ export default {
     }
   }
 </style>
-<style lang='less' scoped>
+<style lang="less" scoped>
-// 此处去掉scoped为修改date-picker背景色，所以业务样式都应放在reservoir层级中，避免影响
+  // 此处去掉scoped为修改date-picker背景色，所以业务样式都应放在reservoir层级中，避免影响
-//@import url(); 引入公共css类
+  //@import url(); 引入公共css类
-.module-header-container {
+  .module-header-container {
     position: absolute;
     z-index: 1000;
     top: 0px;
     width: 100%;
     pointer-events: none;
-}
+  }
-.capability-cloud {
+  .capability-cloud {
     height: 10.8rem;
     background: url('~@/assets/capabilityCloud/bg.png') no-repeat;
     background-size: 100% 100%;
@@ -157,7 +148,7 @@ export default {
       background: url('~@/assets/capabilityCloud/header.png') no-repeat;
       font-size: 0.46rem;
     }
-    .bottom{
+    .bottom {
       bottom: 12px;
       position: absolute;
       left: 545px;
@@ -167,7 +158,6 @@ export default {
       text-align: center;
 
       height: 1.8rem;
-
     }
     .header1 {
       top: 78px;
@@ -189,8 +179,8 @@ export default {
           // line-height: 45px;
           color: #fed93f;
           font-weight: bold;
-            background: url("~@/assets/capabilityCloud/num_bg.png") 
+          background: url('~@/assets/capabilityCloud/num_bg.png') 100% 100%
-            100% 100% no-repeat;
+            no-repeat;
           background-size: 100%;
           text-align: center;
           font-size: 34px;
@@ -199,10 +189,10 @@ export default {
           font-family: DinPro-Bold;
         }
         .mianJi {
-            margin-top: 6px;;
+          margin-top: 6px;
           margin-right: 3px;
           font-size: 22px;
-         float:right;
+          float: right;
         }
         p {
           height: 44px;
@@ -235,9 +225,9 @@ export default {
       //  height: 100%;
       // bottom:2rem;
     }
-}
+  }
-// 日期时间组件
+  // 日期时间组件
-.phone-date-picker {
+  .phone-date-picker {
     color: #fff;
     //border: 1px solid #e4e7ed;
     border: 1px solid #008fbb;
@@ -284,7 +274,5 @@ export default {
       border: 1px solid #008fbb;
       border-color: #009ab3;
     }
-}
+  }
-
-
 </style>

front/src/views/capabilityCloud/components/ComponentServices.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-19 10:15:33
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-08-06 16:21:24
+ * @LastEditTime: 2022-11-29 17:39:20
  * @Description: 能力云图-组件服务
 -->
 <template>
@@ -102,7 +102,7 @@
                   <template #title>{{ item.name }}</template>
                   <span>{{ item.name }}</span>
                 </a-tooltip>
-                <span>{{ item.count || 0 }}</span>
+                <span>{{ item.count || item.score || 0 }}</span>
               </div>
             </div>
           </div>
@@ -125,7 +125,7 @@
   let xinhaianIsShow = whoShow.itShowXiHaiAn //判断是否是西海岸版本
   let snum = ref([
     { title: '上架总量', num: '0000' },
-    { title: '总调用次数(API)', num: '0' },
+    { title: '总调用次数(API)', num: '1008' },
     { title: '健康度(API)', num: '100%' },
   ])
   let dataclick = ref('total')
@@ -164,12 +164,20 @@
             })
             callTheTrend(callTheTrendData.value)
           } else {
-            callTheTrendData.value.snum = ['0', '0', '0', '0', '0', '0', '0']
+            callTheTrendData.value.snum = [
+              '3',
+              '17',
+              '10',
+              '5',
+              '15',
+              '15',
+              '19',
+            ]
             callTheTrend(callTheTrendData.value)
           }
         })
       } else {
-        callTheTrendData.value.snum = ['0', '0', '0', '0', '0', '0', '0']
+        callTheTrendData.value.snum = ['3', '17', '10', '5', '15', '15', '19']
         callTheTrend(callTheTrendData.value)
       }
     } else {
@@ -214,37 +222,37 @@
         })
       } else {
         callTheTrendData.value.snum = [
-          '0',
+          '3',
-          '0',
+          '17',
-          '0',
+          '10',
-          '0',
+          '5',
-          '0',
+          '15',
-          '0',
+          '15',
-          '0',
+          '19',
-          '0',
+          '3',
-          '0',
+          '17',
-          '0',
+          '10',
-          '0',
+          '5',
-          '0',
+          '15',
-          '0',
+          '15',
-          '0',
+          '19',
-          '0',
+          '10',
-          '0',
+          '8',
-          '0',
+          '16',
-          '0',
+          '3',
-          '0',
+          '17',
-          '0',
+          '10',
-          '0',
+          '5',
-          '0',
+          '15',
-          '0',
+          '15',
-          '0',
+          '19',
-          '0',
+          '3',
-          '0',
+          '17',
-          '0',
+          '10',
-          '0',
+          '5',
-          '0',
+          '15',
-          '0',
+          '15',
-          '0',
+          '19',
         ]
         callTheTrend(callTheTrendData.value)
       }
@@ -259,7 +267,7 @@
     option = {
       tooltip: {
         backgroundColor: 'rgba(17,61,116,0.8)',
-        borderWidth: 0,
+        // borderWidth: 0,
         trigger: 'axis',
         formatter: function (val) {
           console.log(val)
@@ -301,11 +309,13 @@
           name: '个',
           type: 'value',
           axisTick: {
-            show: false,
+            show: true,
           },
           axisLine: {
+            show: true,
             lineStyle: {
-              color: '#57617B',
+              color: '#336EBF',
+              width: '1',
             },
           },
           axisLabel: {
@@ -316,6 +326,9 @@
           },
           splitLine: {
             show: false,
+            // lineStyle: {
+            //   color: ['#57617B'],
+            // },
           },
         },
       ],

front/src/views/capabilityCloud/components/DataResources.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-19 10:15:33
- * @LastEditors: hisense.liangjunhua
+ * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-06-27 12:52:18
+ * @LastEditTime: 2022-11-28 16:23:25
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -50,10 +50,10 @@
       name: '总申请次数',
       num: '',
     },
-    {
+    // {
-      name: '满足率',
+    //   name: '满足率',
-      num: '',
+    //   num: '',
-    },
+    // },
   ])
   // 右侧数据
   const assignRankings = ref([

front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue

@@ -257,9 +257,18 @@
                 </b>
                 {{ item.name }} :
               </div>
+              <div v-if="item.type == 'input' && item.name === '参考价格'">
               <a-input 
                 :maxLength="1000"
-                v-if="item.type == 'input' && item.name.indexOf('名称') == -1"
+                v-model:value="item.note1"
+                :placeholder="'请输入' + placeHolderWords(item.name)+',单位为元'"
+                @change="changeIiem(item.name, item.note1)"
+              />
+             <span style="color:red"> (仅用于测算为部门节省资金)</span>
+            </div>
+              <a-input
+                :maxLength="1000"
+                v-else-if="item.type == 'input' && item.name.indexOf('名称') == -1"
                 v-model:value="item.note1"
                 :placeholder="'请输入' + placeHolderWords(item.name)"
                 @change="changeIiem(item.name, item.note1)"

front/src/views/capacitySquare/components/algorithm.vue

@@ -22,7 +22,11 @@
         </div>
         <div class="bottom" v-show="selectFlag2">
           <span class="light"></span>
-          <div v-for="val in dictList" :key="val" @click="changeAreaFunction(val)">
+          <div
+            v-for="val in dictList"
+            :key="val"
+            @click="changeAreaFunction(val)"
+          >
             {{ val }}
           </div>
         </div>
@@ -30,9 +34,18 @@
     </div>
 
     <div class="algorithm-class">
-      <div v-for="(item, index) in dataList" :key="`algorithm-${index}`" class="algorithm-card">
+      <div
-        <a-image :src="algorithmCardPhoto(item)" :width="525" :height="275" :fallback="imgSrc" :preview="false">
+        v-for="(item, index) in dataList"
-        </a-image>
+        :key="`algorithm-${index}`"
+        class="algorithm-card"
+      >
+        <a-image
+          :src="algorithmCardPhoto(item)"
+          :width="525"
+          :height="275"
+          :fallback="imgSrc"
+          :preview="false"
+        ></a-image>
 
         <a-tooltip>
           <template #title>{{ item.name }}</template>
@@ -46,75 +59,79 @@
   </div>
 </template>
 <script setup>
-import { getCategoryTreePage } from '@/api/personalCenter'
+  import { getCategoryTreePage } from '@/api/personalCenter'
-import { getGisByArea } from '@/api/home'
+  import { getGisByArea } from '@/api/home'
-import { ref, onMounted, onBeforeUnmount, nextTick } from 'vue'
+  import { ref, onMounted, onBeforeUnmount, nextTick } from 'vue'
-
+  import { useRouter } from 'vue-router'
-
+  const router = useRouter()
-const deptType = ref(null)
+  const area = router.currentRoute.value.query.area
-const typeName = ref('全市')
+  const deptType = ref(null)
-const typeName2 = ref('全部')
+  const typeName = ref('全市')
-const dictList = ref([])
+  const typeName2 = ref('全部')
-const dataList = ref([])
+  if (area) {
-const selectFlag2 = ref(false)
+    typeName2.value = area
-const selectFlag = ref(false)
+  }
-getCategoryTreePage({
+  const dictList = ref([])
+  const dataList = ref([])
+  const selectFlag2 = ref(false)
+  const selectFlag = ref(false)
+  getCategoryTreePage({
     page: 1,
     limit: 99,
     dictTypeId: '1513712507692818433',
-}).then((res) => {
+  }).then((res) => {
     dictList.value = ['全部']
     res.data.data.list.map((val) => {
       // if (val.dictLabel !== '其他') {
       dictList.value.push(val.dictLabel)
       // }
     })
-})
+  })
-const params = {
+  const params = {
     pageNum: 1,
     type: '智能算法',
     area: typeName2.value == '全部' ? '' : typeName2.value,
-  pageSize: 9 // 固定9
+    pageSize: 9, // 固定9
-}
+  }
 
-// 切换领域
+  // 切换领域
-const changeAreaFunction = (val) => {
+  const changeAreaFunction = (val) => {
-  params.pageNum = 1;
+    params.pageNum = 1
     typeName2.value = val
-  params.area = typeName2.value == '全部' ? '' : typeName2.value;
+    params.area = typeName2.value == '全部' ? '' : typeName2.value
     selectFlag2.value = false
     pageWithAttrsFunction()
-}
+  }
-let algorithmclassDom = null
+  let algorithmclassDom = null
-const imgSrc = ref(require('@/assets/capacitySquare/algorithm-photo.jpg'))
+  const imgSrc = ref(require('@/assets/capacitySquare/algorithm-photo.jpg'))
-const dataLength = ref(true)
+  const dataLength = ref(true)
-const isNoMore = ref(false)
+  const isNoMore = ref(false)
-let url = ref('')
+  let url = ref('')
-const pageWithAttrsFunction = () => {
+  const pageWithAttrsFunction = () => {
     getGisByArea(params).then((res) => {
       dataList.value = res.data.data.list
       if (res.data.data.list.length < 9) {
         dataLength.value = false
       }
     })
-}
+  }
-pageWithAttrsFunction()
+  pageWithAttrsFunction()
 
-//图片显示
+  //图片显示
-const algorithmCardPhoto = (item) => {
+  const algorithmCardPhoto = (item) => {
     let _arr = []
-  if(item.pic && typeof item.pic == 'string') {
+    if (item.pic && typeof item.pic == 'string') {
       _arr = JSON.parse(item.pic)
     }
-  let _img = _arr[0] && _arr[0].img || imgSrc.value;
+    let _img = (_arr[0] && _arr[0].img) || imgSrc.value
-  console.log('_img------------>', _img);
+    console.log('_img------------>', _img)
     return _img
-}
+  }
-//跳转详情页
+  //跳转详情页
-const detailFunction = (id) => {
+  const detailFunction = (id) => {
     window.open(window.SITE_CONFIG.previewUrl + `#/details?id=${id}`)
-}
+  }
-const algorithmFunction = (e) => {
+  const algorithmFunction = (e) => {
     var scrollTop = e.currentTarget.scrollTop
     var windowHeight = e.currentTarget.clientHeight
     var scrollHeight = e.currentTarget.scrollHeight
@@ -135,13 +152,13 @@ const algorithmFunction = (e) => {
     } else {
       isNoMore.value = false
     }
-}
+  }
 
-// 切换区市
+  // 切换区市
-const changeDeptType = (str) => {
+  const changeDeptType = (str) => {
     if (str) {
       if (algorithmclassDom) {
-      algorithmclassDom.scrollTop = 0;
+        algorithmclassDom.scrollTop = 0
       }
       switch (str) {
         case '全市':
@@ -161,50 +178,58 @@ const changeDeptType = (str) => {
           typeName.value = '企 业'
           break
       }
-    params.pageNum = 1;
+      params.pageNum = 1
-    if(deptType.value !== null && deptType.value !== undefined) {
+      if (deptType.value !== null && deptType.value !== undefined) {
-      params.deptType = deptType.value;
+        params.deptType = deptType.value
-    }else {
+      } else {
-      if(Object.keys(params).includes('deptType')) {
+        if (Object.keys(params).includes('deptType')) {
           delete params.deptType
         }
       }
     }
     selectFlag.value = false
     getData(str)
-}
+  }
 
-const getData = (str) => {
+  const getData = (str) => {
     getGisByArea(params).then((res) => {
       const resData = res.data.data || {}
-    if (resData.list.length > 0 && resData.list.length < 9 && algorithmclassDom) {
+      if (
+        resData.list.length > 0 &&
+        resData.list.length < 9 &&
+        algorithmclassDom
+      ) {
         algorithmclassDom.removeEventListener('scroll', algorithmFunction, true)
       }
       dataList.value = resData.list || []
       nextTick(() => {
         algorithmclassDom = document.querySelector('.algorithm-box')
         if (str && algorithmclassDom) {
-        algorithmclassDom.removeEventListener('scroll', algorithmFunction, true)
+          algorithmclassDom.removeEventListener(
+            'scroll',
+            algorithmFunction,
+            true
+          )
           algorithmclassDom.addEventListener('scroll', algorithmFunction, true)
         }
       })
     })
-}
+  }
 
-onMounted(() => {
+  onMounted(() => {
     algorithmclassDom = document.querySelector('.algorithm-class')
     if (dataLength.value) {
       //监听滚动事件
       algorithmclassDom.addEventListener('scroll', algorithmFunction, true)
     }
-})
+  })
-onBeforeUnmount(() => {
+  onBeforeUnmount(() => {
     algorithmclassDom.removeEventListener('scroll', algorithmFunction, true)
-})
+  })
 </script>
 
 <style lang="less" scoped>
-.algorithm {
+  .algorithm {
     .select {
       margin: 0.1rem 0 0.1rem 0.2rem;
       color: #fff;
@@ -229,7 +254,8 @@ onBeforeUnmount(() => {
           position: absolute;
           top: 0.4rem;
           left: 1.52rem;
-        background: url('~@/assets/capacitySquare/select-light1.png') no-repeat;
+          background: url('~@/assets/capacitySquare/select-light1.png')
+            no-repeat;
           background-size: 100%;
         }
       }
@@ -250,11 +276,12 @@ onBeforeUnmount(() => {
           position: absolute;
           top: -0.08rem;
           left: -0.3rem;
-        background: url('~@/assets/capacitySquare/select-light2.png') no-repeat;
+          background: url('~@/assets/capacitySquare/select-light2.png')
+            no-repeat;
           background-size: 100%;
         }
 
-      &>div {
+        & > div {
           width: 1.8rem;
           height: 0.4rem;
           line-height: 0.4rem;
@@ -262,7 +289,7 @@ onBeforeUnmount(() => {
           border-top: 1px solid #aed5ff;
         }
 
-      &>div:nth-of-type(1) {
+        & > div:nth-of-type(1) {
           border: none;
         }
       }
@@ -299,7 +326,8 @@ onBeforeUnmount(() => {
         .algorithm-card-photo {
           height: 100%;
           width: 100%;
-        background: url('~@/assets/capacitySquare/algorithm-photo.jpg') no-repeat;
+          background: url('~@/assets/capacitySquare/algorithm-photo.jpg')
+            no-repeat;
           background-size: 100%;
         }
 
@@ -313,7 +341,8 @@ onBeforeUnmount(() => {
           font-family: alibaba;
           bottom: 0.15rem;
           padding-left: 0.22rem;
-        background: url('~@/assets/capacitySquare/algorithm-title-bg.png') no-repeat;
+          background: url('~@/assets/capacitySquare/algorithm-title-bg.png')
+            no-repeat;
           background-size: 100%;
           display: flex;
           flex-direction: column;
@@ -349,5 +378,5 @@ onBeforeUnmount(() => {
       width: 0.08rem;
       border-radius: 0.08rem;
     }
-}
+  }
 </style>

front/src/views/capacitySquare/components/application.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-08-09 09:31:25
- * @LastEditors: hisense.wuhongjian
+ * @LastEditors: Light
- * @LastEditTime: 2022-10-24 10:44:50
+ * @LastEditTime: 2022-11-29 14:41:49
  * @Description: 应用资源
 -->
 <template>
@@ -57,12 +57,17 @@
   import { selectAppList } from '@/api/home'
   import { useRouter } from 'vue-router'
   const router = useRouter()
+  const selectArea = router.currentRoute.value.query.area
   const pageNum = ref(1)
   const flag = ref(true)
   const type = ref(null)
   const area = ref(null)
   const typeName = ref('全市')
   const typeName2 = ref('全部')
+  if (selectArea && selectArea !== '全部') {
+    typeName2.value = selectArea
+    area.value = selectArea
+  }
   const dictList = ref([])
   const data = reactive({ list: [] })
   const selectFlag = ref(false)
@@ -121,7 +126,7 @@
       type: type.value,
       area: area.value,
     }).then((res) => {
-      console.log('res---应用广场--------->', res);
+      console.log('res---应用广场--------->', res)
 
       if (res.data.data.total.length < 9) {
         dom.removeEventListener('scroll', viewMonitor, true)

front/src/views/capacitySquare/components/layer.vue

@@ -60,9 +60,15 @@
   import { getCategoryTreePage } from '@/api/personalCenter'
   import { getGisByArea } from '@/api/home'
   import { ref, onMounted, onBeforeUnmount, nextTick } from 'vue'
+  import { useRouter } from 'vue-router'
+  const router = useRouter()
+  const area = router.currentRoute.value.query.area
   const deptType = ref(null)
   const typeName = ref('全市')
   const typeName2 = ref('全部')
+  if (area) {
+    typeName2.value = area
+  }
   const dictList = ref([])
   const dataList = ref([])
   const selectFlag2 = ref(false)

front/src/views/demandCenter/demandDetails.vue

@@ -82,7 +82,8 @@
             <a-form-item
               style="margin-bottom: 10px"
               label="需求类型"
-              name="请选择需求类型"
+              name="detailsType"
+              :rules="[{ required: true, message: '请选择需求类型' }]"
             >
               <a-select
                 disabled="true"
@@ -99,7 +100,7 @@
               </a-select>
             </a-form-item>
 
-            <a-tooltip placement="top" mouseEnterDelay="1">
+            <!-- <a-tooltip placement="top" mouseEnterDelay="1">
               <template #title>
                 <span>{{ formName.detailsField }}</span>
               </template>
@@ -115,7 +116,7 @@
                   v-model:value="formName.detailsField"
                 />
               </a-form-item>
-            </a-tooltip>
+            </a-tooltip> -->
 
             <a-form-item
               style="margin-bottom: 10px"

front/src/views/demandCenter/index.vue

@@ -4,7 +4,11 @@
     <div class="main">
       <div class="left">
         <a-layout-sider>
-          <a-menu v-model:selectedKeys="selectedKeys" mode="inline" @click="handleClick">
+          <a-menu
+            v-model:selectedKeys="selectedKeys"
+            mode="inline"
+            @click="handleClick"
+          >
             <a-menu-item v-for="item in menuList" :key="item.key">
               <img :src="item.img" alt="" style="margin-right: 10px" />
               <span>{{ item.title }}</span>
@@ -14,31 +18,45 @@
       </div>
       <div class="right">
         <!-- <div class="title">数据需求</div> -->
-        <a-list class="demo-loadmore-list" :loading="initLoading" item-layout="horizontal" :data-source="list"
+        <a-list
-          :key="showKey">
+          class="demo-loadmore-list"
+          :loading="initLoading"
+          item-layout="horizontal"
+          :data-source="list"
+          :key="showKey"
+        >
           <template #renderItem="{ item }">
             <a-list-item>
-              <a-skeleton avatar :title="false" :loading="!!item.loading" active>
+              <div class="toptitle">
-                <a-tooltip placement="topLeft" arrow-point-at-center mouseEnterDelay="1"
+                <a-tooltip placement="topLeft">
-                  overlayClassName="demandCenter-tooltip-card">
+                  <template #title>{{ item.demandSubject }}</template>
-                  <template #title>
+                  <span
-                    <div class="tooltip-desc">{{ item.demandDetails || '--' }}</div>
+                    @click="showDetail(item)"
-                  </template>
+                    style="cursor: pointer"
-                  <a-list-item-meta :description="'描述：' + (item.demandDetails || '--')">
+                    class="name"
-                    <template #title>
+                  >
-                      <span @click="showDetail(item)" style="cursor: pointer" class="name">
                     {{ item.demandSubject }}
                   </span>
-                      <span class="time">{{ item.createDate }}</span>
-                    </template>
-                  </a-list-item-meta>
                 </a-tooltip>
-              </a-skeleton>
+
+                <span class="time">{{ item.createDate }}</span>
+              </div>
+              <a-tooltip placement="topLeft">
+                <template #title>描述： {{ item.demandDetails }}</template>
+                <div class="bottomdesc">
+                  描述： {{ item.demandDetails || '--' }}
+                </div>
+              </a-tooltip>
             </a-list-item>
           </template>
         </a-list>
-        <a-pagination v-model:current="pageNum" v-model:page-size="pageSize" :total="total" @change="pageChange"
+        <a-pagination
-          :key="showKey">
+          v-model:current="pageNum"
+          v-model:page-size="pageSize"
+          :total="total"
+          @change="pageChange"
+          :key="showKey"
+        >
           <template #buildOptionText="props">
             <span>{{ props.value }}条/页</span>
           </template>
@@ -69,7 +87,16 @@ const pageSize = ref(8)
 const total = ref()
 const showKey = ref(0)
 const whoShow1 = ref(whoShow)
+
+const selectedKeys = ref(['0'])
+
 const menuList = [
+  {
+    key: '0',
+    title: '全部需求',
+    num: '0',
+    img: require('@/assets/home/menuall.png'),
+  },
   {
     key: '1',
     title: '基础设施',
@@ -98,7 +125,7 @@ const menuList = [
     key: '5',
     title: '知识库',
     num: '0',
-    img: require('@/assets/home/menuyyzy.png'),
+    img: require('@/assets/home/menuzsk.png'),
   },
 ]
 const detailsType = ref('')
@@ -113,6 +140,8 @@ const handleClick = (item) => {
     detailsType.value = '应用资源'
   } else if (item.key === '5') {
     detailsType.value = '知识库'
+  } else {
+    detailsType.value = ''
   }
   pageNum.value = 1
   getApplyList()
@@ -138,8 +167,6 @@ const getApplyList = () => {
 }
 
 const showDetail = (item) => {
-  // console.log('demandDetails', item)
-  // store.commit('home/demandDetailsData', item)
   router.push({
     path: '/demandDetails',
     query: {
@@ -232,25 +259,9 @@ onMounted(() => {
       background-color: #ffffff;
       box-shadow: 10px 8px 10px 3px #9dc6ea;
       padding: 20px;
-
+      .toptitle {
-      .title {
+        margin-bottom: 10px;
-        font-size: 22px;
+        & > span:first-child {
-        font-weight: 500;
-        color: #1492ff;
-      }
-
-      .ant-list {
-        height: 730px;
-        overflow-y: scroll;
-
-        :deep(.ant-list-item-meta-title) {
-          display: flex;
-          justify-content: space-between;
-
-          .name {
-            width: 800px;
-            font-size: 18px;
-            color: #1492ff;
           display: -webkit-box;
           /*设置为弹性盒子*/
           -webkit-line-clamp: 1;
@@ -261,13 +272,22 @@ onMounted(() => {
           /*超出显示为省略号*/
           -webkit-box-orient: vertical;
           word-break: break-all;
+          width: 600px;
+          font-size: 14px;
+          color: #1492ff;
+          font-size: 18px;
+        }
+        & > span:first-child:hover {
+          color: #0b5392;
+        }
+        & > span:last-child {
+          float: right;
         }
       }
-
+      .bottomdesc {
-        :deep(.ant-list-item-meta-description) {
         display: -webkit-box;
         /*设置为弹性盒子*/
-          -webkit-line-clamp: 2;
+        -webkit-line-clamp: 1;
         /*最多显示2行*/
         overflow: hidden;
         /*超出隐藏*/
@@ -275,7 +295,55 @@ onMounted(() => {
         /*超出显示为省略号*/
         -webkit-box-orient: vertical;
         word-break: break-all;
+        width: 800px;
+        font-size: 14px;
       }
+
+      .title {
+        font-size: 22px;
+        font-weight: 500;
+        color: #1492ff;
+      }
+
+      .ant-list {
+        height: 730px;
+        overflow-y: scroll;
+        .ant-list-item {
+          display: list-item;
+        }
+        // :deep(.ant-list-item-meta-title) {
+        // // display: flex;
+        //   justify-content: space-between;
+
+        //   .name {
+        //     width: 800px;
+        //     font-size: 18px;
+        //     color: #1492ff;
+        //     display: -webkit-box;
+        //     /*设置为弹性盒子*/
+        //     -webkit-line-clamp: 1;
+        //     /*最多显示2行*/
+        //     overflow: hidden;
+        //     /*超出隐藏*/
+        //     text-overflow: ellipsis;
+        //     /*超出显示为省略号*/
+        //     -webkit-box-orient: vertical;
+        //     word-break: break-all;
+        //   }
+        // }
+
+        // :deep(.ant-list-item-meta-description) {
+        //   display: -webkit-box;
+        //   /*设置为弹性盒子*/
+        //   -webkit-line-clamp: 2;
+        //   /*最多显示2行*/
+        //   overflow: hidden;
+        //   /*超出隐藏*/
+        //   text-overflow: ellipsis;
+        //   /*超出显示为省略号*/
+        //   -webkit-box-orient: vertical;
+        //   word-break: break-all;
+        // }
       }
 
       // 隐藏滚动条

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

@@ -8,8 +8,7 @@
       ></DetalsTitle>
     </div>
     <!-- 青岛市局 -->
-    <div style="width: 100%; display: flex; justify-content: center"
+    <div style="width: 100%; display: flex; justify-content: center">
-    >
       <div class="content" v-for="item in dataFrom.content" :key="item.title">
         <div class="content-left" v-if="item.titleType === '调用接口'">
           <div class="left">
@@ -97,12 +96,14 @@
                 <a-tooltip>
                   <template #title>
                     {{
-                      approveStatus === '通过'
+                      approveStatus === '通过' || role
                         ? item.people.value
                         : '请申请后查看'
                     }}
                   </template>
-                  <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                  <span
+                    :class="{ 'blur-word': approveStatus !== '通过' && !role }"
+                  >
                     {{ item.people.value }}
                   </span>
                 </a-tooltip>
@@ -112,12 +113,14 @@
                 <a-tooltip>
                   <template #title>
                     {{
-                      approveStatus === '通过'
+                      approveStatus === '通过' || role
                         ? item.phone.value
                         : '请申请后查看'
                     }}
                   </template>
-                  <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                  <span
+                    :class="{ 'blur-word': approveStatus !== '通过' && !role }"
+                  >
                     {{ item.phone.value }}
                   </span>
                 </a-tooltip>
@@ -169,7 +172,15 @@
   import { ref, defineProps, watch } from 'vue'
   import { message } from 'ant-design-vue'
   import { useRouter } from 'vue-router'
+  import { useStore } from 'vuex'
   const router = useRouter()
+  const store = useStore()
+  const role = ref(false)
+  store.getters['user/roleList'].map((val) => {
+    if (val === '运维管理员') {
+      role.value = true
+    }
+  })
 
   const approveStatus = ref('通过')
   const whoShow1 = ref(whoShow)

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

@@ -8,8 +8,7 @@
       ></DetalsTitle>
     </div>
     <!-- 青岛市局 -->
-    <div style="width: 100%; display: flex; justify-content: center"
+    <div style="width: 100%; display: flex; justify-content: center">
-    >
       <div class="content">
         <div
           v-for="(item, index) in dataFrom.content"
@@ -24,6 +23,7 @@
                 <a-tooltip
                   v-if="
                     approveStatus !== '通过' &&
+                    !role &&
                     (carditem.attrType === '联系人' ||
                       carditem.attrType === '联系人电话')
                   "
@@ -55,7 +55,15 @@
   import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
   import { ref, defineProps, watch } from 'vue'
   import { useRouter } from 'vue-router'
+  import { useStore } from 'vuex'
   const router = useRouter()
+  const store = useStore()
+  const role = ref(false)
+  store.getters['user/roleList'].map((val) => {
+    if (val === '运维管理员') {
+      role.value = true
+    }
+  })
   const approveStatus = ref('通过')
   const whoShow1 = ref(whoShow)
   let dataFrom = ref({

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

@@ -7,8 +7,7 @@
         :type="dataFrom.englishTitle"
       ></DetalsTitle>
     </div>
-    <div style="width: 100%; display: flex; justify-content: center"
+    <div style="width: 100%; display: flex; justify-content: center">
-    >
       <div class="content" v-for="item in dataFrom.content" :key="item.title">
         <div class="content-left">
           <div class="left">
@@ -52,12 +51,14 @@
                 <a-tooltip>
                   <template #title>
                     {{
-                      approveStatus === '通过'
+                      approveStatus === '通过' || role
                         ? item.people.value
                         : '请申请后查看'
                     }}
                   </template>
-                  <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                  <span
+                    :class="{ 'blur-word': approveStatus !== '通过' && !role }"
+                  >
                     {{ item.people.value }}
                   </span>
                 </a-tooltip>
@@ -67,12 +68,14 @@
                 <a-tooltip>
                   <template #title>
                     {{
-                      approveStatus === '通过'
+                      approveStatus === '通过' || role
                         ? item.phone.value
                         : '请申请后查看'
                     }}
                   </template>
-                  <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                  <span
+                    :class="{ 'blur-word': approveStatus !== '通过' && !role }"
+                  >
                     {{ item.phone.value }}
                   </span>
                 </a-tooltip>
@@ -124,7 +127,15 @@
   import { ref, defineProps, watch } from 'vue'
   import { message } from 'ant-design-vue'
   import { useRouter } from 'vue-router'
+  import { useStore } from 'vuex'
   const router = useRouter()
+  const store = useStore()
+  const role = ref(false)
+  store.getters['user/roleList'].map((val) => {
+    if (val === '运维管理员') {
+      role.value = true
+    }
+  })
   const approveStatus = ref('通过')
   const whoShow1 = ref(whoShow)
   let dataFrom = ref({

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

@@ -7,8 +7,7 @@
         :type="dataFrom.englishTitle"
       ></DetalsTitle>
     </div>
-    <div style="width: 100%; display: flex; justify-content: center"
+    <div style="width: 100%; display: flex; justify-content: center">
-    >
       <div class="content">
         <div class="content-card">
           <div class="left">
@@ -40,6 +39,7 @@
                     <template #title>
                       {{
                         approveStatus !== '通过' &&
+                        !role &&
                         (carditem.attrType === '部门联系人' ||
                           carditem.attrType === '联系人电话')
                           ? '请申请后查看'
@@ -50,6 +50,7 @@
                       :class="{
                         'blur-word':
                           approveStatus !== '通过' &&
+                          !role &&
                           (carditem.attrType === '部门联系人' ||
                             carditem.attrType === '联系人电话'),
                       }"
@@ -80,7 +81,15 @@
   import { pinyin } from 'pinyin-pro'
   import { message } from 'ant-design-vue'
   import { useRouter } from 'vue-router'
+  import { useStore } from 'vuex'
   const router = useRouter()
+  const store = useStore()
+  const role = ref(false)
+  store.getters['user/roleList'].map((val) => {
+    if (val === '运维管理员') {
+      role.value = true
+    }
+  })
   const approveStatus = ref('通过')
   const whoShow1 = ref(whoShow)
   let flag = ref(true)

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

@@ -7,8 +7,7 @@
         :type="dataFrom.englishTitle"
       ></DetalsTitle>
     </div>
-    <div style="width: 100%; display: flex; justify-content: center"
+    <div style="width: 100%; display: flex; justify-content: center">
-    >
       <div class="content" v-for="item in dataFrom.content" :key="item.title">
         <div class="content-left">
           <div class="left">
@@ -63,12 +62,14 @@
                 <a-tooltip>
                   <template #title>
                     {{
-                      approveStatus === '通过'
+                      approveStatus === '通过' || role
                         ? item.people.value
                         : '请申请后查看'
                     }}
                   </template>
-                  <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                  <span
+                    :class="{ 'blur-word': approveStatus !== '通过' && !role }"
+                  >
                     {{ item.people.value }}
                   </span>
                 </a-tooltip>
@@ -78,12 +79,14 @@
                 <a-tooltip>
                   <template #title>
                     {{
-                      approveStatus === '通过'
+                      approveStatus === '通过' || role
                         ? item.phone.value
                         : '请申请后查看'
                     }}
                   </template>
-                  <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                  <span
+                    :class="{ 'blur-word': approveStatus !== '通过' && !role }"
+                  >
                     {{ item.phone.value }}
                   </span>
                 </a-tooltip>
@@ -135,7 +138,15 @@
   import { pinyin } from 'pinyin-pro'
   import { ref, defineProps, watch } from 'vue'
   import { useRouter } from 'vue-router'
+  import { useStore } from 'vuex'
   const router = useRouter()
+  const store = useStore()
+  const role = ref(false)
+  store.getters['user/roleList'].map((val) => {
+    if (val === '运维管理员') {
+      role.value = true
+    }
+  })
   const approveStatus = ref('通过')
   const whoShow1 = ref(whoShow)
   let dataFrom = ref({

front/src/views/home/DetailsPageconetent.vue

@@ -6,7 +6,7 @@
       <detailsPageconetentTree />
     </div>
     <div class="details-pageconetent-left" v-else>
-      <detailsPageInfrastructureTree v-show="flag != '6'" />
+      <detailsPageInfrastructureTree v-if="flag != '6'" />
     </div>
     <div class="top" v-if="Cardsname != '知识库' && Cardsname != '基础设施'">
       <div class="resultListSearchInput-father">
@@ -127,7 +127,7 @@
         </template>
       </div>
       <searchResultList
-        v-show="resourceList.data && resourceList.data.length > 0"
+        v-if="resourceList.data && resourceList.data.length > 0"
         :resourceList="resourceList"
         :key="listKey2"
         :resourceTotal="resourceTotal"
@@ -276,12 +276,14 @@
         :resourceTotal="resourceTotal"
       ></KnowledgeBase>
     </div>
-    <div class="talk-monitor" @click="openMonitor">
+    <!--客户反馈：能力集市-问答机器人属于互联网链接，先注释掉，不要删除。写一下注释，方便后面要放开的时候一下子找到。-->
+    <!-- <div class="talk-monitor" @click="openMonitor">
       <a-tooltip>
         <template #title>问答机器人</template>
         <i></i>
       </a-tooltip>
     </div>
+     -->
     <div @click="showAbilitySquare" class="abilitySquare">
       <p></p>
       <p>能力广场</p>
@@ -833,7 +835,7 @@
       let select =
         router.currentRoute.value.query.select ||
         DETAIL_PAGE_CONTENT_DEFAULT_TAB
-      console.log('select------------>', select)
+        let orderField =router.currentRoute.value.query.orderField 
       // 例如：组件服务是大类型，selectSubType是组件服务的智能算法或图层服务等...
       let selectSubType = router.currentRoute.value.query.type || ''
       let queryName = ref('')
@@ -926,7 +928,6 @@
         ) {
           ;[title[0], title[2]] = [title[2], title[0]]
         }
-        debugger
         titleName.value = title
       }
       // 查询
@@ -1323,6 +1324,8 @@
           globalData.data = []
         }
         select = router.currentRoute.value.query.select
+      
+      
         if (
           (select == '应用资源' &&
             (paramsGetResources.orderField == '' ||
@@ -1619,8 +1622,9 @@
       }
       // 青岛-西海岸处理
       const getXiHaiAn = (res) => {
-        ;((res.data && res.data.data && res.data.data.list) || []).forEach(
+        const data = (res.data && res.data.data && res.data.data.list) || []
-          (val) => {
+        const total = (res.data && res.data.data && res.data.data.total) || 0
+        data.forEach((val) => {
           val.id = val.serviceId // id
           val.name = val.serviceName // 名字
           val.sjlCount = val.requestQuantity // 数据量
@@ -1628,10 +1632,13 @@
           val.deptName = val.departmentName // 部门
           val.createTime = val.createTime.split('.')[0]
           val.createDate = val.createTime // 发布时间
-          }
+        })
-        )
+
-        resourceList.data = res.data.data.list || []
+        console.log('接口数据', data)
-        resourceTotal.value = res.data.data.total || ''
+        resourceList.data = data || []
+        console.log('接口数据2', resourceList.data)
+        resourceTotal.value = total
+        console.log()
       }
       let shoppingCartList = ref([])
       // 获取申购车列表
@@ -1779,6 +1786,10 @@
       onMounted(() => {
         // 从本地读取查询条件，赋值
         //西海岸基础设施放在最前面
+        orderField= router.currentRoute.value.query.orderField  //根据什么排序
+        if(orderField){
+          paramsGetResources.orderField=orderField
+        }
         setTitle()
         handleSetSearchData()
         listKey2.value++
@@ -1864,7 +1875,7 @@
             query: newQuery,
           })
           .then(() => {
-            tagFlag.value = false
+            // tagFlag.value = false
             chongzhi(true)
             getNewList()
           })
@@ -2454,7 +2465,7 @@
     padding-top: 0.05rem;
     position: fixed;
     z-index: 10;
-    bottom: 1.56rem;
+    // bottom: 1.56rem;
     right: 0.1rem;
     cursor: pointer;
     background: #e3edfc;

front/src/views/home/apply.vue

@@ -812,7 +812,7 @@
         console.log('res=====>', res.data.data)
         if (res.data.code == 0) {
           if (res.data.data.length == 0) {
-            message.warning('该关键词，暂无应用资源！')
+            // message.warning('该关键词，暂无应用资源！')
           } else {
             // 过滤本单位的应用系统
             res.data.data.map((val) => {

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

@@ -2,7 +2,7 @@
 海康H5Player
 -->
 <template>
-  <div :id="videoId" style="width: 800px; height: 600px; z-index: 9999"></div>
+  <div :id="videoId" ref="video333" style="width: 800px; height: 600px"></div>
 </template>
 <script>
   // const IS_MOVE_DEVICE = document.body.clientWidth < 992 // 是否移动设备
@@ -41,6 +41,7 @@
         mseSupport: MSE_IS_SUPPORT,
         // tabActive: MSE_IS_SUPPORT ? 'mse' : 'decoder',
         tabActive: 'decoder',
+        videoDom: {},
         urls: {
           realplay: 'ws://10.19.147.22:559/EUrl/q2jQie4',
           talk: 'wss://10.41.163.126:6014/proxy/10.41.163.126:559/EUrl/6gFx47S',
@@ -70,18 +71,13 @@
     },
     created() {},
     mounted() {
-      this.init()
+      // this.init()
       mybus.emit('closeLoading', true)
       this.createPlayer()
-      this.arrangeWindow()
+      // 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('wss://10.134.135.44:6014/proxy/10.10.20.14:559/openUrl/y3mFfcA',0);
     },
     watch: {
       videoUrl: {
@@ -120,15 +116,18 @@
           //szId: 'player'+this.index,
           szId: this.videoId,
           szBasePath: '/util/', //引入静态资源地址，我这里静态资源在public/js文件存放，所以设置为js
-          iMaxSplit: 4,
+          // iMaxSplit: 4,
-          iWidth: '800px',
+          // iWidth: '800px',
-          iCurrentSplit: 4,
+          // iCurrentSplit: 4,
-          openDebug: true,
+          // openDebug: true,
-          oStyle: {
+          // oStyle: {
-            borderSelect: '#FFCC00',
+          //   borderSelect: '#FFCC00',
-          },
+          // },
         })
         let that = this
+        that.videoDom = that.$refs.video333.querySelector('video') || {}
+        // that.videoDom.autoplay = false
+
         // 事件回调绑定
         this.player.JS_SetWindowControlCallback({
           windowEventSelect: function (iWndIndex) {
@@ -138,8 +137,8 @@
           pluginErrorHandler: function (iWndIndex, iErrorCode, oError) {
             //插件错误回调
             console.log('pluginError callback: ', iWndIndex, iErrorCode, oError)
-            message.error('取流异常,请稍后尝试')
+            // message.error('取流异常,请稍后尝试')
-            mybus.emit('closeLoading', false)
+            // mybus.emit('closeLoading', false)
           },
           windowEventOver: function (iWndIndex) {
             //鼠标移过回调
@@ -159,15 +158,19 @@
           },
           firstFrameDisplay: function (iWndIndex, iWidth, iHeight) {
             //首帧显示回调
-            console.log(
+            // console.log(
-              'firstFrame loaded callback: ',
+            //   'firstFrame loaded callback: ',
-              iWndIndex,
+            //   iWndIndex,
-              iWidth,
+            //   iWidth,
-              iHeight
+            //   iHeight
-            )
+            // )
-            // 如果是录像播放，首帧绘制完成后停止
+            // // 如果是录像播放，首帧绘制完成后停止
-            if (!that.realTime) {
+            // if (!that.realTime) {
-              that.pausePlay(iWndIndex)
+            // that.pausePlay(iWndIndex)
+            if (!that.unStopable) {
+              setTimeout(() => {
+                that.videoDom.pause()
+              }, 0)
             }
             mybus.emit('closeLoading', false)
           },
@@ -191,67 +194,23 @@
       // 初始化结束
       // 视频预览
       realplay(playURL, index1) {
+        let that = this
         this.realTime = false
         mybus.emit('closeLoading', true)
         setTimeout(() => {
           mybus.emit('closeLoading', false)
         }, 3000)
+        this.player.JS_Stop(0)
         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,
-            '2022-11-22T10:00:00Z',
-            '2022-11-22T11:00:00Z'
-          )
-          .then(
-            () => {
-              console.log('realplay success')
-            },
-            (e) => {
-              console.error(e)
-              // message.error('错误代码:' + e)
-            }
-          )
-      },
-      // 实时播放
-      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')
+            mybus.emit('closeLoading', false)
-            // 预览时6s停止播放
+            if (!that.unStopable) {
+              setTimeout(() => {
+                that.videoDom.pause()
+              }, 0)
+            }
           },
           (e) => {
             console.error(e)
@@ -272,20 +231,6 @@
           }
         )
       },
-      // 暂停单个视频
-      pausePlay(index) {
-        let that = this
-        this.player.JS_Pause(index).then(
-          () => {
-            console.log('暂停成功')
-          },
-          (e) => {
-            console.error(e)
-            // 暂停失败切换为实时播放
-            that.videoPlay(that.videoUrl, 0)
-          }
-        )
-      },
     },
     beforeUnmount() {
       console.log('关闭所有视频')

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

@@ -69,11 +69,11 @@
           class="left"
           style="display: flex; align-items: center"
           v-else-if="
-            (item.type === '组件服务' &&
+            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] ||
-            item.infoList.filter((val) => val.attrType == '算法效果图片')[0]
+              item.infoList.filter((val) => val.attrType == '算法效果图片')[0])
           "
         >
           <a-image
@@ -304,6 +304,7 @@
           <div class="dec">
             <div
               v-if="
+                item.infoList &&
                 item.infoList.filter((val) => val.attrType == '组件类型')[0]
               "
             >
@@ -743,6 +744,7 @@
        * isFromFather: 是否来自父组件传值
        */
       const changeCondition = (item, isFromFather = false) => {
+      
         console.log('item, isFromFather------------>', item, isFromFather)
         let newType = item.orderType == 'DESC' ? 'ASC' : 'DESC'
         if (isFromFather) {

front/src/views/home/detailsPageInfrastructureTree.vue

@@ -140,7 +140,7 @@
       mybus.on('getDeptList', () => {
         init()
       })
-
+      init()
       const onSelect = async (item, val, child) => {
         console.log('item--------onSelect---->', item)
         console.log('val------onSelect------>', val)

front/src/views/home/infrastructureApplication.vue

@@ -2,7 +2,7 @@
  * @Author: Light
  * @Date: 2022-11-18 11:53:43
  * @LastEditors: Light
- * @LastEditTime: 2022-11-28 16:45:50
+ * @LastEditTime: 2022-11-30 11:55:51
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -28,7 +28,27 @@
           </a-list-item>
         </template>
         <template #header>
-          <div class="title">待申请列表</div>
+          <div class="title">
+            待申请列表
+            <a
+              style="
+                display: inline-block;
+                width: 60px;
+                height: 18px;
+                line-height: 18px;
+                text-align: center;
+                background: #1890ff;
+                border-radius: 3px;
+                font-size: 12px;
+                color: rgb(255, 255, 255);
+                cursor: pointer;
+                margin-left: 10px;
+              "
+              href="/static/download/InstallRootCert.exe"
+            >
+              证书下载
+            </a>
+          </div>
         </template>
         <template #footer>
           <a-button type="primary" @click="showApply">一键申请</a-button>
@@ -320,11 +340,14 @@
     if (item.approveStatus == '通过') {
       dataList.selectItem = item
       getVideoUrl(item.cameraInfo)
+      return
+    } else if (item.backToFirst == 'true') {
+      message.info('请到个人中心查看详情')
     } else {
-      dataList.selectItem = {}
       message.info('请耐心等待审核通过')
-      showVisible.value = false
     }
+    dataList.selectItem = {}
+    showVisible.value = false
   }
   const handleOk = () => {
     console.log('id', instanceId.value)
@@ -427,8 +450,12 @@
       }
     }
   })
+  mybus.on('initDetailsPageconetent', () => {
+    initApply()
+  })
   onBeforeUnmount(() => {
     mybus.off('selectCamera')
+    mybus.off('initDetailsPageconetent')
   })
 </script>
 <style lang="less" scoped>

front/src/views/home/infrastructurePage.vue

@@ -1443,7 +1443,7 @@
     }
   }
   //分页
-  const onRoomChange = () => {
+  const onRoomChange = (pageNumber) => {
     roomPage.value = pageNumber
     searchData()
   }
@@ -1577,6 +1577,7 @@
           JSON.stringify(router.currentRoute.value.query)
         )
         newQuery.selectType = name
+        newQuery.select = '基础设施'
         router
           .replace({
             query: newQuery,
@@ -1595,6 +1596,7 @@
           JSON.stringify(router.currentRoute.value.query)
         )
         newQuery.selectType = name
+        newQuery.select = '基础设施'
         router
           .replace({
             query: newQuery,
@@ -1623,6 +1625,7 @@
           JSON.stringify(router.currentRoute.value.query)
         )
         newQuery.selectType = name
+        newQuery.select = '基础设施'
         router
           .replace({
             query: newQuery,
@@ -1633,6 +1636,7 @@
           JSON.stringify(router.currentRoute.value.query)
         )
         newQuery.selectType = name
+        newQuery.select = '基础设施'
         router
           .replace({
             query: newQuery,
@@ -1661,6 +1665,7 @@
           JSON.stringify(router.currentRoute.value.query)
         )
         newQuery.selectType = name
+        newQuery.select = '基础设施'
         router
           .replace({
             query: newQuery,
@@ -1710,6 +1715,7 @@
           JSON.stringify(router.currentRoute.value.query)
         )
         newQuery.selectType = name
+        newQuery.select = '基础设施'
         router
           .replace({
             query: newQuery,
@@ -1751,6 +1757,7 @@
           JSON.stringify(router.currentRoute.value.query)
         )
         newQuery.selectType = name
+        newQuery.select = '基础设施'
         router
           .replace({
             query: newQuery,
@@ -1802,6 +1809,7 @@
           JSON.stringify(router.currentRoute.value.query)
         )
         newQuery.selectType = name
+        newQuery.select = '基础设施'
         router
           .replace({
             query: newQuery,

front/src/views/home/infrastructurePageXha.vue

@@ -409,7 +409,8 @@
         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)"
+        element-loading-background="rgba(122, 122, 122, 0.9)"
+        :element-loading-svg="svg"
       >
         <video-surveillance></video-surveillance>
       </div>
@@ -714,6 +715,16 @@
   const spinning = ref(true)
   const whoShow1 = ref(whoShow)
   const isXiHaiAn = whoShow1.value.itShowXiHaiAn
+  const svg = `
+        <path class="path" d="
+          M 30 15
+          L 28 17
+          M 25.61 25.61
+          A 15 15, 0, 0, 1, 15 30
+          A 15 15, 0, 1, 1, 27.99 7.5
+          L 15 15
+        " style="stroke-width: 4px; fill: rgba(0, 0, 0, 0)"/>
+      `
   const options = reactive({
     width: '912px', //播放器宽度
     height: '513px', //播放器高度

front/src/views/home/integrationServices.vue

@@ -60,6 +60,7 @@
             show-size-changer
             show-less-items
             show-quick-jumper
+        
             :total="resourceTotal"
             :page-size-options="pageSizeOptions"
             @change="pageChange"

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

@@ -134,6 +134,7 @@
       },
       //立即申请
       applyNow(item){
+        console.log(item)
         getApplyCameraListXha().then(res => {
           let flag = true
           if (res.data.code == 0) {
@@ -152,10 +153,6 @@
             if(flag){
               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

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

@@ -8,11 +8,13 @@
       <div class="bottom">
         <div class="item" v-for="item in productServiceData" :key="item.id">
           <div class="img" :class="item.imgType"></div>
-          <a-tooltip placement="right">
+          <a-tooltip >
             <template #title>{{ item.name }}</template>
             <div class="name">{{ item.name }}</div>
           </a-tooltip>
-
+          <div class="dec">
+                <span>{{ item.deptName }}</span>
+              </div>
           <div class="text">
             {{ item.description || '暂无描述' }}
           </div>
@@ -36,7 +38,7 @@
   const store = useStore()
   const router = useRouter()
   const productServiceData = ref([])
-  selectNewest({ type: '', pageNum: 1, pageSize: 8 }).then((res) => {
+  selectNewest({ type: '应用资源', pageNum: 1, pageSize: 8 }).then((res) => {
     console.log('最新能力===================>', res.data.data.records)
     productServiceData.value = []
     res.data.data.records.forEach((val) => {
@@ -78,7 +80,8 @@
       path: '/DetailsPageconetent',
       query: {
         // select: '组件服务',
-        select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
+        select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
+        orderField:'tdr.create_date'
       },
     })
   }
@@ -173,6 +176,16 @@
             -webkit-box-orient: vertical;
             word-break: break-all;
           }
+          .dec {
+              margin: 8px 8px;
+              text-align: center;
+              padding-right: 10px;
+              color: #0058e1;
+              span {
+                background: rgba(0, 88, 225, 0.1);
+                padding: 5px 5px;
+              }
+            }
           .text {
             width: 100%;
             height: 0.9rem;

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

@@ -41,10 +41,18 @@
               <div class="fw" v-if="select == '收藏量'">
                 {{ select }}:{{ item.collectCount }}
               </div>
+              <a-tooltip>
+                <template #title>{{ item.name }}</template>
                 <div class="name">{{ item.name }}</div>
-              <div class="text">
+              </a-tooltip>
-                {{ item.description || '暂无描述' }}
+              <div class="dec">
+                <span>{{ item.deptName }}</span>
               </div>
+              <a-tooltip >
+                <template #title>{{ item.description || '暂无描述' }}</template>
+                <div class="text">{{item.description || '暂无描述'}}</div>
+              </a-tooltip>
+             
             </div>
           </div>
         </div>
@@ -57,28 +65,28 @@
   </div>
 </template>
 <script setup>
-  import { ref } from 'vue'
+import { ref } from 'vue'
-  import { pageWithAttrs } from '@/api/home.js'
+import { pageWithAttrs } from '@/api/home.js'
-  import { useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
-  import { useStore } from 'vuex'
+import { useStore } from 'vuex'
-  import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
+import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
-  const store = useStore()
+const store = useStore()
-  const router = useRouter()
+const router = useRouter()
-  const select = ref('浏览量')
+const select = ref('申请量')
-  const selList = ref(['浏览量', '申请量', '收藏量'])
+const selList = ref(['申请量', '收藏量'])
-  const list = ref([])
+const list = ref([])
 
-  const paramsGetResources = {
+const paramsGetResources = {
   districtId: '',
   pageNum: 1,
   pageSize: 6,
-    type: '',
+  type: '应用资源',
   name: '',
   infoList: [],
-    orderField: 'visits', // total 综合 visits 浏览量 applyCount 申请量 score 评分  collectCount 收藏量
+  orderField: 'applyCount', // total 综合 visits 浏览量 applyCount 申请量 score 评分  collectCount 收藏量
   orderType: 'DESC', // ASC 升序  DESC 降序
-  }
+}
-  const selectChange = (sel) => {
+const selectChange = (sel) => {
   select.value = sel
   switch (select.value) {
     case '浏览量':
@@ -95,8 +103,8 @@
       break
   }
   getList()
-  }
+}
-  const getList = () => {
+const getList = () => {
   pageWithAttrs(paramsGetResources).then((res) => {
     console.log('查询列表============>', res.data.data.records)
     res.data.data.records.forEach((val) => {
@@ -123,27 +131,25 @@
     })
     list.value = res.data.data.records
   })
-  }
+}
-  getList()
+getList()
 
-  function jumpPage() {
+function jumpPage() {
   // 点击内存入store
   store.commit('home/selectCardsData', {
     selectCardsnum: '组件服务',
   })
-    console.log(
+  console.log('选中===================>', store.getters['home/selectCardsnum'])
-      '选中===================>',
-      store.getters['home/selectCardsnum']
-    )
   router.push({
     path: '/DetailsPageconetent',
     query: {
       // select: '组件服务',
       select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
+      orderField:paramsGetResources.orderField  //根据什么排序
     },
   })
-  }
+}
-  const selectOne = (id) => {
+const selectOne = (id) => {
   console.log('点击===============》', id)
   router.push({
     path: '/details',
@@ -151,10 +157,10 @@
       id: id,
     },
   })
-  }
+}
 </script>
 <style lang="less" scoped>
-  .popular-ability {
+.popular-ability {
   height: 6.8rem;
   background: url('~@/assets/newHome/popular-bg.png') no-repeat;
   background-size: 100%;
@@ -198,7 +204,7 @@
           align-items: center;
           justify-content: center;
           width: 1.05rem;
-            height: 1.39rem;
+          height: 2.1rem;
           background: rgba(255, 255, 255, 0.08);
           margin-bottom: 0.01rem;
           border-right: 0.02rem solid rgba(233, 233, 233, 0.3);
@@ -222,7 +228,7 @@
           .text {
             color: rgba(255, 255, 255, 0.6);
             font-size: 0.14rem;
-              margin-top: 0.08rem;
+       
           }
         }
         .select:hover {
@@ -301,9 +307,19 @@
               -webkit-box-orient: vertical;
               word-break: break-all;
             }
+            .dec {
+              margin: 8px 8px;
+              text-align: center;
+              padding-right: 10px;
+              color: #0058e1;
+              span {
+                background: rgba(0, 88, 225, 0.1);
+                padding: 5px 5px;
+              }
+            }
             .text {
               width: 100%;
-                padding: 0.24rem 0.3rem;
+              padding: 0rem 0.03rem;
               font-size: 0.14rem;
               color: #212121;
               line-height: 0.24rem;
@@ -346,5 +362,5 @@
       background: rgba(0, 88, 225, 0.1);
     }
   }
-  }
+}
 </style>

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

@@ -152,6 +152,7 @@
                 >
                   查看详情
                 </a-button>
+               
                 <!-- <div class="btn" v-if="val.type == '组件服务'">技术文档</div> -->
               </div>
               <div class="ability-bottom">
@@ -174,9 +175,11 @@
                   </a-button>
                 </div>
               </div>
+              <div  v-if="item.approveStatus === '通过'"  style="    margin-top: 15px;font-size: 16px; color: #ee4457;font-weight: bold;">说明：已申请成功，使用方式及联系人请点击"查看详情"按钮查看。</div>
             </div>
           </div>
         </div>
+
         <div class="box" v-if="item.list2.length > 0">
           <div class="ability" v-for="val in item.list2" :key="val.channelId">
             <div class="left sxt"></div>
@@ -277,7 +280,9 @@
               </div>
             </div>
           </div>
+         
         </div>
+      
       </div>
     </div>
     <!-- 单个预览弹窗 -->

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

@@ -59,6 +59,7 @@
           v-for="item in contentList.data"
           :key="item.index"
         >
+          <div class="withdraw" v-if="item.approveStatus === '不通过'"></div>
           <div class="content-body-title">
             <span>
               申请单号：{{
@@ -112,7 +113,13 @@
               审核结果：{{ status2[item.STATUS] }}
             </p>
             <p class="content-body-content-son" v-else>
-              审核结果：{{ item.ended ? '审核完成' : '审核中' }}
+              审核结果：{{
+                item.ended
+                  ? '审核完成'
+                  : item.backToFirst
+                  ? '审核中（被驳回，请修改申请或终止流程）'
+                  : '审核中'
+              }}
             </p>
             <div>
               申请日期：{{
@@ -152,6 +159,7 @@
               height="80"
               v-if="
                 item.processDefinitionName != '能力资源下架' &&
+                item.approveStatus !== '不通过' &&
                 (item.resourceStatus == 4 || item.resourceStatus == 5)
               "
               style="position: absolute; top: 20px; left: -850px"
@@ -1081,6 +1089,16 @@
         height: 150px;
         border-bottom: #cccccc 1px solid;
         position: relative;
+        .withdraw {
+          width: 0.675rem;
+          height: 0.3rem;
+          background: url('~@/assets/home/withdraw.png') no-repeat;
+          background-size: 100%;
+          position: absolute;
+          top: 0.3rem;
+          left: 0.87rem;
+          transform: rotate(-30deg);
+        }
 
         .content-body-title {
           min-width: 100px;

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

@@ -9,38 +9,83 @@
         <div class="form-container">
           <div v-if="applySuccess">
             <div class="title">申请人信息</div>
-            <a-form ref="formRef" :model="formName" name="basic" :label-col="{ style: { width: '106px' } }"
+            <a-form
-              :wrapper-col="{ style: { width: '230px' } }" labelAlign="left" autocomplete="off">
+              ref="formRef"
+              :model="formName"
+              name="basic"
+              :label-col="{ style: { width: '106px' } }"
+              :wrapper-col="{ style: { width: '230px' } }"
+              labelAlign="left"
+              autocomplete="off"
+            >
               <div class="base-info">
-                <a-form-item label="申请人" name="applyUserName" :rules="[{ required: true, message: '请输入申请人' }]">
+                <a-form-item
-                  <a-input placeholder="请输入申请人" v-model:value="formName.applyUserName" />
+                  label="申请人"
+                  name="applyUserName"
+                  :rules="[{ required: true, message: '请输入申请人' }]"
+                >
+                  <a-input
+                    placeholder="请输入申请人"
+                    v-model:value="formName.applyUserName"
+                  />
                 </a-form-item>
 
-                <a-form-item style="margin: 0 22px" label="申请人电话" name="applyUserPhone" :rules="[
+                <a-form-item
+                  style="margin: 0 22px"
+                  label="申请人电话"
+                  name="applyUserPhone"
+                  :rules="[
                     {
                       required: true,
                       pattern: /^1[3456789]\d{9}$/,
                       message: '请输入正确的电话号码',
                     },
-                ]">
+                  ]"
-                  <a-input placeholder="请输入申请人电话" v-model:value="formName.applyUserPhone" />
+                >
+                  <a-input
+                    placeholder="请输入申请人电话"
+                    v-model:value="formName.applyUserPhone"
+                  />
                 </a-form-item>
 
-                <a-form-item label="申请单位" name="applyUserDeptName" :rules="[{ required: true, message: '请输入申请单位' }]">
+                <a-form-item
-                  <a-input placeholder="请输入申请单位" v-model:value="formName.applyUserDeptName" />
+                  label="申请单位"
+                  name="applyUserDeptName"
+                  :rules="[{ required: true, message: '请输入申请单位' }]"
+                >
+                  <a-input
+                    placeholder="请输入申请单位"
+                    v-model:value="formName.applyUserDeptName"
+                  />
                 </a-form-item>
               </div>
 
               <div class="title">需求信息</div>
 
-              <a-form-item style="margin-bottom: 10px" label="需求标题" name="demandSubject"
+              <a-form-item
-                :rules="[{ required: true, message: '请输入需求标题' }]">
+                style="margin-bottom: 10px"
-                <a-input style="width: 350px" v-model:value="formName.demandSubject" />
+                label="需求标题"
+                name="demandSubject"
+                :rules="[{ required: true, message: '请输入需求标题' }]"
+              >
+                <a-input
+                  style="width: 350px"
+                  v-model:value="formName.demandSubject"
+                />
               </a-form-item>
 
-              <a-form-item style="margin-bottom: 10px" label="需求类型" name="detailsType"
+              <a-form-item
-                :rules="[{ required: true, message: '请选择需求类型' }]">
+                style="margin-bottom: 10px"
-                <a-select ref="select" v-model:value="formName.detailsType" @focus="focus" style="width: 200px">
+                label="需求类型"
+                name="detailsType"
+                :rules="[{ required: true, message: '请选择需求类型' }]"
+              >
+                <a-select
+                  ref="select"
+                  v-model:value="formName.detailsType"
+                  @focus="focus"
+                  style="width: 200px"
+                >
                   <a-select-option value="基础设施">基础设施</a-select-option>
                   <a-select-option value="数据资源">数据资源</a-select-option>
                   <a-select-option value="组件服务">组件服务</a-select-option>
@@ -49,24 +94,44 @@
                 </a-select>
               </a-form-item>
 
-              <a-form-item label="应用领域" v-if="formName.detailsType === '应用资源' ||
+              <a-form-item
-              formName.detailsType === '组件服务'" name="detailsField" style="width: 6.93rem" :rules="[
+                label="应用领域"
+                v-if="
+                  formName.detailsType === '应用资源' ||
+                  formName.detailsType === '组件服务'
+                "
+                name="detailsField"
+                style="width: 6.93rem"
+                :rules="[
                   {
                     required: true,
                     message: '请选择应用领域',
                   },
-  ]">
+                ]"
-                <a-select v-model:value="formName.detailsField" :options="applicationSceneOpthion" mode="tags"
+              >
-                  :size="size" placeholder="请选择应用领域" :filterOption="false" :searchValue="false" style="width: 5.87rem">
+                <a-select
-                </a-select>
+                  v-model:value="formName.detailsField"
+                  :options="applicationSceneOpthion"
+                  mode="tags"
+                  :size="size"
+                  placeholder="请选择应用领域"
+                  :filterOption="false"
+                  :searchValue="false"
+                  style="width: 5.87rem"
+                ></a-select>
               </a-form-item>
               <!-- <a-form-item label="应用领域" name="detailsField" style="width: 350px"
                 :rules="[{ required: true, message: '请输入应用领域' }]">
                 <a-input placeholder="请输入应用领域" v-model:value="formName.detailsField" />
               </a-form-item> -->
-              <a-form-item style="margin-bottom: 10px" label="需求描述" name="demandDetails"
+              <a-form-item
-                :rules="[{ required: true, message: '请输入需求描述' }]">
+                style="margin-bottom: 10px"
-                <a-textarea style="
+                label="需求描述"
+                name="demandDetails"
+                :rules="[{ required: true, message: '请输入需求描述' }]"
+              >
+                <a-textarea
+                  style="
                     width: 500px;
                     height: 150px;
                     font-size: 16px;
@@ -76,12 +141,26 @@
                     border-radius: 6px;
                     padding: 10px;
                     resize: none;
-                  " v-model:value="formName.demandDetails" />
+                  "
+                  v-model:value="formName.demandDetails"
+                />
               </a-form-item>
-              <a-form-item style="color: #666; font-size: 16px" label="附件上传" name="applyDoc">
+              <a-form-item
-                <a-upload v-model:file-list="fileList" name="file" :action="upLoadUrl" :headers="headers"
+                style="color: #666; font-size: 16px"
-                  @change="handleChange" :maxCount="1">
+                label="附件上传"
-                  <a-button style="
+                name="applyDoc"
+              >
+                <a-upload
+                  v-model:file-list="fileList"
+                  name="file"
+                  :action="upLoadUrl"
+                  :headers="headers"
+                  @change="handleChange"
+                  @remove="handleRemove"
+                  :maxCount="1"
+                >
+                  <a-button
+                    style="
                       width: 100px;
                       height: 30px;
                       margin-right: 10px;
@@ -92,7 +171,8 @@
                       border: 1px solid #bbd3ef;
                       padding: 0;
                       text-align: center;
-                    ">
+                    "
+                  >
                     <upload-outlined></upload-outlined>
                     文件上传
                   </a-button>
@@ -103,7 +183,8 @@
               </a-form-item>
 
               <a-form-item :wrapper-col="{ offset: 8, span: 16 }">
-                <a-button style="
+                <a-button
+                  style="
                     width: 80px;
                     height: 38px;
                     margin-right: 20px;
@@ -114,10 +195,15 @@
                     border: none;
                     padding: 0;
                     text-align: center;
-                  " type="primary" html-type="cancle" @click="signOut">
+                  "
+                  type="primary"
+                  html-type="cancle"
+                  @click="signOut"
+                >
                   退出申请
                 </a-button>
-                <a-button style="
+                <a-button
+                  style="
                     width: 80px;
                     height: 38px;
                     background: #0087ff;
@@ -127,7 +213,11 @@
                     border: none;
                     padding: 0;
                     text-align: center;
-                  " type="primary" html-type="submit" @click="processStartHandle()">
+                  "
+                  type="primary"
+                  html-type="submit"
+                  @click="processStartHandle()"
+                >
                   提交申请
                 </a-button>
               </a-form-item>
@@ -150,21 +240,21 @@
 </template>
 
 <script>
-import HomeHeader from '@/views/home/components/header'
+  import HomeHeader from '@/views/home/components/header'
-import { reactive, ref } from 'vue'
+  import { reactive, ref } from 'vue'
-import { message } from 'ant-design-vue'
+  import { message } from 'ant-design-vue'
-// import { UploadOutlined } from '@ant-design/icons-vue'
+  // import { UploadOutlined } from '@ant-design/icons-vue'
-import { getUser, getUserInfo, relaunch } from '@/api/home'
+  import { getUser, getUserInfo, relaunch } from '@/api/home'
-import {
+  import {
     demandApply,
     getDemandForm,
     updateDemandForm,
     getCategoryTreePage,
-} from '@/api/personalCenter'
+  } from '@/api/personalCenter'
-// import { baseURL } from '@/config'
+  // import { baseURL } from '@/config'
-import { useRouter } from 'vue-router'
+  import { useRouter } from 'vue-router'
 
-export default {
+  export default {
     name: '',
     props: {},
     components: {
@@ -200,6 +290,13 @@ export default {
           formName.detailsField = res.data.data.detailsField
           formName.demandDetails = res.data.data.demandDetails
           formName.enclosure = res.data.data.enclosure
+          fileList.value = [
+            {
+              uid: res.data.data.id,
+              name: '附件',
+              staus: 'done',
+            },
+          ]
         })
       }
       const applicationSceneOpthion = ref([])
@@ -236,11 +333,16 @@ export default {
       const signOut = () => {
         window.close()
       }
+      const handleRemove = () => {
+        formName.enclosure = ''
+      }
       const handleChange = (info) => {
         if (info.file.status !== 'uploading') {
           console.log(info.file, info.fileList)
         }
-
+        if (info.file.status === 'removed') {
+          formName.enclosure = ''
+        }
         if (info.file.status === 'done') {
           message.success(`${info.file.name} 文件上传成功`)
           formName.enclosure = info.file.response.data
@@ -251,7 +353,7 @@ export default {
 
       const fileList = ref([])
       const processStartHandle = () => {
-      let detailsField = '';
+        let detailsField = ''
         if (formName.detailsField.length > 0) {
           formName.detailsField.map((item) => {
             detailsField += item + ';'
@@ -259,12 +361,13 @@ export default {
         }
         // copy传参
         let _postData = JSON.parse(JSON.stringify(formName))
-      _postData.detailsField = detailsField;
+        _postData.detailsField = detailsField
 
         if (id.value) {
           updateDemandForm(_postData).then((upres) => {
             if (upres.data.code == 0) {
-            relaunch({ data: _postData, taskId: taskId.value }).then((res) => {
+              relaunch({ data: _postData, taskId: taskId.value }).then(
+                (res) => {
                   console.log('驳回================>', res)
                   if (res.data.code == 0) {
                     message.success('重新发起流程成功！')
@@ -274,7 +377,8 @@ export default {
                   } else {
                     message.error('重新发起流程失败！')
                   }
-            })
+                }
+              )
             } else {
               message.error('数据更新失败！')
             }
@@ -304,17 +408,18 @@ export default {
         applySuccess,
         disabled,
         signOut,
+        handleRemove,
         processStartHandle,
         upLoadUrl,
         // baseURL,
         applicationSceneOpthion,
       }
     },
-}
+  }
 </script>
 
 <style scoped lang="less">
-#apply-container {
+  #apply-container {
     background-color: #f5f8fc;
     height: 100%;
     width: 100%;
@@ -387,11 +492,11 @@ export default {
       font-weight: bold;
       color: #000;
     }
-}
+  }
 </style>
 <style>
-body,
+  body,
-html {
+  html {
     height: unset;
-}
+  }
 </style>