Merge branch 'hi-ucs-pre' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-pre

back/public/config/basicConfig.js

@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-08-25 14:37:49
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-11-01 09:22:02
+ * @LastEditTime: 2022-11-01 15:37:21
  * @Description: 告诉大家这是什么
  */
 var _global = {}
@@ -43,8 +43,8 @@ var CONFIGITEM = {
     },
     dev: {
       previewUrl: 'http://localhost:8080/',
-      apiURL: 'http://192.168.124.243:8888/ucs-admin',
+      apiURL: 'http://192.168.124.236:8888/ucs-admin',
-      websocketURL: 'ws://192.168.243.243:8888/ucs-admin/websocket'
+      websocketURL: 'ws://192.168.243.236:8888/ucs-admin/websocket'
     }
   }
 }

back/src/i18n/zh-CN.js

@@ -3,8 +3,8 @@ const t = {}
 t.loading = '加载中...'
 
 t.brand = {}
-t.brand.lg = '资源管理中心'
+t.brand.lg = '能力管理中心'
-t.brand.mini = '数字政务'
+t.brand.mini = '一体化综合指挥'
 
 t.add = '新增'
 t.delete = '删除'

back/src/i18n/zh-TW.js

@@ -3,8 +3,10 @@ const t = {}
 t.loading = '加載中...'
 
 t.brand = {}
-t.brand.lg = '能力管理中心'
+    // t.brand.lg = '能力管理中心'
-t.brand.mini = '一体化综合指挥'
+    // t.brand.mini = '一体化综合指挥'
+t.brand.lg = '通用服务平台'
+t.brand.mini = '城市云脑'
 
 t.add = '新增'
 t.delete = '刪除'
@@ -25,7 +27,7 @@ t.choose = '請選擇'
 t.fileName = '文件名'
 t.design = '在線設計'
 t.preview = '預覽'
-t.reset='重置'
+t.reset = '重置'
 
 t.prompt = {}
 t.prompt.title = '提示'

back/src/router/index.js

@@ -105,7 +105,6 @@ router.beforeEach((to, from, next) => {
       return next({ name: 'login' })
     }
     window.SITE_CONFIG.menuList = res.data.filter(item => item.site === 0)
-    debugger
     fnAddDynamicMenuRoutes(window.SITE_CONFIG.menuList)
     next({ ...to, replace: true })
   }).catch(() => {
@@ -138,7 +137,6 @@ function fnCurrentRouteIsPageRoute (route, pageRoutes = []) {
  */
 function fnAddDynamicMenuRoutes (menuList = [], routes = []) {
   var temp = []
-  debugger
   for (var i = 0; i < menuList.length; i++) {
     if (menuList[i].children && menuList[i].children.length >= 1) {
       temp = temp.concat(menuList[i].children)

back/src/views/main-navbar.vue

@@ -12,7 +12,7 @@
           $t("brand.lg")
         }}</a>
         <span>——</span>
-        <span class="back-title-text">政务系统能力知识库</span>
+        <span class="back-title-text">后台管理系统</span>
       </h1>
     </div>
     <div class="aui-navbar__body">
@@ -222,7 +222,7 @@ export default {
   .aui-navbar__header {
     width: 25%;
     .aui-navbar__brand {
-      margin-left: 20px;
+      margin-left: -30px;
       a {
         font-size: 22px;
         color: #ffffff;

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

@@ -26,7 +26,7 @@
         <!--起始日期 @keyup.enter.native="getDataList()"-->
         <el-form-item>
           <span>日期：</span>
-          <el-date-picker v-model="value1" type="datetimerange" range-separator="至" start-placeholder="开始日期"
+          <el-date-picker v-model="value1" type="daterange" range-separator="至" start-placeholder="开始日期"
             end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
           </el-date-picker>
         </el-form-item>
@@ -161,7 +161,7 @@
             </el-table-column>
             <el-table-column prop="yyzy" label="应用资源" min-width="100%">
             </el-table-column>
-            <el-table-column prop="hys" label="会议室" min-width="100%" v-show='departmentId == 2 || departmentId == 4'>
+            <el-table-column prop="hys" label="会客厅" min-width="100%" v-show='departmentId == 2 || departmentId == 4'>
             </el-table-column>
             <el-table-column prop="zj" label="总计" min-width="100%">
             </el-table-column>
@@ -321,7 +321,7 @@ export default {
         { name: '基础设施', key: 3 },
         { name: '数据资源', key: 4 },
         { name: '知识库', key: 5 },
-        { name: '会议室', value: 6 }
+        { name: '会客厅', value: 6 }
       ],
       tableData: [],
       tableDataClone: [],
@@ -347,9 +347,9 @@ export default {
         { name: '开发组件', value: 3 },
         { name: '业务组件', value: 4 },
         { name: '应用资源', value: 5 },
-        { name: '会议室', value: 6 }
+        { name: '会客厅', value: 6 }
       ], // 类型备选列表
-      typeOptions1: [// 能力上架隐藏会议室
+      typeOptions1: [// 能力上架隐藏会客厅
         { name: '智能算法', value: 1 },
         { name: '图层服务', value: 2 },
         { name: '开发组件', value: 3 },
@@ -909,8 +909,10 @@ export default {
     // 点击查询按钮查询数据
     getDataList() {
       if (this.value1 && this.value1.length > 0) {
-        this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd')
+        // this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd')
-        this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd')
+        // this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd')
+        this.startDate = this.value1[0]
+        this.endDate = this.value1[1]
       } else {
         this.startDate = ''
         this.endDate = ''

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

@@ -3,22 +3,36 @@
     <div class="mod-sys__dept">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:dept:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('sys:dept:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" row-key="id" border style="width: 100%;">
         <el-table-column prop="name" :label="$t('dept.name')" header-align="center" min-width="150"></el-table-column>
-        <el-table-column prop="parentName" :label="$t('dept.parentName')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="parentName" :label="$t('dept.parentName')" header-align="center" align="center">
-        <el-table-column prop="sort" :label="$t('dept.sort')" header-align="center" align="center" width="80"></el-table-column>
+        </el-table-column>
+        <el-table-column prop="sort" :label="$t('dept.sort')" header-align="center" align="center" width="80">
+        </el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('sys:dept:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('sys:dept:update')" type="text" size="small"
-            <el-button v-if="$hasPermission('sys:dept:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+              @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('sys:dept:delete')" type="text" size="small"
+              @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
         <el-table-column prop="type" label="类型" header-align="center" align="center" width="80"></el-table-column>
         <el-table-column prop="district" label="区划" header-align="center" align="center" width="80"></el-table-column>
       </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
     </div>
@@ -31,12 +45,16 @@ import AddOrUpdate from './dept-add-or-update'
 import qs from 'qs'
 export default {
   mixins: [mixinViewModule],
-  data () {
+  data() {
     return {
       mixinViewModuleOptions: {
         getDataListURL: '/sys/dept/list',
         deleteURL: '/sys/dept'
-      }
+      },
+      total: 0,
+      limit: 10,
+      page: 1,
+      dataList: []
     }
   },
   components: {
@@ -45,16 +63,35 @@ export default {
   watch: {
     dataList: {
       handler: function () {
-        this.init()
+        this.getData()
       }
     }
   },
   methods: {
-    init () {
+    // 分页, 每页条数
-      debugger
+    pageSizeChangeHandle (val) {
-      this.$http.get('/sys/dept/list').then((res) => {
+      this.page = 1
-        res.data.data.map((item, index) => {
+      this.limit = val
-          if (item.district != null || item.children.length > 0) {
+      this.getData()
+    },
+    // 分页, 当前页
+    pageCurrentChangeHandle (val) {
+      this.page = val
+      this.getData()
+    },
+    getData() {
+      // debugger
+      let _data = {
+        limt: this.limit,
+        page: this.page,
+      }
+      this.$http.get('sys/dept/page', {
+        params: _data
+      }).then((res) => {
+        this.total = res.data.data.total;
+        res.data.data.list.map((item, index) => {
+          console.log('item, index------------>', item, index);
+          if (item.district != null || item.children.length >= 0) {
             this.$http.get('/sys/region/' + item.district).then((data) => {
               this.dataList[index].district = data.data.data.name
               console.log('datafrom', this.dataList)
@@ -72,10 +109,10 @@ export default {
           }
         })
       })
-    }
     },
-  created () {
+  },
-    this.init()
+  created() {
+    this.getData()
   }
 }
 </script>

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

@@ -45,21 +45,21 @@
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
         @sort-change="dataListSortChangeHandle" style="width: 100%">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="username" :label="$t('user.username')" sortable="custom" header-align="center"
+        <el-table-column prop="username" :label="$t('user.username')" header-align="center"
           align="center"></el-table-column>
         <el-table-column prop="realName" label="真实姓名" header-align="center" align="center"></el-table-column>
         <el-table-column prop="deptName" :label="$t('user.deptName')" header-align="center" align="center">
         </el-table-column>
         <el-table-column prop="email" :label="$t('user.email')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="mobile" :label="$t('user.mobile')" sortable="custom" header-align="center"
+        <el-table-column prop="mobile" :label="$t('user.mobile')"  header-align="center"
           align="center"></el-table-column>
-        <el-table-column prop="gender" :label="$t('user.gender')" sortable="custom" header-align="center"
+        <el-table-column prop="gender" :label="$t('user.gender')"  header-align="center"
           align="center">
           <template slot-scope="scope">
             {{ $getDictLabel('gender', scope.row.gender) }}
           </template>
         </el-table-column>
-        <el-table-column prop="status" :label="$t('user.status')" sortable="custom" header-align="center"
+        <el-table-column prop="status" :label="$t('user.status')"  header-align="center"
           align="center">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.status === 0" size="small" type="danger">{{
@@ -70,7 +70,7 @@
             }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="createDate" :label="$t('user.createDate')" sortable="custom" header-align="center"
+        <el-table-column prop="createDate" :label="$t('user.createDate')"  header-align="center"
           align="center" width="180"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">

front/public/static/config/basicConfig.js

@@ -27,9 +27,9 @@ var CONFIGITEM = {
       backUrl: 'http://15.72.183.90:8001',
       previewUrl: 'http://15.72.183.90:7008/',
       //frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
-      apiURL: 'http://15.72.183.90:8000/renren-admin',
+      apiURL: 'http://15.72.183.90:8000/ucs-admin',
-      websocketURL: '15.72.183.90:8000/renren-admin',
+      websocketURL: '15.72.183.90:8000/ucs-admin',
-      // websocketURL: '192.168.124.233:8888/renren-admin',
+      // websocketURL: '192.168.124.233:8888/ucs-admin',
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
     },
@@ -45,10 +45,10 @@ var CONFIGITEM = {
       backUrl: 'http://15.72.183.90:8001',
       previewUrl: 'http://15.72.183.90:7008/',
       //frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
-      //apiURL: 'http://15.72.183.90:8000/renren-admin',
+      //apiURL: 'http://15.72.183.90:8000/ucs-admin',
-      // websocketURL: '10.16.5.146:8888/renren-admin', // 姜永超
+      // websocketURL: '10.16.5.146:8888/ucs-admin', // 姜永超
-      websocketURL: '10.18.1.99:8889/renren-admin',
+      websocketURL: '10.18.1.99:8889/ucs-admin',
-      // websocketURL: '10.16.5.35:8888/renren-admin',
+      // websocketURL: '10.16.5.35:8888/ucs-admin',
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
     },
@@ -69,10 +69,10 @@ var CONFIGITEM = {
       },
       backUrl: 'http://10.134.135.9:9797',
       previewUrl: 'http://10.134.135.9:9796/',
-      // websocketURL: '10.134.135.9:8888/renren-admin', // 正式环境
+      // websocketURL: '10.134.135.9:8888/ucs-admin', // 正式环境
-      // websocketURL: '10.134.135.92:8888/renren-admin', // 测试环境
+      // websocketURL: '10.134.135.92:8888/ucs-admin', // 测试环境
-      websocketURL: '192.168.124.254:8888/renren-admin', // 李志成-远雄
+      websocketURL: '192.168.124.254:8888/ucs-admin', // 李志成-远雄
-      // websocketURL: '10.18.1.99:8889/renren-admin', // 研发
+      // websocketURL: '10.18.1.99:8889/ucs-admin', // 研发
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
     },
@@ -87,8 +87,8 @@ var CONFIGITEM = {
       },
       backUrl: 'http://localhost:8001',
       previewUrl: 'http://192.168.124.243:9796/',
-      websocketURL: '192.168.124.243:8888/renren-admin',
+      websocketURL: '192.168.124.243:8888/ucs-admin',
-      // websocketURL: '10.18.1.99:8889/renren-admin',
+      // websocketURL: '10.18.1.99:8889/ucs-admin',
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
     },
@@ -103,7 +103,7 @@ var CONFIGITEM = {
       },
       backUrl: 'http://192.168.124.243:9797',
       previewUrl: 'http://192.168.124.243:9796/',
-      websocketURL: '192.168.124.243:8888/renren-admin',
+      websocketURL: '192.168.124.243:8888/ucs-admin',
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
     },
@@ -118,7 +118,7 @@ var CONFIGITEM = {
       },
       backUrl: 'http://124.222.94.39:9797',
       previewUrl: 'http://124.222.94.39:9796/',
-      websocketURL: '124.222.94.39:8888/renren-admin',
+      websocketURL: '124.222.94.39:8888/ucs-admin',
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
     },

front/src/api/home.js

@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-01 19:19:40
  * @LastEditors: Light
- * @LastEditTime: 2022-10-26 10:35:36
+ * @LastEditTime: 2022-10-31 15:52:57
  * @Description: 告诉大家这是什么
  */
 import request from '@/utils/request'
@@ -63,6 +63,13 @@ export function pageWithAttrs(data) {
     data,
   })
 }
+// 筛选
+export function getAppListByDept() {
+  return request({
+    url: '/resource/getAppListByDept',
+    method: 'get',
+  })
+}
 // 获取hls视频流
 export function getHls(params) {
   return request({

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

@@ -461,6 +461,7 @@
       },
       yAxis: {
         name: '部门数量（个）',
+        minInterval: 1,
       },
       grid: {
         height: '65%',

front/src/views/home/DetailsPageconetent.vue

@@ -1190,6 +1190,16 @@
       const re = /^[0-9\u4E00-\u9FA5]*$/
       const getAppResources2 = () => {
         globalFlag.value = false
+        let newQuery = JSON.parse(
+          JSON.stringify(router.currentRoute.value.query)
+        )
+        newQuery.str = searchValue.value
+        router
+          .replace({
+            query: newQuery,
+          })
+          .then(() => {})
+        mybus.emit('changeRoomInput', searchValue.value)
         if (
           whoShow1.value.itShowQingDao &&
           paramsGetResources.type == '基础设施'
@@ -1543,6 +1553,9 @@
         paramsGetResources2.value.regionId = ids
         getAppResources()
       })
+      mybus.on('changeSearchValue', (val) => {
+        searchValue.value = val
+      })
       mybus.on('paramsGetResources', (ids) => {
         if (ids && ids.length > 0) {
           paramsGetResources.deptIds = ids
@@ -1845,6 +1858,7 @@
     },
     beforeUnmount() {
       mybus.off('getCameraByParentId')
+      mybus.off('changeSearchValue')
       mybus.off('selectCardsitem')
       mybus.off('paramsGetResources')
       mybus.off('changeCondition')

front/src/views/home/apply.vue

@@ -260,7 +260,11 @@
   import { getCategoryTreePage, endProcess } from '@/api/personalCenter'
   import mybus from '@/myplugins/mybus'
   import { sgcDel, getApplyForm } from '@/api/personalCenter'
-  import { pageWithAttrs, updateIntegrationServices } from '@/api/home'
+  import {
+    pageWithAttrs,
+    updateIntegrationServices,
+    getAppListByDept,
+  } from '@/api/home'
   import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
   import { getIntegrationDetail, soldierApply } from '@/api/home'
   import { useStore } from 'vuex'
@@ -783,25 +787,18 @@
           })
         }
       }
-      pageWithAttrs({
+      getAppListByDept().then((res) => {
-        pageNum: 1,
+        console.log('res=====>', res.data.data)
-        pageSize: 99999,
-        type: '应用资源',
-        name: '',
-        infoList: [],
-      }).then((res) => {
         if (res.data.code == 0) {
-          if (res.data.data.records.length == 0) {
+          if (res.data.data.length == 0) {
             message.warning('该关键词，暂无应用资源！')
           } else {
             // 过滤本单位的应用系统
-            res.data.data.records.map((val) => {
+            res.data.data.map((val) => {
-              if (val.deptName === deptName) {
               systemOptions2.value.push({
-                  value: val.name,
+                value: val.NAME,
-                  label: val.name,
+                label: val.NAME,
               })
-              }
             })
             // console.log('第一次获取===================>', systemOptions2.value)
           }
@@ -959,7 +956,7 @@
   }
 </script>
 <style scoped lang="less">
-  #apply-container {
+#apply-container {
   // background-color: #f5f8fc;
   height: 100%;
   width: 100%;
@@ -1038,9 +1035,9 @@
     font-weight: bold;
     color: #000;
   }
-  }
+}
 
-  .applicationScene {
+.applicationScene {
   :deep(.ant-select-selector) {
     overflow-x: scroll;
   }
@@ -1048,20 +1045,20 @@
   :deep(.ant-select-selection-overflow) {
     flex-wrap: nowrap;
   }
-  }
+}
 
-  textarea {
+textarea {
   resize: none;
   font-size: 14px;
-  }
+}
 
-  .bottom-btn {
+.bottom-btn {
   display: flex;
   justify-content: center;
   // position: fixed;
-  }
+}
 
-  .cancel-apply {
+.cancel-apply {
   width: 80px;
   height: 38px;
   margin-right: 20px;
@@ -1072,9 +1069,9 @@
   border: none;
   padding: 0;
   text-align: center;
-  }
+}
 
-  .confirm-apply {
+.confirm-apply {
   width: 80px;
   height: 38px;
   background: #0087ff;
@@ -1084,5 +1081,5 @@
   border: none;
   padding: 0;
   text-align: center;
-  }
+}
 </style>

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

@@ -1,5 +1,7 @@
 <template>
   <div class="box">
+    <!-- <IntegrationServiceOrder ref="integrationServiceOrderDom" :orderArray="orderArray" :style="styleObj">
+    </IntegrationServiceOrder> -->
     <div class="CanCase">
       <div class="caseBox" v-for="(item, index) in caseList" :key="index" @click="toView(item)">
         <a-image :preview="false" style="width:300px;height:200px" :src="
@@ -7,13 +9,14 @@
             .attrValue
         " />
         <h3>{{ item.name }}</h3>
-        <p>发布时间 {{ item.updateDate }}</p>
+        <p>发布时间 {{ item.createDate }}</p>
       </div>
     </div>
   </div>
 </template>
 <script setup>
 import { ref, onMounted, onBeforeUnmount, watch, defineProps, defineEmits } from 'vue'
+import IntegrationServiceOrder from './integrationServiceOrder.vue'
 
 import { useRouter } from 'vue-router'
 const router = useRouter()
@@ -27,6 +30,19 @@ const props = defineProps({
     default: '组件服务',
   },
 })
+
+const orderArray = ref([
+  {
+    value: 'create_date',
+    name: '发布时间',
+    orderType: 'DESC',
+  },
+])
+
+const styleObj = ref({
+  'justify-content': 'flex-end',
+   "padding": "0 20px"
+})
 const emits = defineEmits(['saveSearchCodition'])
 
 const caseList = ref([])

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

@@ -587,6 +587,7 @@
   :deep(.ant-list-item) {
     border-bottom: 0.01rem solid #ccc;
     padding: 0.1rem;
+    cursor: default;
   }
 
   :deep(.ant-list-item-meta-title) {
@@ -602,6 +603,7 @@
       -webkit-line-clamp: 2;
       word-break: break-all;
       -webkit-box-orient: vertical;
+      cursor: default;
     }
 
     button {

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

@@ -1,5 +1,5 @@
 <template>
-  <ul class="integrationServiceOrder">
+  <ul class="integrationServiceOrder" :style="styleObj">
     <li v-for="(item, i) in integrationOrderList" :key="i" @click="
       changeOrder(i, item.value, item.orderType == 'DESC' ? 'ASC' : 'DESC')
     ">
@@ -14,7 +14,7 @@
   </ul>
 </template>
 <script setup>
-import { ref, reactive, nextTick, defineExpose } from 'vue'
+import { ref, reactive, nextTick, defineExpose, defineProps } from 'vue'
 import mybus from '@/myplugins/mybus'
 
 const orderList = [
@@ -39,7 +39,18 @@ const orderList = [
   //   orderType: 'DESC',
   // },
 ]
+
+const props = defineProps({
+  orderArray: { type: Array, default: null },
+  styleObj: { type: Object, default: null },
+})
+
+console.log('props.orderArray------------>', props.orderArray);
+
 const integrationOrderList = ref(JSON.parse(JSON.stringify(orderList)))
+if(props.orderArray) {
+  integrationOrderList.value = props.orderArray
+}
 const integrationOrder = reactive({
   orderField: '',
   orderType: '',
@@ -47,12 +58,10 @@ const integrationOrder = reactive({
 
 // 融合服务--排序
 const changeOrder = (i, val, type) => {
-  
-  console.log('i, val, type------------>', i, val, type);
   integrationOrder.orderField = val
   integrationOrder.orderType = type;
   // 0 apply_count ASC
-  let _index = integrationOrderList.value.findIndex(x => x.value = val)
+  let _index = integrationOrderList.value.findIndex(x => x.value == val)
   if (_index > -1) {
     integrationOrderList.value[_index].orderType = type
   }

front/src/views/home/detailsPageconetentTree.vue

@@ -185,31 +185,32 @@
             treeData.value.sort((a, b) => {
               return sortArr.indexOf(a.key) - sortArr.indexOf(b.key)
             })
-            let deptId=user.value.deptId
+            //根据不同的权限展示不同的能力超市左侧树
-            treeData.value.forEach((child) => {
+          //  let deptId=user.value.deptId
-              let childern=child.children
+        //     treeData.value.forEach((child) => {
-              childern.forEach((childs) => {//第一层：市级
+        //       let childern=child.children
-           if(childs.key==deptId ){
+        //       childern.forEach((childs) => {//第一层：市级
-             childs.show=true
+        //    if(childs.key==deptId ){
-             child.show=true
+        //      childs.show=true
-             mybus.emit('paramsGetResources', [childs.key])
+        //      child.show=true
-              selectId.value =childs.key
+        //      mybus.emit('paramsGetResources', [childs.key])
-           }
+        //       selectId.value =childs.key
-           if(childs.children && childs.children.length>0){//第二层 区级
+        //    }
-            let qu=childs.children
+        //    if(childs.children && childs.children.length>0){//第二层 区级
-            qu.forEach((qu) => {
+        //     let qu=childs.children
-           if(qu.key==deptId ){
+        //     qu.forEach((qu) => {
-             qu.show=true
+        //    if(qu.key==deptId ){
-             childs.show=true
+        //      qu.show=true
-             child.show=true
+        //      childs.show=true
-              mybus.emit('paramsGetResources', [qu.key])
+        //      child.show=true
-              selectId.value = qu.key
+        //       mybus.emit('paramsGetResources', [qu.key])
-           }
+        //       selectId.value = qu.key
-           })
+        //    }
-           }
+        //    })
-         })
+        //    }
+        //  })
           
-          })
+        //   })
             console.log('左侧树结构数据======================>', treeData.value)
         
             showKey.value++

front/src/views/home/infrastructurePage.vue

@@ -105,7 +105,13 @@
               <span>面积：{{ item.area }}m²</span>
             </div>
             <div class="bottonmContent">
+              <a-tooltip>
+                <template #title>{{ item.description }}</template>
+                <span>{{ item.description }}</span>
+              </a-tooltip>
+              <!-- <a-tooltip>
                 {{ item.description }}
+              </a-tooltip>        -->
             </div>
           </div>
           <a-button
@@ -937,6 +943,10 @@
   const fileList = ref([])
   const useForm = Form.useForm
   const roomInput = ref('')
+  let roomStr = router.currentRoute.value.query.str
+  if (roomStr) {
+    roomInput.value = roomStr
+  }
   const rulesRef = reactive({
     bookDate: [
       {
@@ -1052,6 +1062,12 @@
       mapSearchParam.value.parentId = parentId
       getCamera()
     })
+    mybus.off('changeRoomInput')
+    mybus.on('changeRoomInput', (val) => {
+      console.log('更改=======》')
+      roomInput.value = val
+      onSearch()
+    })
     mybus.off('getListByMap')
     mybus.on('getListByMap', (param) => {
       mapSearchParam.value.gpsX = param.gpsX
@@ -1226,7 +1242,14 @@
   }
   //   搜索
   const onSearch = (searchValue) => {
-    debugger
+    let newQuery = JSON.parse(JSON.stringify(router.currentRoute.value.query))
+    newQuery.str = roomInput.value
+    router
+      .replace({
+        query: newQuery,
+      })
+      .then(() => {})
+    mybus.emit('changeSearchValue', roomInput.value)
     searchData()
     chengguoSearch()
   }
@@ -2610,6 +2633,14 @@
           font-size: 0.14rem;
           margin: 0.15rem 0 0.2rem 0;
         }
+        .bottonmContent {
+          width: 100%;
+          overflow: hidden; //超出隐藏
+          text-overflow: ellipsis; //超出文本设置为...
+          display: -webkit-box; //将div1转换为盒子模型
+          -webkit-line-clamp: 3; //设置div1的文本为2行
+          -webkit-box-orient: vertical; //从顶部向底部垂直布置子元素
+        }
       }
     }
 

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

@@ -267,12 +267,10 @@
       })
       window.open(newpage.href, '_blank')
     } else if (data === '资源下架') {
-      window.sessionStorage.setItem('type', JSON.stringify('apply'))
+      // 跳转到个人中心--我的发布
+      window.sessionStorage.setItem('type', JSON.stringify('push'))
       const newpage = router.resolve({
         path: '/personalCenter',
-        query: {
-          tabTypeName: '能力上架'
-        }
       })
       window.location.href = newpage.href
     }

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

@@ -44,12 +44,12 @@
           </div>
           <a-tooltip>
             <template #title>
-              {{ item.cameraList ? item.system : item.title }}
+              {{ item.cameraList ? item.system : (item.title|| item.name) }}
             </template>
             <div class="content-body-title">
               <span>
                 名称：{{
-                  item.cameraList ? item.system : item.title || item.name
+                  item.cameraList ? item.system : (item.title || item.name)
                 }}
               </span>
               <div></div>