From 0969ada1c2e9ae34b3b9415e6f6ed2c4d10f8a46 Mon Sep 17 00:00:00 2001
From: kongyeqing <2697454777@qq.com>
Date: Thu, 27 Jul 2023 10:18:02 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=89=E5=85=A8=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E5=8C=BA=E5=9F=9F=E8=BF=87=E6=BB=A4=EF=BC=8C?=
 =?UTF-8?q?=E5=A5=96=E6=83=A9=E8=AE=B0=E5=BD=95=E4=BA=BA=E5=8E=BB=E9=87=8D?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                               |  2 +-
 src/service/deviceAnal.service.ts             |  6 ++++
 src/service/rewardsRecord.service.ts          |  5 +++
 .../rules/rulesManager.component.vue          |  2 +-
 .../rewardsRecord/rewardsRecord.component.vue | 32 ++++++++++++++++---
 .../device/deviceAnal.component.vue           | 16 +++++-----
 src/views/workprogress/leader.component.vue   |  8 ++---
 7 files changed, 53 insertions(+), 18 deletions(-)

diff --git a/.env.production b/.env.production
index 7df11fd..55ea87c 100644
--- a/.env.production
+++ b/.env.production
@@ -5,7 +5,7 @@ VUE_APP_TITLE = 汉邦唐全真数字服务平台
 # 网关地址
 VUE_APP_GATEWAY_URL="/prod-api"
 # 服务地址
-VUE_APP_BASE_API_URL=""
+VUE_APP_BASE_API_URL="http://119.45.186.133:8081"
 # 服务前-- 请严格遵守格式  不允许换行
 VUE_APP_SERVICE_PREFIX= '{"system":"/system","file":"/file","prevention":"/prevention","bpm":"/bpm"}'
 # 是否显示全部菜单
diff --git a/src/service/deviceAnal.service.ts b/src/service/deviceAnal.service.ts
index 16b9f06..a388aad 100644
--- a/src/service/deviceAnal.service.ts
+++ b/src/service/deviceAnal.service.ts
@@ -42,4 +42,10 @@ export default class DeviceService extends BaseService<any>{
         const url = this.prefix.prevention+'/device/inventory/filter/list';
         return this.post(url,params,{},true)
     }
+
+    //过滤区域单元
+    public getDistinctList(params: any):Promise<AxiosResponse<ActionResult<any>>>{
+        const url = this.prefix.prevention+'/device/inventory/getDistinctList';
+        return this.post(url,params)
+    }
 }
\ No newline at end of file
diff --git a/src/service/rewardsRecord.service.ts b/src/service/rewardsRecord.service.ts
index b11a805..478b132 100644
--- a/src/service/rewardsRecord.service.ts
+++ b/src/service/rewardsRecord.service.ts
@@ -38,4 +38,9 @@ export default class RewardsRecordService extends BaseService<any>{
         const url = this.prefix.file+'/getSysFiles';
         return this.get(url,params,false)
     }
+    //奖惩人过滤
+    public getUserIds(params:any):Promise<AxiosResponse<ActionResult<any>>>{
+        const url = this.prefix.prevention+'/incentive/record/getUserIds';
+        return this.get(url,params)
+    }
 }
\ No newline at end of file
diff --git a/src/views/hiddenDanger/rules/rulesManager.component.vue b/src/views/hiddenDanger/rules/rulesManager.component.vue
index aa419fe..adf28e2 100644
--- a/src/views/hiddenDanger/rules/rulesManager.component.vue
+++ b/src/views/hiddenDanger/rules/rulesManager.component.vue
@@ -294,7 +294,7 @@ export default class RulesManagerComponent extends BaseRecordComponent<any> {
         }),filterMethod:(data,row)=>{
             return row.types.indexOf(data)>=0;
         }});
-        this.tableColumn.push({name:'编制人',key:"createBy"});
+        this.tableColumn.push({name:'编制人',key:"createName"});
         this.tableColumn.push({name:'编制时间',key:"createTime"});
         this.updateTableColumn = [];
 
diff --git a/src/views/reward/rewardsRecord/rewardsRecord.component.vue b/src/views/reward/rewardsRecord/rewardsRecord.component.vue
index 7a7aaec..8999c5a 100644
--- a/src/views/reward/rewardsRecord/rewardsRecord.component.vue
+++ b/src/views/reward/rewardsRecord/rewardsRecord.component.vue
@@ -1,5 +1,5 @@
 <script lang="ts">
-import { Component } from 'vue-property-decorator';
+import { Component, Watch } from 'vue-property-decorator';
 import template from './rewardsRecord.component.html'
 import BaseRecordComponent from "hbt-common/components/common/baseRecord.component.vue";
 import FormComponent from "hbt-common/components/common/form.component.vue";
@@ -59,6 +59,8 @@ export default class RewardsRecord extends BaseRecordComponent<any> {
 
     public subShowUpdate = false;
 
+    public userList = [] as any;
+
     public formActions = [{
         name: "查询",
         value: "search",
@@ -142,7 +144,7 @@ export default class RewardsRecord extends BaseRecordComponent<any> {
             require: true,
             width: "calc(50% - 20px)",
             showError: false,
-            datas: this.$store.state.userList
+            datas: this.userList
         },
         {
             name: "工号",
@@ -240,6 +242,8 @@ export default class RewardsRecord extends BaseRecordComponent<any> {
         //
     }
 
+
+
     public changes(data, item) {
         if (item && item.key === 'userId') {
             this.userService.getDetailsByIds({ userId: data }).then((res: any) => {
@@ -315,10 +319,29 @@ export default class RewardsRecord extends BaseRecordComponent<any> {
             this.isReadonly = false;
             this.subIsReadonly = false;
             this.updateParams = { details: [] } as any;
-            this.buildUpdateForm();
-            this.showUpdate = true
+            this.loadUserList()
+
         }
     }
+
+    //奖惩人
+    public loadUserList(userId?) {
+        this.tableService.getUserIds({}).then((res: any) => {
+            let userList = this.$store.state.userList
+            if (!userId && userId !== 0) {
+                let filterUserList = userList.filter(item => res.data.indexOf(item.value) == -1)
+                this.userList = filterUserList
+                this.buildUpdateForm();
+                this.showUpdate = true
+            } else {
+                let filterUserList = userList.filter(item => res.data.indexOf(item.value) == -1 || item.value === userId)
+                this.userList = filterUserList
+                this.buildUpdateForm();
+                this.showUpdate = true
+            }
+        })
+
+    }
     // 分页数据
     public getTableData() {
         this.tableService.selectByPage(this.params).then(res => {
@@ -385,6 +408,7 @@ export default class RewardsRecord extends BaseRecordComponent<any> {
                 this.updateParams.details.forEach((item, index) => {
                     item.index = index + 1;
                 });
+                this.loadUserList(row.userId)
                 this.buildUpdateForm()
                 this.showUpdate = true
             } else {
diff --git a/src/views/risk/assessment/device/deviceAnal.component.vue b/src/views/risk/assessment/device/deviceAnal.component.vue
index 7c118ad..21dbc23 100644
--- a/src/views/risk/assessment/device/deviceAnal.component.vue
+++ b/src/views/risk/assessment/device/deviceAnal.component.vue
@@ -417,11 +417,11 @@ export default class DeviceAnalManagerComponent extends BaseRecordComponent<any>
     public loadAreaData() {
         this.unitList = [];
         this.diviceList = [];
-        this.areaService.selectByPage({ pageSize: 1000 }).then((res: any) => {
-            this.areaList = res.data.datas.map(item => {
+        this.tableService.getDistinctList({}).then((res: any) => {
+            this.areaList = res.data.map(item => {
                 return {
-                    name: item.name,
-                    value: item.id,
+                    name: item.areaName,
+                    value: item.areaId,
                     analRiskLevel: item.analRiskLevel ? item.analRiskLevel : null,
                 }
             });
@@ -430,11 +430,11 @@ export default class DeviceAnalManagerComponent extends BaseRecordComponent<any>
     }
     // 加载单元列表
     public loadUnitData(id?) {
-        this.unitService.selectByPage({ pageSize: 1000, areaId: id }, false).then((res: any) => {
-            this.unitList = res.data.datas.map(item => {
+        this.tableService.getDistinctList({ areaId: id }).then((res: any) => {
+            this.unitList = res.data.map(item => {
                 return {
-                    name: item.name,
-                    value: item.id,
+                    name: item.unitName,
+                    value: item.unitId,
                     deptId: item.chargeDeptId,
                     userId: item.chargeUserId,
                     deptName: item.chargeDeptName,
diff --git a/src/views/workprogress/leader.component.vue b/src/views/workprogress/leader.component.vue
index d058926..a3f14f3 100644
--- a/src/views/workprogress/leader.component.vue
+++ b/src/views/workprogress/leader.component.vue
@@ -303,12 +303,12 @@ export default class LeadershipStructure extends BaseRecordComponent<any> {
         this.tableColumn.push({ name: '审批人', key: "approveUserName" });
 
 
-        this.subTableColumn.push({ name: '序号', key: "index", width: "60px" });
-        this.subTableColumn.push({ name: '姓名', key: "userName", width: "80px" });
+        this.subTableColumn.push({ name: '序号', key: "index", });
+        this.subTableColumn.push({ name: '姓名', key: "userName",});
         this.subTableColumn.push({ name: '单位', key: "deptName",});
         this.subTableColumn.push({ name: '职务', key: "duty", });
-        this.subTableColumn.push({ name: '联系方式', key: "phone",width:"130px"  });
-        this.subTableColumn.push({ name: '职责描述', key: "description", width: "200px", showTip: true, });
+        this.subTableColumn.push({ name: '联系方式', key: "phone" });
+        this.subTableColumn.push({ name: '职责描述', key: "description", width: "250px", showTip: true, });
     }
 
     public callback(data, type) {