From 7ed1556b327c2a0422d3d2a4750c1c3289259224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Wed, 23 Jul 2025 16:21:20 +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/components/charts/bar-sign/index.js       |   3 +-
 src/components/charts/bar/index.js            |   6 ++-
 src/components/charts/pie-legend/index.js     |  20 ++++-----
 src/components/gis-map/index.html             |   4 +-
 src/components/gis-map/index.js               |   8 +++-
 src/components/pannel/index.html              |   3 +-
 src/components/pannel/index.js                |   7 ++++
 src/components/pop-window/close.png           | Bin 391 -> 478 bytes
 src/components/pop-window/icon.png            | Bin 293 -> 536 bytes
 src/components/scroll-table/index.js          |   3 +-
 src/components/scroll-table/index.scss        |   3 +-
 src/views/capital/comps/buttom/1/data.js      |  22 +++++-----
 src/views/capital/comps/buttom/2/close.png    | Bin 0 -> 478 bytes
 src/views/capital/comps/buttom/2/index.html   |   5 +--
 src/views/capital/comps/buttom/2/index.js     |  10 +++++
 src/views/capital/comps/buttom/2/index.scss   |   2 +-
 .../capital/comps/left/bottom/1/index.js      |   4 +-
 .../capital/comps/left/bottom/2/index.html    |   7 ++--
 .../capital/comps/left/bottom/2/index.js      |   7 +++-
 .../capital/comps/left/middle/1/index.js      |   4 +-
 .../capital/comps/left/middle/2/index.html    |   6 ++-
 .../capital/comps/left/middle/2/index.js      |   5 ++-
 src/views/capital/comps/left/top/2/index.html |  14 ++++---
 src/views/capital/comps/left/top/2/index.js   |   3 ++
 src/views/capital/comps/right/top/1/index.js  |  11 ++---
 src/views/capital/index.html                  |   6 +--
 src/views/capital/index.js                    |  14 ++++++-
 src/views/login/index.html                    |   6 +--
 .../property/comps/left/bottom/1/index.html   |   4 +-
 .../property/comps/left/bottom/1/index.js     |   4 +-
 .../property/comps/left/bottom/3/index.js     |   6 +--
 .../property/comps/left/middle/1/index.html   |   4 +-
 .../property/comps/left/middle/3/index.js     |   6 +--
 src/views/property/comps/left/top/3/index.js  |   6 +--
 .../property/comps/right/bottom/3/index.js    |   4 +-
 .../property/comps/right/middle/3/index.js    |   6 +--
 src/views/property/comps/right/top/3/index.js |   6 +--
 src/views/property/index.html                 |   2 +-
 .../property/main-gis/asset-details/close.png | Bin 352 -> 478 bytes
 .../main-gis/asset-details/index.html         |   6 +--
 .../main-gis/asset-details/index.scss         |  39 +++++++++++-------
 .../main-gis/asset-details/tt_icon.png        | Bin 0 -> 536 bytes
 src/views/property/main-gis/index.js          |   2 +-
 src/views/property/main-gis/index.scss        |  28 ++++++++++++-
 .../resources/comps/left/bottom/1/index.html  |   4 +-
 .../resources/comps/left/bottom/1/index.js    |   7 ++--
 .../comps/left/bottom/1/my-table/index.js     |  23 +----------
 .../comps/left/bottom/1/my-table/index.scss   |   6 ++-
 .../resources/comps/left/bottom/2/index.html  |   4 +-
 .../resources/comps/left/bottom/2/index.js    |   6 +--
 .../resources/comps/left/middle/1/index.html  |   4 +-
 .../resources/comps/left/middle/2/index.js    |   6 +--
 src/views/resources/comps/left/top/2/index.js |   6 +--
 .../resources/comps/right/bottom/2/index.js   |   4 +-
 .../resources/comps/right/middle/2/index.js   |   6 +--
 .../resources/comps/right/top/2/index.js      |   6 +--
 src/views/resources/index.html                |   2 +-
 src/views/resources/main-gis/index.js         |   8 ++--
 src/views/resources/main-gis/index.scss       |  25 ++++++++++-
 59 files changed, 257 insertions(+), 166 deletions(-)
 create mode 100644 src/views/capital/comps/buttom/2/close.png
 create mode 100644 src/views/property/main-gis/asset-details/tt_icon.png

diff --git a/src/components/charts/bar-sign/index.js b/src/components/charts/bar-sign/index.js
index febe1bf..661afce 100644
--- a/src/components/charts/bar-sign/index.js
+++ b/src/components/charts/bar-sign/index.js
@@ -76,7 +76,7 @@ export default {
           show: false,
         },
         grid: {
-          left: "10%",
+          left: "2%",
           right: "0%",
           bottom: "5%",
           top: "15%",
@@ -209,7 +209,6 @@ export default {
             zlevel: 11,
           },
           {
-            name: "合格率2",
             type: "pictorialBar",
             symbol: 'image://data:' + this.icon,
             symbolSize: [20, 20],
diff --git a/src/components/charts/bar/index.js b/src/components/charts/bar/index.js
index 3ed521a..9503652 100644
--- a/src/components/charts/bar/index.js
+++ b/src/components/charts/bar/index.js
@@ -25,6 +25,10 @@ export default {
       type: String,
       default: '单位：万元'
     },
+    serverName: {
+      type: String,
+      default: '面积'
+    },
     color: {
       type: Array,
       default: function () {
@@ -194,7 +198,7 @@ export default {
         ],
         series: [
           {
-            name: "面积",
+            name: this.serverName,
             type: "bar",
             barWidth: 15,
             xAxisIndex: 0,
diff --git a/src/components/charts/pie-legend/index.js b/src/components/charts/pie-legend/index.js
index 8d3e6a8..f809ea8 100644
--- a/src/components/charts/pie-legend/index.js
+++ b/src/components/charts/pie-legend/index.js
@@ -75,33 +75,33 @@ export default {
       var rich = {
         color0: {
           color: "rgba(15, 252, 252, 1)",
-          fontSize: 18 * scale,
+          fontSize: 16 * scale,
           padding: [5, 4],
-          align: "center",
+          align: "left",
         },
         color1: {
           color: "rgba(29, 197, 104, 1)",
-          fontSize: 18 * scale,
+          fontSize: 16 * scale,
           padding: [5, 4],
-          align: "center",
+          align: "left",
         },
         color2: {
           color: "rgba(49, 129, 246, 1)",
-          fontSize: 18 * scale,
+          fontSize: 16 * scale,
           padding: [5, 4],
-          align: "center",
+          align: "left",
         },
         color3: {
           color: "rgba(18, 51, 255, 1)",
-          fontSize: 18 * scale,
+          fontSize: 16 * scale,
           padding: [5, 4],
-          align: "center",
+          align: "left",
         },
         color4: {
           color: "rgba(134, 91, 252, 1)",
-          fontSize: 18 * scale,
+          fontSize: 16 * scale,
           padding: [5, 4],
-          align: "center",
+          align: "left",
         },
         hr: {
           // borderColor: "#0b5263",
diff --git a/src/components/gis-map/index.html b/src/components/gis-map/index.html
index 04f30be..db3f9dd 100644
--- a/src/components/gis-map/index.html
+++ b/src/components/gis-map/index.html
@@ -8,7 +8,7 @@
           </template>
       </el-cascader>
     </div>
-    <div class="select_wrap">
+    <div class="select_wrap" v-if="showYears">
       <el-dropdown style="width: 80px">
         <span class="el-dropdown-link" style="color: #c1deff">
           {{ centerYear }}<i class="el-icon-caret-bottom el-icon--right"></i>
@@ -20,4 +20,4 @@
       </el-dropdown>
     </div>
     <div class="mask" style="position: absolute; width: 100%; height: 100%;pointer-events: none;"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/components/gis-map/index.js b/src/components/gis-map/index.js
index 19d0a89..1c7677d 100644
--- a/src/components/gis-map/index.js
+++ b/src/components/gis-map/index.js
@@ -22,6 +22,12 @@ const ALL_CHANGED = ~(1 << 31);
 export default {
   components: {
   },
+  props: {
+    showYears: {
+      type: Boolean,
+      default: true
+    }
+  },
   watch: {
     'queryParams.deptId': {
       handler: function () {
@@ -103,7 +109,7 @@ export default {
   methods: {
     /**
      * 提交dept
-     * @param {*} deptId 
+     * @param {*} deptId
      */
     commitDept (deptId) {
       this.$store.commit('SET_DEPTID', deptId);
diff --git a/src/components/pannel/index.html b/src/components/pannel/index.html
index c2eef36..53a8d85 100644
--- a/src/components/pannel/index.html
+++ b/src/components/pannel/index.html
@@ -12,6 +12,7 @@
       <div class="more">
         <slot name="header"></slot>
         <div v-show="flexIble" class="flexIble hover_pointer" :class="[isOpen ? 'flexIble_open' : '']" @click="open"></div>
+        <div v-show="flexIbleTable" class="flexIble hover_pointer" :class="[isOpen ? 'flexIble_open' : '']" @click="openTable"></div>
       </div>
     </div>
     <div class="light"></div>
@@ -25,4 +26,4 @@
       <div class="right_sign"></div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/components/pannel/index.js b/src/components/pannel/index.js
index 0f0ec7b..b0445de 100644
--- a/src/components/pannel/index.js
+++ b/src/components/pannel/index.js
@@ -16,6 +16,10 @@ export default {
       type: Boolean,
       default: false
     },
+    flexIbleTable: {
+      type: Boolean,
+      default: false
+    },
     // 定义跳转页面url
     uri: {
       type: String,
@@ -52,6 +56,9 @@ export default {
     },
     open () {
       this.isOpen = !this.isOpen
+    },
+    openTable () {
+      this.$emit('openTable')
     }
   }
 };
diff --git a/src/components/pop-window/close.png b/src/components/pop-window/close.png
index b5e8399a156821ba03888172aabf5017880836a2..6f536c6ce470d40359c7eeedaadf7e3830fd69c7 100644
GIT binary patch
literal 478
zcmV<40U`d0P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0004{Nkl<ZIE|gv
z&5Msw6bJCnj0uY|Lozb*QdlWjj+(ulvY4$D8%bW8lDCirg-8~PmA^ptrmU2W1=)Bn
zv!PjFyeuYkrt_=odVY_e`PN-L=jD6P`QCf((>FXfrv>A=HlPph@dyvPr3`ejPhu~&
zcJaT&U0kRgb%iT%Kdb5m&#((`nh1yR9BX?d>);1AV>-V33&+C+kOh|FF&34C2eG{h
z{Q4iHqc~L(o~Q!8VGxHKl5ggTzo_gdu{a2KG_)FR9Kj8oDeSj!2)nVa%2|SmxHdZ*
zs)&uQVL8s_JsiOS?8ogct&a^f>{Q}x`uC;n5{|dT5BH}YZ5SzhqyLDVpOonq|8*S2
zRjkAwyw1v-@Hq&laJq8-!uecr2*=X?DmDF%iw)g9=}gK8tSTI{SeDw|sgfqM;&)hI
z*nf63lmR6MQ;M1_a3$Mb(;&}mIm<EN8(Z{j!xyX$Dau(M&k0!w#!}Zm9*1Z#-oI$4
zSA4{_e5K}55(eI4OP=IR3u_$OWo*LJ($V${h<T2gjaMjcKwOd7Bna-|(_b0*4VQUS
Ulla#lIRF3v07*qoM6N<$f=?IQ=>Px#

literal 391
zcmV;20eJq2P)<h;3K|Lk000e1NJLTq000aC000aK1^@s6R&`wG00001b5ch_0Itp)
z=>Px$K}keGR47xGlD$g<K@i2?yW0yG^Hqq2DFhqa6gGmTl@@}9sD)UVzrb{2p{<1o
zRuZrj5wX!St^a@sVkcPH#N@<~-0eNN%O&`Mpj!>I^P4yGc8Px;eyMLZOZi-Gi{uOe
zPvl+D?bbWl?DL>*2#of672`P90LtG)-{iWhZSp40CqPLmMb_REnD}MFPUN~3pL|S!
zytOq)I*8*4SaN_P0AmrbLEwb_xb7QMO@Kleo)cI}yFWpy%9sqS-61fW<{K?z<`bY8
zhL-@A(+gj~S|q)@<SBs3Bri2up4SHoL9kD9H;w~f!2o*%#;vsJl2^%^z**av^#mA^
z${A}P0OSDp@mi_ctAJu(Ky$w5-41OnNQ<=gBIZ9krPv3u)^^>)p{;|0yfh7Kw;gFJ
l=}NvxI*vR4c(}j*kPq8{aSdR~&*=aF002ovPDHLkV1n=3tq=eJ

diff --git a/src/components/pop-window/icon.png b/src/components/pop-window/icon.png
index fd11f0ed45d6fe428067b786f068c439a069c711..59f4001c5a0480c1edd936a298af27bcb5187edc 100644
GIT binary patch
literal 536
zcmV+z0_XjSP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0005sNkl<ZIE|&1
zJ4;?c5QZPmdO@31iqWr98v|Cx!p2G>c1qNL5Gx_XK*UQKLcC&=BKZr7`O+j2t*i}!
zh@I&^qiAy~jq%FJdthDnXuubi1G_WN?CzPFEqio!MnsiBpGGIp0Q>_=z)#>a@Wtj*
z=Wck%fc?M>&?3kd@JDL~Zd1S=U@UcRB@bw!-T`lbL*Nsz3LFIiYk(eL7^qe7iPX9C
z5I8N^1~3%?g);D4pv$1Cb7MYm09XRnfJxxu9$2PC&}YD4>fEvc?LK}3RlxI{oz>}k
zkh9Ze;1p=G2!lWY_!xoNaf-lKjiTm!9qGOsfuTgHaSVKqz~&V!Q$cef^qUxc2J8T~
zfxm&#sNHeoh-F&ybt1-71J(okfkAz+vrq-u_}T*=CraLmJDmSl*NjBu+Q4aFWtOK>
z<W!akdj|Xkv?^_UEdZAh;HB1lRf(~gC>5%K-oVHz=5?^slIAu7+g>q>eqvXuVjhy%
z&Dl>GmD7~&HPk^4ERm1-zDk`t$(*f@XH}DPih7@FJfGRrIb+;vUyHzq{-Bl9dQSW5
z23}a+0Uv;uvG$e88pM0A!CDqrYLyG{#A~qQ)?s|-yPg1R8rHqrRrsb|;D??7JL1hJ
a0Js9(HHS=6wtR{J0000<MNUMnLSTZ{4fiep

literal 293
zcmV+=0owkFP)<h;3K|Lk000e1NJLTq000UA000UI1^@s6jWW-@00001b5ch_0Itp)
z=>Px#-$_J4R47x8kTFU_Q4mG%o&P@Ad~Fn0p?h!z(G8@vR8W%2%F3W%Qd(vMNj9K+
zP+Wv)_Z#88H&@={H$p(C7?_#MotZ-n(WNvp;6l=2X_5SJVBUwYsdY(R&UbV_2JlGf
ztMo+f1GtpgYu_|ecG8GBpVR%O3V?QSh_yDm74XEpl%AE+jAox|no~&E^&0Y?Ij`k@
zzz`<fjq#n*xH_4=5ZD=<zu|sDAc|c6U-)Y^c?R;Tu9hAst;$m*rz}_q{QXSD6XT4)
r(N;XbTi>>m%CU;K17GwZtjqidcV~a`Od5Qz00000NkvXXu0mjfeb0kp

diff --git a/src/components/scroll-table/index.js b/src/components/scroll-table/index.js
index 6e362d3..8ca9f26 100644
--- a/src/components/scroll-table/index.js
+++ b/src/components/scroll-table/index.js
@@ -65,12 +65,11 @@ export default {
     swiperOption: function () {
       return {
         step: 0.4,
-        limitMoveNum: 1,
+        limitMoveNum: 5,
         hoverStop: true,
         direction: 1,
         openWatch: true,
         singleHeight: 0,
-        singleHeight: 0,
         waitTime: 1000
       }
     }
diff --git a/src/components/scroll-table/index.scss b/src/components/scroll-table/index.scss
index 82ee69e..ad9630a 100644
--- a/src/components/scroll-table/index.scss
+++ b/src/components/scroll-table/index.scss
@@ -74,6 +74,7 @@
   text-align: center;
   overflow: hidden;
   white-space: nowrap;
+  flex: 1!important;
 }
 
 .item1 {
@@ -129,4 +130,4 @@
 
 .margin_top {
   margin-top: 5px;
-}
\ No newline at end of file
+}
diff --git a/src/views/capital/comps/buttom/1/data.js b/src/views/capital/comps/buttom/1/data.js
index 4798bc8..02825b0 100644
--- a/src/views/capital/comps/buttom/1/data.js
+++ b/src/views/capital/comps/buttom/1/data.js
@@ -5,22 +5,22 @@ export default [
     },
     {
       show: true,
-      name: '经营收入',
+      name: '经营收入(万元)',
       value: '716'
     },
     {
       show: true,
-      name: '投资收益',
+      name: '投资收益(万元)',
       value: '716'
     },
     {
       show: true,
-      name: '补助收入',
+      name: '补助收入(万元)',
       value: '716'
     },
     {
       show: true,
-      name: '其他收入',
+      name: '其他收入(万元)',
       value: '716'
     },
     {
@@ -30,33 +30,33 @@ export default [
   [
     {
       show: true,
-      name: '经营支出',
+      name: '经营支出(万元)',
       value: '716'
     },
     {
       show: true,
-      name: '税金及附加',
+      name: '税金及附加(万元)',
       value: '716'
     },
     {
       show: true,
-      name: '管理费用',
+      name: '管理费用(万元)',
       value: '716'
     },
     {
       show: true,
-      name: '公益支出',
+      name: '公益支出(万元)',
       value: '716'
     },
     {
       show: true,
-      name: '其他支出',
+      name: '其他支出(万元)',
       value: '716'
     },
     {
       show: true,
-      name: '所得税费用',
+      name: '所得税费用(万元)',
       value: '103'
     }
   ]
-]
\ No newline at end of file
+]
diff --git a/src/views/capital/comps/buttom/2/close.png b/src/views/capital/comps/buttom/2/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f536c6ce470d40359c7eeedaadf7e3830fd69c7
GIT binary patch
literal 478
zcmV<40U`d0P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0004{Nkl<ZIE|gv
z&5Msw6bJCnj0uY|Lozb*QdlWjj+(ulvY4$D8%bW8lDCirg-8~PmA^ptrmU2W1=)Bn
zv!PjFyeuYkrt_=odVY_e`PN-L=jD6P`QCf((>FXfrv>A=HlPph@dyvPr3`ejPhu~&
zcJaT&U0kRgb%iT%Kdb5m&#((`nh1yR9BX?d>);1AV>-V33&+C+kOh|FF&34C2eG{h
z{Q4iHqc~L(o~Q!8VGxHKl5ggTzo_gdu{a2KG_)FR9Kj8oDeSj!2)nVa%2|SmxHdZ*
zs)&uQVL8s_JsiOS?8ogct&a^f>{Q}x`uC;n5{|dT5BH}YZ5SzhqyLDVpOonq|8*S2
zRjkAwyw1v-@Hq&laJq8-!uecr2*=X?DmDF%iw)g9=}gK8tSTI{SeDw|sgfqM;&)hI
z*nf63lmR6MQ;M1_a3$Mb(;&}mIm<EN8(Z{j!xyX$Dau(M&k0!w#!}Zm9*1Z#-oI$4
zSA4{_e5K}55(eI4OP=IR3u_$OWo*LJ($V${h<T2gjaMjcKwOd7Bna-|(_b0*4VQUS
Ulla#lIRF3v07*qoM6N<$f=?IQ=>Px#

literal 0
HcmV?d00001

diff --git a/src/views/capital/comps/buttom/2/index.html b/src/views/capital/comps/buttom/2/index.html
index 8a0c469..6603dc5 100644
--- a/src/views/capital/comps/buttom/2/index.html
+++ b/src/views/capital/comps/buttom/2/index.html
@@ -1,4 +1,3 @@
-
-<Pannel title="xx预警清单" height="305" width="960">
+<Pannel :title="bottomTit + '预警清单'" height="305" width="960" v-if="showBottom">
   <ScrollTable :headers="headers" :data="data" details></ScrollTable>
-</Pannel>
\ No newline at end of file
+</Pannel>
diff --git a/src/views/capital/comps/buttom/2/index.js b/src/views/capital/comps/buttom/2/index.js
index 795b1b9..82e5e2a 100644
--- a/src/views/capital/comps/buttom/2/index.js
+++ b/src/views/capital/comps/buttom/2/index.js
@@ -5,6 +5,16 @@ export default {
     ScrollTable,
     Pannel
   },
+  props: {
+    showBottom: {
+      type: Boolean,
+      default: false
+    },
+    bottomTit: {
+      type: String,
+      default: ''
+    }
+  },
   data () {
     return {
       headers: ['摘要', '日期', '借方金额', '贷方金额'],
diff --git a/src/views/capital/comps/buttom/2/index.scss b/src/views/capital/comps/buttom/2/index.scss
index 938adcd..9831c89 100644
--- a/src/views/capital/comps/buttom/2/index.scss
+++ b/src/views/capital/comps/buttom/2/index.scss
@@ -14,4 +14,4 @@
     flex: 1;
     width: 100%;
   }
-}
\ No newline at end of file
+}
diff --git a/src/views/capital/comps/left/bottom/1/index.js b/src/views/capital/comps/left/bottom/1/index.js
index 601445c..8624c9c 100644
--- a/src/views/capital/comps/left/bottom/1/index.js
+++ b/src/views/capital/comps/left/bottom/1/index.js
@@ -53,7 +53,7 @@ export default {
         this.isLoad = false;
         // 如果是趋势
         if (this.tabIndex == 1) {
-          analysisOfCapitalExpenditureRend(this.year, this.deptId).then(res => {
+          analysisOfCapitalExpenditureRend(this.deptId, this.year).then(res => {
             let data = res.data.map(item => {
               return {
                 name: item.name + '月',
@@ -65,7 +65,7 @@ export default {
           })
         } else if (this.tabIndex == 2) {
           // 获取类型
-          analysisOfCapitalExpenditureType(this.year, this.deptId).then(res => {
+          analysisOfCapitalExpenditureType(this.deptId, this.year).then(res => {
 
             let data = res.data.list.map(item => {
 
diff --git a/src/views/capital/comps/left/bottom/2/index.html b/src/views/capital/comps/left/bottom/2/index.html
index 3aad404..3f46000 100644
--- a/src/views/capital/comps/left/bottom/2/index.html
+++ b/src/views/capital/comps/left/bottom/2/index.html
@@ -1,16 +1,17 @@
-
 <Pannel title="资金往来不规范预警分析" height="305"
 v-loading="!isLoad"
 element-loading-text="拼命加载中"
 element-loading-spinner="el-icon-loading"
 element-loading-background="rgba(0, 0, 0, 0.1)"
+        flexIbleTable
+        @openTable="openTable"
 >
   <div class="full">
     <div class="top">
       <PannelTabs @change="tabChange" :data="pannelTabsData"></PannelTabs>
     </div>
     <div class="buttom">
-      <BarSign v-if="isLoad" id="bar3" :data="data"></BarSign>
+      <BarSign v-if="isLoad" :unit="'单位：笔'" id="bar3" :data="data"></BarSign>
     </div>
   </div>
-</Pannel>
\ No newline at end of file
+</Pannel>
diff --git a/src/views/capital/comps/left/bottom/2/index.js b/src/views/capital/comps/left/bottom/2/index.js
index 397f634..33684a3 100644
--- a/src/views/capital/comps/left/bottom/2/index.js
+++ b/src/views/capital/comps/left/bottom/2/index.js
@@ -52,7 +52,7 @@ export default {
             let arr = res.data.zc.map(item => {
               return {
                 name: item.name,
-                name: item.value
+                value: item.value
               }
             })
             this.data = arr
@@ -60,7 +60,7 @@ export default {
             let arr = res.data.sr.map(item => {
               return {
                 name: item.name,
-                name: item.value
+                value: item.value
               }
             })
             this.data = arr
@@ -72,6 +72,9 @@ export default {
     tabChange (info) {
       this.tabIndex = info.id
       this.getData()
+    },
+    openTable(){
+      this.$emit('openTable','不规范')
     }
   }
 };
diff --git a/src/views/capital/comps/left/middle/1/index.js b/src/views/capital/comps/left/middle/1/index.js
index 9451354..6fbfc41 100644
--- a/src/views/capital/comps/left/middle/1/index.js
+++ b/src/views/capital/comps/left/middle/1/index.js
@@ -49,7 +49,7 @@ export default {
         this.isLoad = false;
         // 如果是趋势
         if (this.tabIndex == 1) {
-          leftbottomcapitalgainstrend(this.year, this.deptId).then(res => {
+          leftbottomcapitalgainstrend( this.deptId, this.year).then(res => {
             let data = res.data.map(item => {
               return {
                 name: item.name + '月',
@@ -61,7 +61,7 @@ export default {
           })
         } else if (this.tabIndex == 2) {
           // 获取类型
-          leftbottomcapitalgainstype(this.year, this.deptId).then(res => {
+          leftbottomcapitalgainstype(this.deptId, this.year).then(res => {
             let data = res.data.list.map(item => {
               return {
                 name: item.name,
diff --git a/src/views/capital/comps/left/middle/2/index.html b/src/views/capital/comps/left/middle/2/index.html
index 762a08c..ad3d2ce 100644
--- a/src/views/capital/comps/left/middle/2/index.html
+++ b/src/views/capital/comps/left/middle/2/index.html
@@ -4,13 +4,15 @@ v-loading="!isLoad"
 element-loading-text="拼命加载中"
 element-loading-spinner="el-icon-loading"
 element-loading-background="rgba(0, 0, 0, 0.1)"
+        flexIbleTable
+        @openTable="openTable"
 >
   <div class="full">
     <div class="top">
       <PannelTabs @change="tabChange" :data="pannelTabsData"></PannelTabs>
     </div>
     <div class="buttom">
-      <Bar v-if="isLoad" :data="data"d id="bar2" :color="['rgba(134, 91, 252, 1)', 'rgba(49, 129, 246, 1)']"></Bar>
+      <Bar v-if="isLoad" :data="data" :serverName="'金额'" id="bar2" :color="['rgba(134, 91, 252, 1)', 'rgba(49, 129, 246, 1)']"></Bar>
     </div>
   </div>
-</Pannel>
\ No newline at end of file
+</Pannel>
diff --git a/src/views/capital/comps/left/middle/2/index.js b/src/views/capital/comps/left/middle/2/index.js
index cf54035..6e076d2 100644
--- a/src/views/capital/comps/left/middle/2/index.js
+++ b/src/views/capital/comps/left/middle/2/index.js
@@ -48,7 +48,7 @@ export default {
     getData () {
       if (this.year || this.deptId) {
         this.isLoad = false;
-        analysisSensitiveWarningForFundTransactions(this.year, this.deptId).then(res => {
+        analysisSensitiveWarningForFundTransactions( this.deptId, this.year).then(res => {
           if (this.tabIndex == 1) {
             this.data = res.data.zc
           } else if (this.tabIndex == 2) {
@@ -62,6 +62,9 @@ export default {
     tabChange (info) {
       this.tabIndex = info.id
       this.getData()
+    },
+    openTable(){
+      this.$emit('openTable','敏感')
     }
   }
 };
diff --git a/src/views/capital/comps/left/top/2/index.html b/src/views/capital/comps/left/top/2/index.html
index ef25e96..666fe5b 100644
--- a/src/views/capital/comps/left/top/2/index.html
+++ b/src/views/capital/comps/left/top/2/index.html
@@ -1,9 +1,11 @@
 
 <Pannel title="资金支出大额预警分析" height="305"
-v-loading="!isLoad"
-element-loading-text="拼命加载中"
-element-loading-spinner="el-icon-loading"
-element-loading-background="rgba(0, 0, 0, 0.1)"
+        v-loading="!isLoad"
+        element-loading-text="拼命加载中"
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.1)"
+        flexIbleTable
+        @openTable="openTable"
 >
-  <Bar v-if="isLoad" :data="data"></Bar>
-</Pannel>
\ No newline at end of file
+  <Bar v-if="isLoad" :serverName="'金额'" :data="data"></Bar>
+</Pannel>
diff --git a/src/views/capital/comps/left/top/2/index.js b/src/views/capital/comps/left/top/2/index.js
index 0b11fd4..b6b03f5 100644
--- a/src/views/capital/comps/left/top/2/index.js
+++ b/src/views/capital/comps/left/top/2/index.js
@@ -49,6 +49,9 @@ export default {
           this.isLoad = true;
         })
       }
+    },
+    openTable(){
+      this.$emit('openTable','大额')
     }
   }
 };
diff --git a/src/views/capital/comps/right/top/1/index.js b/src/views/capital/comps/right/top/1/index.js
index 0740385..11528df 100644
--- a/src/views/capital/comps/right/top/1/index.js
+++ b/src/views/capital/comps/right/top/1/index.js
@@ -11,6 +11,12 @@ export default {
   computed: {
     ...mapGetters(['year', 'deptId'])
   },
+  data () {
+    return {
+      isLoad: false,
+      data
+    };
+  },
   watch: {
     year: {
       handler () {
@@ -39,10 +45,5 @@ export default {
         })
       }
     }
-  },
-  data () {
-    return {
-      data
-    };
   }
 };
diff --git a/src/views/capital/index.html b/src/views/capital/index.html
index c15c934..8d6ae18 100644
--- a/src/views/capital/index.html
+++ b/src/views/capital/index.html
@@ -7,12 +7,12 @@
   <GisMap></GisMap>
   <!-- 项目初始化 -->
   <div class="left_side col space_between zIndextop">
-    <component :is="item" v-for="(item, index) in currentComp.left" :key="index"></component>
+    <component :is="item" v-for="(item, index) in currentComp.left" :key="index" @openTable="openTable"></component>
   </div>
   <div class="right_side col space_between zIndextop">
     <component :is="item" v-for="(item, index) in currentComp.right" :key="index"></component>
   </div>
   <div class="buttom_side row space_between zIndextop">
-    <component :is="item" v-for="(item, index) in currentComp.buttom" :key="index"></component>
+    <component :is="item" v-for="(item, index) in currentComp.buttom" :key="index" :showBottom="showBottom" :bottomTit="bottomTit"></component>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/views/capital/index.js b/src/views/capital/index.js
index ca57635..9d599ba 100644
--- a/src/views/capital/index.js
+++ b/src/views/capital/index.js
@@ -55,7 +55,9 @@ export default {
       ],
       yellowIcon: require('./icon/yellow.png'),
       tab: '1',
-      comps
+      comps,
+      showBottom: false,
+      bottomTit: ''
     };
   },
   computed: {
@@ -70,6 +72,16 @@ export default {
   methods: {
     tabChange (info) {
       this.tab = info.id;
+    },
+    openTable(val){
+      if (val == this.bottomTit){
+        this.showBottom = !this.showBottom;
+      }else{
+        this.showBottom = true
+      }
+
+
+      this.bottomTit = val
     }
   }
 };
diff --git a/src/views/login/index.html b/src/views/login/index.html
index 85eda0d..6730419 100644
--- a/src/views/login/index.html
+++ b/src/views/login/index.html
@@ -31,9 +31,9 @@
       <div class="auxiliary">
         <el-checkbox class="keepMind" v-model="loginForm.rememberMe">记住密码 </el-checkbox>
         <div class="sms-login">
-          <el-button size="mini" type="text" @click.native.prevent="loginMethod">
-            <span>忘记密码</span>
-          </el-button>
+<!--          <el-button size="mini" type="text" @click.native.prevent="loginMethod">-->
+<!--            <span>忘记密码</span>-->
+<!--          </el-button>-->
         </div>
       </div>
       </el-row>
diff --git a/src/views/property/comps/left/bottom/1/index.html b/src/views/property/comps/left/bottom/1/index.html
index d42a7e1..2e4cd28 100644
--- a/src/views/property/comps/left/bottom/1/index.html
+++ b/src/views/property/comps/left/bottom/1/index.html
@@ -9,7 +9,7 @@ element-loading-background="rgba(0, 0, 0, 0.1)"
       <PannelTabs @change="tabChange" :data="pannelTabData"></PannelTabs>
     </div>
     <div class="buttom">
-      <Bar v-if="isLoad" :data="data" id="bar2"></Bar>
+      <Bar v-if="isLoad" :unit="'单位：个'" :serverName="'数量'" :data="data" id="bar2"></Bar>
     </div>
   </div>
-</Pannel>
\ No newline at end of file
+</Pannel>
diff --git a/src/views/property/comps/left/bottom/1/index.js b/src/views/property/comps/left/bottom/1/index.js
index 70741a9..2f75d1d 100644
--- a/src/views/property/comps/left/bottom/1/index.js
+++ b/src/views/property/comps/left/bottom/1/index.js
@@ -49,9 +49,9 @@ export default {
         this.isLoad = false;
         analysisOfOperatingAssets(this.deptId, this.year).then(res => {
           if (this.tabIndex == 1) {
-            this.data = res.data.jyx
+            this.data = res.data.xz
           } else if (this.tabIndex == 2) {
-            this.data = res.data.fjyx
+            this.data = res.data.cz
           }
           this.isLoad = true;
         })
diff --git a/src/views/property/comps/left/bottom/3/index.js b/src/views/property/comps/left/bottom/3/index.js
index 76c8adc..3b034dd 100644
--- a/src/views/property/comps/left/bottom/3/index.js
+++ b/src/views/property/comps/left/bottom/3/index.js
@@ -27,9 +27,9 @@ export default {
   data () {
     return {
       isLoad: false,
-      headers: ['资产名称', '资产类别', '资产原值（元）', '部门'],
+      headers: ['部门', '资产名称', '资产类别', '资产原值（元）'],
       data: [
-        ['资产名称', '资产类别', '资产原值（元）', '部门']
+        ['部门', '资产名称', '资产类别', '资产原值（元）']
       ]
     };
   },
@@ -39,7 +39,7 @@ export default {
         this.isLoad = false;
         longTermIdleResourceWarning(this.deptId, this.year).then(res => {
           let data = res.data.map(item => {
-            return [item.name, item.resourceSort, item.resourceType, item.deptName]
+            return [ item.deptName, item.name, item.resourceSort, item.resourceType ]
           })
           this.data = data;
           this.isLoad = true;
diff --git a/src/views/property/comps/left/middle/1/index.html b/src/views/property/comps/left/middle/1/index.html
index c5bce15..e5192d7 100644
--- a/src/views/property/comps/left/middle/1/index.html
+++ b/src/views/property/comps/left/middle/1/index.html
@@ -9,7 +9,7 @@ element-loading-background="rgba(0, 0, 0, 0.1)"
       <PannelTabs @change="tabChange" :data="pannelTabData"></PannelTabs>
     </div>
     <div class="buttom">
-      <Bar v-if="isLoad" :data="data" :color="['rgba(134, 91, 252, 1)', 'rgba(49, 129, 246, 1)']"></Bar>
+      <Bar v-if="isLoad" :data="data" :unit="'单位：个'" :serverName="'数量'" :color="['rgba(134, 91, 252, 1)', 'rgba(49, 129, 246, 1)']"></Bar>
     </div>
   </div>
-</Pannel>
\ No newline at end of file
+</Pannel>
diff --git a/src/views/property/comps/left/middle/3/index.js b/src/views/property/comps/left/middle/3/index.js
index 58d5b13..448eb1b 100644
--- a/src/views/property/comps/left/middle/3/index.js
+++ b/src/views/property/comps/left/middle/3/index.js
@@ -27,9 +27,9 @@ export default {
   data () {
     return {
       isLoad: false,
-      headers: ['资产名称', '资产类别', '资产原值', '部门'],
+      headers: ['部门', '资产名称', '资产类别', '资产原值'],
       data: [
-        ['资产名称', '资产类别', '资产原值', '部门']
+        ['部门', '资产名称', '资产类别', '资产原值']
       ]
     };
   },
@@ -39,7 +39,7 @@ export default {
         this.isLoad = false;
         warningForNonStandardRentalOfResources(this.deptId, this.year).then(res => {
           let data = res.data.map(item => {
-            return [item.name, item.resourceSort, item.resourceType, item.deptName]
+            return [item.deptName, item.name, item.resourceSort, item.resourceType]
           })
           this.data = data;
           this.isLoad = true;
diff --git a/src/views/property/comps/left/top/3/index.js b/src/views/property/comps/left/top/3/index.js
index 781ae01..051e196 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: [
-        ['资源名称', '资产类别', '申请日期', '处置类型', '部门']
+        ['部门', '资源名称', '资产类别', '申请日期', '处置类型']
       ]
     };
   },
@@ -39,7 +39,7 @@ export default {
         this.isLoad = false;
         resourceDisposalWarning(this.deptId, this.year).then(res => {
           let data = res.rows.map(item => {
-            return [item.assetName, item.assetType, item.applyAt, item.assetStatus, item.bookName]
+            return [item.bookName, item.assetName, item.assetType, item.applyAt, item.assetStatus]
           })
           this.data = data;
           this.isLoad = true;
diff --git a/src/views/property/comps/right/bottom/3/index.js b/src/views/property/comps/right/bottom/3/index.js
index 861af8b..8f4d0ef 100644
--- a/src/views/property/comps/right/bottom/3/index.js
+++ b/src/views/property/comps/right/bottom/3/index.js
@@ -10,7 +10,7 @@ export default {
   data () {
     return {
       isLoad: false,
-      headers: ['合同编码', '合同名称', '合同截止日期', '部门'],
+      headers: ['部门', '合同编码', '合同名称', '合同截止日期'],
       data: []
     };
   },
@@ -41,7 +41,7 @@ export default {
         this.isLoad = false;
         longTermContractNonExecutionWarning(this.deptId, this.year).then(res => {
           let data = res.data.map(item => {
-            return [item.code, item.name, item.endTime, item.deptName]
+            return [item.deptName, item.code, item.name, item.endTime]
           })
           this.data = data;
           this.isLoad = true;
diff --git a/src/views/property/comps/right/middle/3/index.js b/src/views/property/comps/right/middle/3/index.js
index 6cc601c..b905327 100644
--- a/src/views/property/comps/right/middle/3/index.js
+++ b/src/views/property/comps/right/middle/3/index.js
@@ -10,8 +10,8 @@ export default {
   data () {
     return {
       isLoad: false,
-      headers: ['合同编码', '合同名称', '合同截止日期', '部门'],
-      data: [['合同编码', '合同名称', '合同截止日期', '部门']]
+      headers: ['部门', '合同编码', '合同名称', '合同截止日期'],
+      data: [['部门', '合同编码', '合同名称', '合同截止日期']]
     };
   },
   watch: {
@@ -41,7 +41,7 @@ export default {
         this.isLoad = false;
         contractExpirationWarning(this.deptId, this.year).then(res => {
           let data = res.data.map(item => {
-            return [item.code, item.name, item.endTime, item.deptName]
+            return [item.deptName, item.code, item.name, item.endTime]
           })
           this.data = data;
           this.isLoad = true;
diff --git a/src/views/property/comps/right/top/3/index.js b/src/views/property/comps/right/top/3/index.js
index 2b1e492..499a9d5 100644
--- a/src/views/property/comps/right/top/3/index.js
+++ b/src/views/property/comps/right/top/3/index.js
@@ -27,8 +27,8 @@ export default {
   data () {
     return {
       isLoad: false,
-      headers: ['合同编码', '合同名称', '预结款日期', '结款金额', '部门'],
-      data: [['合同编码', '合同名称', '预结款日期', '结款金额', '部门']]
+      headers: ['部门', '合同编码', '合同名称', '预结款日期', '结款金额'],
+      data: [['部门', '合同编码', '合同名称', '预结款日期', '结款金额']]
     };
   },
   created () {
@@ -41,7 +41,7 @@ export default {
         this.isLoad = false;
         contractPaymentDueWarning(this.deptId, this.year).then(res => {
           let data = res.data.map(item => {
-            return [item.code, item.name, item.settlementDate, item.settlementAmount, item.deptName]
+            return [item.deptName, item.code, item.name, item.settlementDate, item.settlementAmount]
           })
           this.data = data;
           this.isLoad = true;
diff --git a/src/views/property/index.html b/src/views/property/index.html
index db5c5e2..d20ac89 100644
--- a/src/views/property/index.html
+++ b/src/views/property/index.html
@@ -1,6 +1,6 @@
 <div class="page">
   <MainGis v-if="tab === '1'"></MainGis>
-  <GisMap v-else></GisMap>
+  <GisMap v-else :showYears="false"></GisMap>
   <Header title="资产一张图" callBack>
     <div slot="left">
       <Tabs @change="tabChange" :data="tabData"></Tabs>
diff --git a/src/views/property/main-gis/asset-details/close.png b/src/views/property/main-gis/asset-details/close.png
index 0a8337dd9feb7dc35f84978c9c5dd9ea699d907c..6f536c6ce470d40359c7eeedaadf7e3830fd69c7 100644
GIT binary patch
literal 478
zcmV<40U`d0P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0004{Nkl<ZIE|gv
z&5Msw6bJCnj0uY|Lozb*QdlWjj+(ulvY4$D8%bW8lDCirg-8~PmA^ptrmU2W1=)Bn
zv!PjFyeuYkrt_=odVY_e`PN-L=jD6P`QCf((>FXfrv>A=HlPph@dyvPr3`ejPhu~&
zcJaT&U0kRgb%iT%Kdb5m&#((`nh1yR9BX?d>);1AV>-V33&+C+kOh|FF&34C2eG{h
z{Q4iHqc~L(o~Q!8VGxHKl5ggTzo_gdu{a2KG_)FR9Kj8oDeSj!2)nVa%2|SmxHdZ*
zs)&uQVL8s_JsiOS?8ogct&a^f>{Q}x`uC;n5{|dT5BH}YZ5SzhqyLDVpOonq|8*S2
zRjkAwyw1v-@Hq&laJq8-!uecr2*=X?DmDF%iw)g9=}gK8tSTI{SeDw|sgfqM;&)hI
z*nf63lmR6MQ;M1_a3$Mb(;&}mIm<EN8(Z{j!xyX$Dau(M&k0!w#!}Zm9*1Z#-oI$4
zSA4{_e5K}55(eI4OP=IR3u_$OWo*LJ($V${h<T2gjaMjcKwOd7Bna-|(_b0*4VQUS
Ulla#lIRF3v07*qoM6N<$f=?IQ=>Px#

literal 352
zcmV-m0iXVfP)<h;3K|Lk000e1NJLTq000UA000UI1^@s6jWW-@00001b5ch_0Itp)
z=>Px$8c9S!R47wjP_aq_Q4pNDcM%eE$rWN@3c<!Ug^l1BXdzgLHe#V)U^=nT)<Og;
z30R7V*l3y79}vM-u(F9HVo2`xM&9Kj;ug!yFf*`AOs3n7qiS`J<Pw3B$me7@Y!51x
zcW<Fz)1y%{41xy$jo;uHe95`39{I>viZinp0(1XN6FSJ8Yceux1=6WkGhjUc&H>D1
zzz%^+j&Yl{G`%6PS;XHU?JEqYV0K7gxzIbTr|BJljY8-P*v_PHM_vJ#&vmK8T9TZQ
zJn}pNRzu*Jz^qBTj=TpD3%F)kYD}5E0;mG$1Bi<DPXYCDp;q$u)TA|<-2y28y<Gl2
yvek3$EI0azq(zt=1kys@LVifP=$A@Qp8o(wy=Y0EV3At@0000<MNUMnLSTYbPm~7$

diff --git a/src/views/property/main-gis/asset-details/index.html b/src/views/property/main-gis/asset-details/index.html
index af81417..21a2c62 100644
--- a/src/views/property/main-gis/asset-details/index.html
+++ b/src/views/property/main-gis/asset-details/index.html
@@ -1,7 +1,7 @@
   <!--资产信息详情-弹窗-->
   <div class="gl_pop_cash pop_statistical_desc">
     <div class="head_main">
-      <div class="title">{{permanentDetail.name}}</div>
+      <div class="title"><i></i>{{permanentDetail.name}}</div>
       <div class="close" @click="close"></div>
     </div>
     <div class="echarts_main scrollbar">
@@ -14,7 +14,7 @@
         <p>{{permanentDetail.name}}</p>
       </div>
       <div>
-        <p>资产类别</p>
+        <p>资产类型</p>
         <p>{{permanentDetail.assetType}}</p>
       </div>
       <div>
@@ -67,4 +67,4 @@
       </div>
     </div>
 
-  </div>
\ No newline at end of file
+  </div>
diff --git a/src/views/property/main-gis/asset-details/index.scss b/src/views/property/main-gis/asset-details/index.scss
index b991f6c..f46dca7 100644
--- a/src/views/property/main-gis/asset-details/index.scss
+++ b/src/views/property/main-gis/asset-details/index.scss
@@ -1,21 +1,35 @@
 .gl_pop_cash {
   background: rgba(10, 25, 47, 0.8);
   position: absolute;
-  // border: 1px solid #063a95;
+   border: 2px solid #3181f6;
+  box-shadow: 0 0 5px #3181f6;
+  border-radius: 0 0 100px 0;
   // border-left: 0.15vw solid #357dfa;
-  padding: 0 10px;
   z-index: 11;
 
   .head_main {
-    height: 40px;
+    height: 60px;
     display: flex;
     align-items: center;
     position: relative;
     justify-content: space-between;
-
+    padding: 0 20px;
+    background: linear-gradient(to right, rgba(49, 129, 246, .8), rgba(49, 129, 246, 0));
     .title {
       color: #ffad00;
-      font-size: 16px !important;
+      font-size: 20px !important;
+      display: flex;
+      align-items: center;
+      line-height: 1;
+      text-shadow: 0 0 15px #3181f6;
+      i{
+        display: block;
+        width: 20px;
+        height: 20px;
+        background: url("tt_icon.png") no-repeat center;
+        background-size: 100% 100%;
+        margin-right: 10px;
+      }
     }
 
     .close {
@@ -148,25 +162,22 @@
       align-items: center;
 
       &:nth-child(even) {
-        background: rgba(32, 89, 188, 0.2);
+        //background: rgba(32, 89, 188, 0.2);
       }
 
       p {
+        font-size: 16px;
         &:nth-child(1) {
           width: 8vw;
-          padding-left: 1vw;
+          padding-right: 1vw;
+          text-align: right;
           flex-shrink: 0;
+          color: #b0cfec;
         }
-
-        &:nth-child(2) {
-          color: #ffad00;
-        }
-
         margin: 0;
         color: #ffffff;
-        font-size:1.33vh;
         line-height: 3.92vh;
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/views/property/main-gis/asset-details/tt_icon.png b/src/views/property/main-gis/asset-details/tt_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..59f4001c5a0480c1edd936a298af27bcb5187edc
GIT binary patch
literal 536
zcmV+z0_XjSP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0005sNkl<ZIE|&1
zJ4;?c5QZPmdO@31iqWr98v|Cx!p2G>c1qNL5Gx_XK*UQKLcC&=BKZr7`O+j2t*i}!
zh@I&^qiAy~jq%FJdthDnXuubi1G_WN?CzPFEqio!MnsiBpGGIp0Q>_=z)#>a@Wtj*
z=Wck%fc?M>&?3kd@JDL~Zd1S=U@UcRB@bw!-T`lbL*Nsz3LFIiYk(eL7^qe7iPX9C
z5I8N^1~3%?g);D4pv$1Cb7MYm09XRnfJxxu9$2PC&}YD4>fEvc?LK}3RlxI{oz>}k
zkh9Ze;1p=G2!lWY_!xoNaf-lKjiTm!9qGOsfuTgHaSVKqz~&V!Q$cef^qUxc2J8T~
zfxm&#sNHeoh-F&ybt1-71J(okfkAz+vrq-u_}T*=CraLmJDmSl*NjBu+Q4aFWtOK>
z<W!akdj|Xkv?^_UEdZAh;HB1lRf(~gC>5%K-oVHz=5?^slIAu7+g>q>eqvXuVjhy%
z&Dl>GmD7~&HPk^4ERm1-zDk`t$(*f@XH}DPih7@FJfGRrIb+;vUyHzq{-Bl9dQSW5
z23}a+0Uv;uvG$e88pM0A!CDqrYLyG{#A~qQ)?s|-yPg1R8rHqrRrsb|;D??7JL1hJ
a0Js9(HHS=6wtR{J0000<MNUMnLSTZ{4fiep

literal 0
HcmV?d00001

diff --git a/src/views/property/main-gis/index.js b/src/views/property/main-gis/index.js
index aa1f35e..9e061f5 100644
--- a/src/views/property/main-gis/index.js
+++ b/src/views/property/main-gis/index.js
@@ -257,7 +257,7 @@ export default {
               deptOptions.unshift(resm.parentId)
             }
           })
-          this.addrText = deptOptions;
+          this.addrText = [100,...deptOptions];
         });
         this.queryParams.deptId = res.user.loginDeptId;
         this.tempWorkerOpenQueryParams.deptId = res.user.loginDeptId;
diff --git a/src/views/property/main-gis/index.scss b/src/views/property/main-gis/index.scss
index d2561fc..a16efb9 100644
--- a/src/views/property/main-gis/index.scss
+++ b/src/views/property/main-gis/index.scss
@@ -44,8 +44,32 @@
   }
 }
 
-//选择地址
+
+
 .select_address {
+  z-index: 22;
+  // cursor: pointer;
+  // pointer-events: none;
+  position: absolute;
+  left: 480px;
+  top: 112px;
+  height: 44px;
+  border: 2px solid #3181F6;
+  /deep/ .el-cascader {
+    .el-input {
+      background-color: transparent !important;
+
+      .el-input__inner {
+        border: 0;
+        background-color: transparent !important;
+        color: white;
+      }
+    }
+  }
+}
+
+//选择地址
+.a .select_address {
   height: 30px;
   width: 300px;
   position: absolute;
@@ -77,4 +101,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/views/resources/comps/left/bottom/1/index.html b/src/views/resources/comps/left/bottom/1/index.html
index 455d949..47ef783 100644
--- a/src/views/resources/comps/left/bottom/1/index.html
+++ b/src/views/resources/comps/left/bottom/1/index.html
@@ -13,7 +13,7 @@ element-loading-background="rgba(0, 0, 0, 0.1)"
       <PannelTabs @change="tabChange" :data="pannelTabData"></PannelTabs>
     </div>
     <div class="buttom">
-      <Bar v-if="isLoad" id="bar2"></Bar>
+      <Bar v-if="isLoad" :data="barData" :unit="'单位：亩'" id="bar2"></Bar>
     </div>
   </div>
-</Pannel>
\ No newline at end of file
+</Pannel>
diff --git a/src/views/resources/comps/left/bottom/1/index.js b/src/views/resources/comps/left/bottom/1/index.js
index b8bb6bf..237e405 100644
--- a/src/views/resources/comps/left/bottom/1/index.js
+++ b/src/views/resources/comps/left/bottom/1/index.js
@@ -45,7 +45,8 @@ export default {
           name: '出租'
         }
       ],
-      tabIndex: '1'
+      tabIndex: '1',
+      barData:[]
     };
   },
   created () {
@@ -70,10 +71,10 @@ export default {
         this.isLoad = false;
         resourceOutsourcingAnalysis(this.deptId, this.year).then(res => {
           if (this.tabIndex == 1) {
-            this.data = res.data.xz
+            this.barData = res.data.xz
 
           } else if (this.tabIndex == 2) {
-            this.data = res.data.cz
+            this.barData = res.data.cz
 
           }
           this.isLoad = true;
diff --git a/src/views/resources/comps/left/bottom/1/my-table/index.js b/src/views/resources/comps/left/bottom/1/my-table/index.js
index e998dda..5a55bcc 100644
--- a/src/views/resources/comps/left/bottom/1/my-table/index.js
+++ b/src/views/resources/comps/left/bottom/1/my-table/index.js
@@ -27,28 +27,7 @@ export default {
   },
   data () {
     return {
-      tableData: [
-        {
-          date: '2016-05-02',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1518 弄'
-        },
-        {
-          date: '2016-05-04',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1517 弄'
-        },
-        {
-          date: '2016-05-01',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1519 弄'
-        },
-        {
-          date: '2016-05-03',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1516 弄'
-        }
-      ]
+      tableData: []
     };
   },
   filters: {
diff --git a/src/views/resources/comps/left/bottom/1/my-table/index.scss b/src/views/resources/comps/left/bottom/1/my-table/index.scss
index 59f6d24..2d614ea 100644
--- a/src/views/resources/comps/left/bottom/1/my-table/index.scss
+++ b/src/views/resources/comps/left/bottom/1/my-table/index.scss
@@ -13,7 +13,9 @@
   width: 0;
   height: 0;
 }
-
+::v-deep .el-table::before{
+  height: 0;
+}
 
 
 // 去掉el-table的所有背景颜色以及所有hover的颜色
@@ -50,4 +52,4 @@
 
 ::v-deep .my_table .el-table .el-table__header-wrapper {
   background-color: rgba(44, 117, 223, 1) !important;
-}
\ No newline at end of file
+}
diff --git a/src/views/resources/comps/left/bottom/2/index.html b/src/views/resources/comps/left/bottom/2/index.html
index 3bbfefb..917e1ab 100644
--- a/src/views/resources/comps/left/bottom/2/index.html
+++ b/src/views/resources/comps/left/bottom/2/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>
\ No newline at end of file
+</Pannel>
diff --git a/src/views/resources/comps/left/bottom/2/index.js b/src/views/resources/comps/left/bottom/2/index.js
index 2a0e18b..94186df 100644
--- a/src/views/resources/comps/left/bottom/2/index.js
+++ b/src/views/resources/comps/left/bottom/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;
         longTermIdleResourceWarning(this.deptId, this.year).then(res => {
           let data = res.data.map(item => {
-            return [item.name, item.resourceSort, item.totalArea, item.deptName]
+            return [item.deptName, item.name, item.resourceSort, item.totalArea]
           })
           this.data = data;
           this.isLoad = true;
diff --git a/src/views/resources/comps/left/middle/1/index.html b/src/views/resources/comps/left/middle/1/index.html
index 29b5ebd..76c6c0c 100644
--- a/src/views/resources/comps/left/middle/1/index.html
+++ b/src/views/resources/comps/left/middle/1/index.html
@@ -9,7 +9,7 @@ element-loading-background="rgba(0, 0, 0, 0.1)"
       <PannelTabs @change="tabChange" :data="pannelTabData"></PannelTabs>
     </div>
     <div class="buttom">
-      <Bar v-if="isLoad" :data="data" :color="['rgba(134, 91, 252, 1)', 'rgba(49, 129, 246, 1)']"></Bar>
+      <Bar v-if="isLoad" :data="data" :unit="'单位：亩'" :color="['rgba(134, 91, 252, 1)', 'rgba(49, 129, 246, 1)']"></Bar>
     </div>
   </div>
-</Pannel>
\ No newline at end of file
+</Pannel>
diff --git a/src/views/resources/comps/left/middle/2/index.js b/src/views/resources/comps/left/middle/2/index.js
index 9bbd0f8..ac90633 100644
--- a/src/views/resources/comps/left/middle/2/index.js
+++ b/src/views/resources/comps/left/middle/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;
         longTermIdleResourceWarning(this.deptId, this.year).then(res => {
           let data = res.data.map(item => {
-            return [item.name, item.resourceSort, item.totalArea, item.deptName]
+            return [item.deptName, item.name, item.resourceSort, item.totalArea]
           })
           this.data = data;
           this.isLoad = true;
diff --git a/src/views/resources/comps/left/top/2/index.js b/src/views/resources/comps/left/top/2/index.js
index 348edb6..bb96d0d 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.assetName, item.assetType, 'null', item.assetStatus, item.deptId]
+            return [item.deptId, item.assetName, item.assetType, 'null', item.assetStatus]
           })
           this.data = data;
           this.isLoad = true;
diff --git a/src/views/resources/comps/right/bottom/2/index.js b/src/views/resources/comps/right/bottom/2/index.js
index 63eec1e..043a389 100644
--- a/src/views/resources/comps/right/bottom/2/index.js
+++ b/src/views/resources/comps/right/bottom/2/index.js
@@ -10,7 +10,7 @@ export default {
   data () {
     return {
       isLoad: false,
-      headers: ['合同编码', '合同名称', '合同截止日期', '部门'],
+      headers: ['部门', '合同编码', '合同名称', '合同截止日期'],
       data: []
     };
   },
@@ -37,7 +37,7 @@ export default {
         this.isLoad = false;
         longTermContractNonExecutionWarning(this.deptId, this.year).then(res => {
           let data = res.data.map(item => {
-            return [item.code, item.name, item.endTime, item.deptName]
+            return [item.deptName, item.code, item.name, item.endTime]
           })
           this.data = data;
           this.isLoad = true;
diff --git a/src/views/resources/comps/right/middle/2/index.js b/src/views/resources/comps/right/middle/2/index.js
index 30c5f0f..c18316e 100644
--- a/src/views/resources/comps/right/middle/2/index.js
+++ b/src/views/resources/comps/right/middle/2/index.js
@@ -10,8 +10,8 @@ export default {
   data () {
     return {
       isLoad: false,
-      headers: ['合同编码', '合同名称', '合同截止日期', '部门'],
-      data: [['合同编码', '合同名称', '合同截止日期', '部门']]
+      headers: ['部门', '合同编码', '合同名称', '合同截止日期'],
+      data: [['部门', '合同编码', '合同名称', '合同截止日期']]
     };
   },
   computed: {
@@ -38,7 +38,7 @@ export default {
         contractExpirationWarning(this.deptId, this.year).then(res => {
           // console.log('contractExpirationWarning', res);
           let data = res.data.map(item => {
-            return [item.code, item.name, item.endTime, item.deptName]
+            return [item.deptName, item.code, item.name, item.endTime]
           })
           this.data = data;
           this.isLoad = true;
diff --git a/src/views/resources/comps/right/top/2/index.js b/src/views/resources/comps/right/top/2/index.js
index 7af5236..7ed6639 100644
--- a/src/views/resources/comps/right/top/2/index.js
+++ b/src/views/resources/comps/right/top/2/index.js
@@ -10,8 +10,8 @@ export default {
   data () {
     return {
       isLoad: false,
-      headers: ['合同编码', '合同名称', '预结款日期', '结款金额', '部门'],
-      data: [['合同编码', '合同名称', '预结款日期', '结款金额', '部门']]
+      headers: ['部门', '合同编码', '合同名称', '预结款日期', '结款金额'],
+      data: [['部门', '合同编码', '合同名称', '预结款日期', '结款金额']]
     };
   },
   computed: {
@@ -41,7 +41,7 @@ export default {
         this.isLoad = false;
         contractPaymentDueWarning(this.deptId, this.year).then(res => {
           let data = res.data.map(item => {
-            return [item.code, item.name, item.settlementDate, item.settlementAmount, item.deptName]
+            return [item.deptName, item.code, item.name, item.settlementDate, item.settlementAmount]
           })
           this.data = data;
           this.isLoad = true;
diff --git a/src/views/resources/index.html b/src/views/resources/index.html
index c8ade62..636f5ce 100644
--- a/src/views/resources/index.html
+++ b/src/views/resources/index.html
@@ -1,6 +1,6 @@
 <div class="page">
   <MainGis v-if="tab === '1'"></MainGis>
-  <GisMap v-else></GisMap>
+  <GisMap v-else :showYears="false"></GisMap>
   <Header title="资源一张图" callBack>
     <div slot="left">
       <Tabs @change="tabChange" :data="tabData"></Tabs>
diff --git a/src/views/resources/main-gis/index.js b/src/views/resources/main-gis/index.js
index 5fe1236..08ae111 100644
--- a/src/views/resources/main-gis/index.js
+++ b/src/views/resources/main-gis/index.js
@@ -179,7 +179,7 @@ export default {
         contractionStatus: null,
         translate_dict: 1,
       },
-      addrText: [100,],
+      addrText: [100],
       deptTreeProps: {
         checkStrictly: true,
       },
@@ -247,7 +247,7 @@ export default {
               deptOptions.unshift(resm.parentId)
             }
           })
-          this.addrText = deptOptions;
+          this.addrText = [100,...deptOptions];
         });
         this.queryParams.deptId = res.user.loginDeptId;
         this.tempWorkerOpenQueryParams.deptId = res.user.loginDeptId;
@@ -392,10 +392,10 @@ export default {
       if (dept2.deptLevel === '5') {
         // 登录身份为市级领导
         this.userRole = 'cityLeader';
-        this.cityId = dept.id;
+        this.cityId = deptId;
         this.currentDeptLevel = '5';
         // 添加区县边界
-        this.addCountyBorder(dept.children.map(item => item.id));
+        this.addCountyBorder(dept2.children.map(item => item.id));
       } else if (dept2.deptLevel === '4') {
         // 登录身份为县级领导
         this.userRole = 'countyLeader';
diff --git a/src/views/resources/main-gis/index.scss b/src/views/resources/main-gis/index.scss
index 65f6352..1f4cac6 100644
--- a/src/views/resources/main-gis/index.scss
+++ b/src/views/resources/main-gis/index.scss
@@ -46,8 +46,29 @@
   }
 }
 
-//选择地址
 .select_address {
+  z-index: 22;
+  // cursor: pointer;
+  // pointer-events: none;
+  position: absolute;
+  left: 480px;
+  top: 112px;
+  height: 44px;
+  border: 2px solid #3181F6;
+  /deep/ .el-cascader {
+    .el-input {
+      background-color: transparent !important;
+
+      .el-input__inner {
+        border: 0;
+        background-color: transparent !important;
+        color: white;
+      }
+    }
+  }
+}
+//选择地址
+.a .select_address {
   height: 30px;
   width: 300px;
   position: absolute;
@@ -241,4 +262,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}