Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev

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

@@ -245,8 +245,8 @@ export default {
           { min: 1, trigger: 'blur' }
         ],
         area: [
-          { required: true, message: '请输入会议室面积', trigger: 'blur' },
-          { min: 1, message: '请输入数字', type: 'number', trigger: 'blur' }
+          { required: true, message: '请输入会议室面积', trigger: 'blur' }
+          // { min: 1, message: '请输入数字', type: 'number', trigger: 'blur' }
         ],
         description: [
           { required: true, message: '请填写描述内容', trigger: 'blur' },

front/public/static/config/location.js

@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-08-25 18:47:08
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-09-27 16:48:51
  * @Description: 数据资源参数配置
  */
 // eslint-disable-next-line no-undef
@@ -29,19 +29,19 @@ if (newLocation !== 'baotou' && newLocation !== 'xihaian') {
   if (newLocation == 'zhanTingDev' || newLocation == 'dev') {
     whoShow.itShowZhanTingDev = true
   }
-  
+
   infrastructure.deptName = '青岛市大数据发展管理局'
   infrastructure.deptId = '1067246875800000066'
   navListManagement.navList = [
     { name: '共享门户', key: 'home' },
     { name: '能力集市', key: 'DetailsPageconetent' },
-    { name: '能力云图', key: 'capabilityCloud' },
+    // { name: '能力云图', key: 'capabilityCloud' },
     { name: '能力统计', key: 'abilityStatistics' },
     // { name: '开发指南', key: 'developmentGuide' },
     { name: '技术文档', key: 'instructionManual' },
     { name: '需求中心', key: 'demandCenter' },
     // { name: '个人中心', key: 'personalCenter' },
-    { name: '区市站点', key: 'mapTest' },
+    // { name: '区市站点', key: 'mapTest' },
     // { name: '后台管理', key: 'houtaiguanli' },
     //  { name: '典型赋能案例', key: 'assignCase' },
     { name: '融合服务', key: 'integrationServices' },
@@ -531,4 +531,4 @@ else if (newLocation === 'xihaian') {
       },
     ],
   }
-}
+}

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

@@ -55,7 +55,7 @@
     <div class="fixedmount">
       <div @click="applyResource()">
         <p></p>
-        <p>能力申请</p>
+        <p>资源申请</p>
       </div>
       <div @click="toView()">
         <p></p>