From 4e0a985a3b5d83e30b96309ed5b109f8e68a9236 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Fri, 15 Jul 2022 16:51:46 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=88=97=E5=AE=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/back/src/views/modules/ability/IntegratedServices.vue b/back/src/views/modules/ability/IntegratedServices.vue
index ae494b97..397e1b3d 100644
--- a/back/src/views/modules/ability/IntegratedServices.vue
+++ b/back/src/views/modules/ability/IntegratedServices.vue
@@ -23,7 +23,7 @@
         style="width: 100%" :height="qp ? '810px' : '650px'">
         <el-table-column v-for="(item) in Object.keys(tableColumns)" :key="item" :prop="item" label="融合服务名称"
           header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="94" right="0">
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="240" right="0">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('ability:bsabilityai:update')" type="text" size="small"
               @click="handleUpdate(scope.row)">{{ $t("update") }}</el-button>

From 78e3a4d7f0bdcff63406f0e687dc28b0ea423864 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Fri, 15 Jul 2022 17:33:27 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ability/components/common-question.vue    |  2 +-
 .../components/integrated-combine-ability.vue | 32 ++++++++++---------
 .../ability/components/scene-use-step.vue     |  2 +-
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/back/src/views/modules/ability/components/common-question.vue b/back/src/views/modules/ability/components/common-question.vue
index 0ab78cb3..1d729e1e 100644
--- a/back/src/views/modules/ability/components/common-question.vue
+++ b/back/src/views/modules/ability/components/common-question.vue
@@ -14,7 +14,7 @@
                     v-if="dataInfo.length > 1">删除
                 </el-button>
             </el-form-item>
-            <el-button style="margin-left:120px" size="small" v-if="index == dataInfo.length - 1" @click="addItem"
+            <el-button style="margin-left:70px" size="small" v-if="index == dataInfo.length - 1" @click="addItem"
                 type="primary">添加
             </el-button>
         </div>
diff --git a/back/src/views/modules/ability/components/integrated-combine-ability.vue b/back/src/views/modules/ability/components/integrated-combine-ability.vue
index 60952228..80eea64b 100644
--- a/back/src/views/modules/ability/components/integrated-combine-ability.vue
+++ b/back/src/views/modules/ability/components/integrated-combine-ability.vue
@@ -9,24 +9,24 @@
         <div v-if="!loading">
             <div v-for="(item, index) in dataInfo" :key="index">
                 <el-form-item label="能力类别" prop="">
-                    <el-select v-model="item.type" placeholder="请选择能力类别"
-                        @change="(data) => filterSelect(data, item)" :disabled="disabledType">
+                    <el-select v-model="item.type" placeholder="请选择能力类别" @change="(data) => filterSelect(data, item)"
+                        :disabled="disabledType">
                         <el-option v-for="val in typeOptions" :key="val.value" :label="val.value" :value="val.value">
                         </el-option>
                     </el-select>
-                    <el-select style="margin-left: 20px" v-model="item.resourceId" placeholder="请选择能力"
-                        :disabled="disabledType">
-                        <el-option v-for="val in item.abilityOptions" :key="val.id" :label="val.name" :value="val.id">
+                    <el-select class="ability-input" style="margin-left: 20px;max-width:530px" v-model="item.resourceId"
+                        placeholder="请选择能力" filterable :disabled="disabledType">
+                        <el-option style="max-width:530px" v-for="val in item.abilityOptions" :key="val.id"
+                            :label="val.name || '--'" :value="val.id">
                         </el-option>
                     </el-select>
                     <el-button style="margin-left:10px" @click="deleteItem(dataInfo, index)" type="danger" size="small"
                         v-if="!disabledType && dataInfo.length > 1">删除
                     </el-button>
-                    <el-button style="margin-left:10px" size="small"
-                        v-if="!disabledType && index == dataInfo.length - 1" @click="addItem(dataInfo, 0)"
-                        type="primary">添加
-                    </el-button>
                 </el-form-item>
+                <el-button style="margin-left:70px" size="small" v-if="!disabledType && index == dataInfo.length - 1"
+                    @click="addItem(dataInfo, 0)" type="primary">添加
+                </el-button>
             </div>
         </div>
     </div>
@@ -51,9 +51,6 @@ export default {
     data() {
         return {
             typeOptions: [
-                {
-                    value: '',
-                },
                 {
                     value: '数据资源',
                 },
@@ -71,7 +68,6 @@ export default {
                 },
             ],
             dataInfo: [],
-            abilityArray: [],
             abilityArrayCopy: [],
             loading: false,
         }
@@ -139,13 +135,13 @@ export default {
         // 获取能力
         getAbility() {
             return new Promise((resolve, reject) => {
+                this.abilityArrayCopy = []
                 this.loading = true;
                 this.$http.get(`/resource/list`, {}).then(({ data: res }) => {
                     this.loading = false;
                     if (res.code !== 0) {
                         return this.$message.error(res.msg)
                     }
-                    this.abilityArray = res.data || []
                     this.abilityArrayCopy = res.data || []
                     resolve(res)
                 }).catch((err) => {
@@ -160,6 +156,8 @@ export default {
             let selectArray = this.dataInfo.map(v => v.resourceId) || [];
             // 过滤掉已选的
             item.abilityOptions = arr.filter(v => !selectArray.includes(v.id))
+            console.log('abilityOptions------------>', item.abilityOptions);
+
         },
     }
 }
@@ -180,4 +178,8 @@ export default {
     width: 100%;
     height: 100px;
 }
-</style>
\ No newline at end of file
+
+.ability-input {
+    width: calc(100% - 300px);
+}
+</style>
diff --git a/back/src/views/modules/ability/components/scene-use-step.vue b/back/src/views/modules/ability/components/scene-use-step.vue
index f81fa7d6..b2f8a669 100644
--- a/back/src/views/modules/ability/components/scene-use-step.vue
+++ b/back/src/views/modules/ability/components/scene-use-step.vue
@@ -16,7 +16,7 @@
                     v-if="!disabledType && dataInfo.length > 1">删除
                 </el-button>
             </el-form-item>
-            <el-button style="margin-left:120px" size="small" v-if="!disabledType && index == dataInfo.length - 1"
+            <el-button style="margin-left:70px" size="small" v-if="!disabledType && index == dataInfo.length - 1"
                 @click="addItem" type="primary">添加
             </el-button>
         </div>

From 2d12bf76d4fe7f8471acb928ed532ab209c9299f Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Fri, 15 Jul 2022 17:39:24 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/ability/IntegratedServices-add.vue | 18 +++++++++++-------
 .../ability/assignedScene/add-update-scene.vue |  4 ++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/back/src/views/modules/ability/IntegratedServices-add.vue b/back/src/views/modules/ability/IntegratedServices-add.vue
index 9df71299..8144b0b9 100644
--- a/back/src/views/modules/ability/IntegratedServices-add.vue
+++ b/back/src/views/modules/ability/IntegratedServices-add.vue
@@ -31,10 +31,10 @@
               基本信息
             </div>
             <el-form-item label="融合服务名称" prop="name">
-              <el-input v-model="dataForm.name" placeholder="请输入融合服务名称"></el-input>
+              <el-input class="input-box" v-model="dataForm.name" placeholder="请输入融合服务名称"></el-input>
             </el-form-item>
             <el-form-item label="融合服务描述" prop="description">
-              <el-input v-model="dataForm.description" placeholder="请输入融合服务描述"></el-input>
+              <el-input class="input-box" v-model="dataForm.description" placeholder="请输入融合服务描述"></el-input>
             </el-form-item>
             <el-form-item label="应用领域" prop="applicationArea">
               <el-select v-model="dataForm.applicationArea" placeholder="请选择应用领域" filterable>
@@ -43,19 +43,19 @@
               </el-select>
             </el-form-item>
             <el-form-item label="部门联系人" prop="deptUser">
-              <el-input v-model="dataForm.deptUser" placeholder="请输入部门联系人"></el-input>
+              <el-input class="input-box" v-model="dataForm.deptUser" placeholder="请输入部门联系人"></el-input>
             </el-form-item>
             <el-form-item label="部门联系人电话" prop="mobile">
-              <el-input v-model="dataForm.mobile" placeholder="请输入部门联系人电话"></el-input>
+              <el-input class="input-box" v-model="dataForm.mobile" placeholder="请输入部门联系人电话"></el-input>
             </el-form-item>
             <el-form-item label="服务商" prop="provider">
-              <el-input v-model="dataForm.provider" placeholder="请输入服务商"></el-input>
+              <el-input class="input-box" v-model="dataForm.provider" placeholder="请输入服务商"></el-input>
             </el-form-item>
             <el-form-item label="服务商联系人" prop="providerUser">
-              <el-input v-model="dataForm.providerUser" placeholder="请输入服务商联系人"></el-input>
+              <el-input class="input-box" v-model="dataForm.providerUser" placeholder="请输入服务商联系人"></el-input>
             </el-form-item>
             <el-form-item label="服务商联系人电话" prop="providerMobile">
-              <el-input v-model="dataForm.providerMobile" placeholder="请输入服务商联系人电话"></el-input>
+              <el-input class="input-box" v-model="dataForm.providerMobile" placeholder="请输入服务商联系人电话"></el-input>
             </el-form-item>
           </div>
 
@@ -493,4 +493,8 @@ export default {
   color: #606266;
   line-height: 32px;
 }
+
+.input-box {
+  width: 90%;
+}
 </style>
diff --git a/back/src/views/modules/ability/assignedScene/add-update-scene.vue b/back/src/views/modules/ability/assignedScene/add-update-scene.vue
index 8ddc1137..a1e69fad 100644
--- a/back/src/views/modules/ability/assignedScene/add-update-scene.vue
+++ b/back/src/views/modules/ability/assignedScene/add-update-scene.vue
@@ -31,10 +31,10 @@
               基本信息
             </div>
             <el-form-item label="名称" prop="name">
-              <el-input v-model="dataForm.name" placeholder="请输入名称" :disabled="modalType === 'display'"></el-input>
+              <el-input v-model="dataForm.name" placeholder="请输入名称" :disabled="modalType === 'display'" style="width:90%"></el-input>
             </el-form-item>
             <el-form-item label="描述" prop="description">
-              <el-input type="textarea" :rows="3" v-model="dataForm.description" placeholder="请输入描述"
+              <el-input type="textarea" :rows="3" v-model="dataForm.description" placeholder="请输入描述" style="width:90%"
                 :disabled="modalType === 'display'"></el-input>
             </el-form-item>
           </div>