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

2022-11-03 14:50:18 +08:00 · 2022-11-03 14:50:18 +08:00 · c19e1ac231
parent 02de5ba910 b10158ce02
commit c19e1ac231
6 changed files with 152 additions and 150 deletions
--- a/back/public/config/basicConfig.js
+++ b/back/public/config/basicConfig.js
@ -1,8 +1,8 @@
 /*
 * @Author: hisense.wuhongjian
 * @Date: 2022-08-25 14:37:49
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-11-01 15:37:21
+ * @LastEditors: Light
+ * @LastEditTime: 2022-11-03 14:33:57
 * @Description: 告诉大家这是什么
 */
 var _global = {}
@ -43,8 +43,8 @@ var CONFIGITEM = {
    },
    dev: {
      previewUrl: 'http://localhost:8080/',
-      apiURL: 'http://192.168.124.236:8888/ucs-admin',
-      websocketURL: 'ws://192.168.243.236:8888/ucs-admin/websocket'
+      apiURL: 'http://192.168.124.233:8888/ucs-admin',
+      websocketURL: 'ws://192.168.124.236:8888/ucs-admin/websocket'
    }
  }
 }
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@ -170,9 +170,9 @@
      width="30%"
    >
      <el-radio v-model="radio" label="智能算法">智能算法</el-radio>
-      <el-radio v-model="radio" label="图层服务">图层服务</el-radio>
-      <el-radio v-model="radio" label="开发组件">开发组件</el-radio>
-      <el-radio v-model="radio" label="业务组件">业务组件</el-radio>
+      <el-radio v-model="radio" label="图层服务">GIS图层</el-radio>
+      <el-radio v-model="radio" label="开发组件">通用能力组件</el-radio>
+      <el-radio v-model="radio" label="业务组件">业务能力组件</el-radio>
      <span slot="footer" class="dialog-footer">
        <el-button @click="clear">取 消</el-button>
        <el-button type="primary" @click="showPutOnTheShelfVue"
@ -181,7 +181,7 @@
      </span>
    </el-dialog>
    <el-dialog
-      :title="submitFrom.id ? '修改' + radio : '上架' + radio"
+      title="盘点入库"
      :visible.sync="showPutOnTheShelfFlag2"
      :close-on-click-modal="false"
      :close-on-press-escape="false"
@ -583,6 +583,7 @@ export default {
      this.reset()
    },
    showPutOnTheShelf () {
+      // :title="submitFrom.id ? '修改' + radio : '上架' + radio"
      this.showPutOnTheShelfFlag = true
      this.$http.get('/category/getCategoryTree').then((res) => {
        this.insertList = res.data.data.filter(
--- a/back/src/views/modules/ability/bsabilityservice.vue
+++ b/back/src/views/modules/ability/bsabilityservice.vue
@ -175,7 +175,7 @@
      ></relate-application>
    </div>
     <el-dialog
-      :title="submitFrom.id?'修改'+radio:'上架'+radio"
+      title="盘点入库"
      :visible.sync="showPutOnTheShelfFlag2"
      :close-on-click-modal='false'
      :close-on-press-escape='false'
@ -549,6 +549,7 @@ export default {
    },
    // 上架
    showPutOnTheShelf () {
+      //    :title="submitFrom.id?'修改'+radio:'上架'+radio"
      this.showPutOnTheShelfFlag2 = true
      this.$http.get('/category/getCategoryTree').then(res => {
        this.insertList = res.data.data.filter(item => item.name === '应用资源一')[0]
--- a/back/src/views/modules/ability/businessComponents.vue
+++ b/back/src/views/modules/ability/businessComponents.vue
@ -156,9 +156,9 @@
      width="30%"
    >
      <el-radio v-model="radio" label="智能算法">智能算法</el-radio>
-      <el-radio v-model="radio" label="图层服务">图层服务</el-radio>
-      <el-radio v-model="radio" label="开发组件">开发组件</el-radio>
-      <el-radio v-model="radio" label="业务组件">业务组件</el-radio>
+      <el-radio v-model="radio" label="图层服务">GIS图层</el-radio>
+      <el-radio v-model="radio" label="开发组件">通用能力组件</el-radio>
+      <el-radio v-model="radio" label="业务组件">业务能力组件</el-radio>
      <span slot="footer" class="dialog-footer">
        <el-button @click="clear">取 消</el-button>
        <el-button type="primary" @click="showPutOnTheShelfVue"
@ -167,7 +167,7 @@
      </span>
    </el-dialog>
    <el-dialog
-      :title="submitFrom.id ? '修改' + radio : '上架' + radio"
+       title="盘点入库"
      :visible.sync="showPutOnTheShelfFlag2"
      :close-on-click-modal="false"
      :close-on-press-escape="false"
--- a/back/src/views/modules/ability/commonCapabilities.vue
+++ b/back/src/views/modules/ability/commonCapabilities.vue
@ -160,9 +160,9 @@
      width="30%"
    >
      <el-radio v-model="radio" label="智能算法">智能算法</el-radio>
-      <el-radio v-model="radio" label="图层服务">图层服务</el-radio>
-      <el-radio v-model="radio" label="开发组件">开发组件</el-radio>
-      <el-radio v-model="radio" label="业务组件">业务组件</el-radio>
+      <el-radio v-model="radio" label="图层服务">GIS图层</el-radio>
+      <el-radio v-model="radio" label="开发组件">通用能力组件</el-radio>
+      <el-radio v-model="radio" label="业务组件">业务能力组件</el-radio>
      <span slot="footer" class="dialog-footer">
        <el-button @click="clear">取 消</el-button>
        <el-button type="primary" @click="showPutOnTheShelfVue"
@ -171,7 +171,7 @@
      </span>
    </el-dialog>
    <el-dialog
-      :title="submitFrom.id ? '修改' + radio : '上架' + radio"
+      title="盘点入库"
      :visible.sync="showPutOnTheShelfFlag2"
      :close-on-click-modal="false"
      :close-on-press-escape="false"
--- a/back/src/views/modules/capabilityTraceability/index.vue
+++ b/back/src/views/modules/capabilityTraceability/index.vue
@ -2,13 +2,13 @@
 * @Author: Light
 * @Date: 2022-10-31 09:24:38
 * @LastEditors: Light
- * @LastEditTime: 2022-11-02 15:12:38
+ * @LastEditTime: 2022-11-03 14:46:01
 * @Description: 能力溯源分析
 -->
 <template>
    <div class="capabilityTraceability">
      <div class="header">
-        <div class="name">能力溯源统计分析</div>
+        <div class="name">能力溯源分析</div>
        <div class="tab">
          <div v-for="tab in tabList" :key="tab" :class="selectTab==tab?'select':''" @click="changeTab(tab)">{{tab}}</div>
        </div>
@ -39,7 +39,7 @@
          </div>
        </div>
        <div class="two" style="position: relative;">
-          <div class="top"><i></i>按不同部门维度统计</div>
+          <div class="top"><i></i>数字资源能力一本账（按不同部门纬度统计）</div>
          <div class='all' style="position: absolute;top: 0;right: 55px;font-weight: 600;cursor: pointer;">查看全部</div>
          <div class="main">
             <el-table
@ -84,7 +84,7 @@
          </div>
        </div>
        <div class="three">
-          <div class="top"><i></i>按不同职能维度统计</div>
+          <div class="top"><i></i>数字资源能力一本账（按不同职能维度统计）</div>
          <div class="main">
            <div class="nav">
              <div :class="selectDistribution==nav?'select':''" v-for='nav in distributionNav' :key="nav" @click="selectDistribution=nav">{{nav}}</div>
@ -111,7 +111,7 @@
          </div>
        </div>
        <div class="two" style="position: relative;">
-          <div class="top"><i></i>按不同部门维度统计</div>
+          <div class="top"><i></i>数字资源能力一本账（按不同地市纬度统计）</div>
          <div class='all' style="position: absolute;top: 0;right: 55px;font-weight: 600;cursor: pointer;">查看全部</div>
          <div class="main">
             <el-table
@ -156,7 +156,7 @@
          </div>
        </div>
        <div class="three">
-          <div class="top"><i></i>按不同部门维度统计</div>
+          <div class="top"><i></i>数字资源能力一本账（按不同地市纬度统计）</div>
          <div class="main">
            <div class="nav">
              <div :class="selectDistribution2==nav?'select':''" v-for='nav in distributionNav2' :key="nav" @click="selectDistribution2=nav">{{nav}}</div>
@ -170,7 +170,7 @@
        </div>
      </div>
      <!--GIS图层资源-->
-      <el-dialog title="GIS图层资源" :visible.sync="yunshow"  class="status_change">
+      <el-dialog title="GIS图层资源能力溯源信息分析" :visible.sync="yunshow"  class="status_change">
        <div>
        <el-table
        :data="dataList1"
@ -365,151 +365,151 @@ export default {
      allSituationDept: [{ name: '注册项目', num: '100个' }, { name: '注册系统', num: '100个' }, { name: '视频资源', num: '100万路' }, { name: 'GIS图层', num: '100项' }, { name: '云网资源', num: '100个' }, { name: '组件资源', num: '100项' }],
      allSituationDept2: [{ name: '注册地市', num: '100个' }, { name: '注册项目', num: '100个' }, { name: '注册系统', num: '100个' }, { name: '视频资源', num: '100万路' }, { name: 'GIS图层', num: '100项' }, { name: '云网资源', num: '100个' }, { name: '组件资源', num: '100项' }],
      tableData1: [{
-        deptName: '交通运输厅',
-        project: '1005',
-        system: '1005',
-        video: '1005',
-        layer: '1005',
-        cloudResources: '1005',
-        assembly: '1005'
+        deptName: '山东省信访局',
+        project: '2',
+        system: '5',
+        video: '5',
+        layer: '7',
+        cloudResources: '3',
+        assembly: '5'
      }, {
-        deptName: '财政厅',
-        project: '1005',
-        system: '1005',
-        video: '1005',
-        layer: '1005',
-        cloudResources: '1005',
-        assembly: '1005'
+        deptName: '山东省商务厅',
+        project: '5',
+        system: '8',
+        video: '7',
+        layer: '9',
+        cloudResources: '1',
+        assembly: '4'
      }, {
-        deptName: '应急厅',
-        project: '1005',
-        system: '1005',
-        video: '1005',
-        layer: '1005',
-        cloudResources: '1005',
-        assembly: '1005'
+        deptName: '山东省审计厅',
+        project: '1',
+        system: '4',
+        video: '7',
+        layer: '6',
+        cloudResources: '3',
+        assembly: '8'
      }, {
-        deptName: '大数据局',
-        project: '1005',
-        system: '1005',
-        video: '1005',
-        layer: '1005',
-        cloudResources: '1005',
-        assembly: '1005'
+        deptName: '山东省公安厅',
+        project: '1',
+        system: '4',
+        video: '6',
+        layer: '7',
+        cloudResources: '5',
+        assembly: '4'
      }, {
-        deptName: '民政局',
-        project: '1005',
-        system: '1005',
-        video: '1005',
-        layer: '1005',
-        cloudResources: '1005',
-        assembly: '1005'
+        deptName: '山东省水利厅',
+        project: '5',
+        system: '4',
+        video: '6',
+        layer: '1',
+        cloudResources: '7',
+        assembly: '5'
      }, {
-        deptName: '公安厅',
-        project: '1005',
-        system: '1005',
-        video: '1005',
-        layer: '1005',
-        cloudResources: '1005',
-        assembly: '1005'
+        deptName: '山东省民政厅',
+        project: '3',
+        system: '8',
+        video: '9',
+        layer: '6',
+        cloudResources: '3',
+        assembly: '1'
      }, {
-        deptName: '教育厅',
-        project: '1005',
-        system: '1005',
-        video: '1005',
-        layer: '1005',
-        cloudResources: '1005',
-        assembly: '1005'
+        deptName: '山东省自然资源厅',
+        project: '6',
+        system: '8',
+        video: '3',
+        layer: '5',
+        cloudResources: '1',
+        assembly: '5'
      }, {
-        deptName: '审计厅',
-        project: '1005',
-        system: '1005',
-        video: '1005',
-        layer: '1005',
-        cloudResources: '1005',
-        assembly: '1005'
+        deptName: '山东省司法厅',
+        project: '1',
+        system: '6',
+        video: '7',
+        layer: '4',
+        cloudResources: '5',
+        assembly: '2'
      }, {
-        deptName: '海洋局',
-        project: '1005',
-        system: '1005',
-        video: '1005',
-        layer: '1005',
-        cloudResources: '1005',
-        assembly: '1005'
+        deptName: '山东省农业农村厅',
+        project: '6',
+        system: '8',
+        video: '4',
+        layer: '1',
+        cloudResources: '4',
+        assembly: '6'
      }
      ],
      tableData2: [{
-        deptName: '交通运输厅',
-        project: '1005',
-        system: '1005',
-        video: '1005',
-        layer: '1005',
-        cloudResources: '1005',
-        assembly: '1005'
+        deptName: '青岛',
+        project: '7',
+        system: '5',
+        video: '3',
+        layer: '2',
+        cloudResources: '1',
+        assembly: '6'
      }, {
-        deptName: '交通运输厅',
-        project: '1005',
-        system: '1005',
-        video: '1005',
-        layer: '1005',
-        cloudResources: '1005',
-        assembly: '1005'
+        deptName: '济南',
+        project: '5',
+        system: '6',
+        video: '7',
+        layer: '4',
+        cloudResources: '1',
+        assembly: '4'
      }, {
-        deptName: '交通运输厅',
-        project: '1005',
-        system: '1005',
-        video: '1005',
-        layer: '1005',
-        cloudResources: '1005',
-        assembly: '1005'
+        deptName: '淄博',
+        project: '1',
+        system: '5',
+        video: '5',
+        layer: '6',
+        cloudResources: '7',
+        assembly: '2'
      }, {
-        deptName: '交通运输厅',
-        project: '1005',
-        system: '1005',
-        video: '1005',
-        layer: '1005',
-        cloudResources: '1005',
-        assembly: '1005'
+        deptName: '枣庄',
+        project: '6',
+        system: '8',
+        video: '4',
+        layer: '1',
+        cloudResources: '6',
+        assembly: '4'
      }, {
-        deptName: '交通运输厅',
-        project: '1005',
-        system: '1005',
-        video: '1005',
-        layer: '1005',
-        cloudResources: '1005',
-        assembly: '1005'
+        deptName: '东营',
+        project: '5',
+        system: '4',
+        video: '6',
+        layer: '1',
+        cloudResources: '6',
+        assembly: '7'
      }, {
-        deptName: '交通运输厅',
-        project: '1005',
-        system: '1005',
-        video: '1005',
-        layer: '1005',
-        cloudResources: '1005',
-        assembly: '1005'
+        deptName: '烟台',
+        project: '3',
+        system: '4',
+        video: '5',
+        layer: '7',
+        cloudResources: '1',
+        assembly: '6'
      }, {
-        deptName: '交通运输厅',
-        project: '1005',
-        system: '1005',
-        video: '1005',
-        layer: '1005',
-        cloudResources: '1005',
-        assembly: '1005'
+        deptName: '潍坊',
+        project: '1',
+        system: '5',
+        video: '7',
+        layer: '3',
+        cloudResources: '8',
+        assembly: '4'
      }, {
-        deptName: '交通运输厅',
-        project: '1005',
-        system: '1005',
-        video: '1005',
-        layer: '1005',
-        cloudResources: '1005',
-        assembly: '1005'
+        deptName: '临沂',
+        project: '1',
+        system: '6',
+        video: '5',
+        layer: '8',
+        cloudResources: '4',
+        assembly: '3'
      }, {
-        deptName: '交通运输厅',
-        project: '1005',
-        system: '1005',
-        video: '1005',
-        layer: '1005',
-        cloudResources: '1005',
-        assembly: '1005'
+        deptName: '德州',
+        project: '1',
+        system: '5',
+        video: '6',
+        layer: '4',
+        cloudResources: '3',
+        assembly: '2'
      }
      ],
      distributionNav: ['注册项目', '注册系统', '视频资源', 'GIS图层', '云网资源', '组件资源'],