From 02925c328227654c22feabea85f932b2de3d27f5 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Wed, 26 Oct 2022 10:26:36 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E2=80=94=E8=83=BD=E5=8A=9B=E7=BB=9F=E8=AE=A1=EF=BC=8C=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=20=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modules/abilityStatistics/index.vue | 113 ++++++++----------
 1 file changed, 51 insertions(+), 62 deletions(-)

diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index bc35e440..d5fbbf66 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -45,28 +45,27 @@
         <el-form-item>
           <span v-if="this.departmentId === 1 || this.departmentId === 3">上架部门：</span>
           <span v-else>申请部门：</span>
-          <el-select
-            v-model="abilityDepartment"
-            placeholder="请选择部门"
-            filterable
-            clearable
-          >
+          <el-select v-model="abilityDepartment" placeholder="请选择部门" filterable clearable>
             <el-option label="全部" value=""></el-option>
-            <el-option v-for="item in departmentSelects" :key="item.label" :label="item.label" :value="item.value" v-bind="item"></el-option>
+            <el-option v-for="item in departmentSelects" :key="item.label" :label="item.label" :value="item.value"
+              v-bind="item"></el-option>
           </el-select>
         </el-form-item>
 
         <!--类型-->
         <el-form-item>
           <span>类型：</span>
-          <el-select v-if="this.departmentId === 2 || this.departmentId === 4"   v-model="abilityType" placeholder="请选择类型" clearable>
+          <el-select v-if="this.departmentId === 2 || this.departmentId === 4" v-model="abilityType" placeholder="请选择类型"
+            clearable>
             <el-option label="全部" value=""></el-option>
-            <el-option v-for="(item, i) in typeOptions" :key="`${item.name}${i}`" :label="item.name" :value="item.name" v-bind="item">
+            <el-option v-for="(item, i) in typeOptions" :key="`${item.name}${i}`" :label="item.name" :value="item.name"
+              v-bind="item">
             </el-option>
           </el-select>
           <el-select v-else v-model="abilityType" placeholder="请选择类型" clearable>
             <el-option label="全部" value=""></el-option>
-            <el-option v-for="(item, i) in typeOptions1" :key="`${item.name}${i}`" :label="item.name" :value="item.name" v-bind="item">
+            <el-option v-for="(item, i) in typeOptions1" :key="`${item.name}${i}`" :label="item.name" :value="item.name"
+              v-bind="item">
             </el-option>
           </el-select>
         </el-form-item>
@@ -78,11 +77,12 @@
         <!--操作按钮重置-->
         <el-form-item>
           <el-button type="primary" @click="resetDataList()">{{
-          $t('reset')
+              $t('reset')
           }}</el-button>
         </el-form-item>
         <!-- 导出 -->
-        <a class='export' :href="exportExcel+exportExcelType+'?'+exportExcelCondition+'&token='+token">导出全部</a>
+        <a class='export'
+          :href="exportExcel + exportExcelType + '?' + exportExcelCondition + '&token=' + token">导出全部</a>
       </el-form>
       <el-card shadow="never" class="aui-card--fill" v-if="homeIsShow">
         <div class="mod-demand__bsdemand">
@@ -117,7 +117,8 @@
                 能力使用明细
             </span> -->
             <template v-if="detailFlag">
-              <el-checkbox v-model="checked" @change='chagneCheckbox' style="position: absolute;right: 150px;margin-top: -15px;">隐藏空数据</el-checkbox>
+              <el-checkbox v-model="checked" @change='chagneCheckbox'
+                style="position: absolute;right: 150px;margin-top: -15px;">隐藏空数据</el-checkbox>
               <span class="detail-button" @click="goToDetail()">
                 明细
               </span>
@@ -168,14 +169,10 @@
           </el-table>
           <!--明细表-->
 
-          <el-table
-            :data="tableData"
-            :header-cell-style="{ textAlign: 'center',height:'96px' }"
-            :cell-style="{ textAlign: 'center' }"
-            style="width: 100%"
-            v-show="this.departmentId === 3 || this.departmentId === 4"
-          >
-          <el-table-column v-if="this.departmentId === 3" prop="deptName" label="上架部门" min-width="100%">
+          <el-table :data="tableData" :header-cell-style="{ textAlign: 'center', height: '96px' }"
+            :cell-style="{ textAlign: 'center' }" style="width: 100%"
+            v-show="this.departmentId === 3 || this.departmentId === 4">
+            <el-table-column v-if="this.departmentId === 3" prop="deptName" label="上架部门" min-width="100%">
             </el-table-column>
             <el-table-column v-if="this.departmentId === 4" prop="deptName" label="申请部门" min-width="100%">
             </el-table-column>
@@ -233,7 +230,7 @@ import Template from '../devtools/template.vue'
 // })
 export default {
   components: { componentServices, applicationResources, ComponentUsed, AbilityDetail, Template },
-  data () {
+  data() {
     return {
       checked: false,
       departmentSelects: [],
@@ -366,7 +363,7 @@ export default {
       endDate: '' // 结束时间
     }
   },
-  created () {
+  created() {
     this.$http.get('/sys/dept/all').then(res => {
       // console.log('获取部门=========>', res)
       this.departmentSelects = []
@@ -387,7 +384,7 @@ export default {
     // const date2 = new Date(year2, month2, day2, 7)
     // this.value1.unshift(date2)
   },
-  mounted () {
+  mounted() {
     // this.getFirstTree()
     if (this.departmentId === 1) {
       this.handleChose(3)
@@ -402,7 +399,7 @@ export default {
     // ...mapState(['departmentSelects'])
   },
   methods: {
-    chagneCheckbox () {
+    chagneCheckbox() {
       if (this.checked) {
         this.tableData = this.tableDataClone.filter(val => val.count !== 0)
         this.total = this.tableData.length
@@ -411,10 +408,10 @@ export default {
         this.total = this.tableData.length
       }
     },
-    closeModal () {
+    closeModal() {
       this.detailsVisible = false
     },
-    handleCurrentChange (val) {
+    handleCurrentChange(val) {
       console.log('val------------>', val)
       this.currentPage = val
       // todo
@@ -431,7 +428,7 @@ export default {
       //   this.getReleaseTree(val)
       // }
     },
-    getTreeName (data) {
+    getTreeName(data) {
       this.$http
         .get('/census/center/v3/treeList/', {
           params: {
@@ -461,7 +458,7 @@ export default {
     //     },
 
     // 组件服务部门发布情况--改为能力上架统计
-    getFirstTree (page) {
+    getFirstTree(page) {
       if (this.examineStatus == '-1') {
         this.status = ''
       } else if (this.examineStatus == '0') {
@@ -527,7 +524,7 @@ export default {
         })
     },
     // 组件服务部门使用情况列表-改为能力使用统计
-    getSecondTree (page) {
+    getSecondTree(page) {
       if (this.examineStatus == '-1') {
         this.status = ''
       } else if (this.examineStatus == '0') {
@@ -593,7 +590,7 @@ export default {
         })
     },
     // 点击查看详情
-    detailClick (row) {
+    detailClick(row) {
       this.detailParamss = {}
       const applyNumber = row.applyNumber
       if (this.departmentId == 3) { // 能力上架
@@ -635,7 +632,7 @@ export default {
       }
     },
     // 能力上架明细  能力上架统计
-    getOneDetail (page) {
+    getOneDetail(page) {
       var passAndReview = '' // 转变"通过"字段为通过
       if (this.examineStatus == '-1') {
         this.status = ''
@@ -674,7 +671,7 @@ export default {
         })
     },
     // 能力使用明细 能力使用统计
-    getTwoDetail (page) {
+    getTwoDetail(page) {
       var passAndReview = '' // 转变"通过"字段为通过
       if (this.examineStatus == '-1') {
         this.status = ''
@@ -711,7 +708,7 @@ export default {
           })
         })
     },
-    getReleaseTree (page) {
+    getReleaseTree(page) {
       this.$http
         .get('/census/center/selectApplyDeptDetailTypeCountList/', {
           params: {
@@ -758,7 +755,7 @@ export default {
         })
     },
     // 应用资源部门使用情况列表
-    getUsedTree () {
+    getUsedTree() {
       this.$http
         .get('/census/center/v3/resourceReleaseDetails/', {
           params: {
@@ -772,7 +769,7 @@ export default {
           this.tableData = res.data.data.list
         })
     },
-    handleClick (row) {
+    handleClick(row) {
       if (this.choseId === 0) {
         if (this.departmentId === 1) {
           this.homeIsShow = false
@@ -793,7 +790,7 @@ export default {
       }
     },
     // 选择组件
-    choseBtn (index) {
+    choseBtn(index) {
       this.choseId = index
       this.handleChose(1)
     },
@@ -809,7 +806,7 @@ export default {
     //     }
     //   },
     // 选择发布or使用表格
-    handleChose (index) {
+    handleChose(index) {
       this.checked = false
       this.departmentId = index
       if (index === 1) {
@@ -851,26 +848,26 @@ export default {
       }
     },
     // 翻页
-    handleSizeChange (val) {
+    handleSizeChange(val) {
       console.log(`每页 ${val} 条`)
     },
-    closeChild () {
+    closeChild() {
       this.homeIsShow = true
       this.servicesIsShow = false
       this.handleCurrentChange(1)
     },
-    closeChild2 () {
+    closeChild2() {
       this.homeIsShow = true
       this.UsedIsShow = false
       this.handleCurrentChange(1)
     },
-    closeApplication () {
+    closeApplication() {
       this.homeIsShow = true
       this.resourcesIsShow = false
       this.handleCurrentChange(1)
     },
     // 明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数
-    goToDetail () {
+    goToDetail() {
       this.detailFlag = !this.detailFlag
       if (this.departmentId === 1) {
         this.handleChose(3)
@@ -882,7 +879,7 @@ export default {
       }
     },
     // 返回按钮
-    goToBack () {
+    goToBack() {
       this.checked = false
       // departmentId 1，3  2，4 两个值共同判断
       this.detailFlag = !this.detailFlag
@@ -896,7 +893,7 @@ export default {
       }
     },
     // 点击查询按钮查询数据
-    getDataList () {
+    getDataList() {
       if (this.value1 && this.value1.length > 0) {
         this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd')
         this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd')
@@ -927,7 +924,7 @@ export default {
       }
     },
     // 重置按钮查询数据
-    resetDataList () {
+    resetDataList() {
       this.value1 = []
       this.startDate = ''
       this.endDate = ''
@@ -965,7 +962,7 @@ export default {
       }
     },
     // 定义格式化函数：
-    handleTime (time, format) {
+    handleTime(time, format) {
       if (time == null || time == undefined || time == '') {
         return ''
       }
@@ -1159,24 +1156,16 @@ input::placeholder {
   background: #fff;
   border: 1px solid #dcdfe6;
   color: #000;
+  color: #FFF;
+  background-color: #0058e1;
+  border-color: #0058e1;
+  text-decoration: none;
 }
 
 .export:hover {
-  border-color: #c5ddfd;
-  background-color: #ecf4fe;
-  color: #0058e1;
-  text-decoration: none;
+  background: #65a5f9;
+  border-color: #65a5f9;
+  color: #FFF;
 }
 
-.export:active {
-  border-color: #c5ddfd;
-  background-color: #ecf4fe;
-  color: #0058e1;
-  text-decoration: none;
-}
-
-.export:visited {
-  color: #fff;
-  text-decoration: none;
-}
 </style>

From c65dac78eacce0b0b23d9ef140e74ecb9536438f Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Wed, 26 Oct 2022 10:59:47 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AB=99=E5=86=85--?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E7=AE=A1=E7=90=86=EF=BC=9A=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=B6=88=E6=81=AF=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/notice/notice.vue | 58 ++++++++++++++++--------
 1 file changed, 39 insertions(+), 19 deletions(-)

diff --git a/back/src/views/modules/notice/notice.vue b/back/src/views/modules/notice/notice.vue
index 903edf55..a89c69f8 100644
--- a/back/src/views/modules/notice/notice.vue
+++ b/back/src/views/modules/notice/notice.vue
@@ -15,37 +15,47 @@
           <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="title" :label="$t('notice.title')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="type" :label="$t('notice.type')" header-align="center" align="center" width="150">
+        <el-table-column prop="title" :label="$t('notice.title')" header-align="center" align="center" width="180">
+        </el-table-column>
+        <!-- 内容 prop="content"-->
+        <el-table-column :label="$t('news.content')" header-align="center" align="center">
           <template slot-scope="scope">
-              {{ $getDictLabel("notice_type", scope.row.type) }}
+            <el-tooltip effect="dark" :content="scope.row.content" placement="top">
+              <span class="text-ellipsis">{{ scope.row.content }}</span>
+            </el-tooltip>
           </template>
         </el-table-column>
-        <el-table-column prop="senderName" :label="$t('notice.senderName')" header-align="center" align="center" width="150"></el-table-column>
-        <el-table-column prop="senderDate" :label="$t('notice.senderDate')" header-align="center" align="center" width="170"></el-table-column>
+        <el-table-column prop="type" :label="$t('notice.type')" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            {{ $getDictLabel("notice_type", scope.row.type) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="senderName" :label="$t('notice.senderName')" header-align="center" align="center"
+          width="150"></el-table-column>
+        <el-table-column prop="senderDate" :label="$t('notice.senderDate')" header-align="center" align="center"
+          width="170"></el-table-column>
         <el-table-column prop="status" :label="$t('notice.status')" header-align="center" align="center" width="130">
           <template slot-scope="scope">
-              <el-tag v-if="scope.row.status === 0" size="small" type="danger">{{ $t('notice.status0') }}</el-tag>
-              <el-tag v-else size="small" type="success">{{ $t('notice.status1') }}</el-tag>
+            <el-tag v-if="scope.row.status === 0" size="small" type="danger">{{ $t('notice.status0') }}</el-tag>
+            <el-tag v-else size="small" type="success">{{ $t('notice.status1') }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.status === 0" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="scope.row.status === 1" type="text" size="small" @click="viewHandle(scope.row)">{{ $t('notice.view') }}</el-button>
+            <el-button v-if="scope.row.status === 0" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">
+              {{ $t('update') }}</el-button>
+            <el-button v-if="scope.row.status === 1" type="text" size="small" @click="viewHandle(scope.row)">{{
+                $t('notice.view')
+            }}</el-button>
             <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
+      <el-pagination :current-page="page" :page-sizes="[10, 20, 50, 100]" :page-size="limit" :total="total"
+        layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
@@ -60,7 +70,7 @@ import AddOrUpdate from './notice-add-or-update'
 import { addDynamicRoute } from '@/router'
 export default {
   mixins: [mixinViewModule],
-  data () {
+  data() {
     return {
       mixinViewModuleOptions: {
         getDataListURL: '/sys/notice/page',
@@ -77,7 +87,7 @@ export default {
     AddOrUpdate
   },
   methods: {
-    viewHandle (row) {
+    viewHandle(row) {
       // 路由参数
       const routeParams = {
         routeName: `${this.$route.name}__${row.id}`,
@@ -93,3 +103,13 @@ export default {
   }
 }
 </script>
+<style scoped>
+.text-ellipsis {
+  /*1. 先强制一行内显示文本*/
+  white-space: nowrap;
+  /*2. 超出的部分隐藏*/
+  overflow: hidden;
+  /*3. 文字用省略号替代超出的部分*/
+  text-overflow: ellipsis;
+}
+</style>

From 4c77943db2266ae74b3c4c8afbbc96a0cb575052 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Wed, 26 Oct 2022 11:03:51 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=9A=E9=9A=90=E8=97=8F=E5=88=87=E6=8D=A2=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/back/src/views/main-theme-tools.vue b/back/src/views/main-theme-tools.vue
index 73708d12..cb1c3c86 100644
--- a/back/src/views/main-theme-tools.vue
+++ b/back/src/views/main-theme-tools.vue
@@ -8,11 +8,11 @@
 -->
 <template>
   <div class="aui-theme-tools" :class="{ 'aui-theme-tools--open': isOpen }">
-    <div class="aui-theme-tools__toggle" @click="isOpen = !isOpen">
+    <!-- <div class="aui-theme-tools__toggle" @click="isOpen = !isOpen">
       <svg class="icon-svg" aria-hidden="true">
         <use xlink:href="#icon-setting"></use>
       </svg>
-    </div>
+    </div> -->
     <div class="aui-theme-tools__content">
       <div class="aui-theme-tools__item">
         <h3>Navbar</h3>

From 76e1fb7e1b9d7a33b98f15144815a44db1c27a4e Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Wed, 26 Oct 2022 11:07:08 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86--?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=88=87=E6=8D=A2=E8=AF=AD=E8=A8=80=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/main-navbar.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/back/src/views/main-navbar.vue b/back/src/views/main-navbar.vue
index f624e6cd..0836b83d 100644
--- a/back/src/views/main-navbar.vue
+++ b/back/src/views/main-navbar.vue
@@ -41,7 +41,8 @@
         </el-menu-item> -->
       </el-menu>
       <el-menu class="aui-navbar__menu" mode="horizontal">
-        <el-menu-item index="1">
+        <!-- 暂时隐藏切换语言--勿删 -->
+        <!-- <el-menu-item index="1">
           <el-dropdown placement="bottom" :show-timeout="0">
             <el-button size="mini">{{ $t("_lang") }}</el-button>
             <el-dropdown-menu slot="dropdown">
@@ -53,14 +54,14 @@
               >
             </el-dropdown-menu>
           </el-dropdown>
-        </el-menu-item>
-        <el-menu-item index="2">
+        </el-menu-item> -->
+        <!-- <el-menu-item index="2">
           <a href="//115.28.200.119:9091" target="_blank">
             <svg class="icon-svg aui-navbar__icon-menu" aria-hidden="true">
               <use xlink:href="#icon-earth"></use>
             </svg>
           </a>
-        </el-menu-item>
+        </el-menu-item> -->
         <el-menu-item index="3" v-if="$hasPermission('sys:notice:all')">
           <el-badge :is-dot="messageTip">
             <a href="#" @click="myNoticeRouter()"

From f93550990fa51cad9d9e5a9b6415a0865e4ea0df Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Wed, 26 Oct 2022 14:05:05 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E6=90=9C=E7=B4=A2=EF=BC=9A=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=A1=86=E8=AE=BE=E7=BD=AE=E4=B8=BA=E5=8F=AA=E8=AF=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/components/ren-dept-tree/src/ren-dept-tree.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/back/src/components/ren-dept-tree/src/ren-dept-tree.vue b/back/src/components/ren-dept-tree/src/ren-dept-tree.vue
index 5c26123e..2649edeb 100644
--- a/back/src/components/ren-dept-tree/src/ren-dept-tree.vue
+++ b/back/src/components/ren-dept-tree/src/ren-dept-tree.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
-    <el-input v-model="showDeptName" :placeholder="placeholder" @focus="deptDialog">
+    <el-input v-model="showDeptName" :placeholder="placeholder" @focus="deptDialog" readonly
+      @paste.native.capture.prevent="handlePaste">
       <el-button slot="append" icon="el-icon-search" @click="deptDialog"></el-button>
     </el-input>
     <el-input :value="value" style="display: none"></el-input>
@@ -63,6 +64,9 @@ export default {
     }
   },
   methods: {
+    handlePaste() {
+      return false
+    },
     deptDialog() {
       this.expandedKeys = null
       if (this.$refs.tree) {

From 94a940a1abc063c3501863b680510d03602ce47b Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Wed, 26 Oct 2022 14:48:37 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E9=87=91=E5=AE=8F=E7=BD=91-=E8=83=BD?=
 =?UTF-8?q?=E5=8A=9B=E7=BB=9F=E8=AE=A1=EF=BC=9A=E8=B5=84=E6=BA=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E9=87=8F=EF=BC=8C=E7=82=B9=E5=87=BB=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=BA=94=E8=AF=A5=E8=B7=B3=E8=BD=AC=E5=88=B0?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86=E7=9A=84=E8=83=BD=E5=8A=9B?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1-=E8=83=BD=E5=8A=9B=E4=BD=BF=E7=94=A8sheet?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/public/config/basicConfig.js         | 8 ++++----
 front/public/static/config/basicConfig.js | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/back/public/config/basicConfig.js b/back/public/config/basicConfig.js
index 913ffc94..2428c227 100644
--- a/back/public/config/basicConfig.js
+++ b/back/public/config/basicConfig.js
@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2022-08-25 14:37:49
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-13 16:46:41
+ * @LastEditors: Light
+ * @LastEditTime: 2022-10-26 10:48:52
  * @Description: 告诉大家这是什么
  */
 var _global = {}
@@ -43,8 +43,8 @@ var CONFIGITEM = {
     },
     dev: {
       previewUrl: 'http://localhost:8080/',
-      apiURL: 'http://192.168.124.233:8888/renren-admin',
-      websocketURL: 'ws://192.168.124.236:8888/renren-admin/websocket'
+      apiURL: 'http://192.168.124.243:8888/renren-admin',
+      websocketURL: 'ws://192.168.124.243:8888/renren-admin/websocket'
     }
   }
 }
diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js
index 82af318a..796563a2 100644
--- a/front/public/static/config/basicConfig.js
+++ b/front/public/static/config/basicConfig.js
@@ -87,7 +87,7 @@ var CONFIGITEM = {
       },
       backUrl: 'http://localhost:8001',
       previewUrl: 'http://192.168.124.243:9796/',
-      websocketURL: '192.168.124.254:8888/renren-admin',
+      websocketURL: '192.168.124.243:8888/renren-admin',
       // websocketURL: '10.18.1.99:8889/renren-admin',
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',

From 3ef7da2d6c0372c22132a75fa8295b9b1e8a1ca6 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Wed, 26 Oct 2022 14:49:00 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E9=87=91=E5=AE=8F=E7=BD=91-=E8=83=BD?=
 =?UTF-8?q?=E5=8A=9B=E7=BB=9F=E8=AE=A1=EF=BC=9A=E8=B5=84=E6=BA=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E9=87=8F=EF=BC=8C=E7=82=B9=E5=87=BB=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=BA=94=E8=AF=A5=E8=B7=B3=E8=BD=AC=E5=88=B0?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86=E7=9A=84=E8=83=BD=E5=8A=9B?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1-=E8=83=BD=E5=8A=9B=E4=BD=BF=E7=94=A8sheet?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modules/abilityStatistics/index.vue | 19 ++++++++++++-------
 .../components/AbilityTotal.vue               |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index bc35e440..1175ca5b 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -353,12 +353,12 @@ export default {
         { name: '应用资源', value: 5 },
         { name: '会议室', value: 6 }
       ], // 类型备选列表
-      typeOptions1: [//能力上架隐藏会议室
+      typeOptions1: [// 能力上架隐藏会议室
         { name: '智能算法', value: 1 },
         { name: '图层服务', value: 2 },
         { name: '开发组件', value: 3 },
         { name: '业务组件', value: 4 },
-        { name: '应用资源', value: 5 },
+        { name: '应用资源', value: 5 }
 
       ], // 类型备选列表
       detailFlag: false, // 明细返回按钮显示标志位
@@ -389,13 +389,18 @@ export default {
   },
   mounted () {
     // this.getFirstTree()
-    if (this.departmentId === 1) {
-      this.handleChose(3)
-      // this.departmentId = 1;
-    } else if (this.departmentId === 2) {
+    console.log('this.$route.query.Id;', this.$route.query.type)
+    if (this.$route.query.type === 'use') {
       this.handleChose(4)
-      // this.departmentId = 2;
     } else {
+      if (this.departmentId === 1) {
+        this.handleChose(3)
+      // this.departmentId = 1;
+      } else if (this.departmentId === 2) {
+        this.handleChose(4)
+      // this.departmentId = 2;
+      } else {
+      }
     }
   },
   computed: {
diff --git a/front/src/views/abilityStatistics/components/AbilityTotal.vue b/front/src/views/abilityStatistics/components/AbilityTotal.vue
index 66dfc5bd..1fa7e036 100644
--- a/front/src/views/abilityStatistics/components/AbilityTotal.vue
+++ b/front/src/views/abilityStatistics/components/AbilityTotal.vue
@@ -109,7 +109,7 @@
         break
       case '资源申请量':
         window.open(
-          window.SITE_CONFIG.backUrl + '/#/abilityStatistics-index',
+          window.SITE_CONFIG.backUrl + '/#/abilityStatistics-index?type=use',
           '_blank'
         )
         break

From d28628f35a77b5d0c61177b9b99d6ae5e18741d9 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Wed, 26 Oct 2022 15:01:54 +0800
Subject: [PATCH 8/8] =?UTF-8?q?fix=EF=BC=9A=E6=B6=88=E6=81=AF=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E8=8E=B7=E5=8F=96=E5=88=97=E8=A1=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/personalCenter/components/MyApply.vue   | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue
index 29c08390..7654f29e 100644
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/front/src/views/personalCenter/components/MyApply.vue
@@ -208,6 +208,7 @@
     onBeforeUnmount,
     h,
     defineProps,
+    nextTick,
   } from 'vue'
   import {
     getMyProcessInstancePage,
@@ -252,16 +253,19 @@
     typeList.value.push('设备申请')
   }
   const typeStrObj = {
-    能力上架: 'resourcemountapply',
-    能力下架: 'resourcundercarriageapply',
-    能力需求: 'abilitydemandapply',
-    需求评论: 'comment_review',
+    '能力上架': 'resourcemountapply',
+    '能力下架': 'resourcundercarriageapply',
+    '能力需求': 'abilitydemandapply',
+    '需求评论': 'comment_review',
   }
   let tabList = ref(['全部', '审核中', '审核完成'])
   const contentList = reactive({ data: [] })
   let tabIndex = ref(0)
   let typeIndex = ref(0)
   let typeName = ref(typeList.value[0])
+  if(router.currentRoute.value.query.tabTypeName) {
+    typeName.value = router.currentRoute.value.query.tabTypeName
+  }
   const videoVisible = ref(false)
   const numFlag = ref(true)
   const columns = ref([
@@ -306,7 +310,7 @@
     ended.value = ''
     page.value = 1
     typeIndex.value = index
-    typeName.value = item
+    typeName.value = item;
     getApplyList()
   }
 
@@ -565,7 +569,6 @@
       params.processDefinitionKey = processDefinitionKey.value
       getMyProcessInstancePage(params).then((res) => {
         contentList.data = []
-        // initNum(name.value)
         console.log(res.data.data.list)
         contentList.data = res.data.data.list
         total.value = res.data.data.total