From d898bbec7ee4d151236b58c3b77b02ee2d0faeff Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Thu, 30 Jun 2022 19:44:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E3=80=81=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/activiti/demo/putaway-process.vue | 15 ++++++--
 .../components/Business/BusinessUsageMode.vue | 38 +++++++++++++------
 .../LayerService/LayerServiceInformation.vue  | 15 ++++++--
 .../LayerService/LayerServiceNavigation.vue   |  4 +-
 4 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/back/src/views/modules/activiti/demo/putaway-process.vue b/back/src/views/modules/activiti/demo/putaway-process.vue
index 5453a3d1..b4915c25 100644
--- a/back/src/views/modules/activiti/demo/putaway-process.vue
+++ b/back/src/views/modules/activiti/demo/putaway-process.vue
@@ -94,7 +94,7 @@
               placeholder="共享类型"
             ></el-input>
           </el-form-item>
-          <el-form-item label="共享方式">
+          <el-form-item label="共享方式"  v-if="coverageNotShow">
             <el-input
               v-model="dataForm.shareMode"
               :disabled="fieldDisabled"
@@ -108,14 +108,14 @@
               placeholder="共享方条件"
             ></el-input>
           </el-form-item>
-          <el-form-item label="服务接口">
+          <el-form-item label="服务接口" v-if="coverageNotShow">
             <el-input
               v-model="dataForm.apiUrl"
               :disabled="fieldDisabled"
               placeholder="服务接口"
             ></el-input>
           </el-form-item>
-          <el-form-item label="接口请求方式">
+          <el-form-item label="接口请求方式"  v-if="coverageNotShow">
             <el-input
               v-model="dataForm.applyCount"
               :disabled="fieldDisabled"
@@ -179,7 +179,8 @@ export default {
       fieldDisabled: false,
       dataForm: [],
       id: '',
-      shifoushizujian: true
+      shifoushizujian: true,
+      coverageNotShow: true
     }
   },
   watch: {},
@@ -208,6 +209,12 @@ export default {
         }
         this.dataForm = res.data.resourceDTO
         if (this.dataForm.type != '应用资源') {
+          this.dataForm.infoList.forEach((val) => {
+            if (val.attrValue === '图层服务') {
+              this.coverageNotShow = false
+              console.log(this.coverageNotShow, 'wowowo')
+            }
+          })
           this.shifoushizujian = false
         } else {
           this.shifoushizujian = true
diff --git a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue
index f146cdf4..4c3df242 100644
--- a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue
@@ -27,8 +27,15 @@
       </div>
       <div class="content-right">
         <div class="content-right-left">
-          <div class="content-right-title">{{ item.contact }}</div>
+          <!-- <div class="content-right-title">{{ item.contact }}</div> -->
           <div class="content-right-content">
+            <p>
+              <span>{{ item.contact }}</span>
+              <a-tooltip>
+                <template #title>{{ item.facilitator.value }}</template>
+                <span>{{ item.facilitator.value }}</span>
+              </a-tooltip>
+            </p>
             <p>
               <span>{{ item.people.name }}</span>
               <a-tooltip>
@@ -46,8 +53,15 @@
           </div>
         </div>
         <div class="content-right-right">
-          <div class="content-right-title">{{ item.contact2 }}</div>
+          <!-- <div class="content-right-title">{{ item.contact2 }}</div> -->
           <div class="content-right-content">
+            <p>
+              <span>{{ item.contact2 }}</span>
+              <a-tooltip>
+                <template #title>{{ item.facilitator2.value }}</template>
+                <span>{{ item.facilitator2.value }}</span>
+              </a-tooltip>
+            </p>
             <p>
               <span>{{ item.people2.name }}</span>
               <a-tooltip>
@@ -83,19 +97,19 @@
           name: '接口地址：',
         },
         linkValue: '',
-        contact: '归属部门',
-        facilitator: { name: '归属部门：', value: '讯飞科大' },
-        people: { name: '部门联系人：', value: '李四' },
+        contact: '归属部门：',
+        facilitator: { name: '归属部门：', value: '' },
+        people: { name: '部门联系人：', value: '' },
         phone: {
           name: '联系人电话：',
-          value: '12345678901',
+          value: '',
         },
-        contact2: '服务商',
-        facilitator2: { name: '服务商：', value: '科大讯飞' },
-        people2: { name: '服务商联系人：', value: '李四' },
+        contact2: '服务商：',
+        facilitator2: { name: '服务商：', value: '' },
+        people2: { name: '服务商联系人：', value: '' },
         phone2: {
           name: '联系人电话：',
-          value: '1234567890',
+          value: '',
         },
       },
     ],
@@ -114,7 +128,7 @@
     } else {
       // eslint-disable-next-line vue/no-setup-props-destructure
       dataFrom.value.content[0].link.value = props.dataList.apiUrl
-      dataFrom.value.content[0].facilitator.value = props.dataList.deptContacts
+      dataFrom.value.content[0].facilitator.value = props.dataList.deptName
       dataFrom.value.content[0].people.value = props.dataList.deptContacts
       dataFrom.value.content[0].phone.value = props.dataList.deptPhone
       console.log('dataList', props.dataList)
@@ -140,7 +154,7 @@
           flag.value = false
         } else {
           dataFrom.value.content[0].link.value = val.apiUrl
-          dataFrom.value.content[0].facilitator.value = val.deptContacts
+          dataFrom.value.content[0].facilitator.value = val.deptName
           dataFrom.value.content[0].people.value = val.deptContacts
           dataFrom.value.content[0].phone.value = val.deptPhone
           console.log('dataList', val)
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceInformation.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceInformation.vue
index 5887693d..05dbb176 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceInformation.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceInformation.vue
@@ -11,21 +11,30 @@
             <li v-for="(item, index) in dataFromLeft.content" :key="index">
               <img :src="iconImg" />
               <span>{{ item.type }}</span>
-              <p>{{ item.values }}</p>
+              <a-tooltip>
+                <template #title>{{ item.values }}</template>
+                <p>{{ item.values }}</p>
+              </a-tooltip>
             </li>
           </ul>
           <ul>
             <li v-for="(item, index) in dataFromCenter.content" :key="index">
               <img :src="iconImg" />
               <span>{{ item.type }}</span>
-              <p>{{ item.values }}</p>
+              <a-tooltip>
+                <template #title>{{ item.values }}</template>
+                <p>{{ item.values }}</p>
+              </a-tooltip>
             </li>
           </ul>
           <ul>
             <li v-for="(item, index) in dataFromRight.content" :key="index">
               <img :src="iconImg" />
               <span>{{ item.type }}</span>
-              <p>{{ item.values }}</p>
+              <a-tooltip>
+                <template #title>{{ item.values }}</template>
+                <p>{{ item.values }}</p>
+              </a-tooltip>
             </li>
           </ul>
         </div>
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue
index 9ccd0217..6f552327 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue
@@ -129,7 +129,7 @@
       }
     })
     select.value = navList.value.filter(
-      (item) => item.name === list.value[0]
+      (item) => item.name === '图层展示'
     )[0].key
     console.log('11111111111111111111111111', list.value, navList.value)
   }
@@ -205,7 +205,7 @@
         })
         if (list.value.length > 0) {
           select.value = navList.value.filter(
-            (item) => item.name === list.value[0]
+            (item) => item.name === '图层展示'
           )[0].key
         }
         console.log('11111111111111111111111111', list.value, navList.value)