核查图斑、县级审核、市级审核、省级审核列表和统计接口条件重构

src/api/rsmonitoring/dkjbxx.js

@@ -1,11 +1,11 @@
 import request from '@/utils/request'
 
 // 查询地块基本信息（DKJBXX）列表
-export function listDkjbxx(query) {
+export function listDkjbxx(data) {
   return request({
     url: '/rsmonitoring/dkjbxx/list',
-    method: 'get',
-    params: query
+    method: 'POST',
+    data
   })
 }
 export function getDkcount(data) {
@@ -23,6 +23,12 @@ export function getDkjbxx(id) {
     method: 'get'
   })
 }
+export function getDkjbywy(id) {
+  return request({
+    url: '/rsmonitoring/dkjbxx/ywyp/' + id,
+    method: 'get'
+  })
+}
 
 // 核查流程记录
 export function getAuditflow(params) {

src/components/numCard.vue

@@ -5,7 +5,8 @@
       v-for="(item, i) in sdlist"
       :key="i"
       :class="`card${item.ctype}`"
-      style="width: 30%"
+      style="width: 29%"
+      @click="emits('numclick', item.pro)"
     >
       <span
         :class="item.children ? 'cursor' : ''"
@@ -43,12 +44,13 @@ defineProps({
     default: () => [],
   },
 });
+const emits = defineEmits("numclick");
 </script>
 <style  lang="scss" scoped>
 .numCard {
   width: 100%;
   height: 120px;
-  // display: flex;
+  display: flex;
   // background-color: rgba(255, 192, 203, 0.272);
   flex-direction: row;
   align-items: center;
@@ -62,6 +64,7 @@ defineProps({
     max-width: 200px;
     display: inline-block;
     margin: 0 10px;
+    cursor: pointer;
     background: linear-gradient(
       180deg,
       rgba(30, 198, 149, 1) 0%,

src/views/pageCode/checkLand/config.js

@@ -2,23 +2,20 @@
 
 export const FormConfig = [
   [
-
-    // {
-    //   label: '申请状态：',
-    //   prop: 'state',
-    //   span: 5
-    // },
     {
       label: '行政区',
       prop: 'region',
-      span: 5,
-
+      span: 4,
+    },
+    {
+      label: '监测年份',
+      prop: 'monTime',
+      span: 6,
     },
-
     {
       label: '图斑编号',
       prop: 'dkbh',
-      span: 5,
+      span: 4,
       component: 'ElInput',
       componentProps: {
         placeholder: '图斑编号'
@@ -27,19 +24,19 @@ export const FormConfig = [
     {
       label: '图斑面积',
       prop: 'tbmj',
-      span: 7,
+      span: 6,
 
     },
     {
       prop: 'action',
-      span: 5
+      span: 4
     }
   ]
 ]
 
 export const TableHeader = [
   { label: "地块编号", align: "center", prop: "dkbh" },
-  { label: "行政区名称", align: "center", prop: "xmc" },
+  { label: "行政区名称", align: "center", prop: "xzqmc" },
   { label: "监测面积(亩)", align: "center", prop: "dkmj" },
   { label: "前类型", align: "center", prop: "qlx" },
   { label: "后类型", align: "center", prop: "hlx" },

src/views/pageCode/checkLand/index.vue

@@ -1,14 +1,38 @@
 <template>
   <div class="app-container">
     <customForm ref="formRef" :model="queryParams" :config="FormConfig">
+      <template #region>
+        <el-tree-select
+          v-model="queryParams.decideType"
+          :data="deptList"
+          :props="{
+            value: 'deptId',
+            label: 'deptName',
+            children: 'children',
+          }"
+          value-key="deptId"
+          default-expanded-keys
+          check-strictly
+          style="width: 200px"
+        />
+      </template>
+      <template #monTime>
+        <el-date-picker
+          v-model="queryParams.time"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </template>
       <template #tbmj>
         <!-- clearable -->
         <el-select
-          v-model="queryParams.query_links"
-          style="width: 100px; margin-right: 20px"
+          v-model="queryParams.dkmjbs"
+          style="width: 100px; margin-right: 10px"
         >
           <el-option
-            v-for="item in linkList"
+            v-for="item in num_compare"
             :key="item.value"
             :label="item.label"
             :value="item.value"
@@ -16,8 +40,8 @@
           </el-option>
         </el-select>
         <el-input
-          v-model="queryParams.input"
-          style="width: 200px"
+          v-model="queryParams.dkmj"
+          style="width: calc(100% - 120px)"
           placeholder="数据"
         />
       </template>
@@ -29,7 +53,11 @@
       </template>
     </customForm>
     <div class="pointlist" @click="handleBrowse({})"></div>
-    <numCard :sddata="countData" :sdlist="sdlist[route.query.type]"></numCard>
+    <numCard
+      :sddata="countData"
+      :sdlist="sdlist[route.query.type]"
+      @numclick="cardclick"
+    ></numCard>
 
     <tablePage
       class="tablePage"
@@ -113,6 +141,7 @@
 </template>
   
   <script setup name="Dkjbxx">
+import { listDept } from "@/api/system/dept";
 import {
   getDkcount,
   listDkjbxx,
@@ -122,6 +151,7 @@ import {
 import numCard from "@/components/numCard";
 import { FormConfig, TableHeader } from "./config";
 const { proxy } = getCurrentInstance();
+const { num_compare } = proxy.useDict("num_compare");
 const route = useRoute();
 const router = useRouter();
 
@@ -132,22 +162,21 @@ const ids = ref([]);
 const total = ref(0);
 const isfield = ref(true);
 const title = ref("");
-const linkList = ref([
-  { value: 0, label: "大于" },
-  { value: 1, label: "大于等于" },
-  { value: 2, label: "小于" },
-  { value: 3, label: "小于等于" },
-  { value: 4, label: "介于" },
-  { value: 5, label: "等于" },
-]);
 
 const data = reactive({
+  deptList: [],
   form: {},
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    dkbh: '',
-    dkmj: null,
+    time: ["", ""],
+    startTime: "",
+    endTime: "",
+    auditflowList: [],
+    dkmjbs: "",
+    dkmj: "",
+    descValue: "dkmj",
+    dkbh: "",
     xzqdm: null,
   },
   countData: {},
@@ -165,26 +194,26 @@ const data = reactive({
       { name: "县级审核退回图斑", pro: "XJTJ", ctype: "red" },
     ],
     XJ: [
-      { name: "待审核", pro: "155" },
-      { name: "已审核", pro: "155" },
-      { name: "已提交", pro: "155" },
-      { name: "市级退回图斑", pro: "155", ctype: "red" },
-      { name: "省级退回图斑", pro: "155", ctype: "red" },
+      { name: "待审核", pro: "XJDSH" },
+      { name: "已审核", pro: "XJYSH" },
+      { name: "已提交", pro: "XJYTJ" },
+      { name: "市级退回图斑", pro: "SJTH", ctype: "red" },
+      { name: "省级退回图斑", pro: "SJJTH", ctype: "red" },
     ],
     SJ: [
-      { name: "待审核", pro: "155" },
-      { name: "已审核", pro: "155" },
-      { name: "已提交", pro: "155" },
-      { name: "省级退回图斑", pro: "155", ctype: "red" },
+      { name: "待审核", pro: "SJDSH" },
+      { name: "已审核", pro: "SJYSH" },
+      { name: "已提交", pro: "SJYTJ" },
+      { name: "省级退回图斑", pro: "SJJTH", ctype: "red" },
     ],
     SJJ: [
-      { name: "待审核", pro: "155" },
-      { name: "已审核", pro: "155" },
+      { name: "待审核", pro: "SJJDSH" },
+      { name: "已审核", pro: "SJJYSH" },
     ],
   },
 });
 
-const { queryParams, form, rules, sdlist, countData } = toRefs(data);
+const { queryParams, deptList, form, rules, sdlist, countData } = toRefs(data);
 let countparm = {
   normal: {
     all: null,
@@ -193,13 +222,39 @@ let countparm = {
     WYTJ: [{ auditflowStep: "WYQR", successType: "1" }],
     XJSH: [{ auditflowStep: "XJTJ", successType: "1" }],
   },
-  XJ: [],
-  SJ: [],
-  SJJ: [],
+  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: "SJJSH" }],
+  },
 };
 /** 查询地块基本信息（DKJBXX）列表 */
 function getList() {
   loading.value = true;
+  queryParams.value.startTime = queryParams.value.time[0];
+  queryParams.value.endTime = queryParams.value.time[1];
   listDkjbxx(queryParams.value).then((response) => {
     dkjbxxList.value = response.rows;
     total.value = response.total;
@@ -220,6 +275,11 @@ function getcount() {
     });
   });
 }
+function cardclick(key) {
+  let prams = countparm[route.query.type || "normal"];
+  queryParams.value.auditflowList = prams[key];
+  getList();
+}
 // 取消按钮
 function cancel() {
   open.value = false;
@@ -249,7 +309,20 @@ function handleQuery() {
 
 /** 重置按钮操作 */
 function resetQuery() {
-  proxy.resetForm("queryRef");
+  queryParams.value = {
+    pageNum: 1,
+    pageSize: 10,
+    time: ["", ""],
+    startTime: "",
+    endTime: "",
+    auditflowList: [],
+    dkmjbs: "",
+    dkmj: "",
+    descValue: "dkmj",
+    dkbh: "",
+    xzqdm: null,
+  };
+  // proxy.resetForm("queryRef");
   handleQuery();
 }
 
@@ -318,6 +391,12 @@ function handleDownload(row) {
   const zipfile = row.proxypath + ".zip";
   window.open(`${zipfile}`);
 }
+function getDrpt() {
+  listDept({}).then((response) => {
+    deptList.value = proxy.handleTree(response.data, "deptId");
+  });
+}
+getDrpt();
 getcount();
 getList();
 </script>

src/views/remote/farmland/index.vue

@@ -148,6 +148,12 @@ export default {
       maptype: "normal",
       total: 0,
       queryParams: {
+        startTime: "",
+        endTime: "",
+        auditflowList: [{ auditflowStep: "" }],
+        dkmjbs: "",
+        dkmj: "",
+        descValue: "",
         // 监测编号: "", //监测编号
         pageNum: 1,
         pageSize: 10,