task 45202 大屏调整

src/api/asset/resource.js

@@ -135,3 +135,12 @@ export function exportSortSummary (params) {
     params: params
   });
 }
+
+// 查询固定资产详细
+export function attachmentQuery( params ) {
+  return request({
+    url: '/api/system/attachment/query',
+    method: 'get',
+    params: params,
+  })
+}

src/views/sanqing/comps/right/bottom/1/index.html

@@ -2,7 +2,7 @@
   <div class="full">
     <div class="buttom">
       <Bar id="bar6"
-           :color="['#01d4f8', '#2194ff']"
+           :color="['#a482fc', '#865BFC']"
            :data="data"
            unit="单位：亩"
       ></Bar>

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

@@ -1,5 +1,5 @@
 import Pannel from '@/components/pannelNew/index.vue';
-import Bar from '@/components/charts/bar-dimensional/index.vue';
+import Bar from '@/components/charts/bar/index.vue';
 
 export default {
   components: {

src/views/sanqing/index.html

@@ -2,15 +2,15 @@
   <MainGis @getData="getData"></MainGis>
   <Header title="三清一张图" callBack></Header>
   <!-- 项目初始化 -->
+  <div class="row">
+    <component :is="item.name" v-for="(item, index) in currentComp.buttom" :key="index" :data="item.data"></component>
+  </div>
   <div class="left_side col space_between zIndextop">
     <component :is="item.name" v-for="(item, index) in currentComp.left" :key="index" :data="item.data" :countNum="item.name == 'Left31'?item.countNum:0"></component>
   </div>
   <div class="right_side col space_between zIndextop">
     <component :is="item.name" v-for="(item, index) in currentComp.right" :key="index" :data="item.data"></component>
   </div>
-  <div class="row">
-    <component :is="item.name" v-for="(item, index) in currentComp.buttom" :key="index" :data="item.data"></component>
-  </div>
   <Left></Left>
   <Right></Right>
   <Footer></Footer>

src/views/sanqing/index.js

@@ -20,6 +20,7 @@ import { comps } from './data.js'
 
 import { getStatistic } from "@/api/index";
 import { getInfo } from "@/api/login";
+import {mapGetters} from "vuex";
 
 export default {
   components: {
@@ -43,16 +44,33 @@ export default {
     return {
       comps,
       tab: '1',
-      allData: {}
+      allData: {},
+      deptIdPage:100
     };
   },
+  watch: {
+    // year: {
+    //   handler () {
+    //     this.getData(this.deptIdPage);
+    //   },
+    //   immediate: true, // 立即执行
+    // },
+    // deptId: {
+    //   handler () {
+    //     this.getData(this.deptIdPage);
+    //   },
+    //   immediate: true, // 立即执行
+    // }
+  },
   computed: {
+    ...mapGetters(['year', 'deptId']),
     currentComp: function () {
       return this.comps[this.tab]
     }
   },
   created () {
     getInfo().then(res => {
+      this.deptIdPage = res.user.deptId;
       this.getData(res.user.deptId);
     })
   },

src/views/sanqing/main-gis/index.js

@@ -5,7 +5,7 @@ import {
 } from 'ol/proj'
 import { getPermanentListByDeptId, listPermanent } from "@/api/asset/permanent.js";
 import { getInfo } from "@/api/login";
-import { getResourceListByDeptId, listResource } from "@/api/asset/resource.js";
+import { getResourceListByDeptId, listResource, attachmentQuery } from "@/api/asset/resource.js";
 import Legend from '@/components/legend/index.vue';
 import { attachmentList } from "@/api/common/uploadAttachment.js";
 import { treeselect, getDept, listDeptExcludeChild } from "@/api/system/dept";
@@ -98,6 +98,22 @@ export default {
       showImg:false,
     };
   },
+  watch: {
+    'queryParams.deptId': {
+      handler: function () {
+        this.commitDept(this.queryParams.deptId);
+      },
+      immediate: true, // 立即执行
+
+    },
+    deptLength: {
+      handler: function () {
+        //console.log(this.deptLength);
+        this.commitDeptLength(this.deptLength);
+      },
+      immediate: true, // 立即执行
+    }
+  },
   computed: {
   },
   created () {
@@ -159,6 +175,15 @@ export default {
 
   },
   methods: {
+    commitDept (deptId) {
+      this.$store.commit('SET_DEPTID', deptId);
+    },
+    commitDeptLength (length) {
+      this.$store.commit('SET_DEPTIDLENGTH', length);
+    },
+    commitYear (year) {
+      this.$store.commit('SET_YEAR', year);
+    },
     // 获取村边界的图层名称
     getVillageBorderLayerName () {
       getConfigKey("geoserver.layer.villageBorder").then(response => {
@@ -394,7 +419,7 @@ export default {
         tableName: 't_asset_three',
         bizPath: 'asset',
       };
-      attachmentList(parmasData).then((res) => {
+      attachmentQuery(parmasData).then((res) => {
         if (res.code == 200) {
           let UattachmentList = res.rows;
           for (let i = 0; i < UattachmentList.length; i++) {

src/views/sanqing/popover/index.html

@@ -1,5 +1,5 @@
 <div class="popover_main">
-  <h1><i></i>B镇详情<span @click="closePopover">×</span></h1>
+  <h1><i></i>{{data.zcmc}}<span @click="closePopover">×</span></h1>
   <div>
     <p>资产编码</p>
     <p>{{data.zcdm}}</p>
@@ -74,11 +74,11 @@
   </div>
   <div>
     <p>备注</p>
-    <p>{{data.bz}}</p>
+    <p style="width: 75%;">{{data.bz}}</p>
   </div>
   <div style="justify-content: left">
     <p>附件</p>
-    <p>
+    <p style="width: 75%;">
       <block v-for="(item,index) in data.fileList">
         <a :href="item.urlApi" v-if="item.type != 'image'">
           <img :src="item.url" style="width: 3vw;height: 3vw;margin-right: 0.5vw;" alt="">

src/views/sanqing/popover/index.scss

@@ -31,7 +31,7 @@
   }
   div{
     display: flex;
-    justify-content: space-between;
+    //justify-content: space-between;
     p{
       width: 25%;
       padding: 10px 25px;