task 44941 BUG修改

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
   })

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;

src/views/property/comps/left/middle/3/index.html

@@ -1,9 +1,9 @@
 
-<Pannel title="资源不规范出租预警" height="305" flexIble
+<Pannel title="资产不规范出租预警" height="305" flexIble
 v-loading="!isLoad"
 element-loading-text="拼命加载中"
 element-loading-spinner="el-icon-loading"
 element-loading-background="rgba(0, 0, 0, 0.1)"
 >
   <ScrollTable v-if="isLoad " :headers="headers" :data="data"></ScrollTable>
-</Pannel>
+</Pannel>

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;

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
                 }
               ]

src/views/property/comps/left/top/3/index.html

@@ -1,9 +1,9 @@
 
-<Pannel title="资源处置预警" height="305" flexIble
+<Pannel title="资产处置预警" height="305" flexIble
 v-loading="!isLoad"
 element-loading-text="拼命加载中"
 element-loading-spinner="el-icon-loading"
 element-loading-background="rgba(0, 0, 0, 0.1)"
 >
   <ScrollTable v-if="isLoad" :headers="headers" :data="data"></ScrollTable>
-</Pannel>
+</Pannel>

src/views/property/comps/left/top/3/index.js

@@ -27,9 +27,9 @@ export default {
   data () {
     return {
       isLoad: false,
-      headers: ['部门', '资源名称', '资产类别', '申请日期', '处置类型'],
+      headers: ['部门', '资产名称', '资产类别', '申请日期', '处置类型'],
       data: [
-        ['部门', '资源名称', '资产类别', '申请日期', '处置类型']
+        ['部门', '资产名称', '资产类别', '申请日期', '处置类型']
       ]
     };
   },

src/views/property/comps/right/bottom/1/index.js

@@ -28,7 +28,7 @@ export default {
     return {
       isLoad: false,
       data: [],
-      headers: ['部门名称', '合同数量', '排名']
+      headers: ['部门名称', '合同数量(个)', '排名']
     };
   },
   created () {

src/views/property/comps/right/bottom/4/index.js

@@ -27,7 +27,7 @@ export default {
   data () {
     return {
       isLoad: false,
-      headers: ['组织名称', '负债总额(万元)', '资产总额(万元)', '债务率'],
+      headers: ['组织名称', '债务总额(万元)', '资产总额(万元)', '债务率'],
       data: [
       ]
     };

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]
             })

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
                 },
                 {

src/views/resources/comps/left/bottom/1/my-table/index.html

@@ -13,7 +13,8 @@
     </el-table-column>
     <el-table-column prop="attachments" label="附件">
       <template slot-scope="scope">
-        <span @click="look(scope.row)" class="look hover_pointer">查看</span>
+        <span @click="look(scope.row)" class="look hover_pointer" v-if="scope.row.attachments">查看</span>
+        <span class="look hover_pointer" v-else>无</span>
       </template>
     </el-table-column>
   </el-table>

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;