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

---
 .../modules/ability/IntegratedServices.vue     |  3 ++-
 front/src/views/home/detailBack.vue            | 18 +++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/back/src/views/modules/ability/IntegratedServices.vue b/back/src/views/modules/ability/IntegratedServices.vue
index e18a939b..bb6e0d1d 100644
--- a/back/src/views/modules/ability/IntegratedServices.vue
+++ b/back/src/views/modules/ability/IntegratedServices.vue
@@ -140,7 +140,8 @@ export default {
     },
     // 详情
     showDetail(val) {
-      window.open(window.SITE_CONFIG.previewUrl + '#/packagingDetails?id=' + val.id)
+  //    window.open(window.SITE_CONFIG.previewUrl + '#/packagingDetails?id=' + val.id)
+  window.open(window.SITE_CONFIG.previewUrl + '#/integrationServicesDetails?id=' + val.id)
     },
     // showDocument(val) {
     //   console.log(val);
diff --git a/front/src/views/home/detailBack.vue b/front/src/views/home/detailBack.vue
index 25baec9b..501ac261 100644
--- a/front/src/views/home/detailBack.vue
+++ b/front/src/views/home/detailBack.vue
@@ -21,16 +21,16 @@ const previousPage = () => {
 //           this.$router.push({name: this.$store.state.previousRouter.name});
 // }
 //  // let val = router.go(-1)
-
- window.history.go(-1)
+debugger
+let current= router.currentRoute.value.path
+if(current==='/integrationServicesDetails'){
+  router.push({
+    path: '/integrationServices',
+  })
+}else{
+  window.history.go(-1)
+}
 }
-// router.beforeEach((to, from, next) => {
-//   debugger
-//     // console.log('跳转路由=========>', to, from, next)
-//     document.documentElement.scrollTop = 0
-//     document.body.scrollTop = 0
-//     next()
-// })
 </script>
 
 <style scoped lang="less">

From 4c77bb2405c1f58e7e82e9ad40aff978000c61f4 Mon Sep 17 00:00:00 2001
From: unknown <xiaoshangqing@Hisense.ad>
Date: Thu, 3 Nov 2022 17:59:48 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E7=94=B3=E8=B4=AD=E8=BD=A6=E4=B8=AD?=
 =?UTF-8?q?=E5=B1=95=E5=BC=80=E6=94=B6=E8=B5=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/AbilityToApplyFor.vue | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/front/src/views/home/AbilityToApplyFor.vue b/front/src/views/home/AbilityToApplyFor.vue
index a5741a02..dd1f572c 100644
--- a/front/src/views/home/AbilityToApplyFor.vue
+++ b/front/src/views/home/AbilityToApplyFor.vue
@@ -29,7 +29,8 @@
             p-id="5928"
           ></path>
         </svg>
-        <span class="btn" @click="falg = !falg">展开</span>
+        <span class="btn" style="font-weight:600" @click="falg = !falg">展开</span>
+        <span class="btn" @click="falg = !falg">(共{{totalDataNum}}条数据)</span>
       </div>
       <div class="btnBox" v-show="falg">
         <svg
@@ -49,7 +50,7 @@
             fill="#13227a"
           ></path>
         </svg>
-        <span class="btn" @click="falg = !falg">收起</span>
+        <span class="btn" style="font-weight:600" @click="falg = !falg">收起</span>
       </div>
     </div>
     <div
@@ -165,6 +166,7 @@
   })
   const falg = ref(false)
   let dataForm = ref([])
+  let totalDataNum = ref(0);
   const videoVisible = ref(false)
   const xVideoList = ref([])
   const xVideoListAll = ref([])
@@ -251,7 +253,17 @@
         })
     } 
       getDeptAllData(); 
-</script>
+      const getDataTotalNum = () =>{
+        let totalNum  =0;
+       dataForm.value.forEach((item)=>{
+        totalNum = totalNum +item.arr.length;
+     });
+     totalDataNum.value = totalNum;
+    } 
+    getDataTotalNum();
+    //获取数据的总条数
+    
+</script> 
 
 <style scoped lang="less">
   .ability-to-apply-for {

From a0aa8a8ffca9bf66d411f6cb158be605c6039fcc Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Fri, 4 Nov 2022 10:30:50 +0800
Subject: [PATCH 3/5] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/components/ren-region-tree/src/ren-region-tree.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/back/src/components/ren-region-tree/src/ren-region-tree.vue b/back/src/components/ren-region-tree/src/ren-region-tree.vue
index 9036a245..d49807dd 100644
--- a/back/src/components/ren-region-tree/src/ren-region-tree.vue
+++ b/back/src/components/ren-region-tree/src/ren-region-tree.vue
@@ -26,7 +26,7 @@
     </el-tree>
     <template slot="footer">
       <el-button type="default" @click="cancelHandle()" size="mini">{{ $t('cancel') }}</el-button>
-      <el-button type="info" @click="clearHandle()" size="mini">{{ $t('clear') }}</el-button>
+      <!-- <el-button type="info" @click="clearHandle()" size="mini">{{ $t('clear') }}</el-button> -->
       <el-button type="primary" @click="commitHandle()" size="mini">{{ $t('confirm') }}</el-button>
     </template>
   </el-dialog>

From bfaac75b43157e1fa954e48244dc9c0a9920e1eb Mon Sep 17 00:00:00 2001
From: lizhicheng2 <lizhicheng2@hisense.com>
Date: Fri, 4 Nov 2022 13:52:59 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=9A=E5=AE=A2=E5=8E=85description?=
 =?UTF-8?q?=E6=9C=80=E5=A4=A7=E5=AD=97=E7=AC=A6=E9=99=90=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/myAgent/ConferenceRoom.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/back/src/views/modules/myAgent/ConferenceRoom.vue b/back/src/views/modules/myAgent/ConferenceRoom.vue
index 33422707..5c7bb638 100644
--- a/back/src/views/modules/myAgent/ConferenceRoom.vue
+++ b/back/src/views/modules/myAgent/ConferenceRoom.vue
@@ -252,8 +252,8 @@ export default {
           { required: true, message: '请填写描述内容', trigger: 'blur' },
           {
             min: 1,
-            max: 500,
-            message: '长度在 1 到 500 个字符',
+            max: 255,
+            message: '长度在 1 到 255 个字符',
             trigger: 'blur'
           }
         ]

From 0f479dfec467e0980addc1a0e704df4a05efd573 Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Fri, 4 Nov 2022 13:59:28 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/mixins/view-module.js                | 22 +++++++++-----
 .../modules/ability/bsabilityservice.vue      | 10 -------
 .../views/modules/abilityStatistics/index.vue | 29 ++++++++++++++-----
 .../modules/activiti/my-work-dynamics.vue     |  9 ++++--
 front/src/views/home/detailBack.vue           | 26 +++++++----------
 .../personalCenter/components/Collection.vue  |  7 +++--
 6 files changed, 57 insertions(+), 46 deletions(-)

diff --git a/back/src/mixins/view-module.js b/back/src/mixins/view-module.js
index fae86b9b..c92ac8e4 100644
--- a/back/src/mixins/view-module.js
+++ b/back/src/mixins/view-module.js
@@ -95,13 +95,13 @@ export default {
           this.$http.get('/sys/user/info').then(userRes => {
             console.log('当前用户信息===========>', userRes.data.data.id)
             const userId = userRes.data.data.id
-            this.dataList = this.dataList.filter(item => {
-              // userId creator
-              console.log(item.params.creator)
-              if (!(item.params.creator === userId) && !(item.params.userId === userId)) {
-                return item
-              }
-            })
+            // this.dataList = this.dataList.filter(item => {
+            //   // userId creator
+            //   console.log(item.params.creator)
+            //   if (!(item.params.creator === userId) && !(item.params.userId === userId)) {
+            //     return item
+            //   }
+            // })
             this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total : 0
           })
         } else {
@@ -355,7 +355,12 @@ export default {
     },
 
     deleteHandle2(id) {
-      console.log('删除========================》', id, this.dataListSelections)
+      if(id==undefined && this.dataListSelections.length < 1){
+        this.$message({
+          type: 'info',
+          message: '请选择要删除的数据'
+        })
+      }else{
       this.$confirm('确认是否删除?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -385,6 +390,7 @@ export default {
         //   message: '已取消删除'
         // });          
       });
+    }
     },
     // 导出
     exportHandle() {
diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue
index 668a0668..21e55945 100644
--- a/back/src/views/modules/ability/bsabilityservice.vue
+++ b/back/src/views/modules/ability/bsabilityservice.vue
@@ -354,7 +354,6 @@ export default {
       // this.disabled = true
     },
     showDocument (val) {
-      console.log(val)
       window.open(
         window.SITE_CONFIG.frontUrl + '?id=' + val.id + '&&type=' + val.type,
         '_blank'
@@ -459,7 +458,6 @@ export default {
     // },
     // 应用与组件
     applyAndAssembly (val) {
-      console.log('vvvv', val)
       // 根据id和类型查询已关联的组件，将id,type和查出来的数据传递给组件
       const type = '组件服务'
       const id = val.id
@@ -475,7 +473,6 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
-          console.log('rrrrressssz', res.data)
           this.relateApplicationResourceVisible = true
           this.relationData = {
             id: id,
@@ -483,13 +480,11 @@ export default {
             responseData: res.data
           }
           this.topNameArray = ['未关联组件名称', '已关联组件名称']
-          console.log(' this.relationData', this.relationData)
           // 将数据传递给引入的组件
         })
     },
     // 应用与数据资源
     applyAndDataResource (val) {
-      console.log('数据资源')
     },
     // 应用与项目
     applyAndProject (val) {
@@ -507,7 +502,6 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
-          console.log('rrrrressssx', res.data)
           this.relateApplicationResourceVisible = true
           this.relationData = {
             id: id,
@@ -534,7 +528,6 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
-          console.log('rrrrressssj', res.data)
           this.relateApplicationResourceVisible = true
           this.relationData = {
             id: id,
@@ -575,7 +568,6 @@ export default {
       this.showPutOnTheShelfFlag2 = true
       this.$http.get('/category/getCategoryTree').then(res => {
         this.insertList = res.data.data.filter(item => item.name === '应用资源一')[0]
-        console.log(this.insertList, this, this.radio, 'hhhhhhhhhhh')
         this.putOnTheShelfList = this.insertList.children
       })
     },
@@ -670,7 +662,6 @@ export default {
       })
       this.submitFrom.infoList = this.submitFrom.infoList.sort((a, b) => arr.indexOf(a.attrType) - arr.indexOf(b.attrType))
       this.notFilled = []
-      console.log(this.submitFrom, '表单验证')
       if (!this.submitFrom.name) {
         this.notFilled.push('应用名称')
       }
@@ -711,7 +702,6 @@ export default {
               val.attrValue = this.radio
             }
           })
-          console.log('编辑===============>', this.submitFrom)
           // 检验是否有空值
           this.submitFrom.infoList = this.submitFrom.infoList.filter(item => item.attrValue)
           this.$http
diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index f3d58a61..cfc70af3 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -68,6 +68,12 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <!--资源名称 仅明细添加-->
+        
+        <el-form-item v-if="this.departmentId === 3 || this.departmentId === 4">
+          <!-- <span v-if="this.departmentId === 2 || this.departmentId === 4">资源名称：</span> -->
+          <el-input  v-model="resourceName" placeholder="请输入资源名称" clearable></el-input>
+        </el-form-item>
 
         <!--操作按钮查询-->
         <el-form-item>
@@ -341,6 +347,7 @@ export default {
       abilityType: '', // 能力
       beginTime: '', // 开始时间
       endTime: '', // 结束时间
+      resourceName:'',//资源名称
       typeOptions: [
         { name: '智能算法', value: 1 },
         { name: '图层服务', value: 2 },
@@ -523,7 +530,8 @@ export default {
             approveStatus: this.status,
             deptId: this.abilityDepartment,
             startDate: this.startDate,
-            endDate: this.endDate
+            endDate: this.endDate,
+            resourceName:this.resourceName
           })
         })
     },
@@ -589,7 +597,9 @@ export default {
             approveStatus: this.status,
             deptId: this.abilityDepartment,
             startDate: this.startDate,
-            endDate: this.endDate
+            endDate: this.endDate,
+            resourceName:this.resourceName
+          
           })
         })
     },
@@ -658,7 +668,8 @@ export default {
             deptId: this.abilityDepartment,
             type: this.abilityType,
             startDate: this.startDate,
-            endDate: this.endDate
+            endDate: this.endDate,
+            resourceName:this.resourceName
           }
         })
         .then((res) => {
@@ -670,7 +681,8 @@ export default {
             approveStatus: this.status,
             deptId: this.abilityDepartment,
             startDate: this.startDate,
-            endDate: this.endDate
+            endDate: this.endDate,
+            resourceName:this.resourceName
           })
         })
     },
@@ -697,7 +709,8 @@ export default {
             deptId: this.abilityDepartment,
             type: this.abilityType,
             startDate: this.startDate,
-            endDate: this.endDate
+            endDate: this.endDate,
+            resourceName:this.resourceName
           }
         })
         .then((res) => {
@@ -708,7 +721,8 @@ export default {
             approveStatus: this.status,
             deptId: this.abilityDepartment,
             startDate: this.startDate,
-            endDate: this.endDate
+            endDate: this.endDate,
+            resourceName:this.resourceName
           })
         })
     },
@@ -952,7 +966,8 @@ export default {
         approveStatus: this.status,
         deptId: this.abilityDepartment,
         startDate: this.startDate,
-        endDate: this.endDate
+        endDate: this.endDate,
+        resourceName:this.resourceName
       })
       if (this.departmentId === 1) {
         // if (this.detailFlag) {
diff --git a/back/src/views/modules/activiti/my-work-dynamics.vue b/back/src/views/modules/activiti/my-work-dynamics.vue
index 83c0809c..7e1bbb0a 100644
--- a/back/src/views/modules/activiti/my-work-dynamics.vue
+++ b/back/src/views/modules/activiti/my-work-dynamics.vue
@@ -508,7 +508,12 @@ export default {
     },
     // 删除数据
     deleteData (row) {
-      console.log(row)
+      if (this.deleteDataArr.length < 1) {
+        this.$message({
+            type: 'info',
+            message: '请选择要删除的数据'
+          })
+      }else{
       this.$confirm('此操作将删除当前数据, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -542,7 +547,7 @@ export default {
             type: 'info',
             message: '已取消删除'
           })
-        })
+        })}
     },
     // 预览工作动态信息
     async openPreviewData (row) {
diff --git a/front/src/views/home/detailBack.vue b/front/src/views/home/detailBack.vue
index 501ac261..1ca3b1f5 100644
--- a/front/src/views/home/detailBack.vue
+++ b/front/src/views/home/detailBack.vue
@@ -7,30 +7,24 @@
 import { reactive, ref, watch, defineProps } from 'vue'
 import { useRouter } from 'vue-router'
 import { useStore } from 'vuex'
-const store = useStore()
 const router = useRouter()
-
+const oldValue1= ref('')
 const props = defineProps({
   textColor: { type: String, default: '' },
 })
 
 const previousPage = () => {
- //        debugger
-// let a =store.state.previousRouter
-// if (store.state.previousRouter.name) {
-//           this.$router.push({name: this.$store.state.previousRouter.name});
-// }
-//  // let val = router.go(-1)
-debugger
-let current= router.currentRoute.value.path
-if(current==='/integrationServicesDetails'){
-  router.push({
-    path: '/integrationServices',
+  if (window.history.state.back){
+    window.history.go(-1)
+  } else{
+   router.push({
+   path: '/integrationServices',
   })
-}else{
-  window.history.go(-1)
-}
+  }
+
 }
+
+
 </script>
 
 <style scoped lang="less">
diff --git a/front/src/views/personalCenter/components/Collection.vue b/front/src/views/personalCenter/components/Collection.vue
index a3fff65e..e37a41c1 100644
--- a/front/src/views/personalCenter/components/Collection.vue
+++ b/front/src/views/personalCenter/components/Collection.vue
@@ -171,7 +171,7 @@
       console.log('编目一级=============>', res.data)
       res.data.data.forEach((val) => {
         // tabList.value.push(val.name)
-        if (val.name == '应用资源' || val.name == '组件服务') {
+        if (val.name == '应用资源' || val.name == '组件服务' || val.name == '融合服务') {
           tabList.value.push(val.name)
         }
       })
@@ -357,11 +357,12 @@
       })
     } else if (delFlag === undefined) {
       // 融合服务
-      mybus.emit('tabsChange', { flag: item.resourceId })
+     // mybus.emit('tabsChange', { flag: item.resourceId })
+      mybus.emit('tabsChange', { flag: id })
       router.push({
         path: `/integrationServicesDetails`,
         query: {
-          id: item.resourceId,
+          id: id,
         },
       })
     }