核查图斑上图页面统计

src/components/numCard.vue

@@ -55,11 +55,13 @@ const emits = defineEmits("numclick");
   flex-direction: row;
   align-items: center;
   justify-content: space-between;
+  overflow-x: auto;
+  overflow-y: hidden;
 
   .cardItem {
     position: relative;
     // width: 230px;
-    width: 200px;
+    min-width: 130px;
     height: 85px;
     max-width: 200px;
     display: inline-block;

src/store/modules/data.js

@@ -0,0 +1,29 @@
+import { Object } from "ol";
+
+const useDataStore = defineStore(
+  'data',
+  {
+    state: () => ({
+      checkData: new Object()
+    }),
+    actions: {
+      // 获取字典
+      getCheckData() {
+        return this.checkData;
+      },
+      // 设置字典
+      setCheckData(value) {
+        this.checkData = value;
+      },
+     
+      // 清空字典
+      cleanDict() {
+        this.dict = new Array();
+      },
+      // 初始字典
+      initDict() {
+      }
+    }
+  })
+
+export default useDataStore

src/views/pageCode/checkLand/config.js

@@ -33,7 +33,74 @@ export const FormConfig = [
     }
   ]
 ]
-
+export const sdlist = {
+  normal: [
+    { name: "核查图斑", pro: "all", ctype: "blue" },
+    {
+      name: "未分发图斑",
+      pro: "WYFF",
+      // children: [{ name: "未分发图斑", pro: "155" }],
+    },
+    { name: "举证中图斑", pro: "WYDC" },
+    { name: "已举证图斑", pro: "WYTJ" },
+    { name: "外业退回图斑", pro: "WYQR", ctype: "red" },
+    { name: "县级审核退回图斑", pro: "XJTJ", ctype: "red" },
+  ],
+  XJ: [
+    { name: "待审核", pro: "XJDSH" },
+    { name: "已审核", pro: "XJYSH" },
+    { name: "已提交", pro: "XJYTJ" },
+    { name: "市级退回图斑", pro: "SJTH", ctype: "red" },
+    { name: "省级退回图斑", pro: "SJJTH", ctype: "red" },
+  ],
+  SJ: [
+    { name: "待审核", pro: "SJDSH" },
+    { name: "已审核", pro: "SJYSH" },
+    { name: "已提交", pro: "SJYTJ" },
+    { name: "省级退回图斑", pro: "SJJTH", ctype: "red" },
+  ],
+  SJJ: [
+    { name: "待审核", pro: "SJJDSH" },
+    { name: "已审核", pro: "SJJYSH" },
+  ],
+}
+export const countparm = {
+  normal: {
+    all: null,
+    WYFF: [{ auditflowStep: "WYFF" }],
+    WYDC: [{ auditflowStep: "WYDC" }],
+    WYTJ: [{ auditflowStep: "WYTJ" }],
+    XJSH: [{ auditflowStep: "WYQR", successType: "1" }],
+    XJTJ: [{ auditflowStep: "XJTJ", successType: "1" }],
+  },
+  XJ: {
+    XJDSH: [
+      { auditflowStep: "XJHGX" },
+      { auditflowStep: "XJSH" },
+      { auditflowStep: "WYTJ", successType: "0" },
+    ],
+    XJYSH: [{ auditflowStep: "XJSH" }],
+    XJYTJ: [{ auditflowStep: "XJTJ" }],
+    SJTH: [{ auditflowStep: "SJTJ", successType: "1" }],
+    SJJTH: [{ auditflowStep: "SJJTJ", successType: "1" }],
+  },
+  SJ: {
+    SJDSH: [
+      { auditflowStep: "SJSH" },
+      { auditflowStep: "XJTJ", successType: "0" },
+    ],
+    SJYSH: [{ auditflowStep: "SJSH" }],
+    SJYTJ: [{ auditflowStep: "SJTJ" }],
+    SJJTH: [{ auditflowStep: "SJJTJ", successType: "1" }],
+  },
+  SJJ: {
+    SJJDSH: [
+      { auditflowStep: "SJJSH" },
+      { auditflowStep: "SJTJ", successType: "0" },
+    ],
+    SJJYSH: [{ auditflowStep: "SJJTJ" }],
+  },
+};
 export const TableHeader = [
   { label: "地块编号", align: "center", prop: "dkbh" },
   { label: "行政区名称", align: "center", prop: "xzqmc" },

src/views/pageCode/checkLand/index.vue

@@ -157,7 +157,8 @@ import {
   getRoles,
 } from "@/api/rsmonitoring/dkjbxx";
 import numCard from "@/components/numCard";
-import { FormConfig, TableHeader } from "./config";
+import useDataStore from '@/store/modules/data'
+import { FormConfig, TableHeader, countparm, sdlist } from "./config";
 const { proxy } = getCurrentInstance();
 const { num_compare } = proxy.useDict("num_compare");
 const route = useRoute();
@@ -189,78 +190,10 @@ const data = reactive({
     xzqdm: null,
   },
   countData: {},
-  sdlist: {
-    normal: [
-      { name: "核查图斑", pro: "all", ctype: "blue" },
-      {
-        name: "未分发图斑",
-        pro: "WYFF",
-        // children: [{ name: "未分发图斑", pro: "155" }],
-      },
-      { name: "举证中图斑", pro: "WYDC" },
-      { name: "已举证图斑", pro: "WYTJ" },
-      { name: "外业退回图斑", pro: "WYQR", ctype: "red" },
-      { name: "县级审核退回图斑", pro: "XJTJ", ctype: "red" },
-    ],
-    XJ: [
-      { name: "待审核", pro: "XJDSH" },
-      { name: "已审核", pro: "XJYSH" },
-      { name: "已提交", pro: "XJYTJ" },
-      { name: "市级退回图斑", pro: "SJTH", ctype: "red" },
-      { name: "省级退回图斑", pro: "SJJTH", ctype: "red" },
-    ],
-    SJ: [
-      { name: "待审核", pro: "SJDSH" },
-      { name: "已审核", pro: "SJYSH" },
-      { name: "已提交", pro: "SJYTJ" },
-      { name: "省级退回图斑", pro: "SJJTH", ctype: "red" },
-    ],
-    SJJ: [
-      { name: "待审核", pro: "SJJDSH" },
-      { name: "已审核", pro: "SJJYSH" },
-    ],
-  },
 });
 
-const { queryParams, deptList, form, roles, rules, sdlist, countData } =
-  toRefs(data);
-let countparm = {
-  normal: {
-    all: null,
-    WYFF: [{ auditflowStep: "WYFF" }],
-    WYDC: [{ auditflowStep: "WYDC" }],
-    WYTJ: [{ auditflowStep: "WYTJ" }],
-    XJSH: [{ auditflowStep: "WYQR", successType: "1" }],
-    XJTJ: [{ auditflowStep: "XJTJ", successType: "1" }],
-  },
-  XJ: {
-    XJDSH: [
-      { auditflowStep: "XJHGX" },
-      { auditflowStep: "XJSH" },
-      { auditflowStep: "WYTJ", successType: "0" },
-    ],
-    XJYSH: [{ auditflowStep: "XJSH" }],
-    XJYTJ: [{ auditflowStep: "XJTJ" }],
-    SJTH: [{ auditflowStep: "SJTJ", successType: "1" }],
-    SJJTH: [{ auditflowStep: "SJJTJ", successType: "1" }],
-  },
-  SJ: {
-    SJDSH: [
-      { auditflowStep: "SJSH" },
-      { auditflowStep: "XJTJ", successType: "0" },
-    ],
-    SJYSH: [{ auditflowStep: "SJSH" }],
-    SJYTJ: [{ auditflowStep: "SJTJ" }],
-    SJJTH: [{ auditflowStep: "SJJTJ", successType: "1" }],
-  },
-  SJJ: {
-    SJJDSH: [
-      { auditflowStep: "SJJSH" },
-      { auditflowStep: "SJTJ", successType: "0" },
-    ],
-    SJJYSH: [{ auditflowStep: "SJJTJ" }],
-  },
-};
+const { queryParams, deptList, form, roles, rules, countData } = toRefs(data);
+
 /** 查询地块基本信息（DKJBXX）列表 */
 function getList() {
   loading.value = true;
@@ -316,7 +249,7 @@ function reset() {
 /** 搜索按钮操作 */
 function handleQuery() {
   queryParams.value.pageNum = 1;
-  getcount()
+  getcount();
   getList();
 }
 
@@ -400,6 +333,7 @@ function handleExport() {
   );
 }
 function handleBrowse(row, index) {
+  // useDataStore().setCheckData(row);
   router.push({
     path: "/remote/gdjc",
     query: { id: row.id, form: "checkLand", dataType: route.query.type, index },

src/views/pageCode/statistic/progress/index.vue

@@ -172,7 +172,7 @@ const echartRef = ref();
 const echartsMap = ref();
 const mapGeoJson = ref({
   type: "FeatureCollection",
-  features: []
+  features: [],
 });
 
 const tableData = ref([]);
@@ -336,6 +336,7 @@ function getList() {
     // total.value = response.total;
     // loading.value = false;
   });
+  listJz(queryParams.value).then((res) => {});
 }
 function setLnbh(data) {
   // this.eData.yName = `变化面积${this.unitList[this.nowunit].unit}`;

src/views/remote/farmland/index.vue

@@ -48,7 +48,11 @@
           @click="returnlist"
         ></div>
       </div>
-      <numCard :sdlist="sdlist"></numCard>
+      <numCard
+        :sddata="countData"
+        :sdlist="sdList[$route.query.dataType]"
+        @numclick="cardclick"
+      ></numCard>
       <tablePage
         :cloumn="TableHeader"
         :table="{ total, data: tableData }"
@@ -96,8 +100,11 @@ import parse from "wellknown";
 // import { pinyin } from "pinyin-pro";
 
 import { getDkdbList } from "@/api/rsmonitoring/dataEntry";
-import { listDkjbxx, getDkjbxx } from "@/api/rsmonitoring/dkjbxx";
+import { getDkcount, listDkjbxx, getDkjbxx } from "@/api/rsmonitoring/dkjbxx";
 import { TableHeader } from "./config";
+import { countparm, sdlist } from "@/views/pageCode/checkLand/config";
+import useDataStore from "@/store/modules/data";
+
 import "ol/ol.css";
 // import { get as getProjection, transform } from "ol/proj.js";
 import Map from "ol/Map";
@@ -138,11 +145,11 @@ export default {
         { label: "监测面积", value: 1 },
         { label: "外业时间", value: 2 },
       ],
-      sdlist: [
-        { name: "待审核", pronum: "155", promj: "151.12" },
-        { name: "已审核", pronum: "155", promj: "151.12" },
-        { name: "已提交", pronum: "155", promj: "151.12" },
-      ],
+      sdList: sdlist, //[
+      //   { name: "待审核", pronum: "155", promj: "151.12" },
+      //   { name: "已审核", pronum: "155", promj: "151.12" },
+      //   { name: "已提交", pronum: "155", promj: "151.12" },
+      // ],
       domains: 0, //存储动态搜索列表
       // value: ["监测编号"], //下拉框选中的值
       maptype: "normal",
@@ -161,7 +168,7 @@ export default {
       },
       drawer: true,
       direction: "rtl",
-
+      countData: {},
       tableData: [],
       newObj: {},
       curPageResultLayer: {},
@@ -221,21 +228,47 @@ export default {
     getTemplate() {
       this.handleDelete();
       if (this.$route.query.form == "checkLand") {
-        listDkjbxx(this.queryParams).then((res) => {
-          this.setList(res);
-          if (this.$route.query.index) {
-            getDkjbxx(this.$route.query.id).then((res) => {
-              this.newObj = res.data;
-              this.tableClick(this.newObj, this.$route.query.index || 0);
-            });
-          }
-        });
+        if (this.$route.query.index) {
+          getDkjbxx(this.$route.query.id).then((res) => {
+            this.newObj = res.data;
+            this.tableClick(this.newObj, this.$route.query.index || 0);
+          });
+        } else {
+          this.getcount();
+          this.getList();
+        }
       } else {
         getDkdbList(this.queryParams).then((res) => {
           this.setList(res);
         });
       }
     },
+    getList() {
+      listDkjbxx(this.queryParams).then((res) => {
+        this.setList(res);
+      });
+    },
+    getcount() {
+      this.countData = {};
+      let prams = countparm[this.$route.query.dataType || "normal"];
+      Object.keys(prams).forEach((key) => {
+        getDkcount({
+          xzqdm: this.queryParams.xzqdm,
+          startTime: "", //this.queryParams.time[0],
+          endTime: "", //this.queryParams.time[1],
+          auditflowList: prams[key],
+        }).then((res) => {
+          this.countData[`${key}num`] = res.data.countNumber;
+          this.countData[`${key}mj`] = res.data.countSum;
+        });
+      });
+    },
+    cardclick(key) {
+      let prams = countparm[this.$route.query.dataType || "normal"];
+      this.queryParams.auditflowList = prams[key];
+      this.getList();
+    },
+
     setList(res) {
       this.tableData = res.rows;
       this.total = res.total;