From 4281bc515655eb46bbc67b3a5ea96d16dfa411c2 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 1 Nov 2022 10:43:16 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E5=90=8E=E5=8F=B0-=E8=83=BD=E5=8A=9B?=
 =?UTF-8?q?=E6=8C=82=E6=8E=A5-=E7=BB=84=E4=BB=B6=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=EF=BC=9A=E6=9F=A5=E4=B8=8D=E5=88=B0=E6=95=B0=E6=8D=AE=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E5=B0=B1=E6=AD=A3=E5=B8=B8=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E6=9A=82=E6=97=A0=E6=95=B0=E6=8D=AE=E5=B0=B1=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E5=BF=85=E8=A6=81=E8=BF=99=E6=A0=B7=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/modules/ability/bsabilityai.vue |   2 +-
 .../modules/ability/bsabilityservice.vue      |   2 +-
 .../algorithm/algorithm-management.vue        |   2 +-
 .../src/views/modules/canassigncase/index.vue | 170 +++++++++---------
 4 files changed, 88 insertions(+), 88 deletions(-)

diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue
index 41bbff3c..12f6a410 100644
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@@ -514,7 +514,7 @@ export default {
               this.total = 0
               return this.$message.error(res.msg)
             }
-            if (res.data.list.length !== 0) {
+            if (res.data.list.length >= 0) {
               this.dataList = res.data.list
               this.total = this.mixinViewModuleOptions.getDataListIsPage
                 ? res.data.total
diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue
index cf592690..668a0668 100644
--- a/back/src/views/modules/ability/bsabilityservice.vue
+++ b/back/src/views/modules/ability/bsabilityservice.vue
@@ -393,7 +393,7 @@ export default {
               this.total = 0
               return this.$message.error(res.msg)
             }
-            if (res.data.list.length !== 0) {
+            if (res.data.list.length >= 0) {
               this.dataList = res.data.list
               this.total = this.mixinViewModuleOptions.getDataListIsPage
                 ? res.data.total
diff --git a/back/src/views/modules/algorithm/algorithm-management.vue b/back/src/views/modules/algorithm/algorithm-management.vue
index 839664ba..3dba3e36 100644
--- a/back/src/views/modules/algorithm/algorithm-management.vue
+++ b/back/src/views/modules/algorithm/algorithm-management.vue
@@ -249,7 +249,7 @@ export default {
               this.total = 0
               return this.$message.error(res.msg)
             }
-            if (res.data.list.length !== 0) {
+            if (res.data.list.length >= 0) {
               this.dataList = res.data.list
               this.total = this.mixinViewModuleOptions.getDataListIsPage
                 ? res.data.total
diff --git a/back/src/views/modules/canassigncase/index.vue b/back/src/views/modules/canassigncase/index.vue
index 9489a202..b6d2f5cc 100644
--- a/back/src/views/modules/canassigncase/index.vue
+++ b/back/src/views/modules/canassigncase/index.vue
@@ -131,54 +131,54 @@
 </template>
 
 <script>
-import mixinViewModule from "@/mixins/view-module";
-import AddOrUpdate from "./canassigncase-add-or-update";
-import dictionaries from "@/utils/dictionaries";
-import qs from "qs";
-import { type } from "os";
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './canassigncase-add-or-update'
+import dictionaries from '@/utils/dictionaries'
+import qs from 'qs'
+import { type } from 'os'
 export default {
   mixins: [mixinViewModule],
-  data() {
+  data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: "/resource/page",
+        getDataListURL: '/resource/page',
         getDataListIsPage: true,
-        exportURL: "/ability/bsabilityai/export",
-        deleteURL: "/resource/delete",
-        deleteIsBatch: true,
+        exportURL: '/ability/bsabilityai/export',
+        deleteURL: '/resource/delete',
+        deleteIsBatch: true
       },
       disabled: false,
       sceneArr: dictionaries.sceneArr,
       fieldArr: dictionaries.fieldArr,
       shareFormArr: dictionaries.shareFormArr,
       dataForm: {
-        name: "",
-        creator: "",
+        name: '',
+        creator: '',
         selectType: 0,
         delFlag: 0,
-        type: "赋能案例",
+        type: '赋能案例'
       },
-      qp: false,
-    };
+      qp: false
+    }
   },
   watch: {},
   components: {
-    AddOrUpdate,
+    AddOrUpdate
   },
-  created() {
-    this.dataForm.name = "";
-    this.dataForm.type = "赋能案例";
+  created () {
+    this.dataForm.name = ''
+    this.dataForm.type = '赋能案例'
   },
-  mounted() {
-    window.addEventListener("resize", this.a);
-    this.fullScreen();
+  mounted () {
+    window.addEventListener('resize', this.a)
+    this.fullScreen()
   },
   methods: {
-    reset() {
+    reset () {
       this.$http
         .get(
           this.mixinViewModuleOptions.getDataListURL +
-            "?" +
+            '?' +
             qs.stringify({
               // order: this.order,
               // orderField: this.orderField,
@@ -187,138 +187,138 @@ export default {
               selectType: 0,
               limit: 10,
               delFlag: 0,
-              creator: "",
-              type: "赋能案例",
-              name: "",
+              creator: '',
+              type: '赋能案例',
+              name: ''
             })
         )
         .then(({ data: res }) => {
-          this.dataForm.name = "";
+          this.dataForm.name = ''
           if (res.code !== 0) {
-            this.dataList = [];
-            this.total = 0;
-            return this.$message.error(res.msg);
+            this.dataList = []
+            this.total = 0
+            return this.$message.error(res.msg)
           }
           this.dataList = this.mixinViewModuleOptions.getDataListIsPage
             ? res.data.list
-            : res.data;
+            : res.data
           this.total = this.mixinViewModuleOptions.getDataListIsPage
             ? res.data.total
-            : 0;
+            : 0
           if (this.mixinViewModuleOptions.requestCallback) {
-            this.mixinViewModuleOptions.requestCallback(res.data);
+            this.mixinViewModuleOptions.requestCallback(res.data)
           }
-          this.dataListLoading = false;
+          this.dataListLoading = false
         })
         .catch(() => {
-          this.dataListLoading = false;
-        });
+          this.dataListLoading = false
+        })
     },
-    showDetail(val) {
-      this.addOrUpdateVisible = true;
-      this.disabled = false;
+    showDetail (val) {
+      this.addOrUpdateVisible = true
+      this.disabled = false
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.UpdateState = false;
-        this.$refs.addOrUpdate.dataFormShowDetails = val;
-        this.$refs.addOrUpdate.init();
-      });
-      this.disabled = true;
+        this.$refs.addOrUpdate.UpdateState = false
+        this.$refs.addOrUpdate.dataFormShowDetails = val
+        this.$refs.addOrUpdate.init()
+      })
+      this.disabled = true
     },
-    showDocument(val) {
-      console.log(val);
+    showDocument (val) {
+      console.log(val)
       window.open(
-        window.SITE_CONFIG.frontUrl + "?id=" + val.id + "&&type=" + val.type,
-        "_blank"
-      );
+        window.SITE_CONFIG.frontUrl + '?id=' + val.id + '&&type=' + val.type,
+        '_blank'
+      )
     },
-    findValue(list, type) {
-      const found = list.find((item) => item.attrType === type);
+    findValue (list, type) {
+      const found = list.find((item) => item.attrType === type)
       if (found) {
-        return found.attrValue;
+        return found.attrValue
       } else {
-        return "暂无数据";
+        return '暂无数据'
       }
     },
-    getDataList2(names) {
+    getDataList2 (names) {
       if (names != null) {
         this.$http
           .get(
             this.mixinViewModuleOptions.getDataListURL +
-              "?" +
+              '?' +
               qs.stringify({
                 // order: this.order,
                 // orderField: this.orderField,
                 // type: '组件服务',
                 pageNum: 1,
                 pageSize: this.limit,
-                type: "赋能案例",
-                creator: "",
+                type: '赋能案例',
+                creator: '',
                 selectType: 0,
                 delFlag: 0,
-                name: names,
+                name: names
               })
           )
           .then(({ data: res }) => {
             if (res.code !== 0) {
-              this.dataList = [];
-              this.total = 0;
-              return this.$message.error(res.msg);
+              this.dataList = []
+              this.total = 0
+              return this.$message.error(res.msg)
             }
-            if (res.data.list.length !== 0) {
-              this.dataList = res.data.list;
+            if (res.data.list.length >= 0) {
+              this.dataList = res.data.list
               this.total = this.mixinViewModuleOptions.getDataListIsPage
                 ? res.data.total
-                : 0;
+                : 0
               if (this.mixinViewModuleOptions.requestCallback) {
-                this.mixinViewModuleOptions.requestCallback(res.data);
+                this.mixinViewModuleOptions.requestCallback(res.data)
               }
-              this.dataListLoading = false;
+              this.dataListLoading = false
             } else {
-              this.$message.error("未查询到相关信息");
-              this.reset();
+              this.$message.error('未查询到相关信息')
+              this.reset()
             }
           })
           .catch(() => {
-            this.dataListLoading = false;
-          });
+            this.dataListLoading = false
+          })
       } else {
-        this.$message.error("查询不能输入为空");
+        this.$message.error('查询不能输入为空')
       }
     },
-    fullScreen() {
+    fullScreen () {
       if (window.outerHeight === screen.availHeight) {
         if (window.outerWidth === screen.availWidth) {
           console.log(
-            "全屏1",
+            '全屏1',
             window.outerHeight,
             screen.availHeight,
             window.outerWidth,
             screen.availWidth
-          );
-          this.qp = false;
+          )
+          this.qp = false
         } else {
           console.log(
-            "不是全屏2",
+            '不是全屏2',
             window.outerHeight,
             screen.availHeight,
             window.outerWidth,
             screen.availWidth
-          );
-          this.qp = true;
+          )
+          this.qp = true
         }
       } else {
         console.log(
-          "不是全屏3",
+          '不是全屏3',
           window.outerHeight,
           screen.availHeight,
           window.outerWidth,
           screen.availWidth
-        );
-        this.qp = true;
+        )
+        this.qp = true
       }
-    },
-  },
-};
+    }
+  }
+}
 </script>
 <style lang="scss" scoped>
 .el-tooltip__popper {

From 2a2eb0fbc32df100bdcaacc5bcc12b17bfe39f50 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 1 Nov 2022 13:56:55 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E8=B0=83=E6=8D=A2=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E8=B5=84=E6=BA=90=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/newHome/components/Navigation.vue   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/front/src/views/newHome/components/Navigation.vue b/front/src/views/newHome/components/Navigation.vue
index 2c24745d..a7dacf61 100644
--- a/front/src/views/newHome/components/Navigation.vue
+++ b/front/src/views/newHome/components/Navigation.vue
@@ -161,13 +161,13 @@
   const store = useStore()
   const router = useRouter()
   const topList = ref([
-    '组件服务',
     '应用资源',
+    '组件服务',
     '基础设施',
     '数据资源',
     '知识库',
   ])
-  const select = ref(whoShow.itShowQingDao ? '' : '组件服务')
+  const select = ref(whoShow.itShowQingDao ? '' : '应用资源')
   let applicationDataList = ref([])
   let technosphereDataList = ref([])
   const fabubumen = ref([
@@ -283,14 +283,14 @@
   }
   const mohuchaxun = ref('组件服务')
   function onSearch() {
-  // if (text.value) {
-      snum.value.str = text.value
-      console.log('===================>', text.value)
-      store.commit('home/selectCardsData', snum.value)
-      router.push({
-        path: '/DetailsPageconetent',
-        query: snum.value,
-      })
+    // if (text.value) {
+    snum.value.str = text.value
+    console.log('===================>', text.value)
+    store.commit('home/selectCardsData', snum.value)
+    router.push({
+      path: '/DetailsPageconetent',
+      query: snum.value,
+    })
     // } else {
     //   message.warning('请输入查询内容！')
     // }

From 33e9cfe9600e16701a67362c6fc3e5b653fbcb25 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 1 Nov 2022 14:32:01 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/personalCenter/components/ApplyDetails.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/front/src/views/personalCenter/components/ApplyDetails.vue b/front/src/views/personalCenter/components/ApplyDetails.vue
index f9cd16ae..e4c93573 100644
--- a/front/src/views/personalCenter/components/ApplyDetails.vue
+++ b/front/src/views/personalCenter/components/ApplyDetails.vue
@@ -120,36 +120,43 @@
       title: '任务名称',
       dataIndex: 'activityName',
       key: 'activityName',
+      width: '180px',
     },
     {
       title: '处理部门',
       dataIndex: 'assigneeDeptName',
       key: 'assigneeDeptName',
+      width: '180px',
     },
     {
       title: '处理人',
       dataIndex: 'assigneeName',
       key: 'assigneeName',
+      width: '180px',
     },
     {
       title: '任务开始时间',
       dataIndex: 'startTime',
       key: 'startTime',
+      width: '180px',
     },
     {
       title: '任务结束时间',
       dataIndex: 'endTime',
       key: 'endTime',
+      width: '180px',
     },
     {
       title: '审核意见',
       dataIndex: 'comment',
       key: 'comment',
+      width: '180px',
     },
     {
       title: '任务时长',
       dataIndex: 'duration',
       key: 'duration',
+      width: '180px',
     },
   ]
   const getInfo = () => {

From 39501228645b90403b7d2048c7feee82ee3ea52c Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 1 Nov 2022 14:41:17 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/DetailsPageconetent.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 42474b96..57a235de 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -1165,7 +1165,11 @@
             res.data.data.map((val) => {
               if (mapFlag && val.count != 0) {
                 mapFlag = false
-                changeCards(val.type)
+                if (Cardsname.value === val.type) {
+                  getAppResources2()
+                } else {
+                  changeCards(val.type)
+                }
               }
             })
             if (!mapFlag) {

From b755a35565827b7c4011f6200edb8c9762bfce15 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 1 Nov 2022 14:59:31 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E5=8A=A0=E9=83=A8=E9=97=A8=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modules/myAgent/demo/competency-application.vue    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue
index 8b8634bc..d532698f 100644
--- a/back/src/views/modules/myAgent/demo/competency-application.vue
+++ b/back/src/views/modules/myAgent/demo/competency-application.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-29 15:59:51
  * @LastEditors: Light
- * @LastEditTime: 2022-10-27 16:04:01
+ * @LastEditTime: 2022-11-01 14:59:14
  * @Description: 告诉大家这是什么
 -->
 <!--  流程业务表单   -->
@@ -63,6 +63,7 @@
     <!-- 申请能力 -->
     <div class="AbilityApply">
       <h3>申请能力</h3>
+      <div style="font-size:18px;font-weight:600;margin-top:20px;">{{deptName}}</div>
       <ul v-for="item in dataList" :key="item.id">
         <!-- <li class="title">{{item.address}}</li> -->
         <li class="clearfix">
@@ -157,6 +158,7 @@ export default {
         content: {}
       },
       dataList: [],
+      deptName: '',
       inputAgree: '',
       inputNo: '',
       agreeOrList: '同意'
@@ -270,6 +272,7 @@ export default {
               this.dataForm,
               'elas============================'
             )
+            this.deptName = res.data.tAbilityApplicationDTOList[0].resourceOwnerDept.name
             this.$http
               .get(
             `/act/task/getTaskVariables?${params}&variableName=allowEntrust`

From c8813f968803d3adb64ec13412d18f89e4075826 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 1 Nov 2022 15:00:51 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=AE=A1=E6=89=B9=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/myAgent/demo/competency-application.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue
index d532698f..5bce2930 100644
--- a/back/src/views/modules/myAgent/demo/competency-application.vue
+++ b/back/src/views/modules/myAgent/demo/competency-application.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-29 15:59:51
  * @LastEditors: Light
- * @LastEditTime: 2022-11-01 14:59:14
+ * @LastEditTime: 2022-11-01 15:00:19
  * @Description: 告诉大家这是什么
 -->
 <!--  流程业务表单   -->
@@ -230,6 +230,7 @@ export default {
       })
     },
     showDialog (title) {
+      this.input = title
       this.dialogVisible = true
       this.dialogType = title
     },

From 0dc6bb2012295e099738e6b6539c322ca6f4d133 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Tue, 1 Nov 2022 15:21:58 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=BE=85=E5=8A=9E-?=
 =?UTF-8?q?=E8=83=BD=E5=8A=9B=E8=B5=84=E6=BA=90=E4=B8=8A=E6=9E=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=E4=B8=BA?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../myAgent/demo/ResourcesAndServices.vue     | 272 ++++++++----------
 1 file changed, 114 insertions(+), 158 deletions(-)

diff --git a/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
index 3287c978..c32b8653 100644
--- a/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
+++ b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
@@ -7,84 +7,62 @@
           <div class="dataTitleSon">
             {{ itemson.name }}
           </div>
-          <div
-            class="dataContent"
-            v-if="
-              itemson.name !== '算法优势' &&
-              itemson.name !== '应用场景' &&
-              itemson.name !== '功能介绍'
-            "
-          >
-            <el-form-item
-              v-for="itemsonson in itemson.children"
-              :key="itemsonson.name"
-              :label="
-                itemsonson.type != ' multipleAdditions' ? itemsonson.name : ''
-              "
-              v-show="
-                !(
-                  itemsonson.name === '平台地址' ||
-                  itemsonson.name === 'SDK安装包' ||
-                  itemsonson.name === '接口请求方式' ||
-                  itemsonson.name === '服务接口'
-                )
-              "
-            >
-              <div
-                class="videoAndImgCss"
-                v-if="
-                  itemsonson.type === 'video' || itemsonson.type === 'image'
-                "
-                @click="videoAndImg(itemsonson.note1)"
-              >
+          <div class="dataContent" v-if="
+            itemson.name !== '算法优势' &&
+            itemson.name !== '应用场景' &&
+            itemson.name !== '功能介绍'
+          ">
+            <el-form-item v-for="itemsonson in itemson.children" :key="itemsonson.name" :label="
+              itemsonson.type != ' multipleAdditions' ? itemsonson.name : ''
+            " v-show="
+  !(
+    itemsonson.name === '平台地址' ||
+    itemsonson.name === 'SDK安装包' ||
+    itemsonson.name === '接口请求方式' ||
+    itemsonson.name === '服务接口'
+  )
+">
+              <div class="videoAndImgCss" v-if="
+                itemsonson.type === 'video' || itemsonson.type === 'image'
+              " @click="videoAndImg(itemsonson.note1)">
                 浏览
               </div>
-               <div
-                class="videoAndImgCss"
-                v-if="
-                  itemsonson.name === '上传附件'
-                "
-                @click="videoAndImg(itemsonson.note1)"
-              >
+              <div class="videoAndImgCss" v-if="
+                itemsonson.name === '上传附件'
+              " @click="videoAndImg(itemsonson.note1)">
                 下载
               </div>
-              <div
-                v-else-if="itemsonson.type === ' multipleAdditions'"
-                class="multipleAdditionsClass"
-              >
-                <div
-                  v-for="multipleAdditionsItem in itemsonson.note1"
-                  :key="multipleAdditionsItem"
-                >
+              <div v-else-if="itemsonson.type === ' multipleAdditions'" class="multipleAdditionsClass">
+                <div v-for="multipleAdditionsItem in itemsonson.note1" :key="multipleAdditionsItem">
                   <el-tooltip placement="top">
                     <div slot="content">
                       {{
-                        multipleAdditionsItem.question ||
-                        multipleAdditionsItem.type ||
-                        multipleAdditionsItem.name
+                          multipleAdditionsItem.question ||
+                          multipleAdditionsItem.type ||
+                          multipleAdditionsItem.name
                       }}
                     </div>
                     <div>
                       {{
-                        multipleAdditionsItem.question ||
-                        multipleAdditionsItem.type ||
-                        multipleAdditionsItem.name
+                          multipleAdditionsItem.question ||
+                          multipleAdditionsItem.type ||
+                          multipleAdditionsItem.name
                       }}
                     </div>
                   </el-tooltip>
                   <el-tooltip placement="top">
                     <div slot="content">
                       {{
-                        multipleAdditionsItem.answer ||
-                        multipleAdditionsItem.price ||
-                        multipleAdditionsItem.img
+                          multipleAdditionsItem.answer ||
+                          multipleAdditionsItem.price ||
+                          multipleAdditionsItem.img
                       }}
                     </div>
                     <div>
                       {{
-                        multipleAdditionsItem.answer ||
-                        multipleAdditionsItem.price ||
-                        multipleAdditionsItem.img
+                          multipleAdditionsItem.answer ||
+                          multipleAdditionsItem.price ||
+                          multipleAdditionsItem.img
                       }}
                     </div>
                   </el-tooltip>
@@ -95,54 +73,31 @@
                   <!-- <div>{{ multipleAdditionsItem }}</div> -->
                 </div>
               </div>
-              <el-tooltip v-else placement="top" :disabled="itemsonson.note1 !== null?false:true" :content="itemsonson.note1">
+              <el-tooltip v-else placement="top" :disabled="itemsonson.note1 !== null ? false : true"
+                :content="itemsonson.note1">
                 <!-- <div slot="content" v-show="itemsonson.note1">{{ itemsonson.note1 }}</div> -->
-                <el-input
-                  v-model="itemsonson.note1"
-                  disabled="disabled"
-                ></el-input>
+                <el-input v-model="itemsonson.note1" disabled="disabled"></el-input>
               </el-tooltip>
             </el-form-item>
-            <el-form-item
-              v-for="itemsonson in itemson.children"
-              :key="itemsonson.name"
-              :label="
-                itemsonson.type != ' multipleAdditions' ? itemsonson.name : ''
-              "
-              v-show="
-                (itemsonson.name === '平台地址' && showDocking) ||
-                (itemsonson.name === 'SDK安装包' && showSDK) ||
-                (itemsonson.name === '接口请求方式' && showInterface) ||
-                (itemsonson.name === '服务接口' && showInterface)
-              "
-            >
-            <el-tooltip placement="top" :disabled="itemsonson.note1 !== null?false:true" :content="itemsonson.note1">
-              <el-input
-                v-model="itemsonson.note1"
-                disabled="disabled"
-              ></el-input>
-            </el-tooltip>
+            <el-form-item v-for="itemsonson in itemson.children" :key="itemsonson.name" :label="
+              itemsonson.type != ' multipleAdditions' ? itemsonson.name : ''
+            " v-show="
+  (itemsonson.name === '平台地址' && showDocking) ||
+  (itemsonson.name === 'SDK安装包' && showSDK) ||
+  (itemsonson.name === '接口请求方式' && showInterface) ||
+  (itemsonson.name === '服务接口' && showInterface)
+">
+              <el-tooltip placement="top" :disabled="itemsonson.note1 !== null ? false : true" :content="itemsonson.note1">
+                <el-input v-model="itemsonson.note1" disabled="disabled"></el-input>
+              </el-tooltip>
 
             </el-form-item>
           </div>
-          <div
-            v-else-if="itemson.name === '算法优势'"
-            style="margin-bottom: 20px"
-          >
-            <div
-              v-for="itemDataForm in dataForm.infoList"
-              :key="itemDataForm.attrType"
-            >
-              <div
-                v-if="itemDataForm.attrType === '算法优势'"
-                class="textAndImg"
-              >
-                <div
-                  v-for="itemDataFormValue in itemDataForm.attrValue"
-                  :key="itemDataFormValue.name + 'value'"
-                  class="textAndImgSon"
-                  style="border: 1px solid #3c9bcd;margin"
-                >
+          <div v-else-if="itemson.name === '算法优势'" style="margin-bottom: 20px">
+            <div v-for="itemDataForm in dataForm.infoList" :key="itemDataForm.attrType">
+              <div v-if="itemDataForm.attrType === '算法优势'" class="textAndImg">
+                <div v-for="itemDataFormValue in itemDataForm.attrValue" :key="itemDataFormValue.name + 'value'"
+                  class="textAndImgSon" style="border: 1px solid #3c9bcd;margin">
                   <div>{{ itemDataFormValue.name }}</div>
                   <el-tooltip placement="top">
                     <div slot="content">{{ itemDataFormValue.desc }}</div>
@@ -152,24 +107,11 @@
               </div>
             </div>
           </div>
-          <div
-            v-else-if="itemson.name === '应用场景'"
-            style="margin-bottom: 20px"
-          >
-            <div
-              v-for="itemDataForm in dataForm.infoList"
-              :key="itemDataForm.attrType"
-            >
-              <div
-                v-if="itemDataForm.attrType === '应用场景'"
-                class="textAndImg"
-              >
-                <div
-                  v-for="itemDataFormValue in itemDataForm.attrValue"
-                  :key="itemDataFormValue.name + 'value'"
-                  class="textAndImgSon"
-                  style="border: 1px solid #3c9bcd;margin"
-                >
+          <div v-else-if="itemson.name === '应用场景'" style="margin-bottom: 20px">
+            <div v-for="itemDataForm in dataForm.infoList" :key="itemDataForm.attrType">
+              <div v-if="itemDataForm.attrType === '应用场景'" class="textAndImg">
+                <div v-for="itemDataFormValue in itemDataForm.attrValue" :key="itemDataFormValue.name + 'value'"
+                  class="textAndImgSon" style="border: 1px solid #3c9bcd;margin">
                   <div>{{ itemDataFormValue.name }}</div>
                   <el-tooltip placement="top">
                     <div slot="content">{{ itemDataFormValue.desc }}</div>
@@ -180,24 +122,11 @@
               </div>
             </div>
           </div>
-          <div
-            v-else-if="itemson.name === '功能介绍'"
-            style="margin-bottom: 20px"
-          >
-            <div
-              v-for="itemDataForm in dataForm.infoList"
-              :key="itemDataForm.attrType"
-            >
-              <div
-                v-if="itemDataForm.attrType === '功能介绍'"
-                class="textAndImg"
-              >
-                <div
-                  v-for="itemDataFormValue in itemDataForm.attrValue"
-                  :key="itemDataFormValue.name + 'value'"
-                  class="textAndImgSon"
-                  style="border: 1px solid #3c9bcd;margin"
-                >
+          <div v-else-if="itemson.name === '功能介绍'" style="margin-bottom: 20px">
+            <div v-for="itemDataForm in dataForm.infoList" :key="itemDataForm.attrType">
+              <div v-if="itemDataForm.attrType === '功能介绍'" class="textAndImg">
+                <div v-for="itemDataFormValue in itemDataForm.attrValue" :key="itemDataFormValue.name + 'value'"
+                  class="textAndImgSon" style="border: 1px solid #3c9bcd;margin">
                   <div>{{ itemDataFormValue.name }}</div>
                   <el-tooltip placement="top">
                     <div slot="content">{{ itemDataFormValue.desc }}</div>
@@ -227,7 +156,7 @@ export default {
       type: Array
     }
   },
-  data () {
+  data() {
     return {
       dataList: [],
       dataView: [],
@@ -242,12 +171,12 @@ export default {
     }
   },
   watch: {
-    dataList (item) {
+    dataList(item) {
       if (item) {
         this.dataList = item
       }
     },
-    insertList (val) {
+    insertList(val) {
       if (val) {
         if (this.dataForm.type === '应用资源') {
           this.dataView = val.filter(
@@ -437,7 +366,7 @@ export default {
   },
   computed: {},
   methods: {
-    videoAndImg (link) {
+    videoAndImg(link) {
       if (link) {
         window.open(link)
       } else {
@@ -447,7 +376,7 @@ export default {
         })
       }
     },
-    deptName () {
+    deptName() {
       console.log(this.dataForm.deptId)
       this.$http
         .get(`/sys/dept/${this.dataForm.deptId}`)
@@ -456,13 +385,13 @@ export default {
           this.unit = res.data.name
         })
     },
-    queryPartAppByKeyIdFunction (index, indexSon, indexSonSon) {
+    queryPartAppByKeyIdFunction(index, indexSon, indexSonSon) {
       if (this.dataForm.type === '组件服务') {
         this.$http
           .get(
             '/dataResourceRel/queryApp4PartByKeyId' +
-              '?keyId=' +
-              this.dataForm.id
+            '?keyId=' +
+            this.dataForm.id
           )
           .then(({ data: res }) => {
             this.dataView.children[index].children[indexSon].children[
@@ -478,9 +407,9 @@ export default {
         this.$http
           .get(
             '/dataResourceRel/queryPart4AppByKeyId?keyId=' +
-              this.dataForm.id +
-              '&type=' +
-              '组件服务'
+            this.dataForm.id +
+            '&type=' +
+            '组件服务'
           )
           .then(({ data: res }) => {
             this.dataView.children[index].children[indexSon].children[
@@ -495,8 +424,8 @@ export default {
       }
     }
   },
-  created () {},
-  mounted () {
+  created() { },
+  mounted() {
     this.deptName()
   }
 }
@@ -514,6 +443,7 @@ export default {
     font-size: 22px;
     margin-bottom: 25px;
   }
+
   .dataTitleSon {
     padding-left: 30px;
     color: #333333;
@@ -522,9 +452,11 @@ export default {
     background: url("~@/assets/img/sj-jx.png") no-repeat;
     background-position-x: 15px;
   }
+
   .multipleAdditionsClass {
     display: flex;
-    & > div {
+
+    &>div {
       margin-right: 30px;
       border: 1px solid #3c9bcd;
       width: 212px;
@@ -534,7 +466,8 @@ export default {
       align-items: center;
       padding: 10px;
       overflow: hidden;
-      & > div:first-child {
+
+      &>div:first-child {
         margin-bottom: 10px;
         font-weight: bold;
         line-height: 14px;
@@ -544,7 +477,8 @@ export default {
         -webkit-box-orient: vertical;
         -webkit-line-clamp: 2;
       }
-      & > div:nth-child(2) {
+
+      &>div:nth-child(2) {
         overflow: hidden;
         text-overflow: ellipsis;
         display: -webkit-box;
@@ -552,7 +486,8 @@ export default {
         -webkit-line-clamp: 6;
         line-height: initial;
       }
-      & > div:nth-child(3) {
+
+      &>div:nth-child(3) {
         width: 90%;
         overflow: hidden;
         text-overflow: ellipsis;
@@ -563,6 +498,7 @@ export default {
       }
     }
   }
+
   .videoAndImgCss {
     cursor: pointer;
     font-size: 12px;
@@ -571,10 +507,13 @@ export default {
     padding: 5px;
     margin-top: 10px;
     background: rgba(60, 155, 205, 0.1);
+    display: inline-block;
   }
+
   .textAndImg {
     display: flex;
     padding-left: 30px;
+
     .textAndImgSon {
       width: 212px;
       height: 182px;
@@ -584,7 +523,8 @@ export default {
       align-items: center;
       padding: 10px;
       position: relative;
-      & > div {
+
+      &>div {
         -webkit-line-clamp: 5;
         overflow: hidden;
         text-overflow: ellipsis;
@@ -592,11 +532,13 @@ export default {
         -webkit-box-orient: vertical;
         word-break: break-all;
       }
-      & > div:first-child {
+
+      &>div:first-child {
         margin-bottom: 10px;
         font-weight: bold;
       }
-      & > div:nth-child(3) {
+
+      &>div:nth-child(3) {
         margin-top: 10px;
         position: absolute;
         bottom: 8px;
@@ -610,13 +552,27 @@ export default {
       }
     }
   }
+
   .dataContent {
-    display: grid;
-    grid-template-columns: repeat(3, 33%);
-    padding-left: 30px;
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+
   }
+
+  ::v-deep .el-form-item {
+    flex: 1;
+    display: flex;
+    justify-content: flex-start;
+  }
+
+  ::v-deep .el-form-item__label {
+    width: 112px;
+  }
+
   ::v-deep .el-form-item__content {
     display: inline-block;
+
     input {
       width: 400px;
     }

From 72229ea4fbfbee1363d937ce6ad5b204927dd0af Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 1 Nov 2022 15:35:30 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=8E=E5=B8=82?=
 =?UTF-8?q?=E4=BA=91=E8=84=91=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/infrastructurePage.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 80efcaff..0ddcbba2 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -1052,7 +1052,7 @@
           roomResult.value = true
           onSearch()
         } else {
-          tabClick(0, '政务云资源')
+          tabClick(0, '城市云脑会客厅')
         }
       }
     }
@@ -1106,14 +1106,14 @@
       content: isXiHaiAn
         ? ['视频资源']
         : username == 'admin'
-        ? ['政务云资源', '视频资源', '城市云脑会客厅', '视频会议']
-        : ['政务云资源', '视频资源', '城市云脑会客厅'],
+        ? ['城市云脑会客厅', '视频资源', '政务云资源', '视频会议']
+        : ['城市云脑会客厅', '视频资源', '政务云资源'],
     },
   ])
   let clickList = ref([]) //存储点击的tab
   if (!isXiHaiAn) {
     tabList.value.push({
-      title: '政务云资源',
+      title: '城市云脑会客厅',
       content: [],
     })
   }

From 27cb8bd7d323354b5c26de4161bf877508f2c647 Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Tue, 1 Nov 2022 15:54:53 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=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/abilityStatistics/index.vue         | 4 ++--
 back/src/views/modules/myAgent/AbilityResourceShelf.vue    | 3 ++-
 back/src/views/modules/myAgent/AbilityResourcesRemoved.vue | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index d55a4e06..f3d58a61 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -31,7 +31,7 @@
           </el-date-picker>
         </el-form-item>
         <!--审核状态-->
-        <el-form-item>
+        <el-form-item v-if="this.departmentId === 3 || this.departmentId === 4">
           <span>审核状态：</span>
           <el-select v-model="examineStatus" placeholder="请选审核状态" clearable>
             <el-option label="全部" value="-1"></el-option>
@@ -53,7 +53,7 @@
         </el-form-item>
 
         <!--类型-->
-        <el-form-item>
+        <el-form-item v-if="this.departmentId === 3 || this.departmentId === 4">
           <span>类型：</span>
           <el-select  @change="changeIiem" v-if="this.departmentId === 2 || this.departmentId === 4"   v-model="abilityType" placeholder="请选择类型" clearable>
             <el-option label="全部" value=""></el-option>
diff --git a/back/src/views/modules/myAgent/AbilityResourceShelf.vue b/back/src/views/modules/myAgent/AbilityResourceShelf.vue
index 5c69e18c..876c2562 100644
--- a/back/src/views/modules/myAgent/AbilityResourceShelf.vue
+++ b/back/src/views/modules/myAgent/AbilityResourceShelf.vue
@@ -154,7 +154,6 @@ export default {
   methods: {
     // 处理
     taskHandle (row) {
-      console.log('row======================>', row, this.forwardHandleUrl)
       if (!row.businessKey) {
         return this.$message.error(this.$t('task.businessKeyError'))
       }
@@ -171,7 +170,9 @@ export default {
     bus.$off('abilityResourceShelfInit')
     bus.$on('abilityResourceShelfInit', () => {
       this.getDataList()
+      bus.$emit('updateTaskNum')
     })
+   
   }
 }
 </script>
diff --git a/back/src/views/modules/myAgent/AbilityResourcesRemoved.vue b/back/src/views/modules/myAgent/AbilityResourcesRemoved.vue
index d36d485d..5e56202e 100644
--- a/back/src/views/modules/myAgent/AbilityResourcesRemoved.vue
+++ b/back/src/views/modules/myAgent/AbilityResourcesRemoved.vue
@@ -171,6 +171,7 @@ export default {
     bus.$off('AbilityResourcesRemovedInit')
     bus.$on('AbilityResourcesRemovedInit', () => {
       this.getDataList()
+      bus.$emit('updateTaskNum')
     })
   }
 }

From e4cdac8bb98bf3bd74118e2fab98e5145f67119e Mon Sep 17 00:00:00 2001
From: unknown <xiaoshangqing@Hisense.ad>
Date: Tue, 1 Nov 2022 18:05:32 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=94=B6=E8=97=8F=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/LayerService/LayerServiceTopDetails.vue          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
index e9bf1059..347a0bd7 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
@@ -151,7 +151,7 @@
     console.log('收藏===================》', props.dataList)
     if (scFlag2.value) {
       scFlag2.value = false
-      if (props.dataList.isCollect) {
+      if (props.dataList.isCollect == 'true') {
         scDel([props.dataList.id]).then((res) => {
           if (res.data.msg === 'success') {
             message.success('取消成功')