From b13577d4b44f70a1f3ec5a0d5d116c988ddf94a3 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Tue, 18 Oct 2022 15:34:46 +0800
Subject: [PATCH 1/4] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/main-sidebar.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/back/src/views/main-sidebar.vue b/back/src/views/main-sidebar.vue
index 62dc4831..9c881026 100644
--- a/back/src/views/main-sidebar.vue
+++ b/back/src/views/main-sidebar.vue
@@ -2,7 +2,7 @@
  * @Author: kongjun qdkongjun@gmail.com
  * @Date: 2022-06-20 09:29:59
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-18 15:22:45
+ * @LastEditTime: 2022-10-18 15:34:00
  * @FilePath: \back\src\views\main-sidebar.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -49,7 +49,7 @@ export default {
   },
   created () {
     this.getNum()
-    // this.$store.state.sidebarMenuList = window.SITE_CONFIG["menuList"];
+    this.$store.state.sidebarMenuList = window.SITE_CONFIG.menuList
     // 更新我的待办得数量
     bus.$off('updateTaskNum')
     bus.$on('updateTaskNum', () => {

From a139bd809b44d966de6d88ea6fc1e982bb07f21b Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Tue, 18 Oct 2022 15:35:14 +0800
Subject: [PATCH 2/4] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/main-sidebar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/back/src/views/main-sidebar.vue b/back/src/views/main-sidebar.vue
index 9c881026..40867a8d 100644
--- a/back/src/views/main-sidebar.vue
+++ b/back/src/views/main-sidebar.vue
@@ -31,7 +31,7 @@
       </el-menu>
     </div>
   </aside>
-</template>
+</template>\
 
 <script>
 import http from '@/utils/request'

From c41028ffaa74ff6d23260038b47442e4c211e31a Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 18 Oct 2022 15:42:53 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modules/abilityStatistics/index.vue | 82 +++++++++++++++++--
 1 file changed, 77 insertions(+), 5 deletions(-)

diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index 75686078..b6041468 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -94,6 +94,11 @@
             $t('reset')
           }}</el-button>
         </el-form-item>
+        <!-- 导出 -->
+        <a class='export' :href="exportExcel+exportExcelType+'?'+exportExcelCondition+'&token='+token">导出</a>
+        <!-- <el-form-item>
+          <el-button type="primary" @click="exportExcel()">导出</el-button>
+        </el-form-item> -->
       </el-form>
       <el-card shadow="never" class="aui-card--fill" v-if="homeIsShow">
         <div class="mod-demand__bsdemand">
@@ -273,11 +278,12 @@
 
 </template>
 <script>
+import Cookies from 'js-cookie'
 import componentServices from './componentServices.vue'
 import AbilityDetail from './components/abilityDetails'
 import applicationResources from './applicationResources.vue'
 import ComponentUsed from './componentUsed.vue'
-
+import qs from 'qs'
 import { mapState } from 'vuex'
 // const props = defineProps({
 //   processDefinitionName: { type: String, default: null },
@@ -291,6 +297,10 @@ export default {
   components: { componentServices, applicationResources, ComponentUsed, AbilityDetail },
   data () {
     return {
+      exportExcel: CONFIGITEM.configData[CONFIGITEM.version].apiURL + '/census/center/export',
+      exportExcelCondition: '',
+      exportExcelType: '',
+      token: Cookies.get('ucsToken'),
       detailType: '',
       detailParamss: {},
       isBack: true,
@@ -374,7 +384,7 @@ export default {
         { name: '基础设施', key: 3 },
         { name: '数据资源', key: 4 },
         { name: '知识库', key: 5 },
-        { name: '会议室', value: 6}
+        { name: '会议室', value: 6 }
       ],
       tableData: [],
       tableData2: [
@@ -399,7 +409,7 @@ export default {
         { name: '通用开发组件', value: 3 },
         { name: '页面开发组件', value: 4 },
         { name: '应用资源', value: 5 },
-        { name: '会议室', value: 6}
+        { name: '会议室', value: 6 }
       ], // 类型备选列表
       detailFlag: false, // 明细返回按钮显示标志位
       startDate: '', // 开始时间
@@ -482,7 +492,7 @@ export default {
         this.status = '审核中'
       } else if (this.examineStatus == '1') {
         this.status = '通过'
-      }else if (this.examineStatus == '2') {
+      } else if (this.examineStatus == '2') {
         this.status = '不通过'
       } else {
         this.status = this.examineStatus
@@ -530,6 +540,12 @@ export default {
           }
           this.tableData = res.data.data
           this.total = res.data.data.total
+          this.exportExcelCondition = qs.stringify({
+            approveStatus: this.status,
+            deptId: this.abilityDepartment,
+            startDate: this.startDate,
+            endDate: this.endDate
+          })
         })
     },
     // 组件服务部门使用情况列表-改为能力使用统计
@@ -588,6 +604,12 @@ export default {
           }
           this.tableData = res.data.data
           this.total = res.data.data.total
+          this.exportExcelCondition = qs.stringify({
+            approveStatus: this.status,
+            deptId: this.abilityDepartment,
+            startDate: this.startDate,
+            endDate: this.endDate
+          })
         })
     },
     // 点击查看详情
@@ -641,7 +663,7 @@ export default {
         this.status = '审核中'
       } else if (this.examineStatus == '1') {
         this.status = '通过'
-      }  else if (this.examineStatus == '2') {
+      } else if (this.examineStatus == '2') {
         this.status = '不通过'
       } else {
         this.status = this.examineStatus
@@ -662,6 +684,12 @@ export default {
           console.log('111111', this.tableData, res.data.data)
           this.tableData = res.data.data
           this.total = res.data.data.total
+          this.exportExcelCondition = qs.stringify({
+            approveStatus: this.status,
+            deptId: this.abilityDepartment,
+            startDate: this.startDate,
+            endDate: this.endDate
+          })
         })
     },
     // 能力使用明细
@@ -693,6 +721,12 @@ export default {
         .then((res) => {
           this.tableData = res.data.data
           this.total = res.data.data.total
+          this.exportExcelCondition = qs.stringify({
+            approveStatus: this.status,
+            deptId: this.abilityDepartment,
+            startDate: this.startDate,
+            endDate: this.endDate
+          })
         })
     },
     getReleaseTree (page) {
@@ -799,6 +833,7 @@ export default {
           if (!this.detailFlag) {
             this.detailFlag = !this.detailFlag
           }
+          this.exportExcelType = 'SelectDeptDetailTypeCountList'
           this.getFirstTree()
         } else if (this.choseId === 1) {
           // this.getReleaseTree()
@@ -808,6 +843,7 @@ export default {
           if (!this.detailFlag) {
             this.detailFlag = !this.detailFlag
           }
+          this.exportExcelType = 'SelectApplyDeptDetailTypeCountList'
           this.getSecondTree()
         } else {
           // this.getUsedTree()
@@ -815,6 +851,7 @@ export default {
       } else if (index === 3) {
         this.detailFlag = false
         if (this.choseId === 0) {
+          this.exportExcelType = 'SelectCensusResourceTable'
           this.getOneDetail()
         } else {
           // this.getUsedTree()
@@ -822,6 +859,7 @@ export default {
       } else if (index === 4) {
         this.detailFlag = false
         if (this.choseId === 0) {
+          this.exportExcelType = 'SelectCensusApplyTable'
           this.getTwoDetail()
         } else {
           // this.getUsedTree()
@@ -911,6 +949,13 @@ export default {
       this.examineStatus = ''
       this.abilityDepartment = ''
       this.abilityType = ''
+      this.approveStatus = ''
+      this.exportExcelCondition = qs.stringify({
+        approveStatus: this.status,
+        deptId: this.abilityDepartment,
+        startDate: this.startDate,
+        endDate: this.endDate
+      })
       if (this.departmentId === 1) {
         // if (this.detailFlag) {
         //   this.handleChose(3)
@@ -1100,4 +1145,31 @@ input::placeholder {
   text-overflow: ellipsis;
   word-break: break-all;
 }
+.export {
+  display: inline-block;
+  width: 70px;
+  height: 40px;
+  line-height: 40px;
+  text-align: center;
+  border-radius: 5px;
+  background: #fff;
+  border: 1px solid #dcdfe6;
+  color: #000;
+}
+.export:hover {
+  border-color: #c5ddfd;
+  background-color: #ecf4fe;
+  color: #0058e1;
+  text-decoration: none;
+}
+.export:active {
+  border-color: #c5ddfd;
+  background-color: #ecf4fe;
+  color: #0058e1;
+  text-decoration: none;
+}
+.export:visited {
+  color: #fff;
+  text-decoration: none;
+}
 </style>

From 8e6fac427be11f38be9409138e432a4130d3ddd6 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Tue, 18 Oct 2022 15:48:34 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=8Fbug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/main-sidebar.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/back/src/views/main-sidebar.vue b/back/src/views/main-sidebar.vue
index 40867a8d..78596756 100644
--- a/back/src/views/main-sidebar.vue
+++ b/back/src/views/main-sidebar.vue
@@ -2,7 +2,7 @@
  * @Author: kongjun qdkongjun@gmail.com
  * @Date: 2022-06-20 09:29:59
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-18 15:34:00
+ * @LastEditTime: 2022-10-18 15:46:51
  * @FilePath: \back\src\views\main-sidebar.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -31,7 +31,7 @@
       </el-menu>
     </div>
   </aside>
-</template>\
+</template>
 
 <script>
 import http from '@/utils/request'
@@ -49,7 +49,7 @@ export default {
   },
   created () {
     this.getNum()
-    this.$store.state.sidebarMenuList = window.SITE_CONFIG.menuList
+    // this.$store.state.sidebarMenuList = window.SITE_CONFIG.menuList
     // 更新我的待办得数量
     bus.$off('updateTaskNum')
     bus.$on('updateTaskNum', () => {
@@ -96,6 +96,7 @@ export default {
             menu.total = daibanNum
           }
         }
+        this.$store.state.sidebarMenuList = menuList
       })
     }
   }