From 9ae72f0b9d65fbd28913f7e0a613039e212eaa24 Mon Sep 17 00:00:00 2001
From: unknown <xiaoshangqing@Hisense.ad>
Date: Thu, 3 Nov 2022 14:20:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/ability/bsabilityai.vue        | 9 +++++----
 back/src/views/modules/ability/bsabilityservice.vue   | 3 ++-
 back/src/views/modules/ability/businessComponents.vue | 8 ++++----
 back/src/views/modules/ability/commonCapabilities.vue | 8 ++++----
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue
index 0a282a3b..ea4cb3c9 100644
--- 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(
diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue
index 94d1f652..7dbb33ee 100644
--- 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]
diff --git a/back/src/views/modules/ability/businessComponents.vue b/back/src/views/modules/ability/businessComponents.vue
index 22576b80..4eb8598a 100644
--- 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"
diff --git a/back/src/views/modules/ability/commonCapabilities.vue b/back/src/views/modules/ability/commonCapabilities.vue
index ea35e340..d815310a 100644
--- 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"

From e915396532f40d76ac1731b6caae4d8a8730c3fe Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Thu, 3 Nov 2022 14:42:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?11.03=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/capabilityTraceability/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/back/src/views/modules/capabilityTraceability/index.vue b/back/src/views/modules/capabilityTraceability/index.vue
index c2c26a4c..cd4ddc73 100644
--- a/back/src/views/modules/capabilityTraceability/index.vue
+++ b/back/src/views/modules/capabilityTraceability/index.vue
@@ -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"