列表调整

src/components/tablePage.vue

@@ -100,6 +100,8 @@ export default {
   methods: {
     // 搜索
     searchFun() {
+      this.$emit("update:pageNum", this.pageNum);
+      this.$emit("update:pageSize", this.pageSize);
       this.$emit("currentChange", {
         pageNum: this.pageNum,
         pageSize: this.pageSize,

src/views/pageCode/checkLand/config.js

@@ -0,0 +1,50 @@
+
+
+export const FormConfig = [
+  [
+
+    // {
+    //   label: '申请状态：',
+    //   prop: 'state',
+    //   span: 5
+    // },
+    {
+      label: '行政区',
+      prop: 'region',
+      span: 5,
+
+    },
+
+    {
+      label: '文件名称',
+      prop: 'entityid',
+      span: 5,
+      component: 'ElInput',
+      componentProps: {
+        placeholder: '文件名称'
+      }
+    },
+    {
+      label: '图斑面积',
+      prop: 'tbmj',
+      span: 7,
+
+    },
+    {
+      prop: 'action',
+      span: 5
+    }
+  ]
+]
+
+export const TableHeader = [
+  { label: "地块编号", align: "center", prop: "dkbh" },
+  { label: "行政区名称", align: "center", prop: "xmc" },
+  { label: "监测面积(亩)", align: "center", prop: "dkmj" },
+  { label: "前类型", align: "center", prop: "qlx" },
+  { label: "后类型", align: "center", prop: "hlx" },
+  { label: "前时相", align: "center", prop: "qsx" },
+  { label: "后时相", align: "center", prop: "hsx" },
+  { label: "操作", slot: "action", width: 140, align: 'center' },
+]
+

src/views/pageCode/dataEntry/config.js

@@ -16,7 +16,7 @@ export const FormConfig = [
     },
     {
       label: '录入时间',
-      prop: 'link',
+      prop: 'time',
       span: 5,
 
     },
@@ -42,7 +42,7 @@ export const TableHeader = [
   { label: "图斑个数", prop: "geomNumber", align: 'center' },
   { label: "监测面积（亩）", prop: "geomArea", align: 'center' },
   { label: "数据量", prop: "qlx", align: 'center' },
-  { label: "录入时间", prop: "createTime", align: 'center', width: 200,},
+  { label: "录入时间", prop: "createTime", align: 'center', width: 200, },
   { label: "重复数量", prop: "updateNumberCheckFull", align: 'center' },
   { label: "成功数量", prop: "updateNumberCheckSuccess", align: 'center' },
   { label: "更新失败数量", prop: "updateNumberFull", align: 'center' },
@@ -50,112 +50,3 @@ export const TableHeader = [
   { label: "操作", slot: "action", width: 140, align: 'center' },
 ]
 
-
-// 详情字段
-export const detailInfos = [
-  [
-    [
-      { flag: 'label', value: '申请时间', span: 8 },
-      { flag: 'value', value: 'sqTime', span: 16 }
-    ],
-    [
-      { flag: 'label', value: '申请部门', span: 8 },
-      { flag: 'value', value: 'sqDepartmentBy', span: 16 }
-    ]
-  ],
-  [
-    [
-      { flag: 'label', value: '数据服务', span: 8 },
-      { flag: 'value', value: 'systemName', span: 16 }
-    ],
-    [
-      { flag: 'label', value: '数据类型', span: 8 },
-      { flag: 'value', value: 'zymlTypeName', span: 16 }
-    ]
-  ],
-  [
-    [
-      { flag: 'label', value: '申请范围', span: 4 },
-      { flag: 'value', value: 'sqFw', span: 20 }
-    ],
-  ],
-  [[
-    { flag: 'label', value: '申请理由', span: 4 },
-    { flag: 'value', value: 'sqReason', span: 20 }
-  ]],
-  [[
-    { flag: 'label', value: '系统名称', span: 4 },
-    { flag: 'value', value: 'systemName', span: 20 }
-  ]],
-  [[
-    { flag: 'label', value: '调用IP', span: 4 },
-    { flag: 'value', value: 'callIp', span: 20 }
-  ]],
-  [[
-    { flag: 'label', value: '预期使用时间', span: 4 },
-    { flag: 'value', value: 'sqDeadline', span: 20 }
-  ]],
-  [[
-    { flag: 'label', value: '附件', span: 4 },
-    { flag: 'value', value: 'attachment', span: 20, isslot: true }
-  ]]
-]
-export const shjlInfos = [
-  [[
-    { flag: 'label', value: '审核结果', span: 4 },
-    { flag: 'value', value: 'jg', span: 20, isslot: true }
-  ]],
-  [[
-    { flag: 'label', value: '审核意见', span: 4 },
-    { flag: 'value', value: 'spReason', span: 20 }
-  ]],
-  [[
-    { flag: 'label', value: '有效截止日期', span: 4 },
-    { flag: 'value', value: 'deadline', span: 20 }
-  ]],
-  [[
-    { flag: 'label', value: '审核人', span: 4 },
-    { flag: 'value', value: 'sqUserBy', span: 20 }
-  ]],
-  [[
-    { flag: 'label', value: '审核时间', span: 4 },
-    { flag: 'value', value: 'spTime', span: 20 }
-  ]],
-]
-export const chInfos = [
-  [[
-    { flag: 'label', value: '撤回时间', span: 4 },
-    { flag: 'value', value: 'sqRevokeTime', span: 20 }
-  ]],
-  [[
-    { flag: 'label', value: '撤回原因', span: 4 },
-    { flag: 'value', value: 'sqRevokeReason', span: 20 }
-  ]],
-]
-
-
-
-
-export const gxConfig = [
-  [
-    {
-      label: '',
-      prop: 'query_data',
-      span: 8,
-      component: 'ElInput',
-      componentProps: {
-        placeholder: '请输入查询名称或Id'
-      }
-    },
-    {
-      label: '',
-      prop: 'link',
-      span: 8
-    },
-    {
-      prop: 'action',
-      span: 5
-    }
-  ]
-]
-

src/views/pageCode/dataEntry/index.vue

@@ -1,20 +1,15 @@
 <template>
   <div class="app-container">
     <customForm ref="formRef" :model="queryParams" :config="FormConfig">
-      <template #link>
-        <el-select
-          v-model="queryParams.query_links"
-          placeholder="请选择实体关系"
-          clearable
-        >
-          <el-option
-            v-for="item in linkList"
-            :key="item.value"
-            :label="item.value"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
+      <template #time>
+        <el-date-picker
+          v-model="queryParams.time"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          style="width: 100%"
+        />
       </template>
       <template #action>
         <el-button type="primary" icon="Search" @click="handleQuery"
@@ -71,6 +66,8 @@
       ref="tableDialogRef"
       @selectChange="handleSelectionChange"
       @currentChange="getList"
+      v-model:pageNum="queryParams.pageNum"
+      v-model:pageSize="queryParams.pageSize"
     >
       <template #action="{ row }">
         <el-button link type="primary" @click="handleBrowse(row)"
@@ -156,7 +153,7 @@ const { queryParams, form, rules } = toRefs(data);
 /** 查询地块基本信息（DKdb）列表 */
 function getList(pages) {
   loading.value = true;
-  listDkdb({ ...queryParams.value, ...pages }).then((response) => {
+  listDkdb(queryParams.value).then((response) => {
     dkdbList.value = response.rows;
     total.value = response.total;
     loading.value = false;

src/views/remote/farmland/details.vue

@@ -116,16 +116,35 @@
       <el-tab-pane label="业务记录" name="ywjl" v-if="!form">
         <el-timeline>
           <el-timeline-item
-            v-for="(activity, index) in activities"
+            v-for="(acti, index) in activities"
             :key="index"
-            :icon="activity.icon"
-            :type="activity.type"
-            :color="activity.color"
-            :size="activity.size"
-            :hollow="activity.hollow"
-            :timestamp="activity.timestamp"
+            :type="acti.successType == '0' ? 'primary' : ''"
+            size="large"
+            :hollow="true"
+            :timestamp="acti.auditflowStepValue"
+            placement="top"
           >
-            {{ activity.content }}
+            <div class="timelinediv">
+              <span class="name">[{{ acti.createBy }}] </span>
+              <span class="operate">
+                {{ audiText[acti.auditflowOperateType] || "" }}
+              </span>
+              <span class="time"> 于 {{ acti.createTime }}</span>
+              <span
+                v-if="['001', '002', '003'].includes(acti.auditflowOperateType)"
+                class="time more"
+                @click="more"
+                >更多</span
+              >
+            </div>
+            <div
+              v-if="['001', '002', '003'].includes(acti.auditflowOperateType)"
+            >
+              {{
+                audiText[acti.auditflowOperateType].replace("合规性", "")
+              }}结论：
+              {{ acti.successType == "0" ? "通过" : "不通过" }}
+            </div>
           </el-timeline-item>
         </el-timeline>
       </el-tab-pane>
@@ -135,7 +154,8 @@
   
   <script setup name="details">
 import Hcxx from "./hcxx.vue";
-import { getDetailsDk, adddb } from "@/api/rsmonitoring/dataEntry";
+import { getDetailsDk } from "@/api/rsmonitoring/dataEntry";
+import { getDkjbxx, getAuditflow } from "@/api/rsmonitoring/dkjbxx";
 import {
   jbxx,
   tdxzTable,
@@ -143,6 +163,7 @@ import {
   gdTable,
   yjjbntTable,
   stbhTable,
+  audiText,
 } from "./config";
 
 const { proxy } = getCurrentInstance();
@@ -155,54 +176,63 @@ const data = reactive({
   ywyptab: "tdxz",
   infoObj: { name: "swed" },
   hcxxList: [{}],
-  activities: [
-    {
-      content: "Custom icon",
-      timestamp: "2018-04-12 20:46",
-      size: "large",
-      type: "primary",
-    },
-    {
-      content: "Custom color",
-      timestamp: "2018-04-03 20:46",
-      color: "#0bbd87",
-    },
-    {
-      content: "Custom size",
-      timestamp: "2018-04-03 20:46",
-      size: "large",
-    },
-    {
-      content: "Custom hollow",
-      timestamp: "2018-04-03 20:46",
-      type: "primary",
-      hollow: true,
-    },
-    {
-      content: "Default node",
-      timestamp: "2018-04-03 20:46",
-    },
-  ],
+  activities: [],
 });
 
 const { activeName, ywyptab, infoObj, hcxxList, activities } = toRefs(data);
 
 function getDetails({ pcsjid, id }) {
-  console.log(pcsjid, id, "getDetails", form);
   if (form) {
     getDetailsDk(id).then((res) => {
       infoObj.value = res.data;
     });
+  } else {
+    getDkjbxx(id).then((res) => {
+      infoObj.value = res.data;
+    });
+    getAuditflow({ dkjdxxId: id }).then((res) => {
+      activities.value = res.data;
+    });
   }
 }
 defineExpose({ getDetails });
 </script>
-<style scoped>
+<style scoped lang="scss">
 .el-button {
   margin: 0px !important;
   margin-bottom: 12px !important;
 }
+
+.timelinediv {
+  .name {
+    color: #95f204;
+  }
+  .operate {
+    color: #f59a23;
+  }
+  .time {
+    color: #5ba7f0;
+  }
+  .more {
+    display: inline-block;
+    position: absolute;
+    right: 20px;
+    cursor: pointer;
+  }
+}
+</style>
+<style  lang="scss">
 .details {
+  height: calc(100% - 40px);
+  overflow: hidden;
+  .el-tabs {
+    height: 100%;
+  }
+  .el-tabs__content {
+    height: calc(100% - 60px);
+    overflow-y: auto;
+    overflow-x: hidden;
+  }
 }
 </style>
   

src/views/remote/farmland/index.vue

@@ -58,6 +58,8 @@
         ref="tableDialogRef"
         @selectChange="handleSelectionChange"
         @currentChange="getTemplate"
+        v-model:pageNum="queryParams.pageNum"
+        v-model:pageSize="queryParams.pageSize"
       >
         <template #action="{ row, $index }">
           <el-button size="mini" type="text" @click.stop="flyto(row)"
@@ -209,8 +211,7 @@ export default {
       console.log(this.queryParams, ";this.queryParams", this.domains);
     },
     //动态获取设置的模版字段
-    getTemplate(query) {
-      if (query) this.queryParams.pageNum = query.pageNum;
+    getTemplate() {
       this.handleDelete();
       if (this.$route.query.form == "checkLand") {
         listDkjbxx(this.queryParams).then((res) => {