接口对接

src/components/charts/bar/index.js

@@ -42,11 +42,28 @@ export default {
     return {
       chart: null
     };
+  },
+  watch: {
+    data: {
+      handler: function (val) {
+        this.$nextTick(function(){
+          setTimeout(()=>{
+            this.initChart();
+          },2000)
+          console.log(val)
+        });
+      },
+      immediate: true,
+      deep:true
+    }
+  },
+  create () {
+
   },
   mounted () {
-    setTimeout(()=>{
-      this.initChart();
-    },2000)
+    // setTimeout(()=>{
+    //   this.initChart();
+    // },2000)
   },
   computed: {
   },

src/views/sanqing/index.html

@@ -1,5 +1,5 @@
 <div class="page">
-  <MainGis></MainGis>
+  <MainGis @getData="getData"></MainGis>
   <Header title="三清五治一张图" callBack></Header>
   <!-- 项目初始化 -->
   <div class="left_side col space_between zIndextop">

src/views/sanqing/index.js

@@ -52,15 +52,23 @@ export default {
     }
   },
   created () {
-    this.currentComp.right[0].data = [];
-    this.currentComp.right[1].data = [];
-    this.currentComp.right[2].data = [];
-
-    this.currentComp.left[0].data = [];
-    this.currentComp.left[1].data = [];
-    this.currentComp.left[2].data = [];
     getInfo().then(res => {
-      getStatistic({ deptId: res.user.deptId }).then((response) => {
+      this.getData(res.user.deptId);
+    })
+  },
+  mounted () {
+
+  },
+  methods: {
+    getData(deptId){
+      this.currentComp.right[0].data = [];
+      this.currentComp.right[1].data = [];
+      this.currentComp.right[2].data = [];
+
+      this.currentComp.left[0].data = [];
+      this.currentComp.left[1].data = [];
+      this.currentComp.left[2].data = [];
+      getStatistic({deptId: deptId}).then((response) => {
         response.data.jtzyzcDeptList.map(rr => {
           this.currentComp.right[0].data.push({
             name: rr.deptName,
@@ -115,12 +123,7 @@ export default {
         console.log(this.currentComp)
         this.allData = response.data;
       });
-    })
-  },
-  mounted () {
-
-  },
-  methods: {
+    },
     tabChange (info) {
       this.tab = info.id;
     }

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

@@ -84,7 +84,11 @@
 
   </div>
   <div class="mask" style="position: absolute; width: 100%; height: 100%;pointer-events: none;"></div>
-  <Popover v-if="showResourceDetail" :data="resourceDetail" @closePopover="closePopover"></Popover>
+  <Popover v-if="showResourceDetail" :data="resourceDetail" @closePopover="closePopover" @openImage="openImage"></Popover>
+  <div class="imgBox" v-if="showImg">
+    <div class="box_bg" @click="showImg = false"></div>
+    <img :src="fileUrl" alt="">
+  </div>
   <!--选择地址-->
   <div class="select_address">
     <div class="dot left"></div>

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

@@ -38,145 +38,6 @@ export default {
         status: null,
         translate_dict: 1,
       },
-
-      //零工公开请求参数
-      tempWorkerOpenQueryParams: {
-        // 分页
-        pageNum: 1,
-        pageSize: 10,
-        // 查询排序
-        //orderByColumn: "id",
-        //isAsc: "desc",
-        bookId: null,
-        deptId: null,
-        deptName: null,
-        openNy: null,
-        openYear: null,
-        openName: null,
-        openFile: null,
-        openPic: null,
-        remark: null,
-        translate_dict: 1,
-      },
-
-      //重大事项公开请求参数
-      majorEventOpenQueryParams: {
-        // 分页
-        pageNum: 1,
-        pageSize: 10,
-        // 查询排序
-        //orderByColumn: "id",
-        //isAsc: "desc",
-        bookId: null,
-        deptId: null,
-        deptName: null,
-        openNy: null,
-        openYear: null,
-        openDate: null,
-        openName: null,
-        openFile: null,
-        openPic: null,
-        content: null,
-        remark: null,
-        translate_dict: 1,
-      },
-
-      //补贴资金管理请求参数
-      subsidyFundsQueryParams: {
-        // 分页
-        pageNum: 1,
-        pageSize: 10,
-        // 查询排序
-        orderByColumn: "id",
-        isAsc: "desc",
-        year: null,
-        areaName: null,
-        name: null,
-        idCard: null,
-        itemName: null,
-        releaseDate: null,
-        translate_dict: 1,
-      },
-
-      //固定资产请求参数
-      permanentQueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        code: null,
-        name: null,
-        assetType: null,
-        operationType: null,
-        addType: null,
-        useType: null,
-        assetStatus: '1',
-        translate_dict: 1,
-      },
-
-      //资源资产请求参数
-      resourceListQueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        bookId: null,
-        deptId: null,
-        code: null,
-        name: null,
-        resourceType: null,
-        /*farmingResourceType: null,
-        buildResourceType: null,
-        unusedResourceType: null,*/
-        resourceSort: null,
-        totalArea: null,
-        location: null,
-        east: null,
-        west: null,
-        south: null,
-        north: null,
-        sumArea: null,
-        groupArea: null,
-        groupValue: null,
-        rentArea: null,
-        rentValue: null,
-        rentLessee: null,
-        rentStartTime: null,
-        rentEndTime: null,
-        otherArea: null,
-        otherValue: null,
-        farmerArea: null,
-        circulationArea: null,
-        circulationValue: null,
-        investmentArea: null,
-        investmentValue: null,
-        investmentLessee: null,
-        investmentStartTime: null,
-        investmentEndTime: null,
-        status: null,
-        translate_dict: 1,
-      },
-      //合同信息请求参数
-      contractionByPermanentQueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        bookId: null,
-        deptId: null,
-        code: null,
-        name: null,
-        assetType: null,
-        firstParty: null,
-        secondParty: null,
-        collectionPay: null,
-        contractionSource: null,
-        totalAmount: null,
-        receivedAmount: null,
-        settledAmount: null,
-        buildingTime: null,
-        startTime: null,
-        endTime: null,
-        num: null,
-        unit: null,
-        price: null,
-        contractionStatus: null,
-        translate_dict: 1,
-      },
       addrText: [100,],
       deptTreeProps: {
         checkStrictly: true,
@@ -232,6 +93,9 @@ export default {
       threeNhTypeOptions: [],
       natureOwnershipTypeOptions: [],
       sysYesNoOptions: [],
+      fileList: [],
+      fileUrl:'',
+      showImg:false,
     };
   },
   computed: {
@@ -262,8 +126,10 @@ export default {
       treeselectByDeptId({ deptId: res.user.deptId }).then((resp) => {
         this.addrOptions = resp.data;
         this.headerTitle = res.user.deptName + '阳光村务一张图';
-        listDeptExcludeChild(res.user.loginDeptId).then((resp) => {
-          let deptOptions = [res.user.loginDeptId];
+        //loginDeptId
+        listDeptExcludeChild(res.user.deptId).then((resp) => {
+          //loginDeptId
+          let deptOptions = [res.user.deptId];
           resp.data.map(resm => {
             if (res.user.parentDeptName == resm.deptName) {
               deptOptions.unshift(resm.deptId)
@@ -272,17 +138,11 @@ export default {
           })
           this.addrText = deptOptions;
         });
-        this.queryParams.deptId = res.user.loginDeptId;
-        this.tempWorkerOpenQueryParams.deptId = res.user.loginDeptId;
-        this.majorEventOpenQueryParams.deptId = res.user.loginDeptId;
-        this.subsidyFundsQueryParams.deptId = res.user.loginDeptId;
-        this.permanentQueryParams.deptId = res.user.loginDeptId;
-        this.resourceListQueryParams.deptId = res.user.loginDeptId;
-        this.contractionByPermanentQueryParams.deptId = res.user.loginDeptId;
+        this.queryParams.deptId = res.user.deptId;//loginDeptId
         //列表请求
         this.getAllList(res.user.deptId);
         // 加载地图
-        this.initMap(res.user.loginDeptId);
+        this.initMap(res.user.deptId);
 
         // 获取村边界的图层名称
         this.getVillageBorderLayerName();
@@ -351,27 +211,7 @@ export default {
     selectAddress (value) {
       const deptId = value[value.length - 1];
       this.queryParams.deptId = deptId;
-      this.tempWorkerOpenQueryParams.deptId = deptId;
-      this.majorEventOpenQueryParams.deptId = deptId;
-      this.subsidyFundsQueryParams.deptId = deptId;
-      this.permanentQueryParams.deptId = deptId;
-      this.resourceListQueryParams.deptId = deptId;
-      this.contractionByPermanentQueryParams.deptId = deptId;
-      this.infoTotal = undefined;
-      this.resourceTotal = undefined;
-      this.permanentTotal = undefined;
-      this.subsidyFundsTotal = undefined;
-      this.majorEventOpenTotal = undefined;
-      this.tempWorkerOpenTotal = undefined;
-      this.affairsTotal = undefined;
-      this.affairsList = [];
-      this.tempWorkerOpenList = [];
-      this.majorEventOpenList = [];
-      this.subsidyFundsList = [];
-      this.permanentList = [];
-      this.resourceList = [];
-      this.infoList = [];
-      this.getAllList();
+      this.getAllList(deptId);
 
       gis.getMapContainer().removeLayer(this.villageBorder);
       this.villageBorder = '';
@@ -634,32 +474,14 @@ export default {
       });
     },
     getAllList (deptId) {
-      //三务公开
-      // this.getList(null);
-      // //零工公开
-      // this.getTempWorkerOpenList();
-      // //重大事项公开
-      // this.getMajorEventOpenList();
-      // //补贴资金管理
-      // this.getSubsidyFundsList();
-      // //固定资产
-      // this.getPermanentListList();
-      // //资源资产
-      // this.getResourceListList();
-      // //合同信息
-      // this.getContractionByPermanentList();
-      // //资金情况
-      // this.getFundAndBankAmountByDeptIdArray();
-      //this.getThreeList(deptId);
-    },
-    getThreeList(deptId){
-
-      getThreeList({ deptId: deptId }).then(response => {
-
-      });
+      this.$emit('getData',deptId);
     },
     closePopover(){
       this.showResourceDetail = false;
+    },
+    openImage(url){
+      this.fileUrl = url;
+      this.showImg = true;
     }
   }
 };

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

@@ -241,3 +241,25 @@
     }
   }
 }
+
+
+.imgBox{
+  position: absolute;
+  left: 0;
+  top: 0;
+  z-index: 999999;
+  width: 100vw;
+  height: 100%;
+  .box_bg{
+    background-color: rgba(0,0,0,0.5);
+    width: 100%;
+    height: 100%;
+  }
+  img{
+    height: 60vh;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%,-50%);
+  }
+}

src/views/sanqing/popover/index.html

@@ -87,8 +87,4 @@
       </block>
     </p>
   </div>
-  <div class="imgBox" v-if="showImg">
-    <div class="box_bg" @click="showImg = false"></div>
-    <img :src="fileUrl" alt="">
-  </div>
 </div>

src/views/sanqing/popover/index.js

@@ -9,9 +9,6 @@ export default {
   },
   data () {
     return {
-      fileList: [],
-      fileUrl:'',
-      showImg:false,
     };
   },
   created () {
@@ -23,8 +20,7 @@ export default {
       this.$emit('closePopover');
     },
     openImage(url){
-      this.fileUrl = url;
-      this.showImg = true;
+      this.$emit('openImage', url);
     }
   }
 };

src/views/sanqing/popover/index.scss

@@ -44,22 +44,3 @@
     }
   }
 }
-
-.imgBox{
-  position: fixed;
-  z-index: 999999;
-  width: 100vw;
-  height: 100vh;
-  .box_bg{
-    background-color: rgba(0,0,0,0.5);
-    width: 100%;
-    height: 100vh;
-  }
-  img{
-    height: 60vh;
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%,-50%);
-  }
-}