task 44941 BUG修改

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

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,

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",

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>
+</div>

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

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>
+</div>

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

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

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;
-}
+}

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

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>
+</Pannel>

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: ['摘要', '日期', '借方金额', '贷方金额'],

src/views/capital/comps/buttom/2/index.scss

@@ -14,4 +14,4 @@
     flex: 1;
     width: 100%;
   }
-}
+}

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 => {
 

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>
+</Pannel>

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','不规范')
     }
   }
 };

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,

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>
+</Pannel>

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','敏感')
     }
   }
 };

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>
+  <Bar v-if="isLoad" :serverName="'金额'" :data="data"></Bar>
+</Pannel>

src/views/capital/comps/left/top/2/index.js

@@ -49,6 +49,9 @@ export default {
           this.isLoad = true;
         })
       }
+    },
+    openTable(){
+      this.$emit('openTable','大额')
     }
   }
 };

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

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>
+</div>

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

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>

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>
+</Pannel>

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

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;

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>
+</Pannel>

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;

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;

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;

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;

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;

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>

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>
+  </div>

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;
       }
     }
   }
-}
+}

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;

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 @@
       }
     }
   }
-}
+}

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>
+</Pannel>

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;

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: {

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;
-}
+}

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>
+</Pannel>

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;

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>
+</Pannel>

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;

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;

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;

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;

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;

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>

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';

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 @@
       }
     }
   }
-}
+}