From d712d98bdcc927bdede31bc10eb64e49e622774a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Thu, 24 Jul 2025 17:33:18 +0800 Subject: [PATCH] =?UTF-8?q?task=2044941=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/property/api/index.js | 4 ++-- src/views/property/comps/left/bottom/3/index.js | 4 ++-- src/views/property/comps/left/middle/3/index.html | 4 ++-- src/views/property/comps/left/middle/3/index.js | 2 +- src/views/property/comps/left/middle/4/index.js | 6 +++--- src/views/property/comps/left/top/3/index.html | 4 ++-- src/views/property/comps/left/top/3/index.js | 4 ++-- src/views/property/comps/right/bottom/1/index.js | 2 +- src/views/property/comps/right/bottom/4/index.js | 2 +- src/views/property/comps/right/middle/1/index.js | 2 ++ src/views/property/comps/right/middle/4/index.js | 2 +- src/views/resources/comps/left/bottom/1/my-table/index.html | 3 ++- src/views/resources/comps/left/top/2/index.js | 6 +++--- 13 files changed, 24 insertions(+), 21 deletions(-) diff --git a/src/views/property/api/index.js b/src/views/property/api/index.js index d8e440c..dee3507 100644 --- a/src/views/property/api/index.js +++ b/src/views/property/api/index.js @@ -73,7 +73,7 @@ export function warningForNonStandardRentalOfResources (deptId, year) { year } return request({ - url: 'api/home/xixia/resourceWarning/zybgfczyj', + url: 'api/home/xixia/assetWarning/zcbgfczyj', method: 'get', params: query }) @@ -86,7 +86,7 @@ export function longTermIdleResourceWarning (deptId, year) { year } return request({ - url: 'api/home/xixia/resourceWarning/zybgfczyj', + url: 'api/home/xixia/assetWarning/zccqxzyj', method: 'get', params: query }) diff --git a/src/views/property/comps/left/bottom/3/index.js b/src/views/property/comps/left/bottom/3/index.js index 3b034dd..ca9f51b 100644 --- a/src/views/property/comps/left/bottom/3/index.js +++ b/src/views/property/comps/left/bottom/3/index.js @@ -38,8 +38,8 @@ export default { if (this.year, this.deptId) { this.isLoad = false; longTermIdleResourceWarning(this.deptId, this.year).then(res => { - let data = res.data.map(item => { - return [ item.deptName, item.name, item.resourceSort, item.resourceType ] + let data = res.rows.map(item => { + return [item.deptName, item.name, item.assetType, item.originalValue] }) this.data = data; this.isLoad = true; diff --git a/src/views/property/comps/left/middle/3/index.html b/src/views/property/comps/left/middle/3/index.html index 079c4d4..51c9942 100644 --- a/src/views/property/comps/left/middle/3/index.html +++ b/src/views/property/comps/left/middle/3/index.html @@ -1,9 +1,9 @@ - - \ No newline at end of file + diff --git a/src/views/property/comps/left/middle/3/index.js b/src/views/property/comps/left/middle/3/index.js index 448eb1b..56776c7 100644 --- a/src/views/property/comps/left/middle/3/index.js +++ b/src/views/property/comps/left/middle/3/index.js @@ -39,7 +39,7 @@ export default { this.isLoad = false; warningForNonStandardRentalOfResources(this.deptId, this.year).then(res => { let data = res.data.map(item => { - return [item.deptName, item.name, item.resourceSort, item.resourceType] + return [item.deptName, item.name, item.assetType, item.originalValue] }) this.data = data; this.isLoad = true; diff --git a/src/views/property/comps/left/middle/4/index.js b/src/views/property/comps/left/middle/4/index.js index 368f592..dd87959 100644 --- a/src/views/property/comps/left/middle/4/index.js +++ b/src/views/property/comps/left/middle/4/index.js @@ -63,15 +63,15 @@ export default { value: item.zbdz }, { - name: '高债务率', + name: '高负债率', value: item.gfzl }, { - name: '中债务率', + name: '中负债率', value: item.zfzl }, { - name: '低债务率', + name: '低负债率', value: item.dfzl } ] diff --git a/src/views/property/comps/left/top/3/index.html b/src/views/property/comps/left/top/3/index.html index f206f5a..13df215 100644 --- a/src/views/property/comps/left/top/3/index.html +++ b/src/views/property/comps/left/top/3/index.html @@ -1,9 +1,9 @@ - - \ No newline at end of file + diff --git a/src/views/property/comps/left/top/3/index.js b/src/views/property/comps/left/top/3/index.js index 051e196..aef2028 100644 --- a/src/views/property/comps/left/top/3/index.js +++ b/src/views/property/comps/left/top/3/index.js @@ -27,9 +27,9 @@ export default { data () { return { isLoad: false, - headers: ['部门', '资源名称', '资产类别', '申请日期', '处置类型'], + headers: ['部门', '资产名称', '资产类别', '申请日期', '处置类型'], data: [ - ['部门', '资源名称', '资产类别', '申请日期', '处置类型'] + ['部门', '资产名称', '资产类别', '申请日期', '处置类型'] ] }; }, diff --git a/src/views/property/comps/right/bottom/1/index.js b/src/views/property/comps/right/bottom/1/index.js index 7f71ae9..95508c9 100644 --- a/src/views/property/comps/right/bottom/1/index.js +++ b/src/views/property/comps/right/bottom/1/index.js @@ -28,7 +28,7 @@ export default { return { isLoad: false, data: [], - headers: ['部门名称', '合同数量', '排名'] + headers: ['部门名称', '合同数量(个)', '排名'] }; }, created () { diff --git a/src/views/property/comps/right/bottom/4/index.js b/src/views/property/comps/right/bottom/4/index.js index a24a444..88bd5fb 100644 --- a/src/views/property/comps/right/bottom/4/index.js +++ b/src/views/property/comps/right/bottom/4/index.js @@ -27,7 +27,7 @@ export default { data () { return { isLoad: false, - headers: ['组织名称', '负债总额(万元)', '资产总额(万元)', '债务率'], + headers: ['组织名称', '债务总额(万元)', '资产总额(万元)', '债务率'], data: [ ] }; diff --git a/src/views/property/comps/right/middle/1/index.js b/src/views/property/comps/right/middle/1/index.js index 861340c..2d5b239 100644 --- a/src/views/property/comps/right/middle/1/index.js +++ b/src/views/property/comps/right/middle/1/index.js @@ -50,11 +50,13 @@ export default { this.isLoad = false; analysisOfAmountRanking(this.deptId, this.year).then(res => { if (this.tabIndex == 1) { + this.headers = ['部门名称', '数量(个)', '排名']; let data = res.data.sl.map(item => { return [item.name, item.value, item.index] }) this.data = data } else if (this.tabIndex == 2) { + this.headers = ['部门名称', '金额(万元)', '排名']; let data = res.data.je.map(item => { return [item.name, item.value, item.index] }) diff --git a/src/views/property/comps/right/middle/4/index.js b/src/views/property/comps/right/middle/4/index.js index 60b0781..41014d6 100644 --- a/src/views/property/comps/right/middle/4/index.js +++ b/src/views/property/comps/right/middle/4/index.js @@ -59,7 +59,7 @@ export default { if (item.name === this.currentselect) { let data = [ { - name: '资不抵债', + name: '资不抵债务', value: item.zbdzw }, { diff --git a/src/views/resources/comps/left/bottom/1/my-table/index.html b/src/views/resources/comps/left/bottom/1/my-table/index.html index 70c745a..137220c 100644 --- a/src/views/resources/comps/left/bottom/1/my-table/index.html +++ b/src/views/resources/comps/left/bottom/1/my-table/index.html @@ -13,7 +13,8 @@ diff --git a/src/views/resources/comps/left/top/2/index.js b/src/views/resources/comps/left/top/2/index.js index bb96d0d..b2826a6 100644 --- a/src/views/resources/comps/left/top/2/index.js +++ b/src/views/resources/comps/left/top/2/index.js @@ -27,9 +27,9 @@ export default { data () { return { isLoad: false, - headers: ['部门', '资源名称', '类别', '面积（亩）', '处置类型'], + headers: ['部门', '资源名称', '类别', '申请日期', '处置类型'], data: [ - ['部门', '资源名称', '类别', '面积（亩）', '处置类型'] + ['部门', '资源名称', '类别', '申请日期', '处置类型'] ] }; }, @@ -39,7 +39,7 @@ export default { this.isLoad = false; resourceFisposalWarning(this.deptId, this.year).then(res => { let data = res.rows.map(item => { - return [item.deptId, item.assetName, item.assetType, 'null', item.assetStatus] + return [item.deptId, item.assetName, item.assetType, item.applyAt, item.assetStatus] }) this.data = data; this.isLoad = true;