From 3fb7474426ad4f0d5518a511f282a56c9cbf227e Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Wed, 29 Jun 2022 11:31:25 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E5=9B=BE=E5=B1=82=E6=9C=8D=E5=8A=A1bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LayerService/LayerServiceNavigation.vue   | 47 ++++++++++++++++++-
 .../LayerService/LayerServicePreview.vue      | 14 ++++--
 .../LayerService/LayerServiceUsageMode.vue    |  6 +++
 3 files changed, 62 insertions(+), 5 deletions(-)

diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue
index fcbc0846..b6c96318 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue
@@ -93,10 +93,31 @@
         if (item.attrValue === '是') {
           list.value.push('图层预览')
         }
+      } else if (
+        item.attrType === '服务类型' ||
+        item.attrType === '覆盖区域' ||
+        item.attrType === '切片策略' ||
+        item.attrType === '坐标系' ||
+        item.attrType === '切片尺寸' ||
+        item.attrType === '最小级别' ||
+        item.attrType === '数据范围' ||
+        item.attrType === '图层类型' ||
+        item.attrType === '最大级别'
+      ) {
+        list.value.push('图层信息')
+      } else if (
+        item.attrType === '技术文档' ||
+        item.attrType === '服务商' ||
+        item.attrType === '服务商联系人' ||
+        item.attrType === '使用手册' ||
+        item.attrType === '服务地址' ||
+        item.attrType === '样式服务地址' ||
+        item.attrType === '服务商联系电话'
+      ) {
+        list.value.push('使用方式')
       }
     })
-    list.value.push('图层信息')
-    list.value.push('使用方式')
+
     navList.value.forEach((item) => {
       console.log(item)
       if (list.value.indexOf(item.name) > -1) {
@@ -147,6 +168,28 @@
             if (item.attrValue === '是') {
               list.value.push('图层预览')
             }
+          } else if (
+            item.attrType === '服务类型' ||
+            item.attrType === '覆盖区域' ||
+            item.attrType === '切片策略' ||
+            item.attrType === '坐标系' ||
+            item.attrType === '切片尺寸' ||
+            item.attrType === '最小级别' ||
+            item.attrType === '数据范围' ||
+            item.attrType === '图层类型' ||
+            item.attrType === '最大级别'
+          ) {
+            list.value.push('图层信息')
+          } else if (
+            item.attrType === '技术文档' ||
+            item.attrType === '服务商' ||
+            item.attrType === '服务商联系人' ||
+            item.attrType === '使用手册' ||
+            item.attrType === '服务地址' ||
+            item.attrType === '样式服务地址' ||
+            item.attrType === '服务商联系电话'
+          ) {
+            list.value.push('使用方式')
           }
         })
         list.value.push('图层信息')
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServicePreview.vue b/front/src/views/detailsAll/components/LayerService/LayerServicePreview.vue
index c0f50a4d..8611e43d 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServicePreview.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServicePreview.vue
@@ -8,7 +8,7 @@
 <template>
   <div class="application-presentation" v-if="flag">
     <detals-title title="图层预览" type="PREVIEW"></detals-title>
-    <div class="main" :style="`${img}background-position:center;`">
+    <div class="main">
       <iframe
         :src="img"
         width="100%"
@@ -35,7 +35,11 @@
     if (!imgindex) {
       flag.value = false
     } else {
-      img.value = imgindex.attrValue
+      props.dataList.infoList.map((item) => {
+        if (item.attrType === '预览服务地址') {
+          img.value = imgindex.attrValue || '--'
+        }
+      })
     }
   }
   watch(
@@ -48,7 +52,11 @@
         if (!imgindex) {
           flag.value = false
         } else {
-          img.value = imgindex.attrValue
+          val.infoList.map((item) => {
+            if (item.attrType === '预览服务地址') {
+              img.value = imgindex.attrValue || '--'
+            }
+          })
         }
       }
     }
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
index fee4027e..2e780bbe 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
@@ -88,6 +88,9 @@
         item.attrType === '技术文档' ||
         item.attrType === '服务商' ||
         item.attrType === '服务商联系人' ||
+        item.attrType === '使用手册' ||
+        item.attrType === '服务地址' ||
+        item.attrType === '样式服务地址' ||
         item.attrType === '服务商联系电话'
     )[0]
     if (!obj) {
@@ -122,6 +125,9 @@
             item.attrType === '技术文档' ||
             item.attrType === '服务商' ||
             item.attrType === '服务商联系人' ||
+            item.attrType === '使用手册' ||
+            item.attrType === '服务地址' ||
+            item.attrType === '样式服务地址' ||
             item.attrType === '服务商联系电话'
         )[0]
         if (!obj) {

From cf1f75fd8313c2664b836d6277f3fdb6fb399256 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Wed, 29 Jun 2022 11:37:47 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E9=9B=86=E5=B8=82?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/DetailsPageconetent.vue | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 2082dd47..931abc69 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -1038,8 +1038,8 @@
       const resourceList = reactive({ data: [] })
       const videoList = reactive({ data: [] })
       const resourceTotal = ref('')
-      const getAppResources = () => {
-        paramsGetResources.pageNum = 1
+      const getAppResources = (switchIndex) => {
+        //switchIndex这个参数是下面的分页传过来的参数
         paramsGetResources.name = searchValue.value
         paramsGetResources.type = Cardsname.value
         console.log(
@@ -1050,7 +1050,10 @@
           !whoShow1.value.itShowBaoTou &&
           paramsGetResources.type === '数据资源'
         ) {
-          getDataResource({
+          if (switchIndex != '分页查询') {
+            paramsGetResources.pageNum = 1
+          }
+          let dataResourceParams = {
             serviceName: paramsGetResources.name, //资源名称
             orderField: whoShow1.value.itShowQingDao
               ? paramsGetResources.orderField == 'applyCount'
@@ -1062,7 +1065,8 @@
             orderType: paramsGetResources.orderType.toLowerCase(), //排序方式：desc，asc
             pageNum: paramsGetResources.pageNum, //页码
             pageSize: paramsGetResources.pageSize, //分页大小
-          }).then((res) => {
+          }
+          getDataResource(dataResourceParams).then((res) => {
             console.log('数据资源==================>', res.data.data)
             if (whoShow1.value.itShowQingDao) {
               res.data.data.data.forEach((val) => {
@@ -1092,6 +1096,10 @@
             }
           })
         } else if (paramsGetResources.type !== '数据资源') {
+          if (switchIndex != '分页查询') {
+            paramsGetResources.pageNum = 1
+          }
+          debugger
           pageWithAttrs(paramsGetResources).then((res) => {
             console.log('查询列表============>', resourceList, res.data.data)
             resourceList.data = []
@@ -1183,7 +1191,9 @@
         loading.value = true
         currentPage.value = val
         paramsGetResources.pageNum = val
-        getAppResources()
+        let params = '分页查询' //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
+        getAppResources(params)
+        debugger
       }
       // const findZywMessage = () => {
       //   zywMessage().then((res) => {

From 738ebda6461fe32b51a4e2931cbe27e9ebc5dc32 Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Wed, 29 Jun 2022 11:40:45 +0800
Subject: [PATCH 03/11] =?UTF-8?q?349=E8=83=BD=E5=8A=9B=E6=8C=82=E8=BD=BD-?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD-=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=A1=86=E6=B8=85=E7=A9=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/ability/bsinfrastructure.vue      | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/back/src/views/modules/ability/bsinfrastructure.vue b/back/src/views/modules/ability/bsinfrastructure.vue
index 1166902c..84572707 100644
--- a/back/src/views/modules/ability/bsinfrastructure.vue
+++ b/back/src/views/modules/ability/bsinfrastructure.vue
@@ -46,8 +46,8 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 // import AddOrUpdate from './order-add-or-update'
-import {addDynamicRoute} from "@/router";
-import RelateApplication from "./bsabilityai-relate-application.vue"
+import { addDynamicRoute } from '@/router'
+import RelateApplication from './bsabilityai-relate-application.vue'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -62,7 +62,7 @@ export default {
         orderId: '',
         status: '',
         userId: '',
-        type: "基础设施",
+        type: '基础设施'
       },
       // 关联应用弹窗
       relateApplicationVisible: false,
@@ -75,33 +75,33 @@ export default {
   },
   components: {
     // AddOrUpdate,
-    RelateApplication,
+    RelateApplication
   },
   methods: {
-     //重置
-     resetDataList(){
-        this.dataForm=this.noDataForm;
-        this.page=1;                    // 当前页码
-        this.query();
-     },
-      // 点击关联应用按钮
-    showRelateApplication(row){
+    // 重置
+    resetDataList () {
+      this.dataForm.orderId = ''
+      this.page = 1 // 当前页码
+      this.query()
+    },
+    // 点击关联应用按钮
+    showRelateApplication (row) {
       this.$http.get(`dataResourceRel/queryApplicationRelByResourceId?referenceId=${row.id}`).then(({ data: res }) => {
-        if( res && res.data ) {
-          this.relateApplicationVisible = true;
+        if (res && res.data) {
+          this.relateApplicationVisible = true
           this.relateInfo = {
             id: row.id,
             responseData: res.data,
             linkType: '2'
-          };
+          }
         }
       }).catch(() => { })
     },
-      // 是否展示关联应用弹窗
-    handleIsShowRelatePopup(type) {
-      this.relateApplicationVisible = type;
+    // 是否展示关联应用弹窗
+    handleIsShowRelatePopup (type) {
+      this.relateApplicationVisible = type
     }
-    
+
   }
 }
 </script>

From 592c506c231d0e450830769fb4a16532681ea63a Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Wed, 29 Jun 2022 14:34:42 +0800
Subject: [PATCH 04/11] =?UTF-8?q?341=E4=B8=AA=E4=BA=BA=E5=8A=9E=E5=85=AC-?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8A=A8=E6=80=81-=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/activiti/my-work-dynamics.vue     | 338 +++++++++---------
 .../src/views/demandCenter/demandDetails.vue  |  37 +-
 2 files changed, 189 insertions(+), 186 deletions(-)

diff --git a/back/src/views/modules/activiti/my-work-dynamics.vue b/back/src/views/modules/activiti/my-work-dynamics.vue
index 2c49710e..144991c8 100644
--- a/back/src/views/modules/activiti/my-work-dynamics.vue
+++ b/back/src/views/modules/activiti/my-work-dynamics.vue
@@ -340,15 +340,15 @@
 <script>
 // @ is an alias to /src
 export default {
-  data() {
+  data () {
     return {
-      fileUploadUrl: window.SITE_CONFIG.apiURL + "/upload",
+      fileUploadUrl: window.SITE_CONFIG.apiURL + '/upload',
       // 表格筛选条件对象
       queryData: {
-        keyworld: "",
+        keyworld: '',
         pageIndex: 1,
         pageSize: 10,
-        total: 0,
+        total: 0
       },
       // 表格数据数组对象
       tableData: [],
@@ -359,307 +359,307 @@ export default {
       // imageUrl: '',
       // 新增数据表单对象
       addDataFrom: {
-        title: "",
-        note1: "",
-        content: "",
-        imageUrl: "",
-        delFlag: 0,
+        title: '',
+        note1: '',
+        content: '',
+        imageUrl: '',
+        delFlag: 0
       },
       // 新增数据表单验证对象
       addDataFromRules: {
-        title: [{ required: true, message: "请输入标题", trigger: "blur" }],
-        note1: [{ required: true, message: "请输入摘要", trigger: "blur" }],
-        content: [{ required: true, message: "请输入内容", trigger: "blur" }],
+        title: [{ required: true, message: '请输入标题', trigger: 'blur' }],
+        note1: [{ required: true, message: '请输入摘要', trigger: 'blur' }],
+        content: [{ required: true, message: '请输入内容', trigger: 'blur' }],
         imageUrl: [
-          { required: true, message: "请输入图片地址", trigger: "blur" },
-        ],
+          { required: true, message: '请输入图片地址', trigger: 'blur' }
+        ]
       },
       editDataDialogVisabled: false,
       eidtDataForm: {
-        title: "",
-        note1: "",
-        content: "",
-        imageUrl: "",
+        title: '',
+        note1: '',
+        content: '',
+        imageUrl: ''
       },
       eidtDataFromRules: {
-        title: [{ required: true, message: "请输入标题", trigger: "blur" }],
-        note1: [{ required: true, message: "请输入摘要", trigger: "blur" }],
-        content: [{ required: true, message: "请输入内容", trigger: "blur" }],
+        title: [{ required: true, message: '请输入标题', trigger: 'blur' }],
+        note1: [{ required: true, message: '请输入摘要', trigger: 'blur' }],
+        content: [{ required: true, message: '请输入内容', trigger: 'blur' }],
         imageUrl: [
-          { required: true, message: "请输入图片地址", trigger: "blur" },
-        ],
+          { required: true, message: '请输入图片地址', trigger: 'blur' }
+        ]
       },
       perviewDataDialogVisabled: false,
       previewData: {
-        title: "",
-        note1: "",
-        content: "",
-        imageUrl: "",
-        delFlag: 0,
+        title: '',
+        note1: '',
+        content: '',
+        imageUrl: '',
+        delFlag: 0
       },
-      previewImg: "", // 预览图片
+      previewImg: '', // 预览图片
       deleteDataArr: [],
-      dialogVisibleImg: false,
-    };
+      dialogVisibleImg: false
+    }
   },
-  created() {
-    this.getTableData();
+  created () {
+    this.getTableData()
   },
   methods: {
-    tableChange(val) {
-      this.deleteDataArr = val.map((item) => item.id);
-      console.log(this.deleteDataArr);
+    tableChange (val) {
+      this.deleteDataArr = val.map((item) => item.id)
+      console.log(this.deleteDataArr)
     },
-    restTableData() {
-      this.queryData.keyworld = "";
-      this.getTableData();
+    restTableData () {
+      this.queryData.keyworld = ''
+      this.getTableData()
     },
-    showView(file) {
-      this.previewImg = file.url;
-      this.dialogVisibleImg = true;
+    showView (file) {
+      this.previewImg = file.url
+      this.dialogVisibleImg = true
     },
-    getTableData() {
+    getTableData () {
       this.$http
-        .get("/workdynamics/page", {
+        .get('/workdynamics/page', {
           params: {
             limit: this.queryData.pageSize,
             page: this.queryData.pageIndex,
-            name: this.queryData.keyworld,
-          },
+            name: this.queryData.keyworld
+          }
         })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg);
+            return this.$message.error(res.msg)
           }
-          this.tableData = res.data.list;
-          this.queryData.total = res.data.total;
+          this.tableData = res.data.list
+          this.queryData.total = res.data.total
         })
-        .catch(() => {});
+        .catch(() => {})
     },
-    flashTableData() {
-      this.queryData.pageIndex = 1;
-      this.getTableData();
+    flashTableData () {
+      this.queryData.pageIndex = 1
+      this.getTableData()
     },
     // 分页大小更改
-    handleSizeChange(value) {
-      this.queryData.pageSize = value;
-      this.getTableData();
+    handleSizeChange (value) {
+      this.queryData.pageSize = value
+      this.getTableData()
     },
     // 当前索引更改
-    handleCurrentChange(val) {
-      this.queryData.pageIndex = val;
-      this.getTableData();
+    handleCurrentChange (val) {
+      this.queryData.pageIndex = val
+      this.getTableData()
     },
     // 新增数据窗口关闭事件
-    addDataDialogClose() {
-      this.$refs.addDataFormRef.resetFields();
-      this.addDataFrom.imageUrl = "";
-      this.$refs.addUpload.clearFiles();
+    addDataDialogClose () {
+      this.$refs.addDataFormRef.resetFields()
+      this.addDataFrom.imageUrl = ''
+      this.$refs.addUpload.clearFiles()
       // this.addDataFrom.imagesFiles = []
       // this.$refs.addDataFromUploadRef.clearFiles()
     },
-    editDataDialogClose() {
-      this.$refs.editDataFormRef.resetFields();
-      this.eidtDataForm.imageUrl = "";
-      this.$refs.editUpload.clearFiles();
+    editDataDialogClose () {
+      this.$refs.editDataFormRef.resetFields()
+      this.eidtDataForm.imageUrl = ''
+      this.$refs.editUpload.clearFiles()
     },
     // 追加数据
-    addDataDialogConfirm() {
+    addDataDialogConfirm () {
       this.$refs.addDataFormRef.validate(async (valid) => {
         if (valid) {
-          //console.log("新增新增", this.addDataFrom);
+          // console.log("新增新增", this.addDataFrom);
           this.$http
-            .post("/workdynamics/insert", this.addDataFrom)
+            .post('/workdynamics/insert', this.addDataFrom)
             .then(({ data: res }) => {
               if (res.code !== 0) {
-                return this.$message.error(res.msg);
+                return this.$message.error(res.msg)
               }
-              this.$message.success("新增成功");
-              this.addDataDialogVisabled = false;
-              this.getTableData();
+              this.$message.success('新增成功')
+              this.addDataDialogVisabled = false
+              this.getTableData()
             })
-            .catch(() => {});
+            .catch(() => {})
         } else {
-          this.$message.success("表单数据填写不完整");
+          this.$message.success('表单数据填写不完整')
         }
-      });
+      })
     },
     // 限定图片
-    handleExceed() {
-      this.$message({ type: "error", message: "最多支持一张图片上传" });
+    handleExceed () {
+      this.$message({ type: 'error', message: '最多支持一张图片上传' })
     },
     // 限制标题
-    titleExceed(str) {
+    titleExceed (str) {
       if (str.length >= 200) {
-        this.$message.error("标题文字不能超过200字");
+        this.$message.error('标题文字不能超过200字')
       }
     },
     // 限制内容
-    contentExceed(str) {
+    contentExceed (str) {
       if (str.length >= 2000) {
-        this.$message.error("内容文字不能超过2000字");
+        this.$message.error('内容文字不能超过2000字')
       }
     },
-    //限制摘要
-    noteExceed(str) {
+    // 限制摘要
+    noteExceed (str) {
       if (str.length >= 1000) {
-        this.$message.error("摘要文字不能超过1000字");
+        this.$message.error('摘要文字不能超过1000字')
       }
     },
     // 删除数据
-    deleteData(row) {
-      console.log(row);
-      this.$confirm("此操作将删除当前数据, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+    deleteData (row) {
+      console.log(row)
+      this.$confirm('此操作将删除当前数据, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(async () => {
-          let ids = [];
+          let ids = []
           if (this.deleteDataArr.length > 1) {
-            ids = this.deleteDataArr;
+            ids = this.deleteDataArr
           } else {
-            ids = [row.id];
+            ids = [row.id]
           }
-          console.log(ids);
+          console.log(ids)
           this.$http
-            .delete("/workdynamics/delete", {
-              data: ids,
+            .delete('/workdynamics/delete', {
+              data: ids
             })
             .then(({ data: res }) => {
               if (res.code !== 0) {
-                return this.$message.error(res.msg);
+                return this.$message.error(res.msg)
               }
               this.$message({
-                type: "success",
-                message: "删除成功!",
-              });
-              this.getTableData();
-            });
+                type: 'success',
+                message: '删除成功!'
+              })
+              this.getTableData()
+            })
         })
         .catch(() => {
           this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
-        });
+            type: 'info',
+            message: '已取消删除'
+          })
+        })
     },
-    //预览工作动态信息
-    async openPreviewData(row) {
-      console.log("预览预览", row);
+    // 预览工作动态信息
+    async openPreviewData (row) {
+      console.log('预览预览', row)
       const { data: res } = await this.$http.get(
         `workdynamics/select/${row.id}`
-      );
+      )
 
       if (res.code !== 0) {
-        return this.$message.error(res.msg);
+        return this.$message.error(res.msg)
       }
 
-      this.previewData = res.data;
+      this.previewData = res.data
 
-      this.perviewDataDialogVisabled = true;
+      this.perviewDataDialogVisabled = true
     },
-    perviewDataDialogClose() {
-      this.perviewDataDialogVisabled = false;
+    perviewDataDialogClose () {
+      this.perviewDataDialogVisabled = false
     },
-    handleAvatarSuccess(res, file) {
+    handleAvatarSuccess (res, file) {
       if (res.code !== 0) {
-        return this.$message.error(res.msg);
+        return this.$message.error(res.msg)
       }
 
-      this.addDataFrom.imageUrl = res.data;
+      this.addDataFrom.imageUrl = res.data
       // this.imageUrl = URL.createObjectURL(file.raw);
     },
-    beforeAvatarUpload(file) {
+    beforeAvatarUpload (file) {
       const isImage =
-        file.type === "image/jpeg" ||
-        file.type === "image/jpg" ||
-        file.type === "image/png";
-      const isLt2M = file.size / 1024 / 1024 < 2;
+        file.type === 'image/jpeg' ||
+        file.type === 'image/jpg' ||
+        file.type === 'image/png'
+      const isLt2M = file.size / 1024 / 1024 < 2
 
       if (!isImage) {
-        this.$message.error("上传头像图片只能是 JPG 格式!");
+        this.$message.error('上传头像图片只能是 JPG 格式!')
       }
       if (!isLt2M) {
-        this.$message.error("上传头像图片大小不能超过 2MB!");
+        this.$message.error('上传头像图片大小不能超过 2MB!')
       }
-      return isImage && isLt2M;
+      return isImage && isLt2M
     },
-    eidtHandleAvatarSuccess(res, file) {
+    eidtHandleAvatarSuccess (res, file) {
       if (res.code !== 0) {
-        return this.$message.error(res.msg);
+        return this.$message.error(res.msg)
       }
 
-      this.eidtDataForm.imageUrl = res.data;
+      this.eidtDataForm.imageUrl = res.data
       // this.imageUrl = URL.createObjectURL(file.raw);
     },
-    editBeforeAvatarUpload(file) {
+    editBeforeAvatarUpload (file) {
       const isImage =
-        file.type === "image/jpeg" ||
-        file.type === "image/jpg" ||
-        file.type === "image/png";
-      const isLt2M = file.size / 1024 / 1024 < 2;
+        file.type === 'image/jpeg' ||
+        file.type === 'image/jpg' ||
+        file.type === 'image/png'
+      const isLt2M = file.size / 1024 / 1024 < 2
 
       if (!isImage) {
-        this.$message.error("上传头像图片只能是 JPG 格式!");
+        this.$message.error('上传头像图片只能是 JPG 格式!')
       }
       if (!isLt2M) {
-        this.$message.error("上传头像图片大小不能超过 2MB!");
+        this.$message.error('上传头像图片大小不能超过 2MB!')
       }
-      return isImage && isLt2M;
+      return isImage && isLt2M
     },
-    async openEditDialog(row) {
+    async openEditDialog (row) {
       const { data: res } = await this.$http.get(
         `workdynamics/select/${row.id}`
-      );
+      )
 
       if (res.code !== 0) {
-        return this.$message.error(res.msg);
+        return this.$message.error(res.msg)
       }
 
-      this.eidtDataForm = res.data;
+      this.eidtDataForm = res.data
 
-      this.editDataDialogVisabled = true;
+      this.editDataDialogVisabled = true
     },
-    eidtDataDialogConfirm() {
+    eidtDataDialogConfirm () {
       this.$refs.editDataFormRef.validate(async (valid) => {
         if (valid) {
-          console.log(this.eidtDataForm);
+          console.log(this.eidtDataForm)
           this.$http
-            .put("/workdynamics/update", this.eidtDataForm)
+            .put('/workdynamics/update', this.eidtDataForm)
             .then(({ data: res }) => {
               if (res.code !== 0) {
-                return this.$message.error(res.msg);
+                return this.$message.error(res.msg)
               }
-              this.$message.success("编辑成功");
-              this.editDataDialogVisabled = false;
-              this.getTableData();
+              this.$message.success('编辑成功')
+              this.editDataDialogVisabled = false
+              this.getTableData()
             })
-            .catch(() => {});
+            .catch(() => {})
         } else {
-          this.$message.success("表单数据填写不完整");
+          this.$message.success('表单数据填写不完整')
         }
-      });
+      })
     },
-    addUploadRemoveFile(file, fileList) {
-      this.$refs.addUpload.clearFiles();
-      this.addDataFrom.imageUrl = "";
-    },
-    editUploadRemoveFile(file, fileList) {
-      this.$refs.editUpload.clearFiles();
-      this.eidtDataForm.imageUrl = "";
+    addUploadRemoveFile (file, fileList) {
+      this.$refs.addUpload.clearFiles()
+      this.addDataFrom.imageUrl = ''
     },
+    editUploadRemoveFile (file, fileList) {
+      this.$refs.editUpload.clearFiles()
+      this.eidtDataForm.imageUrl = ''
+    }
   },
   computed: {
-    editDialogShowFileList() {
+    editDialogShowFileList () {
       if (this.eidtDataForm.imageUrl) {
         return [
-          { name: this.eidtDataForm.imageUrl, url: this.eidtDataForm.imageUrl },
-        ];
+          { name: this.eidtDataForm.imageUrl, url: this.eidtDataForm.imageUrl }
+        ]
       }
-    },
-  },
-};
+    }
+  }
+}
 </script>
 <style scoped lang="scss">
 ::v-deep .el-checkbox__input.is-checked .el-checkbox__inner,
@@ -728,7 +728,7 @@ export default {
 
   .preview-title {
     width: 100%;
-    height: 90px;
+    min-height: 90px;
     //margin-top: -40px;
     border-bottom: solid #c6c6c6 1px;
     .title-text {
@@ -752,7 +752,7 @@ export default {
   }
   .preview-note {
     width: 100%;
-    height: 100px;
+    min-height: 100px;
     text-align: left;
     margin-top: 24px;
     text-indent: 2em;
diff --git a/front/src/views/demandCenter/demandDetails.vue b/front/src/views/demandCenter/demandDetails.vue
index cbf6ca70..40b0669f 100644
--- a/front/src/views/demandCenter/demandDetails.vue
+++ b/front/src/views/demandCenter/demandDetails.vue
@@ -231,6 +231,7 @@
             size="small"
             pageSize="8"
             :total="total"
+            v-model:current="page"
             @change="handleCurrentChange"
           />
         </a-list>
@@ -248,7 +249,7 @@
   import {
     demandComment,
     demandCommentPage,
-    demandCommentDelete,
+    // demandCommentDelete,
     demandCommentApply,
   } from '@/api/demandCenter'
   import { getUser, getUserInfo } from '@/api/home'
@@ -264,15 +265,15 @@
     })
   })
   //删除提示框
-  const confirm = (item) => {
-    console.log(item)
-    evaluateDelete(item)
-  }
+  // const confirm = (item) => {
+  //   console.log(item)
+  //   evaluateDelete(item)
+  // }
 
-  const cancel = (e) => {
-    console.log(e)
-    message.error('已取消删除')
-  }
+  // const cancel = (e) => {
+  //   console.log(e)
+  //   message.error('已取消删除')
+  // }
   // const store = useStore()
   const router = useRouter()
 
@@ -322,14 +323,14 @@
   //   })
   // }
 
-  const evaluateDelete = (item) => {
-    demandCommentDelete([item.id]).then((res) => {
-      if (res.data.code == 0) {
-        message.success('删除评论成功！')
-      }
-      evaluateList()
-    })
-  }
+  // const evaluateDelete = (item) => {
+  //   demandCommentDelete([item.id]).then((res) => {
+  //     if (res.data.code == 0) {
+  //       message.success('删除评论成功！')
+  //     }
+  //     evaluateList()
+  //   })
+  // }
   const evaluateList = () => {
     const params = {
       page: page.value,
@@ -339,6 +340,7 @@
     demandCommentPage(params).then((res) => {
       evaluateData.value = res.data.data.list
       total.value = res.data.data.total
+      console.log(evaluateData, 'evaluateData')
     })
   }
 
@@ -382,6 +384,7 @@
     // formName.value = formData.value
     const id = router.currentRoute.value.query.id
     getDemandForm(id).then((res) => {
+      console.log(res, 'res')
       const { data } = res.data
       formName.value.applyUserName = data.applyUserName
       formName.value.applyUserPhone = data.applyUserPhone

From 53e03ef4135de91f57df693cbd1f5eb7aa2e219c Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Wed, 29 Jun 2022 15:09:02 +0800
Subject: [PATCH 05/11] =?UTF-8?q?339-=E6=91=98=E8=A6=81=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/activiti/my-work-dynamics.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/back/src/views/modules/activiti/my-work-dynamics.vue b/back/src/views/modules/activiti/my-work-dynamics.vue
index 144991c8..7e0d92d5 100644
--- a/back/src/views/modules/activiti/my-work-dynamics.vue
+++ b/back/src/views/modules/activiti/my-work-dynamics.vue
@@ -132,7 +132,7 @@
             show-word-limit
           ></el-input>
         </el-form-item>
-        <el-form-item prop="title" label="摘要">
+        <el-form-item prop="note1" label="摘要">
           <el-input
             v-model="addDataFrom.note1"
             autocomplete="off"
@@ -224,7 +224,7 @@
             show-word-limit
           ></el-input>
         </el-form-item>
-        <el-form-item prop="title" label="摘要">
+        <el-form-item prop="note1" label="摘要">
           <el-input
             v-model="eidtDataForm.note1"
             autocomplete="off"

From 24e8607277123ee2803b0ca2134c568c097e0c98 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Wed, 29 Jun 2022 15:50:26 +0800
Subject: [PATCH 06/11] =?UTF-8?q?add:=20=E5=B7=A5=E4=BD=9C=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/assets/img/workBench/NO1.png         | Bin 0 -> 10072 bytes
 back/src/assets/img/workBench/NO2.png         | Bin 0 -> 9627 bytes
 back/src/assets/img/workBench/NO3.png         | Bin 0 -> 9592 bytes
 back/src/assets/img/workBench/hasToDo.png     | Bin 0 -> 3025 bytes
 back/src/assets/img/workBench/one.png         | Bin 0 -> 2084 bytes
 back/src/assets/img/workBench/publish.png     | Bin 0 -> 1356 bytes
 back/src/assets/img/workBench/todo.png        | Bin 0 -> 1908 bytes
 back/src/assets/img/workBench/two.png         | Bin 0 -> 2263 bytes
 .../workBench/components/bottom-view.vue      |  18 ++++
 .../workBench/components/center-view.vue      |  19 +++++
 .../workBench/components/dept-chart-view.vue  |  27 ++++++
 .../workBench/components/dept-todo-view.vue   |  18 ++++
 .../src/views/modules/workBench/workBench.vue |  80 ++++++++++++++++++
 13 files changed, 162 insertions(+)
 create mode 100644 back/src/assets/img/workBench/NO1.png
 create mode 100644 back/src/assets/img/workBench/NO2.png
 create mode 100644 back/src/assets/img/workBench/NO3.png
 create mode 100644 back/src/assets/img/workBench/hasToDo.png
 create mode 100644 back/src/assets/img/workBench/one.png
 create mode 100644 back/src/assets/img/workBench/publish.png
 create mode 100644 back/src/assets/img/workBench/todo.png
 create mode 100644 back/src/assets/img/workBench/two.png
 create mode 100644 back/src/views/modules/workBench/components/bottom-view.vue
 create mode 100644 back/src/views/modules/workBench/components/center-view.vue
 create mode 100644 back/src/views/modules/workBench/components/dept-chart-view.vue
 create mode 100644 back/src/views/modules/workBench/components/dept-todo-view.vue
 create mode 100644 back/src/views/modules/workBench/workBench.vue

diff --git a/back/src/assets/img/workBench/NO1.png b/back/src/assets/img/workBench/NO1.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f92372e3a4fff85dcd7ed38e044b0d4db156ec2
GIT binary patch
literal 10072
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
C^MHN;

literal 0
HcmV?d00001

diff --git a/back/src/assets/img/workBench/NO2.png b/back/src/assets/img/workBench/NO2.png
new file mode 100644
index 0000000000000000000000000000000000000000..f03231e4be50440a9e8e26ea11d5a539c837ac3d
GIT binary patch
literal 9627
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

literal 0
HcmV?d00001

diff --git a/back/src/assets/img/workBench/NO3.png b/back/src/assets/img/workBench/NO3.png
new file mode 100644
index 0000000000000000000000000000000000000000..63d878c95848ead6360ea1a4b27de611d21853fa
GIT binary patch
literal 9592
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

literal 0
HcmV?d00001

diff --git a/back/src/assets/img/workBench/hasToDo.png b/back/src/assets/img/workBench/hasToDo.png
new file mode 100644
index 0000000000000000000000000000000000000000..f51a763268e205836527f752cbf6f74242897da8
GIT binary patch
literal 3025
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
NZE*J3BFm$v{{s^dJ@fzo

literal 0
HcmV?d00001

diff --git a/back/src/assets/img/workBench/one.png b/back/src/assets/img/workBench/one.png
new file mode 100644
index 0000000000000000000000000000000000000000..d976454005fed01f8db9662e0686a336a1750766
GIT binary patch
literal 2084
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
Cpj<Hk

literal 0
HcmV?d00001

diff --git a/back/src/assets/img/workBench/publish.png b/back/src/assets/img/workBench/publish.png
new file mode 100644
index 0000000000000000000000000000000000000000..70320c8c60214b10655e0fb153a0de09abd8feea
GIT binary patch
literal 1356
zcmeAS@N?(olHy`uVBq!ia0vp^^MTlqgAGU?;jOL%Qj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07?>3^Ln2Bde0{8v^K<nQL2C3WatnaE85nHrD+&^mvr|hH
zl2X$%^K6yg@7}MZkeOnu6mIHk;9KCFnvv;IRg@ZB<rk7%m7Q#vqGWHUU{hfQG$1#%
zBvGLvHz%*ys=`(YY_1iM4HDK@QUEI{$+lI3I4Z(7K*2e`C{@8!&r~<rz|cg&+)~fb
z)X>DjP)EVYz|dIVz*yhVSl7_V%D~df&{P2mlz_GsrKDK}xwt{?0`hE?GD=Dctn~HE
z%ggo3jrH=2()A53EiLs8jP#9+bb%^#i!1X=5-W7`ij`p|xTF>*7iAWdWaj57fJ{tG
z$}cUkRRX#c;)UD-xUqS~&|m@vn0`fKfxe-h0mw@*g}%P{mFDKcRTq~8r6Sym)!^cg
z%7Rq=pw#00(xPNw#HA^NtSYc_E=o--$uA1Y&(DE{Vn9ZINq%ugeu09svw}u=W?o8u
zd9fx~xv#I4XI^nhVqS8pr;Du;&;Y&6%oHmVM?+U<Q)6>CGiO&rAk)&t#l_Ll)Xdq^
z(8<Zj#Tcg7B|o_|H#M&WrZ)wl*8-<rP)f)x0NU)5T9jFqn&MWJpQ`}&u~jB+x0vEI
z52`l>w_D6`>eUB2MjsTfNbw940wx|16P{{;9C*4<%>yR(B4Dca<C-tWz`%IW)5S5Q
z;?|oxw))P25(hp$zZdr^cGd*8?uaAo2|~>hF3}rj>#8Lhbhox1IU%m_ah^b@3(pa6
z-ZE}y&ycQdnNwfKt#wgyN-j9p`{cj$`OS0x6rbOjS=<|O$WCw~ALGBcEf>O)4}5=n
zLB&SnN?cCHCi@Ru9~*x-)Gz=^hDXdF8IQ0(V(#ES!v1I0Q89<DuYZR>YBrzMmMpXT
zgNtstT}A5WnpF!Y{dmx-cX-0r!<`G}|5z~h{-k-wdp7U02}&1~-?B=}c<H75Z+0nj
zwq6X_>REF^t^SRd_k~HHf|O(8-$pCiWu!i1ev?zX{~K@5_v<?Q+$Ftl=tVQf8l7Kv
zCQo(g5hJk<{#&tkZyIf#=u`a0Y4x3MZEttU%yrw%I{9zi=sS^RqCG7$=lt6xY@Pg3
zJAR(N`_XmXhbOm7kM@4p#+|G8c$>=RbMu}~zHlb&l;)a`>%}ytR~2zTe9NwN=E8-V
zM^BUI{#bBl^IN$oQ>7;Ed->z?^U}W96=hM6CVPB;lKbm*!;b|~J96JVd$^nNqvO^e
z{>*g`8?xLs>Q82xr(h=_-@y+e9cmQp8sK4e_<x7~DKm$Oo0ATkGqN!xDdn%3Y`F9)
PsC@Hu^>bP0l+XkKTgLp~

literal 0
HcmV?d00001

diff --git a/back/src/assets/img/workBench/todo.png b/back/src/assets/img/workBench/todo.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6bc9a2d5c26fa23f7d920d337349172b25d1146
GIT binary patch
literal 1908
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
ac5l=E%+H<c9j`Ll{)6(cXt-ALQT|`}r0bRd

literal 0
HcmV?d00001

diff --git a/back/src/assets/img/workBench/two.png b/back/src/assets/img/workBench/two.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca37aa8d0810a06b9e17a199d8d6f7e5515eb59c
GIT binary patch
literal 2263
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
YVRm`)+qu#t9nG%>n-$1BPmjv{4}71j8~^|S

literal 0
HcmV?d00001

diff --git a/back/src/views/modules/workBench/components/bottom-view.vue b/back/src/views/modules/workBench/components/bottom-view.vue
new file mode 100644
index 00000000..93c9b0ca
--- /dev/null
+++ b/back/src/views/modules/workBench/components/bottom-view.vue
@@ -0,0 +1,18 @@
+<template>
+    <div class="bottom-view">
+
+    </div>
+</template>
+<script>
+export default {
+
+}
+</script>
+<style lang="scss" scoped>
+.bottom-view {
+    width: 100%;
+    height: 335px;
+    background: green;
+    box-sizing: border-box;
+}
+</style>
\ No newline at end of file
diff --git a/back/src/views/modules/workBench/components/center-view.vue b/back/src/views/modules/workBench/components/center-view.vue
new file mode 100644
index 00000000..a435f270
--- /dev/null
+++ b/back/src/views/modules/workBench/components/center-view.vue
@@ -0,0 +1,19 @@
+<template>
+    <div class="center-view">
+
+    </div>
+</template>
+<script>
+export default {
+
+}
+</script>
+<style lang="scss" scoped>
+.center-view {
+    width: 100%;
+    height: 335px;
+    margin-bottom: 16px;
+    background: blue;
+    box-sizing: border-box;
+}
+</style>
\ No newline at end of file
diff --git a/back/src/views/modules/workBench/components/dept-chart-view.vue b/back/src/views/modules/workBench/components/dept-chart-view.vue
new file mode 100644
index 00000000..753f6902
--- /dev/null
+++ b/back/src/views/modules/workBench/components/dept-chart-view.vue
@@ -0,0 +1,27 @@
+<template>
+    <div class="dept-box">
+        <div class="left-title-box">
+            <div class="content">
+                <!-- <img class="img" :src=""></img> -->
+                <div></div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data() {
+        return {
+
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+.dept-box {
+    width: 394px;
+    height: 252px;
+    margin: 16px;
+    background: pink;
+}
+</style>
\ No newline at end of file
diff --git a/back/src/views/modules/workBench/components/dept-todo-view.vue b/back/src/views/modules/workBench/components/dept-todo-view.vue
new file mode 100644
index 00000000..1f50786e
--- /dev/null
+++ b/back/src/views/modules/workBench/components/dept-todo-view.vue
@@ -0,0 +1,18 @@
+<template>
+    <div class="dept-box">
+
+    </div>
+</template>
+<script>
+export default {
+
+}
+</script>
+<style lang="scss" scoped>
+.dept-box {
+    width: 394px;
+    height: 252px;
+    margin: 16px;
+    background: pink;
+}
+</style>
\ No newline at end of file
diff --git a/back/src/views/modules/workBench/workBench.vue b/back/src/views/modules/workBench/workBench.vue
new file mode 100644
index 00000000..20998672
--- /dev/null
+++ b/back/src/views/modules/workBench/workBench.vue
@@ -0,0 +1,80 @@
+<template>
+    <div class="work-brnch-box">
+        <!-- 上 -->
+        <div class="flex-row-start top">
+            <div class="flex-row-start dept-left">
+                <dept-todo-view title="部门待办" :dataInfo="toToData"></dept-todo-view>
+                <dept-todo-view title="部门已办" :dataInfo="hasToDodoData"></dept-todo-view>
+            </div>
+            <div class="dept-chart-box"></div>
+        </div>
+        <!-- 中 -->
+        <div class="center">
+            <center-view></center-view>
+        </div>
+        <!-- 下 -->
+        <div class="bottom">
+            <bottom-view></bottom-view>
+        </div>
+    </div>
+</template>
+<script>
+import BottomView from '../workBench/components/bottom-view.vue'
+import CenterView from '../workBench/components/center-view.vue'
+import deptTodoView from '../workBench/components/dept-todo-view.vue'
+
+export default {
+    components: {
+        deptTodoView,
+        BottomView,
+        CenterView,
+    },
+    data() {
+        return {
+            // 部门待办
+            toToData: {
+                color: '#f86f01',
+                // imgSrc: require(''),
+            },
+            // 部门已办
+            hasToDodoData: {
+                color: '#21b107',
+            }
+        }
+    },
+    methods: {
+
+    },
+}
+</script>
+
+
+<style lang="scss" scoped>
+.margin-h-16 {
+    margin: 0 16px;
+}
+
+.flex-row-start {
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+}
+
+.work-brnch-box {
+    .top {
+        height: 284px;
+        margin-bottom: 16px;
+        background: green;
+    }
+
+    .dept-left {
+        width: 836px;
+    }
+
+    .dept-chart-box {
+        width: 780px;
+        height: 100%;
+        background: orange;
+    }
+}
+</style>
\ No newline at end of file

From 8287422d9a3fb93ebd05bcb3ff2e04d210d01900 Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Wed, 29 Jun 2022 15:54:22 +0800
Subject: [PATCH 07/11] =?UTF-8?q?333-=E8=BE=93=E5=85=A5=E6=A1=86=E4=B8=8A?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E9=BB=91=E6=A1=86=E6=8F=90=E7=A4=BA=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/apply.vue | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index 5bf6df4d..0648e013 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -68,17 +68,17 @@
                 name="system"
                 :rules="[{ required: true, message: '请输入申请应用' }]"
               >
-                <a-tooltip placement="top">
-                  <template #title>
+                <!-- <a-tooltip placement="top"> -->
+                <!-- <template #title>
                     <span>{{ formName.formNameSystem }}</span>
-                  </template>
-                  <a-input
-                    style="width: 350px; background-color: #f5f5f5"
-                    v-model:value="formName.formNameSystem"
-                    :disabled="disabled"
-                  />
-                  <span style="width: 350px; background-color: #f5f5f5"></span>
-                </a-tooltip>
+                  </template> -->
+                <a-input
+                  style="width: 350px; background-color: #f5f5f5"
+                  v-model:value="formName.formNameSystem"
+                  :disabled="disabled"
+                />
+                <span style="width: 350px; background-color: #f5f5f5"></span>
+                <!-- </a-tooltip> -->
               </a-form-item>
 
               <a-form-item

From 2a6ba2659416e91f0b81e8d8aeeca3455ccc33ec Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Wed, 29 Jun 2022 16:56:51 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=83=BD=E5=8A=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/api/home.js                         |   8 ++
 .../src/views/detailsAll/AlgorithmDetails.vue |  23 +++-
 .../views/detailsAll/ApplicationDetails.vue   |  23 +++-
 .../src/views/detailsAll/BusinessDetails.vue  |  23 +++-
 .../views/detailsAll/DeveloperComponents.vue  |  23 +++-
 front/src/views/detailsAll/LayerService.vue   |  23 +++-
 .../Algorithm/AlgorithmAssociatedAbility.vue  | 127 ++++++++++++++++++
 .../Algorithm/AlgorithmNavigation.vue         |   6 +
 .../ApplicationAssociatedAbility.vue          | 127 ++++++++++++++++++
 .../Application/ApplicationNavigation.vue     |   6 +
 .../Business/BusinessAssociatedAbility.vue    | 127 ++++++++++++++++++
 .../Business/BusinessNavigation.vue           |   6 +
 .../Developer/DeveloperAssociatedAbility.vue  | 127 ++++++++++++++++++
 .../Developer/DeveloperNavigation.vue         |   7 +-
 .../LayerServiceAssociatedAbility.vue         | 127 ++++++++++++++++++
 .../LayerService/LayerServiceNavigation.vue   |   7 +-
 front/src/views/home/DetailsPageconetent.vue  |   4 -
 17 files changed, 783 insertions(+), 11 deletions(-)
 create mode 100644 front/src/views/detailsAll/components/Algorithm/AlgorithmAssociatedAbility.vue
 create mode 100644 front/src/views/detailsAll/components/Application/ApplicationAssociatedAbility.vue
 create mode 100644 front/src/views/detailsAll/components/Business/BusinessAssociatedAbility.vue
 create mode 100644 front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue
 create mode 100644 front/src/views/detailsAll/components/LayerService/LayerServiceAssociatedAbility.vue

diff --git a/front/src/api/home.js b/front/src/api/home.js
index 6f560eb9..85da72ff 100644
--- a/front/src/api/home.js
+++ b/front/src/api/home.js
@@ -297,3 +297,11 @@ export function getDataResource(data) {
     data,
   })
 }
+//应用详情列表
+export function queryPartAppByKeyId(params) {
+  return request({
+    url: 'dataResourceRel/queryPart4AppByKeyId',
+    method: 'get',
+    params,
+  })
+}
diff --git a/front/src/views/detailsAll/AlgorithmDetails.vue b/front/src/views/detailsAll/AlgorithmDetails.vue
index 911b4974..1bac95d9 100644
--- a/front/src/views/detailsAll/AlgorithmDetails.vue
+++ b/front/src/views/detailsAll/AlgorithmDetails.vue
@@ -21,6 +21,12 @@
       id="algorithm-display"
       class="scrollBox"
     ></algorithm-display>
+    <!-- 关联能力 -->
+    <algorithm-associated-ability
+      :associatedComponents="associatedComponents"
+      id="algorithm-associated-ability"
+      class="scrollBox"
+    ></algorithm-associated-ability>
     <!-- 算法优势 -->
     <algorithm-advantage
       :dataList="dataList.data"
@@ -70,6 +76,7 @@
 </template>
 <script setup>
   import AlgorithmTopDetails from '@/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue'
+  import AlgorithmAssociatedAbility from '@/views/detailsAll/components/Algorithm/AlgorithmAssociatedAbility.vue'
   import AlgorithmNavigation from '@/views/detailsAll/components/Algorithm/AlgorithmNavigation.vue'
   import AlgorithmDisplay from '@/views/detailsAll/components/Algorithm/AlgorithmDisplay.vue'
   import AlgorithmAdvantage from '@/views/detailsAll/components/Algorithm/AlgorithmAdvantage.vue'
@@ -81,7 +88,7 @@
   import AlgorithmCommonProblem from '@/views/detailsAll/components/Algorithm/AlgorithmCommonProblem' //常见问题
   import { ref, onMounted, onBeforeUnmount, reactive } from 'vue'
   import { useRouter } from 'vue-router'
-  import { updateVisits, selectOne } from '@/api/home'
+  import { updateVisits, selectOne, queryPartAppByKeyId } from '@/api/home'
   import mybus from '@/myplugins/mybus'
   const router = useRouter()
   const scrollTop = ref(0)
@@ -90,6 +97,11 @@
   const dataList = reactive({ data: {} })
   const id = router.currentRoute.value.query.id
   const obj = JSON.parse(window.sessionStorage.getItem('preview'))
+  const associatedComponents = ref([
+    { type: '应用资源', dataList: [] },
+    { type: '数据资源', dataList: [] },
+    { type: '基础设施', dataList: [] },
+  ])
   document.documentElement.style.transition = 'all 0.3s ease'
   document.documentElement.scrollTop = 0
   document.body.style.transition = 'all 0.3s ease'
@@ -148,6 +160,15 @@
           })
         }
       })
+      associatedComponents.value.map((item, index) => {
+        let queryPartAppByKeyIdParams = {
+          keyId: id,
+          type: item.type,
+        }
+        queryPartAppByKeyId(queryPartAppByKeyIdParams).then((res) => {
+          associatedComponents.value[index].dataList = res.data.data
+        })
+      })
     } else if (obj) {
       dataList.data = obj
       console.log('预览==============', obj)
diff --git a/front/src/views/detailsAll/ApplicationDetails.vue b/front/src/views/detailsAll/ApplicationDetails.vue
index 0664547e..509ade79 100644
--- a/front/src/views/detailsAll/ApplicationDetails.vue
+++ b/front/src/views/detailsAll/ApplicationDetails.vue
@@ -29,6 +29,12 @@
       id="application-associated-components"
       class="scrollBox"
     ></application-associated-components>
+    <!-- 关联能力 -->
+    <application-associated-ability
+      :associatedComponents="associatedComponents"
+      id="application-associated-ability"
+      class="scrollBox"
+    ></application-associated-ability>
     <!-- 功能介绍-->
     <application-function-intorduction
       :dataList="dataList.data"
@@ -64,6 +70,7 @@
 <script setup>
   import ApplicationAbilityToise from '@/views/detailsAll/components/Application/ApplicationAbilityToise.vue'
   import ApplicationAssociatedComponents from '@/views/detailsAll/components/Application/ApplicationAssociatedComponents.vue'
+  import ApplicationAssociatedAbility from '@/views/detailsAll/components/Application/ApplicationAssociatedAbility.vue'
   import ApplicationOwningDepartmentAndServiceProvider from '@/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue'
   import ApplicationFunctionIntorduction from '@/views/detailsAll/components/Application/ApplicationFunctionIntorduction.vue'
   import ApplicationDeploymentAndSecurity from '@/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue'
@@ -73,8 +80,13 @@
   import ApplicationCommonProblem from '@/views/detailsAll/components/Application/ApplicationCommonProblem' //常见问题
   import { ref, onMounted, onBeforeUnmount, reactive } from 'vue'
   import { useRouter } from 'vue-router'
-  import { updateVisits, selectOne } from '@/api/home'
+  import { updateVisits, selectOne, queryPartAppByKeyId } from '@/api/home'
   import mybus from '@/myplugins/mybus'
+  const associatedComponents = ref([
+    { type: '组件服务', dataList: [] },
+    { type: '数据资源', dataList: [] },
+    { type: '基础设施', dataList: [] },
+  ])
   const router = useRouter()
   const scrollTop = ref(0)
   const domArr = ref([])
@@ -140,6 +152,15 @@
           })
         }
       })
+      associatedComponents.value.map((item, index) => {
+        let queryPartAppByKeyIdParams = {
+          keyId: id,
+          type: item.type,
+        }
+        queryPartAppByKeyId(queryPartAppByKeyIdParams).then((res) => {
+          associatedComponents.value[index].dataList = res.data.data
+        })
+      })
     } else if (obj) {
       dataList.data = obj
       console.log('预览==============', obj)
diff --git a/front/src/views/detailsAll/BusinessDetails.vue b/front/src/views/detailsAll/BusinessDetails.vue
index aaadae11..8cbd5352 100644
--- a/front/src/views/detailsAll/BusinessDetails.vue
+++ b/front/src/views/detailsAll/BusinessDetails.vue
@@ -21,6 +21,12 @@
       id="business-presentation"
       class="scrollBox"
     ></business-presentation>
+    <!-- 关联能力 -->
+    <business-associated-ability
+      :associatedComponents="associatedComponents"
+      id="business-associated-ability"
+      class="scrollBox"
+    ></business-associated-ability>
     <!-- 功能介绍-->
     <business-function-intorduction
       :dataList="dataList.data"
@@ -55,6 +61,7 @@
 </template>
 <script setup>
   import BusinessApplicationCase from '@/views/detailsAll/components/Business/BusinessApplicationCase.vue' // 应用案例
+  import BusinessAssociatedAbility from '@/views/detailsAll/components/Business/BusinessAssociatedAbility.vue'
   import BusinessApplicationScenarios from '@/views/detailsAll/components/Business/BusinessApplicationScenarios.vue' // 应用场景
   import BusinessFunctionIntorduction from '@/views/detailsAll/components/Business/BusinessFunctionIntorduction.vue' // 功能介绍
   import BusinessTopDetails from '@/views/detailsAll/components/Business/BusinessTopDetails.vue' // 头部基本信息
@@ -64,7 +71,7 @@
   import BusinessCommonProblem from '@/views/detailsAll/components/Business/BusinessCommonProblem' //常见问题
   import { ref, onMounted, onBeforeUnmount, reactive } from 'vue'
   import { useRouter } from 'vue-router'
-  import { updateVisits, selectOne } from '@/api/home'
+  import { updateVisits, selectOne, queryPartAppByKeyId } from '@/api/home'
   import mybus from '@/myplugins/mybus'
   const router = useRouter()
   const scrollTop = ref(0)
@@ -73,6 +80,11 @@
   const dataList = reactive({ data: {} })
   const id = router.currentRoute.value.query.id
   const obj = JSON.parse(window.sessionStorage.getItem('preview'))
+  const associatedComponents = ref([
+    { type: '应用资源', dataList: [] },
+    { type: '数据资源', dataList: [] },
+    { type: '基础设施', dataList: [] },
+  ])
   document.documentElement.style.transition = 'all 0.3s ease'
   document.documentElement.scrollTop = 0
   document.body.style.transition = 'all 0.3s ease'
@@ -131,6 +143,15 @@
           })
         }
       })
+      associatedComponents.value.map((item, index) => {
+        let queryPartAppByKeyIdParams = {
+          keyId: id,
+          type: item.type,
+        }
+        queryPartAppByKeyId(queryPartAppByKeyIdParams).then((res) => {
+          associatedComponents.value[index].dataList = res.data.data
+        })
+      })
     } else if (obj) {
       dataList.data = obj
       console.log('预览==============', obj)
diff --git a/front/src/views/detailsAll/DeveloperComponents.vue b/front/src/views/detailsAll/DeveloperComponents.vue
index d150981a..1c7c5c9e 100644
--- a/front/src/views/detailsAll/DeveloperComponents.vue
+++ b/front/src/views/detailsAll/DeveloperComponents.vue
@@ -21,6 +21,12 @@
       id="eveloper-presentation"
       class="scrollBox"
     ></Developer-presentation>
+    <!-- 关联能力 -->
+    <developer-associated-ability
+      :associatedComponents="associatedComponents"
+      id="developer-associated-ability"
+      class="scrollBox"
+    ></developer-associated-ability>
     <!-- 功能介绍-->
     <developer-function-intorduction
       :dataList="dataList.data"
@@ -61,6 +67,7 @@
 </template>
 <script setup>
   import DeveloperApplicationScenarios from '@/views/detailsAll/components/Developer/DeveloperApplicationScenarios.vue' //应用场景
+  import DeveloperAssociatedAbility from '@/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue'
   import DeveloperOwningDepartmentAndServiceProvider from '@/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue' //使用方式
   import DeveloperFunctionIntorduction from '@/views/detailsAll/components/Developer/DeveloperFunctionIntorduction.vue' //功能介绍
   import DeveloperApplicationCase from '@/views/detailsAll/components/Developer/DeveloperApplicationCase' //应用案例
@@ -71,7 +78,7 @@
   import DeveloperTrial from '@/views/detailsAll/components/Developer/DeveloperTrial' //组件试用
   import { ref, onMounted, onBeforeUnmount, reactive } from 'vue'
   import { useRouter } from 'vue-router'
-  import { updateVisits, selectOne } from '@/api/home'
+  import { updateVisits, selectOne, queryPartAppByKeyId } from '@/api/home'
   import mybus from '@/myplugins/mybus'
   const router = useRouter()
   const scrollTop = ref(0)
@@ -80,6 +87,11 @@
   const dataList = reactive({ data: {} })
   const id = router.currentRoute.value.query.id
   const obj = JSON.parse(window.sessionStorage.getItem('preview'))
+  const associatedComponents = ref([
+    { type: '应用资源', dataList: [] },
+    { type: '数据资源', dataList: [] },
+    { type: '基础设施', dataList: [] },
+  ])
   document.documentElement.style.transition = 'all 0.3s ease'
   document.documentElement.scrollTop = 0
   document.body.style.transition = 'all 0.3s ease'
@@ -138,6 +150,15 @@
           })
         }
       })
+      associatedComponents.value.map((item, index) => {
+        let queryPartAppByKeyIdParams = {
+          keyId: id,
+          type: item.type,
+        }
+        queryPartAppByKeyId(queryPartAppByKeyIdParams).then((res) => {
+          associatedComponents.value[index].dataList = res.data.data
+        })
+      })
     } else if (obj) {
       dataList.data = obj
       console.log('预览==============', obj)
diff --git a/front/src/views/detailsAll/LayerService.vue b/front/src/views/detailsAll/LayerService.vue
index 1eec31a7..126e17cb 100644
--- a/front/src/views/detailsAll/LayerService.vue
+++ b/front/src/views/detailsAll/LayerService.vue
@@ -29,6 +29,12 @@
       id="service-information"
       class="scrollBox"
     ></layer-service-information>
+    <!-- 关联能力 -->
+    <layer-service-associated-ability
+      :associatedComponents="associatedComponents"
+      id="layer-service-associated-ability"
+      class="scrollBox"
+    ></layer-service-associated-ability>
     <!-- 应用场景 -->
     <layer-service-application-scenarios
       :dataList="dataList.data"
@@ -63,6 +69,7 @@
 </template>
 <script setup>
   import LayerServiceApplicationCase from '@/views/detailsAll/components/LayerService/LayerServiceApplicationCase' //应用案例
+  import LayerServiceAssociatedAbility from '@/views/detailsAll/components/LayerService/LayerServiceAssociatedAbility.vue'
   import LayerServiceApplicationScenarios from '@/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue' //应用场景
   import LayerServiceCommonProblem from '@/views/detailsAll/components/LayerService/LayerServiceCommonProblem' //常见问题
   import LayerServiceInformation from '@/views/detailsAll/components/LayerService/LayerServiceInformation.vue' //图层信息
@@ -73,7 +80,7 @@
   import LayerServiceUsageMode from '@/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue' //使用方式
   import { ref, onMounted, onBeforeUnmount, reactive } from 'vue'
   import { useRouter } from 'vue-router'
-  import { updateVisits, selectOne } from '@/api/home'
+  import { updateVisits, selectOne, queryPartAppByKeyId } from '@/api/home'
   import mybus from '@/myplugins/mybus'
   const router = useRouter()
   const scrollTop = ref(0)
@@ -82,6 +89,11 @@
   const dataList = reactive({ data: {} })
   const id = router.currentRoute.value.query.id
   const obj = JSON.parse(window.sessionStorage.getItem('preview'))
+  const associatedComponents = ref([
+    { type: '应用资源', dataList: [] },
+    { type: '数据资源', dataList: [] },
+    { type: '基础设施', dataList: [] },
+  ])
   document.documentElement.style.transition = 'all 0.3s ease'
   document.documentElement.scrollTop = 0
   document.body.style.transition = 'all 0.3s ease'
@@ -140,6 +152,15 @@
           })
         }
       })
+      associatedComponents.value.map((item, index) => {
+        let queryPartAppByKeyIdParams = {
+          keyId: id,
+          type: item.type,
+        }
+        queryPartAppByKeyId(queryPartAppByKeyIdParams).then((res) => {
+          associatedComponents.value[index].dataList = res.data.data
+        })
+      })
     } else if (obj) {
       dataList.data = obj
       console.log('预览==============', obj)
diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmAssociatedAbility.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmAssociatedAbility.vue
new file mode 100644
index 00000000..4740f254
--- /dev/null
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmAssociatedAbility.vue
@@ -0,0 +1,127 @@
+<template>
+  <div class="application-associated-ability" v-if="flag">
+    <detals-title title="关联能力" type="RELEVANCE"></detals-title>
+    <div class="application-associated-ability-main">
+      <div
+        class="associated-ability-card"
+        v-for="(item, index) in dataFrom"
+        :key="item.type"
+      >
+        <div class="associated-ability-card-title">
+          {{ item.type }}
+        </div>
+        <div class="associated-ability-card-content">
+          <div
+            class="associated-ability-card-content-font"
+            v-for="(dataListitem, dataListindex) in item.dataList"
+            :key="dataListitem.id"
+            @click="switchFunction(dataListitem.id)"
+          >
+            <span>{{ dataListindex + 1 }}、</span>
+            {{ dataListitem.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+  import { ref, defineProps, watch } from 'vue'
+  import { useRouter } from 'vue-router'
+  const router = useRouter()
+  import DetalsTitle from '@/views/detailsAll/components/DetalsTitle.vue'
+  const props = defineProps({
+    associatedComponents: { type: Array, default: null },
+  })
+  const dataFrom = ref([])
+  const flag = ref(true)
+  const oldid = router.currentRoute.value.query.id
+  //点击查看详情
+  const switchFunction = (id) => {
+    router.push({
+      path: '/details',
+      query: {
+        id: id,
+      },
+    })
+  }
+  if (props.associatedComponents) {
+    flag.value = true
+    dataFrom.value = props.associatedComponents
+    console.log('dataFrom.value', dataFrom.value)
+  } else {
+    flag.value = false
+  }
+  watch(
+    () => props.associatedComponents,
+    (val) => {
+      if (val) {
+        flag.value = true
+        dataFrom.value = props.associatedComponents
+        console.log('dataFrom.value', dataFrom.value)
+      } else {
+        flag.value = false
+      }
+    }
+  )
+  watch(
+    () => router.currentRoute.value.query.id,
+    (newValue, oldValue) => {
+      if (oldid != router.currentRoute.value.query.id) {
+        window.location.reload()
+      }
+    },
+    { immediate: true }
+  )
+</script>
+
+<style lang="less" scoped>
+  .application-associated-ability {
+    padding-top: 0.8rem;
+    padding-bottom: 0.8rem;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    .application-associated-ability-main {
+      margin-top: 0.4rem;
+      width: 13.14rem;
+      display: flex;
+      justify-content: space-between;
+      .associated-ability-card {
+        width: 4.28rem;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        border: 1px solid #e4e6f5;
+        border-radius: 0.1rem;
+        padding-bottom: 0.3rem;
+        cursor: pointer;
+        .associated-ability-card-title {
+          padding-top: 0.3rem;
+          font-size: 0.22rem;
+          text-align: center;
+        }
+        .associated-ability-card-content {
+          width: 100%;
+          margin-top: 0.25rem;
+          padding-left: 0.3rem;
+          .associated-ability-card-content-font {
+            font-size: 0.18rem;
+            color: #999;
+            margin-right: 0.15rem;
+            margin-top: 0.15rem;
+          }
+          .associated-ability-card-content-font:hover {
+            color: #0058e1;
+          }
+        }
+      }
+      .associated-ability-card:hover {
+        border-radius: 0.02rem;
+        border: 0.01rem solid #0058e1;
+        box-shadow: 0rem 0.08rem 0.2rem rgba(0, 88, 225, 0.3);
+      }
+    }
+  }
+</style>
diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmNavigation.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmNavigation.vue
index 96b831ab..bb2ac893 100644
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmNavigation.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmNavigation.vue
@@ -32,6 +32,10 @@
       name: '算法优势',
       key: 'algorithm-advantage',
     },
+    {
+      name: '关联能力',
+      key: 'algorithm-associated-ability',
+    },
     {
       name: '应用场景',
       key: 'application-scenarios',
@@ -87,6 +91,7 @@
         list.value.push('使用方式')
       }
     })
+    list.value.push('关联能力')
     navList.value.forEach((item) => {
       console.log(item)
       if (list.value.indexOf(item.name) > -1) {
@@ -131,6 +136,7 @@
             list.value.push('使用方式')
           }
         })
+        list.value.push('关联能力')
         navList.value.forEach((item) => {
           console.log(item)
           if (list.value.indexOf(item.name) > -1) {
diff --git a/front/src/views/detailsAll/components/Application/ApplicationAssociatedAbility.vue b/front/src/views/detailsAll/components/Application/ApplicationAssociatedAbility.vue
new file mode 100644
index 00000000..4740f254
--- /dev/null
+++ b/front/src/views/detailsAll/components/Application/ApplicationAssociatedAbility.vue
@@ -0,0 +1,127 @@
+<template>
+  <div class="application-associated-ability" v-if="flag">
+    <detals-title title="关联能力" type="RELEVANCE"></detals-title>
+    <div class="application-associated-ability-main">
+      <div
+        class="associated-ability-card"
+        v-for="(item, index) in dataFrom"
+        :key="item.type"
+      >
+        <div class="associated-ability-card-title">
+          {{ item.type }}
+        </div>
+        <div class="associated-ability-card-content">
+          <div
+            class="associated-ability-card-content-font"
+            v-for="(dataListitem, dataListindex) in item.dataList"
+            :key="dataListitem.id"
+            @click="switchFunction(dataListitem.id)"
+          >
+            <span>{{ dataListindex + 1 }}、</span>
+            {{ dataListitem.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+  import { ref, defineProps, watch } from 'vue'
+  import { useRouter } from 'vue-router'
+  const router = useRouter()
+  import DetalsTitle from '@/views/detailsAll/components/DetalsTitle.vue'
+  const props = defineProps({
+    associatedComponents: { type: Array, default: null },
+  })
+  const dataFrom = ref([])
+  const flag = ref(true)
+  const oldid = router.currentRoute.value.query.id
+  //点击查看详情
+  const switchFunction = (id) => {
+    router.push({
+      path: '/details',
+      query: {
+        id: id,
+      },
+    })
+  }
+  if (props.associatedComponents) {
+    flag.value = true
+    dataFrom.value = props.associatedComponents
+    console.log('dataFrom.value', dataFrom.value)
+  } else {
+    flag.value = false
+  }
+  watch(
+    () => props.associatedComponents,
+    (val) => {
+      if (val) {
+        flag.value = true
+        dataFrom.value = props.associatedComponents
+        console.log('dataFrom.value', dataFrom.value)
+      } else {
+        flag.value = false
+      }
+    }
+  )
+  watch(
+    () => router.currentRoute.value.query.id,
+    (newValue, oldValue) => {
+      if (oldid != router.currentRoute.value.query.id) {
+        window.location.reload()
+      }
+    },
+    { immediate: true }
+  )
+</script>
+
+<style lang="less" scoped>
+  .application-associated-ability {
+    padding-top: 0.8rem;
+    padding-bottom: 0.8rem;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    .application-associated-ability-main {
+      margin-top: 0.4rem;
+      width: 13.14rem;
+      display: flex;
+      justify-content: space-between;
+      .associated-ability-card {
+        width: 4.28rem;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        border: 1px solid #e4e6f5;
+        border-radius: 0.1rem;
+        padding-bottom: 0.3rem;
+        cursor: pointer;
+        .associated-ability-card-title {
+          padding-top: 0.3rem;
+          font-size: 0.22rem;
+          text-align: center;
+        }
+        .associated-ability-card-content {
+          width: 100%;
+          margin-top: 0.25rem;
+          padding-left: 0.3rem;
+          .associated-ability-card-content-font {
+            font-size: 0.18rem;
+            color: #999;
+            margin-right: 0.15rem;
+            margin-top: 0.15rem;
+          }
+          .associated-ability-card-content-font:hover {
+            color: #0058e1;
+          }
+        }
+      }
+      .associated-ability-card:hover {
+        border-radius: 0.02rem;
+        border: 0.01rem solid #0058e1;
+        box-shadow: 0rem 0.08rem 0.2rem rgba(0, 88, 225, 0.3);
+      }
+    }
+  }
+</style>
diff --git a/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue b/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue
index a53358b2..3fc42394 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue
@@ -36,6 +36,10 @@
       name: '关联组件',
       key: 'application-associated-components',
     },
+    {
+      name: '关联能力',
+      key: 'application-associated-ability',
+    },
     {
       name: '使用能力',
       key: 'ability-to-use',
@@ -77,6 +81,7 @@
         list.value.push('应用展示')
       }
     })
+    list.value.push('关联能力')
     navList.value.forEach((item) => {
       console.log(item)
       if (list.value.indexOf(item.name) > -1) {
@@ -111,6 +116,7 @@
             list.value.push('应用展示')
           }
         })
+        list.value.push('关联能力')
         list.value.push('部署与安全')
         list.value.push('归属部门与服务商')
         navList.value.forEach((item) => {
diff --git a/front/src/views/detailsAll/components/Business/BusinessAssociatedAbility.vue b/front/src/views/detailsAll/components/Business/BusinessAssociatedAbility.vue
new file mode 100644
index 00000000..4740f254
--- /dev/null
+++ b/front/src/views/detailsAll/components/Business/BusinessAssociatedAbility.vue
@@ -0,0 +1,127 @@
+<template>
+  <div class="application-associated-ability" v-if="flag">
+    <detals-title title="关联能力" type="RELEVANCE"></detals-title>
+    <div class="application-associated-ability-main">
+      <div
+        class="associated-ability-card"
+        v-for="(item, index) in dataFrom"
+        :key="item.type"
+      >
+        <div class="associated-ability-card-title">
+          {{ item.type }}
+        </div>
+        <div class="associated-ability-card-content">
+          <div
+            class="associated-ability-card-content-font"
+            v-for="(dataListitem, dataListindex) in item.dataList"
+            :key="dataListitem.id"
+            @click="switchFunction(dataListitem.id)"
+          >
+            <span>{{ dataListindex + 1 }}、</span>
+            {{ dataListitem.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+  import { ref, defineProps, watch } from 'vue'
+  import { useRouter } from 'vue-router'
+  const router = useRouter()
+  import DetalsTitle from '@/views/detailsAll/components/DetalsTitle.vue'
+  const props = defineProps({
+    associatedComponents: { type: Array, default: null },
+  })
+  const dataFrom = ref([])
+  const flag = ref(true)
+  const oldid = router.currentRoute.value.query.id
+  //点击查看详情
+  const switchFunction = (id) => {
+    router.push({
+      path: '/details',
+      query: {
+        id: id,
+      },
+    })
+  }
+  if (props.associatedComponents) {
+    flag.value = true
+    dataFrom.value = props.associatedComponents
+    console.log('dataFrom.value', dataFrom.value)
+  } else {
+    flag.value = false
+  }
+  watch(
+    () => props.associatedComponents,
+    (val) => {
+      if (val) {
+        flag.value = true
+        dataFrom.value = props.associatedComponents
+        console.log('dataFrom.value', dataFrom.value)
+      } else {
+        flag.value = false
+      }
+    }
+  )
+  watch(
+    () => router.currentRoute.value.query.id,
+    (newValue, oldValue) => {
+      if (oldid != router.currentRoute.value.query.id) {
+        window.location.reload()
+      }
+    },
+    { immediate: true }
+  )
+</script>
+
+<style lang="less" scoped>
+  .application-associated-ability {
+    padding-top: 0.8rem;
+    padding-bottom: 0.8rem;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    .application-associated-ability-main {
+      margin-top: 0.4rem;
+      width: 13.14rem;
+      display: flex;
+      justify-content: space-between;
+      .associated-ability-card {
+        width: 4.28rem;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        border: 1px solid #e4e6f5;
+        border-radius: 0.1rem;
+        padding-bottom: 0.3rem;
+        cursor: pointer;
+        .associated-ability-card-title {
+          padding-top: 0.3rem;
+          font-size: 0.22rem;
+          text-align: center;
+        }
+        .associated-ability-card-content {
+          width: 100%;
+          margin-top: 0.25rem;
+          padding-left: 0.3rem;
+          .associated-ability-card-content-font {
+            font-size: 0.18rem;
+            color: #999;
+            margin-right: 0.15rem;
+            margin-top: 0.15rem;
+          }
+          .associated-ability-card-content-font:hover {
+            color: #0058e1;
+          }
+        }
+      }
+      .associated-ability-card:hover {
+        border-radius: 0.02rem;
+        border: 0.01rem solid #0058e1;
+        box-shadow: 0rem 0.08rem 0.2rem rgba(0, 88, 225, 0.3);
+      }
+    }
+  }
+</style>
diff --git a/front/src/views/detailsAll/components/Business/BusinessNavigation.vue b/front/src/views/detailsAll/components/Business/BusinessNavigation.vue
index e285dc53..fa9f6e76 100644
--- a/front/src/views/detailsAll/components/Business/BusinessNavigation.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessNavigation.vue
@@ -36,6 +36,10 @@
       name: '应用场景',
       key: 'application-scenarios',
     },
+    {
+      name: '关联能力',
+      key: 'business-associated-ability',
+    },
     {
       name: '应用案例',
       key: 'application-case',
@@ -87,6 +91,7 @@
         list.value.push('组件展示')
       }
     })
+    list.value.push('关联能力')
     list.value.push('使用方式')
     navList.value.forEach((item) => {
       console.log(item)
@@ -136,6 +141,7 @@
             list.value.push('组件展示')
           }
         })
+        list.value.push('关联能力')
         list.value.push('使用方式')
         navList.value.forEach((item) => {
           console.log(item)
diff --git a/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue b/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue
new file mode 100644
index 00000000..4740f254
--- /dev/null
+++ b/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue
@@ -0,0 +1,127 @@
+<template>
+  <div class="application-associated-ability" v-if="flag">
+    <detals-title title="关联能力" type="RELEVANCE"></detals-title>
+    <div class="application-associated-ability-main">
+      <div
+        class="associated-ability-card"
+        v-for="(item, index) in dataFrom"
+        :key="item.type"
+      >
+        <div class="associated-ability-card-title">
+          {{ item.type }}
+        </div>
+        <div class="associated-ability-card-content">
+          <div
+            class="associated-ability-card-content-font"
+            v-for="(dataListitem, dataListindex) in item.dataList"
+            :key="dataListitem.id"
+            @click="switchFunction(dataListitem.id)"
+          >
+            <span>{{ dataListindex + 1 }}、</span>
+            {{ dataListitem.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+  import { ref, defineProps, watch } from 'vue'
+  import { useRouter } from 'vue-router'
+  const router = useRouter()
+  import DetalsTitle from '@/views/detailsAll/components/DetalsTitle.vue'
+  const props = defineProps({
+    associatedComponents: { type: Array, default: null },
+  })
+  const dataFrom = ref([])
+  const flag = ref(true)
+  const oldid = router.currentRoute.value.query.id
+  //点击查看详情
+  const switchFunction = (id) => {
+    router.push({
+      path: '/details',
+      query: {
+        id: id,
+      },
+    })
+  }
+  if (props.associatedComponents) {
+    flag.value = true
+    dataFrom.value = props.associatedComponents
+    console.log('dataFrom.value', dataFrom.value)
+  } else {
+    flag.value = false
+  }
+  watch(
+    () => props.associatedComponents,
+    (val) => {
+      if (val) {
+        flag.value = true
+        dataFrom.value = props.associatedComponents
+        console.log('dataFrom.value', dataFrom.value)
+      } else {
+        flag.value = false
+      }
+    }
+  )
+  watch(
+    () => router.currentRoute.value.query.id,
+    (newValue, oldValue) => {
+      if (oldid != router.currentRoute.value.query.id) {
+        window.location.reload()
+      }
+    },
+    { immediate: true }
+  )
+</script>
+
+<style lang="less" scoped>
+  .application-associated-ability {
+    padding-top: 0.8rem;
+    padding-bottom: 0.8rem;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    .application-associated-ability-main {
+      margin-top: 0.4rem;
+      width: 13.14rem;
+      display: flex;
+      justify-content: space-between;
+      .associated-ability-card {
+        width: 4.28rem;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        border: 1px solid #e4e6f5;
+        border-radius: 0.1rem;
+        padding-bottom: 0.3rem;
+        cursor: pointer;
+        .associated-ability-card-title {
+          padding-top: 0.3rem;
+          font-size: 0.22rem;
+          text-align: center;
+        }
+        .associated-ability-card-content {
+          width: 100%;
+          margin-top: 0.25rem;
+          padding-left: 0.3rem;
+          .associated-ability-card-content-font {
+            font-size: 0.18rem;
+            color: #999;
+            margin-right: 0.15rem;
+            margin-top: 0.15rem;
+          }
+          .associated-ability-card-content-font:hover {
+            color: #0058e1;
+          }
+        }
+      }
+      .associated-ability-card:hover {
+        border-radius: 0.02rem;
+        border: 0.01rem solid #0058e1;
+        box-shadow: 0rem 0.08rem 0.2rem rgba(0, 88, 225, 0.3);
+      }
+    }
+  }
+</style>
diff --git a/front/src/views/detailsAll/components/Developer/DeveloperNavigation.vue b/front/src/views/detailsAll/components/Developer/DeveloperNavigation.vue
index 05b817f9..dc751b18 100644
--- a/front/src/views/detailsAll/components/Developer/DeveloperNavigation.vue
+++ b/front/src/views/detailsAll/components/Developer/DeveloperNavigation.vue
@@ -28,6 +28,10 @@
       name: '组件展示',
       key: 'eveloper-presentation',
     },
+    {
+      name: '关联能力',
+      key: 'developer-associated-ability',
+    },
     {
       name: '功能介绍',
       key: 'function-introduction',
@@ -66,7 +70,6 @@
   if (props.dataList.infoList) {
     list.value = []
     props.dataList.infoList.map((item) => {
-      debugger
       if (
         item.attrType === '常见问题' ||
         item.attrType === '应用案例' ||
@@ -77,6 +80,7 @@
         list.value.push('组件展示')
       }
     })
+    list.value.push('关联能力')
     navList.value.forEach((item) => {
       console.log(item)
       if (list.value.indexOf(item.name) > -1) {
@@ -111,6 +115,7 @@
             list.value.push('组件展示')
           }
         })
+        list.value.push('关联能力')
         list.value.push('组件试用')
         list.value.push('使用方式')
         navList.value.forEach((item) => {
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceAssociatedAbility.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceAssociatedAbility.vue
new file mode 100644
index 00000000..4740f254
--- /dev/null
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceAssociatedAbility.vue
@@ -0,0 +1,127 @@
+<template>
+  <div class="application-associated-ability" v-if="flag">
+    <detals-title title="关联能力" type="RELEVANCE"></detals-title>
+    <div class="application-associated-ability-main">
+      <div
+        class="associated-ability-card"
+        v-for="(item, index) in dataFrom"
+        :key="item.type"
+      >
+        <div class="associated-ability-card-title">
+          {{ item.type }}
+        </div>
+        <div class="associated-ability-card-content">
+          <div
+            class="associated-ability-card-content-font"
+            v-for="(dataListitem, dataListindex) in item.dataList"
+            :key="dataListitem.id"
+            @click="switchFunction(dataListitem.id)"
+          >
+            <span>{{ dataListindex + 1 }}、</span>
+            {{ dataListitem.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+  import { ref, defineProps, watch } from 'vue'
+  import { useRouter } from 'vue-router'
+  const router = useRouter()
+  import DetalsTitle from '@/views/detailsAll/components/DetalsTitle.vue'
+  const props = defineProps({
+    associatedComponents: { type: Array, default: null },
+  })
+  const dataFrom = ref([])
+  const flag = ref(true)
+  const oldid = router.currentRoute.value.query.id
+  //点击查看详情
+  const switchFunction = (id) => {
+    router.push({
+      path: '/details',
+      query: {
+        id: id,
+      },
+    })
+  }
+  if (props.associatedComponents) {
+    flag.value = true
+    dataFrom.value = props.associatedComponents
+    console.log('dataFrom.value', dataFrom.value)
+  } else {
+    flag.value = false
+  }
+  watch(
+    () => props.associatedComponents,
+    (val) => {
+      if (val) {
+        flag.value = true
+        dataFrom.value = props.associatedComponents
+        console.log('dataFrom.value', dataFrom.value)
+      } else {
+        flag.value = false
+      }
+    }
+  )
+  watch(
+    () => router.currentRoute.value.query.id,
+    (newValue, oldValue) => {
+      if (oldid != router.currentRoute.value.query.id) {
+        window.location.reload()
+      }
+    },
+    { immediate: true }
+  )
+</script>
+
+<style lang="less" scoped>
+  .application-associated-ability {
+    padding-top: 0.8rem;
+    padding-bottom: 0.8rem;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    .application-associated-ability-main {
+      margin-top: 0.4rem;
+      width: 13.14rem;
+      display: flex;
+      justify-content: space-between;
+      .associated-ability-card {
+        width: 4.28rem;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        border: 1px solid #e4e6f5;
+        border-radius: 0.1rem;
+        padding-bottom: 0.3rem;
+        cursor: pointer;
+        .associated-ability-card-title {
+          padding-top: 0.3rem;
+          font-size: 0.22rem;
+          text-align: center;
+        }
+        .associated-ability-card-content {
+          width: 100%;
+          margin-top: 0.25rem;
+          padding-left: 0.3rem;
+          .associated-ability-card-content-font {
+            font-size: 0.18rem;
+            color: #999;
+            margin-right: 0.15rem;
+            margin-top: 0.15rem;
+          }
+          .associated-ability-card-content-font:hover {
+            color: #0058e1;
+          }
+        }
+      }
+      .associated-ability-card:hover {
+        border-radius: 0.02rem;
+        border: 0.01rem solid #0058e1;
+        box-shadow: 0rem 0.08rem 0.2rem rgba(0, 88, 225, 0.3);
+      }
+    }
+  }
+</style>
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue
index b6c96318..cdaa2258 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue
@@ -32,6 +32,10 @@
       name: '图层信息',
       key: 'service-information',
     },
+    {
+      name: '关联能力',
+      key: 'layer-service-associated-ability',
+    },
     {
       name: '应用场景',
       key: 'service-application-scenarios',
@@ -117,7 +121,7 @@
         list.value.push('使用方式')
       }
     })
-
+    list.value.push('关联能力')
     navList.value.forEach((item) => {
       console.log(item)
       if (list.value.indexOf(item.name) > -1) {
@@ -192,6 +196,7 @@
             list.value.push('使用方式')
           }
         })
+        list.value.push('关联能力')
         list.value.push('图层信息')
         list.value.push('使用方式')
         navList.value.forEach((item) => {
diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 931abc69..5060a8ba 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -1018,7 +1018,6 @@
               })
               console.log('paramsGetResources', paramsGetResources)
             }
-            // debugger
             tecHnosphere = router.currentRoute.value.query.tecHnosphere
             appLiCation = router.currentRoute.value.query.appLiCation
             if (val.typeList && val.typeList.length > 6) {
@@ -1099,7 +1098,6 @@
           if (switchIndex != '分页查询') {
             paramsGetResources.pageNum = 1
           }
-          debugger
           pageWithAttrs(paramsGetResources).then((res) => {
             console.log('查询列表============>', resourceList, res.data.data)
             resourceList.data = []
@@ -1193,7 +1191,6 @@
         paramsGetResources.pageNum = val
         let params = '分页查询' //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
         getAppResources(params)
-        debugger
       }
       // const findZywMessage = () => {
       //   zywMessage().then((res) => {
@@ -1246,7 +1243,6 @@
         router.currentRoute.value.query.appLiCation = ''
         tecHnosphere = router.currentRoute.value.query.tecHnosphere
         appLiCation = router.currentRoute.value.query.appLiCation
-        // debugger
         let newQuery = JSON.parse(
           JSON.stringify(router.currentRoute.value.query)
         )

From 819806a367bc179a5a9ab07a2e43377e1199bdcb Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Wed, 29 Jun 2022 17:23:32 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=EF=BC=9A?=
 =?UTF-8?q?=E8=81=94=E8=B0=83=20=E5=BE=85=E5=8A=9E=20=E5=B7=B2=E5=8A=9Eapi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/workBench/api.js       |  46 +++++++
 .../workBench/components/dept-chart-view.vue  |   7 +-
 .../workBench/components/dept-todo-view.vue   | 128 +++++++++++++++++-
 .../src/views/modules/workBench/workBench.vue |  56 +++++++-
 4 files changed, 225 insertions(+), 12 deletions(-)
 create mode 100644 back/src/views/modules/workBench/api.js

diff --git a/back/src/views/modules/workBench/api.js b/back/src/views/modules/workBench/api.js
new file mode 100644
index 00000000..52da4412
--- /dev/null
+++ b/back/src/views/modules/workBench/api.js
@@ -0,0 +1,46 @@
+// /resource/getByDept
+import http from '@/utils/request';
+
+function Request({
+    methods, url, data, success, fali
+}) {
+    let _key = methods == 'get' ? 'params' : 'data';
+    return new Promise((resolve, reject) => {
+        http[methods](url, {
+            [_key]: data
+        }).then(res => {
+            resolve(res)
+        }, err => {
+            reject(err)
+        })
+    })
+
+}
+
+// /resource/getByDept:获取当前登录用户所在部门发布的资源
+
+// 部门待办列表
+export const getToDoTask = (data, success, fail) => {
+    Request({
+        methods: 'get',
+        url: '/act/task/deptToDoTaskPage',
+        data
+    }).then(res => {
+        success && success(res)
+    }).catch(err => {
+        fail && fail(err)
+    })
+}
+
+// 部门已办列表
+export const getHasToDoTask = (data, success, fail) => {
+    Request({
+        methods: 'get',
+        url: '/act/his/getDeptHandledInstancePage',
+        data
+    }).then(res => {
+        success && success(res)
+    }).catch(err => {
+        fail && fail(err)
+    })
+}
\ No newline at end of file
diff --git a/back/src/views/modules/workBench/components/dept-chart-view.vue b/back/src/views/modules/workBench/components/dept-chart-view.vue
index 753f6902..126c5706 100644
--- a/back/src/views/modules/workBench/components/dept-chart-view.vue
+++ b/back/src/views/modules/workBench/components/dept-chart-view.vue
@@ -1,11 +1,6 @@
 <template>
     <div class="dept-box">
-        <div class="left-title-box">
-            <div class="content">
-                <!-- <img class="img" :src=""></img> -->
-                <div></div>
-            </div>
-        </div>
+       
     </div>
 </template>
 <script>
diff --git a/back/src/views/modules/workBench/components/dept-todo-view.vue b/back/src/views/modules/workBench/components/dept-todo-view.vue
index 1f50786e..a500f1b8 100644
--- a/back/src/views/modules/workBench/components/dept-todo-view.vue
+++ b/back/src/views/modules/workBench/components/dept-todo-view.vue
@@ -1,18 +1,140 @@
 <template>
-    <div class="dept-box">
-
+    <div class="dept-box" :class="dataInfo.noMarginleft ? 'no-margin-left' : ''">
+        <div class="left-box"
+            :style="{ 'background': dataInfo.bgColor, 'border-right': `1px solid ${dataInfo.borderColor}` }">
+            <div class="content">
+                <img class="img" :src="dataInfo.imgSrc" />
+                <div class="title">{{ title }}</div>
+                <div class="flex-row-bottom">
+                    <span class="num" :style="{ 'color': dataInfo.textColor }">{{ formatNum(dataInfo.num) }}</span>
+                    <span class="unit" :style="{ 'color': dataInfo.textColor }">{{ dataInfo.unit || '个' }}</span>
+                </div>
+            </div>
+        </div>
+        <div class="list-box" v-if="dataInfo.list.length > 0">
+            <div class="list-item" v-for="(item, i) in dataInfo.list" :key="i">
+                {{ item[dataInfo.nameStr] || '--' }}
+            </div>
+            <div class="more">
+                查看更多 >
+            </div>
+        </div>
+        <div class="list-box flex-row-center no-data" v-else>
+            暂无数据
+        </div>
     </div>
 </template>
 <script>
 export default {
+    data() {
+        return {
 
+        }
+    },
+    props: {
+        dataInfo: {
+            type: Object,
+            default: () => { }
+        },
+        title: {
+            type: String,
+            default: ''
+        },
+    },
+    methods: {
+        formatNum(num) {
+            return num || num === 0 ? num : '--'
+        }
+    }
 }
 </script>
 <style lang="scss" scoped>
+.no-margin-left {
+    margin-left: 0;
+}
+
+.flex-row-bottom {
+    display: flex;
+    justify-content: center;
+    align-items: baseline;
+}
+
+.flex-row-center {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
 .dept-box {
+    display: flex;
+    align-items: center;
     width: 394px;
     height: 252px;
     margin: 16px;
-    background: pink;
+    background: rgba($color: #f1f3f6, $alpha: 0.8);
+}
+
+.left-box {
+    display: flex;
+    justify-content: center;
+    width: 80px;
+    border-radius: 2px;
+    height: 100%;
+}
+
+.img {
+    height: 50px;
+    width: 50px;
+    margin: 0 auto;
+}
+
+.content {
+    // margin-top: 57px;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+}
+
+.title {
+    font-size: 18px;
+    color: #000;
+    margin-top: 25px;
+    margin-bottom: 18px;
+}
+
+.num {
+    font-size: 30px;
+}
+
+.unit {
+    font-size: 16px;
+    margin-left: 2px;
+}
+
+.list-box {
+    width: 314px;
+    height: 252px;
+}
+
+.list-item {
+    height: 44px;
+    line-height: 44px;
+    box-sizing: border-box;
+    border-bottom: 1px dashed #c6c6c6;
+    font-size: 16px;
+    color: #212121;
+}
+
+.more {
+    color: #212121;
+    font-size: 14px;
+    height: 32px;
+    line-height: 32px;
+    text-align: right;
+}
+
+.no-data {
+    font-size: 16px;
+    color: #212121;
 }
 </style>
\ No newline at end of file
diff --git a/back/src/views/modules/workBench/workBench.vue b/back/src/views/modules/workBench/workBench.vue
index 20998672..a8033a0e 100644
--- a/back/src/views/modules/workBench/workBench.vue
+++ b/back/src/views/modules/workBench/workBench.vue
@@ -22,6 +22,7 @@
 import BottomView from '../workBench/components/bottom-view.vue'
 import CenterView from '../workBench/components/center-view.vue'
 import deptTodoView from '../workBench/components/dept-todo-view.vue'
+import * as Apis from './api'
 
 export default {
     components: {
@@ -34,16 +35,65 @@ export default {
             // 部门待办
             toToData: {
                 color: '#f86f01',
-                // imgSrc: require(''),
+                imgSrc: require('@/assets/img/workBench/todo.png'),
+                bgColor: 'rgba(228,138,1,0.12)',
+                borderColor: 'rgba(250,123,12,0.54)',
+                textColor: '#f86f01',
+                num: 34,
+                list: [],
+                nameStr: 'taskName'
             },
             // 部门已办
             hasToDodoData: {
+                noMarginleft: true,
                 color: '#21b107',
+                imgSrc: require('@/assets/img/workBench/hasToDo.png'),
+                bgColor: 'rgba(37,165,13,0.12)',
+                borderColor: 'rgba(49,194,20,0.54)',
+                textColor: '#21b107',
+                num: 34,
+                list: [],
+                nameStr: 'processDefinitionName'
             }
         }
     },
+    mounted() {
+        this.getToDo()
+        this.getHasToDo()
+    },
     methods: {
-
+        // 待办
+        getToDo() {
+            let data = {
+                limit: 5,
+                page: 1,
+            }
+            Apis.getToDoTask(data, res => {
+                if (res.data.code !== 0) {
+                    return;
+                }
+                console.log('res----待办-------->', res.data);
+                this.toToData.list = res.data.data.records || []
+            }, err => {
+                console.log('err-----待办------->', err);
+            })
+        },
+        // 已办
+        getHasToDo() {
+            let data = {
+                limit: 5,
+                page: 1,
+            }
+            Apis.getHasToDoTask(data, res => {
+                if (res.data.code !== 0) {
+                    return;
+                }
+                console.log('res----已办-------->', res.data);
+                this.hasToDodoData.list = res.data.data.records || []
+            }, err => {
+                console.log('err-----已办------->', err);
+            })
+        },
     },
 }
 </script>
@@ -64,7 +114,7 @@ export default {
     .top {
         height: 284px;
         margin-bottom: 16px;
-        background: green;
+        background: #fff;
     }
 
     .dept-left {

From ccbcab8dfaea2d427437f1314ad21284add64e8b Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Wed, 29 Jun 2022 17:28:49 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E6=96=B0=E8=83=BD=E5=8A=9B=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/public/index.html                        |   7 +-
 .../activiti/demo/correction-process2.vue     | 295 ++++++-----
 .../modules/myAgent/CompetencyApplication.vue |  23 +-
 .../myAgent/demo/competency-application.vue   | 460 ++++++++++++++++++
 front/public/index.html                       |   8 +-
 front/src/api/home.js                         |   6 +-
 front/src/views/home/AbilityToApplyFor.vue    |   8 +-
 front/src/views/home/apply.vue                | 264 +++++++---
 .../components/PurchaseVehicle.vue            |  15 +-
 9 files changed, 833 insertions(+), 253 deletions(-)
 create mode 100644 back/src/views/modules/myAgent/demo/competency-application.vue

diff --git a/back/public/index.html b/back/public/index.html
index eb19bbb6..f975e31c 100644
--- a/back/public/index.html
+++ b/back/public/index.html
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-11 10:11:40
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-23 18:30:45
+ * @LastEditTime: 2022-06-29 16:59:38
  * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@@ -42,8 +42,9 @@
   <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
     <script>
       // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.166:8888/renren-admin';
-    window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin';
-    // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
+    // window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin';
+    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
+    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
     // window.SITE_CONFIG['apiURL'] = 'http://15.2.23.141:8000/renren-admin';
     // WebSocket地址
     window.SITE_CONFIG['socketURL'] ='ws://localhost:8080/renren-admin/websocket';
diff --git a/back/src/views/modules/activiti/demo/correction-process2.vue b/back/src/views/modules/activiti/demo/correction-process2.vue
index 04b1db78..f242b753 100644
--- a/back/src/views/modules/activiti/demo/correction-process2.vue
+++ b/back/src/views/modules/activiti/demo/correction-process2.vue
@@ -241,180 +241,177 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-::v-deep .big-BOX{
-  background:rgba(244,245,248,0.8);
-  padding:24px;
-  h3{
-    font-size:16px;
-    color:#212121
+::v-deep .big-BOX {
+  background: rgba(244, 245, 248, 0.8);
+  padding: 24px;
+  h3 {
+    font-size: 16px;
+    color: #212121;
   }
-  p{
-    width:78%;
-    display:flex;
+  p {
+    width: 78%;
+    display: flex;
     justify-content: space-between;
-    color:#212121;
-    font-size:14px;
-    span{
-      display:inline-block;
-      margin-left:8px;
-      line-height:32px;
-      span{
-        font-weight:bold;
+    color: #212121;
+    font-size: 14px;
+    span {
+      display: inline-block;
+      margin-left: 8px;
+      line-height: 32px;
+      span {
+        font-weight: bold;
       }
     }
   }
-  p:last-of-type{
-    margin-top:16px;
-    width:100%;
-    span{
-      display:flex;
-      span{
-      padding:0 12px;
-      height:32px;
-      background:rgba(232,234,239,1);
-      border-radius:2px;
-      button{
-        background:unset;
-        border:0;
-        color:#0558e1;
-        font-size:14px;
-      }
+  p:last-of-type {
+    margin-top: 16px;
+    width: 100%;
+    span {
+      display: flex;
+      span {
+        padding: 0 12px;
+        height: 32px;
+        background: rgba(232, 234, 239, 1);
+        border-radius: 2px;
+        button {
+          background: unset;
+          border: 0;
+          color: #0558e1;
+          font-size: 14px;
+        }
       }
     }
   }
 }
-::v-deep .AbilityApply{
-    margin-top:32px;
+::v-deep .AbilityApply {
+  margin-top: 32px;
 
-  h3{
-     font-size:16px;
-    color:#212121;
-    border-bottom:1px solid #dddee1;
-    padding-bottom:10px;
-  }
-  ul{
-    padding-left: 0px;
-     li{
-      list-style:none;
-    padding: 30px 0;
+  h3 {
+    font-size: 16px;
+    color: #212121;
     border-bottom: 1px solid #dddee1;
-    display:flex;
-    img{
-      width:100px;
-      height:100px;
-    }
-    div{
-      margin-left:16px;
-          display: flex;
-    flex-direction: column;
-    justify-content: center;
-    h2{
-      margin-bottom:20px;
-      font-size:20px;
-      color:#000;
-      display:flex;
-      span{
-        display:block;
-        font-size:14px;
-        color:#ffffff;
-        margin-left:8px;
-        background:rgba(0,184,230,0.8);
+    padding-bottom: 10px;
+  }
+  ul {
+    padding-left: 0px;
+    li {
+      list-style: none;
+      padding: 30px 0;
+      border-bottom: 1px solid #dddee1;
+      display: flex;
+      img {
+        width: 100px;
+        height: 100px;
+      }
+      div {
+        margin-left: 16px;
         display: flex;
-    align-items: center;
-    padding: 0 5px;
-    border-radius: 4px;
+        flex-direction: column;
+        justify-content: center;
+        h2 {
+          margin-bottom: 20px;
+          font-size: 20px;
+          color: #000;
+          display: flex;
+          span {
+            display: block;
+            font-size: 14px;
+            color: #ffffff;
+            margin-left: 8px;
+            background: rgba(0, 184, 230, 0.8);
+            display: flex;
+            align-items: center;
+            padding: 0 5px;
+            border-radius: 4px;
+          }
+        }
+        p {
+          margin-bottom: 0;
+        }
       }
     }
-     p{
-      margin-bottom:0;
+    .clearfix:after {
+      display: block;
+      content: "";
+      clear: both;
     }
+    .title {
+      color: #0558e1;
+      font-size: 18px;
+      padding-bottom: 0;
+      border-bottom: 0;
     }
+    .title:before {
+      content: "";
+      width: 6px;
+      height: 6px;
+      display: inline-block;
+      border-radius: 50%;
+      background: #0558e1;
+      vertical-align: middle;
+      margin-right: 10px;
+      margin-top: 6px;
     }
-    .clearfix:after{
-      display:block;
-      content:"";
-      clear:both;
-    }
-    .title{
-      color:#0558e1;
-      font-size:18px;
-      padding-bottom:0;
-    border-bottom: 0;
-
-    }
-     .title:before {
-           content: "";
-           width: 6px;
-           height: 6px;
-           display: inline-block;
-           border-radius: 50%;
-           background: #0558e1;
-           vertical-align: middle;
-          margin-right: 10px;
-    margin-top: 6px;
-           }
-
   }
 }
-::v-deep .agreeOr>div{
-  display:flex;
-      align-items: center;
-  .el-input{
+::v-deep .agreeOr > div {
+  display: flex;
+  align-items: center;
+  .el-input {
     margin-right: 10px;
     margin-left: 32px;
   }
-
 }
-::v-deep   .agreeOr>div:last-of-type{
-    margin-top:15px;
+::v-deep .agreeOr > div:last-of-type {
+  margin-top: 15px;
+}
+.blueAll {
+  ::v-deep .el-radio-button__inner {
+    width: 80px;
+    height: 32px;
+    line-height: 32px;
+    padding: 0;
+    border-radius: 2px;
+    background: #ffffff;
+    color: #0558e1;
+    border: 1px solid #0558e1;
   }
-  .blueAll{
-    ::v-deep .el-radio-button__inner{
-    width:80px;
-    height:32px;
-    line-height:32px;
-    padding:0;
-    border-radius:2px;
-    background:#ffffff;
-    color:#0558e1;
-    border:1px solid #0558e1;
+  ::v-deep .el-radio-button__orig-radio:checked + .el-radio-button__inner {
+    box-shadow: unset !important;
+    background: #0558e1;
+    color: #ffffff;
   }
-   ::v-deep .el-radio-button__orig-radio:checked+.el-radio-button__inner{
-      box-shadow: unset !important;
-    background:#0558e1;
-    color:#ffffff;
+}
+.inputBule {
+  width: 55px;
+  height: 32px;
+  line-height: 32px;
+  padding: 0;
+  border-radius: 2px;
+  background: #0558e1;
+  color: #ffffff;
+  border: 1px solid #0558e1;
+}
+.redAll {
+  margin-left: 10px;
+  ::v-deep .el-radio-button__inner {
+    width: 80px;
+    height: 32px;
+    line-height: 32px;
+    padding: 0;
+    border-radius: 2px;
+    border: 1px solid #e83a48;
+    background: #ffffff;
+    color: #e83a48;
+    margin-left: 10px;
   }
+  ::v-deep .el-radio-button__orig-radio:checked + .el-radio-button__inner {
+    box-shadow: unset !important;
+    color: #ffffff;
+    background: #e83a48;
   }
-  .inputBule{
-     width:55px;
-    height:32px;
-    line-height:32px;
-    padding:0;
-    border-radius:2px;
-    background:#0558e1;
-    color:#ffffff;
-    border:1px solid #0558e1;
-  }
-  .redAll{
-    margin-left:10px;
-    ::v-deep .el-radio-button__inner{
-    width:80px;
-    height:32px;
-    line-height:32px;
-    padding:0;
-    border-radius:2px;
-   border:1px solid #e83a48;
-    background:#ffffff;
-    color:#e83a48;
-    margin-left:10px;
-    }
-    ::v-deep .el-radio-button__orig-radio:checked+.el-radio-button__inner{
-      box-shadow: unset !important;
-       color:#ffffff;
-      background: #e83a48;
-  }
-  }
-  .blueInput{
-    width:55px;
-  }
+}
+.blueInput {
+  width: 55px;
+}
 </style>
diff --git a/back/src/views/modules/myAgent/CompetencyApplication.vue b/back/src/views/modules/myAgent/CompetencyApplication.vue
index 1a3edea2..ceae9900 100644
--- a/back/src/views/modules/myAgent/CompetencyApplication.vue
+++ b/back/src/views/modules/myAgent/CompetencyApplication.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-27 11:27:22
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-27 11:50:45
+ * @LastEditTime: 2022-06-29 16:31:26
  * @Description: 能力申请
 -->
 <template>
@@ -43,11 +43,7 @@
         <el-table-column label="申请人" header-align="center" align="center">
           <template slot-scope="scope">
             <span>{{
-              (scope.row.params && scope.row.params.user) ||
-              (scope.row.params && scope.row.params.applyUserName) ||
-              (scope.row.params && scope.row.params.userName) ||
-              (scope.row.params && scope.row.params.undercarriageUserName)||
-              (scope.row.params && scope.row.params.name)
+              (scope.row.params && scope.row.params.tAbilityApplicationDTOList[0].user)
             }}</span>
           </template>
         </el-table-column>
@@ -58,13 +54,7 @@
         >
           <template slot-scope="scope">
             <span>{{
-              (scope.row.params && scope.row.params.system) ||
-              (scope.row.params && scope.row.params.demandSubject) ||
-              (scope.row.params &&
-                scope.row.params.resourceDTO &&
-                scope.row.params.resourceDTO.name) ||
-              (scope.row.params && scope.row.params.undercarriageReason)||
-              (scope.row.params && scope.row.params.comment)
+              (scope.row.params && scope.row.params.tAbilityApplicationDTOList[0].title)
             }}</span>
           </template>
         </el-table-column>
@@ -104,12 +94,12 @@
               @click="taskHandle(scope.row)"
               >{{ $t("manage") }}</el-button
             >
-            <el-button
+            <!-- <el-button
               type="text"
               size="small"
               @click="taskDetail(scope.row)"
               >{{ $t("process.viewFlowImage") }}</el-button
-            >
+            > -->
           </template>
         </el-table-column>
       </el-table>
@@ -143,7 +133,8 @@ export default {
       },
       dataForm: {
         taskName: '',
-        taskId: ''
+        taskId: '',
+        processDefinitionKey: 'abilityprocess_v2'
       },
       processInstanceId: ''
     }
diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue
new file mode 100644
index 00000000..f3f02e2a
--- /dev/null
+++ b/back/src/views/modules/myAgent/demo/competency-application.vue
@@ -0,0 +1,460 @@
+<!--
+ * @Author: hisense.liangjunhua
+ * @Date: 2022-06-29 15:59:51
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-06-29 17:21:00
+ * @Description: 告诉大家这是什么
+-->
+<!--  流程业务表单   -->
+<template>
+  <el-card shadow="never" class="aui-card--fill" :key='showKey'>
+
+  <!-- 申请人详情 -->
+  <div>
+     <h3>申请人信息</h3>
+    <div class="big-BOX">
+      <p>
+        <span class="text">申请人：<span> {{dataForm.content.user || '--'}}</span></span>
+        <span class="text">电话：<span>{{dataForm.content.phone || '--'}}</span></span>
+        <span class="text">单位：<span>{{dataForm.content.unit || '--'}}</span></span>
+      </p>
+      <p>
+        <span class="text"> 能力申请标题：<span> {{dataForm.content.title|| '--'}}</span></span>
+        <span class="text">应用系统：<span>{{dataForm.content.applicationSystem || '--'}}</span></span>
+        <span class="text">应用场景：<span> {{dataForm.content.applicationSceneStr || '--'}}</span></span>
+      </p>
+      <p>
+        <span> 能力应用期望效果：<span> {{dataForm.content.effectWish|| '--'}}</span></span>
+      </p>
+      <p v-if="dataForm.content.enclosure">
+      <span> 申请附件：<span> {{dataForm.content.enclosure|| '--'}}<button  @click="downloadFile2(dataForm.content.enclosure)">预览</button></span></span>
+
+      </p>
+    </div>
+  </div>
+
+  <!-- 申请能力 -->
+  <div class="AbilityApply">
+     <h3>申请能力</h3>
+    <ul  v-for="item in dataList" :key="item.id">
+      <!-- <li class="title">{{item.address}}</li> -->
+      <li class="clearfix">
+            <img
+              src="~@/assets/img/imgLeft.png"
+            />
+            <div>
+            <h2>{{item.name}}<span>{{item.type}}</span></h2>
+            <p>{{item.describe}}</p>
+            </div>
+      </li>
+    </ul>
+  </div>
+    <!--  流程综合组件   -->
+  <!--   <ren-process-multiple
+      v-if="processVisible"
+      updateInstanceIdUrl="/processForm/tabilityapplication/updateInstanceId"
+      saveFormUrl="/processForm/tabilityapplication"
+      dataFormName="dataForm"
+      ref="renProcessMultiple"
+    ></ren-process-multiple> -->
+
+    <!-- 审批 -->
+    <div class="agreeOr">
+      <h3>审批</h3>
+      <div>
+        <el-radio-group v-model="agreeOrList" style="width:230px;">
+          <el-radio-button label="同意" class="blueAll">同意</el-radio-button>
+          <el-radio-button label="退回" class="redAll">退回</el-radio-button>
+        </el-radio-group>
+        <el-input v-if="agreeOrList ==='同意' " v-model="inputAgree" placeholder="请输入同意意见"></el-input>
+        <el-input v-if="agreeOrList ==='退回'" v-model="inputNo" placeholder="请输入退回意见"></el-input>
+         <el-button class="inputBule" @click="agreeOrNot">提交</el-button>
+      </div>
+    </div>
+
+ <!--  流程详情   -->
+    <ren-process-detail-import></ren-process-detail-import>
+  </el-card>
+</template>
+
+<script>
+// 引入工作流公共方法
+import processModule from '@/mixins/process-module'
+import debounce from 'lodash/debounce'
+import qs from 'qs'
+import RenProcessDetailImport from '@/components/ren-process-detail/src/ren-process-detail-import'
+export default {
+  // 注入公共方法
+  mixins: [processModule],
+  data () {
+    return {
+      visible: true,
+      showKey: 0,
+      // 表单属性是否可编辑
+      // fieldDisabled: false,
+      // dataForm: {
+      //   id: '',
+      //   user: '',
+      //   phone: '',
+      //   unit: '',
+      //   area: '',
+      //   system: '',
+      //   scene: '',
+      //   basis: ''
+      // }
+      dataForm: {
+        id: '',
+        content: {}
+      },
+      dataList: [],
+      inputAgree: '',
+      inputNo: '',
+      agreeOrList: '同意'
+    }
+  },
+  created () {
+    // 将业务KEY赋值给表单
+    console.log('params=================>', this.$route, this.$route.params)
+    this.dataForm.taskId = this.$route.params.taskId
+    this.init()
+    // // 流程回调
+    var callbacks = {
+      startProcessSuccessCallback: this.closeCurrentTab,
+      startProcessErrorCallback: this.startProcessErrorCallback,
+      taskHandleSuccessCallback: this.closeCurrentTab,
+      taskHandleErrorCallback: this.taskHandleErrorCallback,
+      formSaveSuccessCallback: null,
+      formSaveErrorCallback: null
+    }
+    // 初始化综合组件
+    this.initProcessMultiple(callbacks)
+  },
+  computed: {
+    // dataRule () {
+    //   return {
+    //     inputAgree: [
+    //       { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+    //     ],
+    //     inputNo: [
+    //       { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+    //     ]
+    //   }
+    // }
+  },
+  components: {
+    RenProcessDetailImport
+  },
+  methods: {
+    init () {
+      // this.visible = true
+      this.$nextTick(() => {
+        // this.$refs.dataForm.resetFields()
+        if (this.dataForm.taskId) {
+          // 如业务KEY已存在，不允许编辑
+          // this.fieldDisabled = true
+          this.getInfo()
+          console.log(this.dataForm, 'init')
+        }
+      })
+    },
+    downloadFile2 (url) {
+      window.open(
+        window.SITE_CONFIG.previewUrl +
+        'hisense_office/onlinePreview?url=' +
+        btoa(encodeURI(url))
+      )
+    },
+    // 获取信息
+    getInfo () {
+      this.$http
+        .get(`/act/task/getTaskVariables?taskId=${this.dataForm.taskId}&variableName=tAbilityApplicationDTOList`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            console.log(res.data)
+            return this.$message.error(res.msg)
+          }
+          console.log(res.data, this.dataForm, 'elas============================')
+          if (res.data.tAbilityApplicationDTOList[0].applicationScene) {
+            res.data.tAbilityApplicationDTOList[0].applicationSceneStr = ''
+            res.data.tAbilityApplicationDTOList[0].applicationScene.map((val, index) => {
+              res.data.tAbilityApplicationDTOList[0].applicationSceneStr += val
+              if (index < res.data.tAbilityApplicationDTOList[0].applicationScene.length - 1) {
+                res.data.tAbilityApplicationDTOList[0].applicationSceneStr += '、'
+              }
+            })
+          }
+          this.dataForm.content = res.data.tAbilityApplicationDTOList[0]
+          res.data.tAbilityApplicationDTOList.map(val => {
+            this.$http.get('/resource/' + val.resourceId).then(res1 => {
+              console.log(res1.data.data, '1111111111111111111111111111111111')
+              this.dataList.push({
+                name: res1.data.data.name,
+                type: res1.data.data.type,
+                describe: res1.data.data.description
+              })
+            })
+          })
+        })
+        .catch(() => {})
+    },
+    // 申请能力
+    applyData () {
+      this.$http
+        .get(`/resource/select/${this.dataForm.instanceId}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            console.log(res.data, 'hhhhh')
+            // return this.$message.error(res.msg)
+          }
+          // console.log(res.data, 'elas')
+          // this.dataForm.content = res.data
+          // console.log(this.dataForm, 'ela')
+        })
+        .catch(() => {})
+    },
+    // 同意与退回
+    agreeOrNot: debounce(function () {
+      if (this.agreeOrList === '同意') {
+        console.log('this.dataForm', this.dataForm)
+        const params = qs.stringify({
+          taskId: this.dataForm.taskId,
+          comment: this.inputAgree
+        })
+        console.log(params)
+        this.$http.post('/act/task/complete?' + params).then(({ data: res }) => {
+          if (res.code !== 0) {
+            this.$message.error(res.msg)
+            if (this.callbacks.taskHandleErrorCallback) {
+              this.callbacks.taskHandleErrorCallback(res)
+            }
+            return
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              if (this.callbacks.taskHandleSuccessCallback) {
+                this.callbacks.taskHandleSuccessCallback(res)
+              }
+            }
+          })
+        }).catch(() => {})
+      } else if (this.agreeOrList === '退回') {
+        const params = qs.stringify({
+          taskId: this.dataForm.taskId,
+          comment: this.inputNo
+        })
+        this.$http.post('/act/task/backToFirst?', params).then(({ data: res }) => {
+          if (res.code !== 0) {
+            this.$message.error(res.msg)
+            if (this.callbacks.taskHandleErrorCallback) {
+              this.callbacks.taskHandleErrorCallback(res)
+            }
+            return
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              if (this.callbacks.taskHandleSuccessCallback) {
+                this.callbacks.taskHandleSuccessCallback(res)
+              }
+            }
+          })
+        })
+      }
+    }, 1000, { leading: true, trailing: false }),
+    // 启动流程出错回调
+    startProcessErrorCallback (data) {
+      console.log(data)
+    },
+    // 任务处理出错回调
+    taskHandleErrorCallback (data) {}
+  },
+  mounted () {
+    // this.applyData()
+  }
+}
+</script>
+<style scoped lang="scss">
+::v-deep .big-BOX {
+  background: rgba(244, 245, 248, 0.8);
+  padding: 24px;
+  h3 {
+    font-size: 16px;
+    color: #212121;
+  }
+  p {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    color: #212121;
+    font-size: 14px;
+    span {
+      display: inline-block;
+      margin-left: 8px;
+      line-height: 32px;
+      span {
+        font-weight: bold;
+      }
+    }
+    .text {
+      width: 500px;
+    }
+  }
+  p:last-of-type {
+    margin-top: 16px;
+    width: 100%;
+    span {
+      display: flex;
+      span {
+        padding: 0 12px;
+        height: 32px;
+        background: rgba(232, 234, 239, 1);
+        border-radius: 2px;
+        button {
+          background: unset;
+          border: 0;
+          color: #0558e1;
+          font-size: 14px;
+        }
+      }
+    }
+  }
+}
+::v-deep .AbilityApply {
+  margin-top: 32px;
+
+  h3 {
+    font-size: 16px;
+    color: #212121;
+    border-bottom: 1px solid #dddee1;
+    padding-bottom: 10px;
+  }
+  ul {
+    padding-left: 0px;
+    li {
+      list-style: none;
+      padding: 30px 0;
+      border-bottom: 1px solid #dddee1;
+      display: flex;
+      img {
+        width: 100px;
+        height: 100px;
+      }
+      div {
+        margin-left: 16px;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        h2 {
+          margin-bottom: 20px;
+          font-size: 20px;
+          color: #000;
+          display: flex;
+          span {
+            display: block;
+            font-size: 14px;
+            color: #ffffff;
+            margin-left: 8px;
+            background: rgba(0, 184, 230, 0.8);
+            display: flex;
+            align-items: center;
+            padding: 0 5px;
+            border-radius: 4px;
+          }
+        }
+        p {
+          margin-bottom: 0;
+        }
+      }
+    }
+    .clearfix:after {
+      display: block;
+      content: "";
+      clear: both;
+    }
+    .title {
+      color: #0558e1;
+      font-size: 18px;
+      padding-bottom: 0;
+      border-bottom: 0;
+    }
+    .title:before {
+      content: "";
+      width: 6px;
+      height: 6px;
+      display: inline-block;
+      border-radius: 50%;
+      background: #0558e1;
+      vertical-align: middle;
+      margin-right: 10px;
+      margin-top: 6px;
+    }
+  }
+}
+::v-deep .agreeOr > div {
+  display: flex;
+  align-items: center;
+  .el-input {
+    margin-right: 10px;
+    margin-left: 32px;
+  }
+}
+::v-deep .agreeOr > div:last-of-type {
+  margin-top: 15px;
+}
+.blueAll {
+  ::v-deep .el-radio-button__inner {
+    width: 80px;
+    height: 32px;
+    line-height: 32px;
+    padding: 0;
+    border-radius: 2px;
+    background: #ffffff;
+    color: #0558e1;
+    border: 1px solid #0558e1;
+  }
+  ::v-deep .el-radio-button__orig-radio:checked + .el-radio-button__inner {
+    box-shadow: unset !important;
+    background: #0558e1;
+    color: #ffffff;
+  }
+}
+.inputBule {
+  width: 55px;
+  height: 32px;
+  line-height: 32px;
+  padding: 0;
+  border-radius: 2px;
+  background: #0558e1;
+  color: #ffffff;
+  border: 1px solid #0558e1;
+}
+.redAll {
+  margin-left: 10px;
+  ::v-deep .el-radio-button__inner {
+    width: 80px;
+    height: 32px;
+    line-height: 32px;
+    padding: 0;
+    border-radius: 2px;
+    border: 1px solid #e83a48;
+    background: #ffffff;
+    color: #e83a48;
+    margin-left: 10px;
+  }
+  ::v-deep .el-radio-button__orig-radio:checked + .el-radio-button__inner {
+    box-shadow: unset !important;
+    color: #ffffff;
+    background: #e83a48;
+  }
+}
+.blueInput {
+  width: 55px;
+}
+</style>
diff --git a/front/public/index.html b/front/public/index.html
index afc695e8..5f765f8b 100644
--- a/front/public/index.html
+++ b/front/public/index.html
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.wuhongjian
  * @Date: 2022-03-29 16:45:25
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-06-28 16:52:46
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-06-29 16:59:49
  * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@@ -45,9 +45,9 @@
     // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
     // 开发
     window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
-    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796';
+    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
     window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
-    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.239:8888/renren-admin';
+    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
     window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
     // 穿透版本
     // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
diff --git a/front/src/api/home.js b/front/src/api/home.js
index 6f560eb9..d2af042f 100644
--- a/front/src/api/home.js
+++ b/front/src/api/home.js
@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-01 19:19:40
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-06-22 18:59:03
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-06-29 14:34:24
  * @Description: 告诉大家这是什么
  */
 import request from '@/utils/request'
@@ -114,7 +114,7 @@ export function lastestPage(params) {
 // 提交申请
 export function submitApply(data) {
   return request({
-    url: '/ability/center/apply',
+    url: '/ability/center/v2/apply',
     method: 'post',
     data,
   })
diff --git a/front/src/views/home/AbilityToApplyFor.vue b/front/src/views/home/AbilityToApplyFor.vue
index 36d26a83..ec68b65f 100644
--- a/front/src/views/home/AbilityToApplyFor.vue
+++ b/front/src/views/home/AbilityToApplyFor.vue
@@ -10,7 +10,7 @@
         <span></span>
         {{ item.deptName }}
       </div>
-      <template v-for="val in item.children" :key="val.resourceId">
+      <template v-for="val in item.arr" :key="val.resourceId">
         <div class="item">
           <div class="name">
             <span>{{ val.resourceName }}</span>
@@ -48,11 +48,9 @@
   //移除方法
   const removeFunction = (data) => {
     dataForm.value.map((val) => {
-      val.children = val.children.filter(
-        (item) => item.resourceId !== data.resourceId
-      )
+      val.arr = val.arr.filter((item) => item.resourceId !== data.resourceId)
     })
-    dataForm.value = dataForm.value.filter((val) => val.children.length !== 0)
+    dataForm.value = dataForm.value.filter((val) => val.arr.length !== 0)
   }
 </script>
 
diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index 5bf6df4d..0af91f1c 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -20,6 +20,18 @@
               labelAlign="left"
               autocomplete="off"
             >
+              <div class="base-info">
+                <a-form-item
+                  label="申请标题"
+                  name="title"
+                  :rules="[{ required: true, message: '请输入申请标题' }]"
+                >
+                  <a-input
+                    placeholder="请输入能力申请标题"
+                    v-model:value="formName.title"
+                  />
+                </a-form-item>
+              </div>
               <div class="base-info">
                 <a-form-item
                   label="申请人信息"
@@ -59,71 +71,71 @@
                   <a-input
                     placeholder="请输入单位"
                     v-model:value="formName.unit"
+                    disabled
                   />
                 </a-form-item>
               </div>
-              <a-form-item
-                style="margin-bottom: 10px"
-                label="申请应用"
-                name="system"
-                :rules="[{ required: true, message: '请输入申请应用' }]"
-              >
-                <a-tooltip placement="top">
-                  <template #title>
-                    <span>{{ formName.formNameSystem }}</span>
-                  </template>
+              <div class="base-info">
+                <a-form-item
+                  label="应用系统"
+                  name="applicationSystem"
+                  :rules="[{ required: true, message: '请选择应用系统' }]"
+                >
+                  <a-select
+                    v-model:value="formName.applicationSystem"
+                    show-search
+                    placeholder="请选择应用系统"
+                    style="width: 200px"
+                    :options="systemOptions"
+                    @focus="handleFocus"
+                    @blur="handleBlur"
+                    @change="systemHandleChange"
+                    @search="systemHandleSearch"
+                  ></a-select>
+                </a-form-item>
+                <a-form-item
+                  class="applicationScene"
+                  label="应用场景"
+                  name="applicationScene"
+                  :rules="[{ required: true, message: '请选择应用场景' }]"
+                  style="width: 6.93rem"
+                >
+                  <a-select
+                    v-model:value="formName.applicationScene"
+                    :options="applicationSceneOpthion"
+                    mode="tags"
+                    :size="size"
+                    placeholder="请选择应用场景"
+                    :filterOption="false"
+                    :searchValue="false"
+                    style="width: 5.87rem"
+                  ></a-select>
+                </a-form-item>
+              </div>
+              <div>
+                <a-form-item
+                  label="应用背景"
+                  name="applicationBackground"
+                  :rules="[{ required: true, message: '请输入应用背景' }]"
+                >
                   <a-input
-                    style="width: 350px; background-color: #f5f5f5"
-                    v-model:value="formName.formNameSystem"
-                    :disabled="disabled"
+                    placeholder="请输入应用背景"
+                    v-model:value="formName.applicationBackground"
                   />
-                  <span style="width: 350px; background-color: #f5f5f5"></span>
-                </a-tooltip>
-              </a-form-item>
-
-              <a-form-item
-                style="margin-bottom: 10px"
-                label="应用场景"
-                name="scene"
-                :rules="[{ required: true, message: '请输入应用场景' }]"
-              >
-                <a-textarea
-                  style="
-                    width: 500px;
-                    height: 150px;
-                    font-size: 16px;
-                    line-height: 24px;
-                    color: #333;
-                    border: 1px solid #e0e0e0;
-                    resize: none;
-                    border-radius: 6px;
-                    padding: 10px;
-                  "
-                  v-model:value="formName.scene"
-                />
-              </a-form-item>
-
-              <a-form-item
-                style="margin-bottom: 10px"
-                label="申请依据"
-                name="basis"
-                :rules="[{ required: true, message: '请输入申请依据' }]"
-              >
-                <a-textarea
-                  style="
-                    width: 500px;
-                    height: 150px;
-                    font-size: 16px;
-                    line-height: 24px;
-                    color: #333;
-                    border: 1px solid #e0e0e0;
-                    border-radius: 6px;
-                    padding: 10px;
-                    resize: none;
-                  "
-                  v-model:value="formName.basis"
-                />
-              </a-form-item>
+                </a-form-item>
+              </div>
+              <div>
+                <a-form-item
+                  label="期望效果"
+                  name="effectWish"
+                  :rules="[{ required: true, message: '请输入期望效果' }]"
+                >
+                  <a-input
+                    placeholder="请输入期望效果"
+                    v-model:value="formName.effectWish"
+                  />
+                </a-form-item>
+              </div>
 
               <a-form-item
                 style="color: #666; font-size: 16px"
@@ -206,11 +218,7 @@
             <div>
               <img src="../../assets/home/success.png" alt="" />
             </div>
-            <p>
-              您已成功申请{{
-                formName.formNameSystem || ''
-              }},请耐心等待审批结果，结果会第一时间通知您！
-            </p>
+            <p>您已成功申请能力,请耐心等待审批结果，结果会第一时间通知您！</p>
           </div>
         </div>
       </article>
@@ -238,8 +246,10 @@
     relaunch,
     selectOne,
   } from '@/api/home'
+  import { getCategoryTreePage } from '@/api/personalCenter'
   import mybus from '@/myplugins/mybus'
   import { sgcDel, getApplyForm } from '@/api/personalCenter'
+  import { pageWithAttrs } from '@/api/home'
   // import { baseURL } from '@/config'
   // import AsideMenu from './components/asideMenu.vue'
 
@@ -257,16 +267,18 @@
       const disabled = ref(false)
       const baseURL = window.SITE_CONFIG.apiURL
       let record = ref('1')
+      const text = ref('')
       const formName = reactive({
+        title: '', // 标题
+        applicationSystem: [], // 应用系统
+        applicationScene: [], // 应用场景
+        applicationBackground: '', // 应用背景
+        effectWish: '', // 期望效果
         user: '',
         userId: '',
         phone: '',
         unit: '',
-        area: '',
         system: [],
-        scene: '',
-        basis: '',
-        formNameSystem: '',
         enclosure: '', //附件
       })
       const dataList = ref([])
@@ -294,7 +306,21 @@
           // console.log('回填数据================>', res, formName.phone)
         })
       }
-
+      const applicationSceneOpthion = ref([])
+      getCategoryTreePage({
+        page: 1,
+        limit: 20,
+        dictTypeId: '1513712507692818433',
+        deFlage: 0,
+      }).then((res) => {
+        res.data.data.list.map((val) => {
+          applicationSceneOpthion.value.push({
+            value: val.dictLabel,
+            label: val.dictLabel,
+          })
+        })
+        // console.log('字典值========>', applicationSceneOpthion.value)
+      })
       // console.log(formName.system)
       const formRef = ref()
       const applySuccess = ref(true)
@@ -350,6 +376,31 @@
             if (!formName) {
               return message.error('请设置表单名称')
             }
+            let ids = []
+            formName.system = []
+            list.value.map((val) => {
+              val.arr.map((item) => {
+                formName.system.push({
+                  resourceId: item.resourceId,
+                  resourceName: item.resourceName,
+                })
+                console.log(item.id)
+                ids.push(item.id)
+              })
+            })
+            console.log('提交数据==========================>', formName, ids)
+            submitApply(formName).then((res) => {
+              applySuccess.value = false
+              message.success('操作成功！')
+              console.log('能力申请================>', res)
+              if (ids) {
+                sgcDel({ ids: ids }).then((res) => {
+                  if (res.data.msg === 'success') {
+                    mybus.emit('getSgcNum')
+                  }
+                })
+              }
+            })
             // if (arr && arr.length !== 0) {
             //   console.log('提交')
             //   const obj = ref({})
@@ -480,6 +531,7 @@
           label: '交通运输局',
         },
       ])
+      const systemOptions = ref([])
 
       const handleChange = (info) => {
         if (info.file.status !== 'uploading') {
@@ -538,6 +590,63 @@
       //     })
       //   })
       // })
+      // 应用系统下拉
+      const flag = ref(true)
+      const systemHandleChange = (value) => {
+        console.log(`selected ${value}`)
+      }
+      const systemHandleSearch = (value) => {
+        console.log(`search ${value}`)
+        text.value = value
+        systemOptions.value = []
+        window.setTimeout(() => {
+          if (flag.value && text.value == value && text.value !== '') {
+            console.log('1秒未输入~~~~~~~~~~~~~~~~~~~~~~~~~~')
+            pageWithAttrs({
+              pageNum: 99999,
+              pageSize: 5,
+              type: '应用资源',
+              name: text.value,
+              infoList: [],
+            }).then((res) => {
+              if (res.data.code == 0) {
+                if (res.data.data.records.length == 0) {
+                  message.warning('该关键词，暂无应用资源！')
+                } else {
+                  res.data.data.records.map((val) => {
+                    systemOptions.value.push({
+                      value: val.name,
+                      label: val.name,
+                    })
+                  })
+                  console.log(
+                    '第一次获取===================>',
+                    systemOptions.value
+                  )
+                }
+              } else {
+                message.error('获取数据失败!')
+              }
+            })
+          }
+        }, 500)
+      }
+
+      const handleBlur = () => {
+        console.log('blur')
+        flag.value = false
+      }
+
+      const handleFocus = () => {
+        console.log('focus')
+        flag.value = true
+        systemOptions.value = []
+      }
+
+      // const filterOption = (input, option) => {
+      //   return option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      // }
+
       onBeforeUnmount(() => {
         mybus.off('reomveOldData')
       })
@@ -561,6 +670,12 @@
         baseURL,
         beforeUpload,
         dataList,
+        systemHandleChange,
+        systemHandleSearch,
+        handleBlur,
+        handleFocus,
+        systemOptions,
+        applicationSceneOpthion,
       }
     },
   }
@@ -599,6 +714,7 @@
     }
     .base-info {
       display: flex;
+      justify-content: space-between;
     }
     :deep(.ant-form-item-label) {
       label {
@@ -631,4 +747,12 @@
       color: #000;
     }
   }
+  .applicationScene {
+    :deep(.ant-select-selector) {
+      overflow-x: scroll;
+    }
+    :deep(.ant-select-selection-overflow) {
+      flex-wrap: nowrap;
+    }
+  }
 </style>
diff --git a/front/src/views/personalCenter/components/PurchaseVehicle.vue b/front/src/views/personalCenter/components/PurchaseVehicle.vue
index 3c3b92be..3520bf07 100644
--- a/front/src/views/personalCenter/components/PurchaseVehicle.vue
+++ b/front/src/views/personalCenter/components/PurchaseVehicle.vue
@@ -513,6 +513,8 @@
           }
           val.checked = true
         })
+      } else {
+        getListByDeptId(item)
       }
       item.checkAll = true
       checkedList.value.push(item.deptId)
@@ -665,11 +667,18 @@
     //     }
     //   }
     // })
-    if (checkedList.value.length == 0) {
+    if (checkedListAbility.value.length == 0) {
       message.error('请先选择需要申请的数据！')
     } else {
-      // console.log('一键申请===================>', list.value)
-      localStorage.setItem('applyList', JSON.stringify(list.value))
+      let arr = []
+      list.value.map((val) => {
+        val.arr = val.children.filter(
+          (item) => checkedListAbility.value.indexOf(item.resourceId) > -1
+        )
+      })
+      arr = list.value.filter((val) => val.arr.length !== 0)
+      console.log('一键申请===================>', arr)
+      localStorage.setItem('applyList', JSON.stringify(arr))
       router.push({
         path: '/apply',
       })

From 50d0576a708161782853a5dd8341effcb2449260 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Wed, 29 Jun 2022 18:23:08 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../myAgent/demo/competency-application.vue   |  9 ++++-----
 front/src/api/personalCenter.js               | 10 ++++++++++
 .../components/ApplyDetails.vue               |  8 ++++++++
 .../personalCenter/components/MyApply.vue     | 20 ++++++++++++++-----
 4 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue
index f3f02e2a..74fc2a7c 100644
--- a/back/src/views/modules/myAgent/demo/competency-application.vue
+++ b/back/src/views/modules/myAgent/demo/competency-application.vue
@@ -2,13 +2,12 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-29 15:59:51
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-29 17:21:00
+ * @LastEditTime: 2022-06-29 18:17:07
  * @Description: 告诉大家这是什么
 -->
 <!--  流程业务表单   -->
 <template>
   <el-card shadow="never" class="aui-card--fill" :key='showKey'>
-
   <!-- 申请人详情 -->
   <div>
      <h3>申请人信息</h3>
@@ -73,7 +72,7 @@
     </div>
 
  <!--  流程详情   -->
-    <ren-process-detail-import></ren-process-detail-import>
+    <ren-process-detail></ren-process-detail>
   </el-card>
 </template>
 
@@ -82,7 +81,7 @@
 import processModule from '@/mixins/process-module'
 import debounce from 'lodash/debounce'
 import qs from 'qs'
-import RenProcessDetailImport from '@/components/ren-process-detail/src/ren-process-detail-import'
+import RenProcessDetail from '@/components/ren-process-detail/src/ren-process-detail'
 export default {
   // 注入公共方法
   mixins: [processModule],
@@ -142,7 +141,7 @@ export default {
     // }
   },
   components: {
-    RenProcessDetailImport
+    RenProcessDetail
   },
   methods: {
     init () {
diff --git a/front/src/api/personalCenter.js b/front/src/api/personalCenter.js
index 83566908..faed5074 100644
--- a/front/src/api/personalCenter.js
+++ b/front/src/api/personalCenter.js
@@ -150,6 +150,16 @@ export function nengliziyuanshangjiaapply(params) {
     params,
   })
 }
+export function getTaskVariables(params) {
+  return request({
+    url:
+      '/act/task/getTaskVariables?taskId=' +
+      params.taskId +
+      '&variableName=tAbilityApplicationDTOList',
+    method: 'get',
+    params,
+  })
+}
 // 能力下架申请
 export function undercarriage(data) {
   return request({
diff --git a/front/src/views/personalCenter/components/ApplyDetails.vue b/front/src/views/personalCenter/components/ApplyDetails.vue
index 806f5719..ab3d9294 100644
--- a/front/src/views/personalCenter/components/ApplyDetails.vue
+++ b/front/src/views/personalCenter/components/ApplyDetails.vue
@@ -509,6 +509,7 @@
     getTaskHandleDetailInfo,
     getDemandForm,
     nengliziyuanshangjiaapply,
+    getTaskVariables,
   } from '@/api/personalCenter'
   import { selectOneDel } from '@/api/home'
   const downloadFile = (path, name) => {
@@ -593,6 +594,12 @@
     resourceId: { type: String, default: null },
   })
   const getInfo = () => {
+    console.log(props.processInstanceId, '============================')
+    if (props.processDefinitionName == '能力申请') {
+      getTaskVariables({ taskId: props.processInstanceId }).then((res) => {
+        console.log('获取数据====================>', res.data.data)
+      })
+    }
     if (props.processDefinitionName == '能力申请流程') {
       getApplyForm(props.businessKey).then((res) => {
         const { data } = res.data
@@ -662,6 +669,7 @@
   })
 
   const getResourceURL = () => {
+    console.log('111111111111111111111111111111', Cookies.get('token'))
     const params = qs.stringify({
       token: Cookies.get('token'),
       // processInstanceId: this.dataForm.processInstanceId
diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue
index 8fa64659..dfa3d105 100644
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/front/src/views/personalCenter/components/MyApply.vue
@@ -60,7 +60,7 @@
           <div class="content-body-content">
             <p class="content-body-content-son">
               审核结果：{{
-                item.ended ? '审核完成' : item.backToFirst ? '被驳回' : '审核中'
+                item.ended ? '审核完成' : item.backToFirst ? '被终止' : '审核中'
               }}
             </p>
           </div>
@@ -95,10 +95,16 @@
             <div></div>
           </div>
           <div class="button-box">
-            <div class="button" @click="showDetail(item)">查看流程</div>
-            <div class="button" @click="showAdd(item)" v-if="item.backToFirst">
-              修改
+            <div
+              class="button"
+              @click="showDetail(item)"
+              v-if="!(item.processDefinitionName == '能力申请')"
+            >
+              查看流程
             </div>
+            <!-- <div class="button" @click="showAdd(item)" v-if="item.backToFirst">
+              修改
+            </div> -->
             <div
               v-if="
                 !(
@@ -107,7 +113,11 @@
                   item.ended == false
                 )
               "
-              v-show="item.resourceStatusTip == '正常' && item.ended"
+              v-show="
+                item.resourceStatusTip == '正常' &&
+                item.ended &&
+                item.processDefinitionName !== '能力申请'
+              "
               class="button button-details"
               @click="
                 viewDetail(