From 74ea64476c3d8e259835fedd5b77b2bcc692dd08 Mon Sep 17 00:00:00 2001
From: zhufu <17863654727@163.com>
Date: Fri, 8 Nov 2024 15:30:40 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E9=87=8D=E7=82=B9=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=80=89=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/keyproblem/keyissuesI/auditinfo/MapList/index.vue     | 2 +-
 .../demo/keyproblem/keyissuesII/auditinfo/MapList/index.vue    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/demo/keyproblem/keyissuesI/auditinfo/MapList/index.vue b/src/views/demo/keyproblem/keyissuesI/auditinfo/MapList/index.vue
index fdd83833..214143c7 100644
--- a/src/views/demo/keyproblem/keyissuesI/auditinfo/MapList/index.vue
+++ b/src/views/demo/keyproblem/keyissuesI/auditinfo/MapList/index.vue
@@ -272,8 +272,8 @@
   });
   const markTypeOptions = ref([
     { label: '合法', value: '合法' },
+    { label: '违法', value: '违法' },
     { label: '其他', value: '其他' },
-    { label: '非粮化', value: '非粮化' },
   ]);
 
   const dataList = ref([]);
diff --git a/src/views/demo/keyproblem/keyissuesII/auditinfo/MapList/index.vue b/src/views/demo/keyproblem/keyissuesII/auditinfo/MapList/index.vue
index a4d2ba60..3b9d931e 100644
--- a/src/views/demo/keyproblem/keyissuesII/auditinfo/MapList/index.vue
+++ b/src/views/demo/keyproblem/keyissuesII/auditinfo/MapList/index.vue
@@ -272,8 +272,9 @@
   });
   const markTypeOptions = ref([
     { label: '合法', value: '合法' },
+    { label: '违法', value: '违法' },
     { label: '其他', value: '其他' },
-    { label: '非粮化', value: '非粮化' },
+    { label: '自建自用', value: '自建自用' },
   ]);
 
   const dataList = ref([]);

From 88cc3670b7d8757da64a70c7fd1fed6eabfa8b52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=A6=8D?= <1455167345@qq.com>
Date: Fri, 8 Nov 2024 15:31:23 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=B8=BE=E8=AF=81=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/keyproblem/keyissuesI/auditinfo/MapList/index.vue     | 2 +-
 .../demo/keyproblem/keyissuesII/auditinfo/MapList/index.vue    | 3 ++-
 src/views/demo/redlinesupervision/auditinfo/MapList/index.vue  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/demo/keyproblem/keyissuesI/auditinfo/MapList/index.vue b/src/views/demo/keyproblem/keyissuesI/auditinfo/MapList/index.vue
index fdd83833..214143c7 100644
--- a/src/views/demo/keyproblem/keyissuesI/auditinfo/MapList/index.vue
+++ b/src/views/demo/keyproblem/keyissuesI/auditinfo/MapList/index.vue
@@ -272,8 +272,8 @@
   });
   const markTypeOptions = ref([
     { label: '合法', value: '合法' },
+    { label: '违法', value: '违法' },
     { label: '其他', value: '其他' },
-    { label: '非粮化', value: '非粮化' },
   ]);
 
   const dataList = ref([]);
diff --git a/src/views/demo/keyproblem/keyissuesII/auditinfo/MapList/index.vue b/src/views/demo/keyproblem/keyissuesII/auditinfo/MapList/index.vue
index a4d2ba60..3b9d931e 100644
--- a/src/views/demo/keyproblem/keyissuesII/auditinfo/MapList/index.vue
+++ b/src/views/demo/keyproblem/keyissuesII/auditinfo/MapList/index.vue
@@ -272,8 +272,9 @@
   });
   const markTypeOptions = ref([
     { label: '合法', value: '合法' },
+    { label: '违法', value: '违法' },
     { label: '其他', value: '其他' },
-    { label: '非粮化', value: '非粮化' },
+    { label: '自建自用', value: '自建自用' },
   ]);
 
   const dataList = ref([]);
diff --git a/src/views/demo/redlinesupervision/auditinfo/MapList/index.vue b/src/views/demo/redlinesupervision/auditinfo/MapList/index.vue
index 1c053fb1..d0d93b30 100644
--- a/src/views/demo/redlinesupervision/auditinfo/MapList/index.vue
+++ b/src/views/demo/redlinesupervision/auditinfo/MapList/index.vue
@@ -273,7 +273,7 @@
   const markTypeOptions = ref([
     { label: '合法', value: '合法' },
     { label: '其他', value: '其他' },
-    { label: '非粮化', value: '非粮化' },
+    { label: '违法', value: '违法' },
   ]);
 
   const dataList = ref([]);

From 74f4573b5c5011fb76c95988e1bb02d0b9db0972 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=95=E5=B5=A9?= <17854119262@163.com>
Date: Fri, 8 Nov 2024 17:24:06 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E9=9D=9E=E6=B3=95=E9=87=87=E7=9F=BF-?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../caseoffence/feifacaikuang/index.data.ts   |  8 +++-
 .../demo/caseoffence/feifacaikuang/index.vue  | 46 +++++++++++--------
 src/views/demo/system/menu/MenuTree.vue       | 37 ++++++++-------
 src/views/demo/system/specialcolumn/index.vue | 38 ++++++++++++---
 4 files changed, 86 insertions(+), 43 deletions(-)

diff --git a/src/views/demo/caseoffence/feifacaikuang/index.data.ts b/src/views/demo/caseoffence/feifacaikuang/index.data.ts
index bed89bf5..85d55c63 100644
--- a/src/views/demo/caseoffence/feifacaikuang/index.data.ts
+++ b/src/views/demo/caseoffence/feifacaikuang/index.data.ts
@@ -72,6 +72,12 @@ export const columns: BasicColumn[] = [
     fixed: 'right',
     width: 100,
   },
+  {
+    title: '上报率',
+    dataIndex: 'sbl',
+    fixed: 'right',
+    width: 100,
+  },
 ];
 
 // 无人机发现违法行为情况统计明细表-搜索
@@ -84,7 +90,7 @@ export const searchFormSchema: FormSchema[] = [
     componentProps: {
       format: 'YYYY-MM-DD',
       placeholder: ['开始日期', '结束日期'],
-      defaultValue: [dayjs(dayjs().add(-1, 'day'), 'YYYY-MM-DD'), dayjs(dayjs().add(-1, 'day'), 'YYYY-MM-DD')]
+      defaultValue: [dayjs('2024-08-01', 'YYYY-MM-DD'), dayjs(dayjs().add(-1, 'day'), 'YYYY-MM-DD')]
     },
   },
 ];
diff --git a/src/views/demo/caseoffence/feifacaikuang/index.vue b/src/views/demo/caseoffence/feifacaikuang/index.vue
index db8e41af..cbe9bf31 100644
--- a/src/views/demo/caseoffence/feifacaikuang/index.vue
+++ b/src/views/demo/caseoffence/feifacaikuang/index.vue
@@ -6,16 +6,13 @@
       </template>
       <template #bodyCell="{ column, record }">
         <!-- 整改率 -->
-        <template v-if="column.key === 'zgl'">
-           {{ record.zgl }}%
-        </template>
+        <template v-if="column.key === 'zgl'"> {{ record.zgl }}% </template>
         <!-- 驳回率 -->
-        <template v-if="column.key === 'bhl'">
-           {{ record.bhl }}%
-        </template>
-        </template>
+        <template v-if="column.key === 'bhl'"> {{ record.bhl }}% </template>
+        <!-- 上报率 -->
+        <template v-if="column.key === 'sbl'"> {{ record.sbl }}% </template>
+      </template>
     </BasicTable>
-
   </div>
 </template>
 
@@ -56,17 +53,28 @@
     pagination: false,
     beforeFetch: (data) => {
       // 接口请求前 参数处理
-      // 默认展示昨天的
-      var temp = {
-        startTime: data.startTime
-          ? dayjs(data.startTime).startOf('day').format('YYYY-MM-DD')
-          : dayjs().startOf('day').add(-1, 'day').format('YYYY-MM-DD'),
-        endTime: data.endTime
-          ? dayjs(data.endTime).endOf('day').format('YYYY-MM-DD HH:mm:ss')
-          : dayjs().endOf('day').add(-1, 'day').format('YYYY-MM-DD HH:mm:ss'),
-      };
-      searchParams.value = temp;
-      return temp;
+      console.log(data);
+      // 默认时间
+      if (Object.keys(data).length == 0) {
+        var temp = {
+          startTime: dayjs('2024-08-01').startOf('day').format('YYYY-MM-DD'),
+          endTime: dayjs().endOf('day').add(-1, 'day').format('YYYY-MM-DD HH:mm:ss'),
+        };
+        searchParams.value = temp;
+        return temp;
+      }
+      // 起始时间和结束时间格式和精确值
+      if (data.startTime && data.endTime) {
+        var temp = {
+          startTime: dayjs(data.startTime).startOf('day').format('YYYY-MM-DD'),
+          endTime: dayjs(data.endTime).endOf('day').format('YYYY-MM-DD HH:mm:ss'),
+        };
+        searchParams.value = temp;
+        return temp;
+      }
+      if (data.startTime === null || data.endTime === undefined) {
+        searchParams.value = {};
+      }
     },
     afterFetch: (res) => {},
   });
diff --git a/src/views/demo/system/menu/MenuTree.vue b/src/views/demo/system/menu/MenuTree.vue
index bf51d67d..c7271178 100644
--- a/src/views/demo/system/menu/MenuTree.vue
+++ b/src/views/demo/system/menu/MenuTree.vue
@@ -19,7 +19,7 @@
 <script lang="ts" setup>
   import { onMounted, ref, h, nextTick, unref } from 'vue';
   import { BasicTree, TreeItem, TreeActionItem, TreeActionType } from '@/components/Tree';
-  import { getMenuList, deleteMenu, getMenuDetail, getSpecialData } from '@/api/demo/system';
+  import { getMenuList, deleteMenu, getAllModuleDetail, getSpecialData } from '@/api/demo/system';
   import { FormOutlined, DeleteOutlined } from '@ant-design/icons-vue';
   import { router } from '@/router';
   import { useMessage } from '@/hooks/web/useMessage';
@@ -33,29 +33,27 @@
   const asyncExpandTreeRef = ref<Nullable<TreeActionType>>(null);
   async function fetch() {
     treeData.value = (await getMenuList()) as unknown as TreeItem[];
-    treeData.value.forEach((item, index) => {
-      getMenuDetailById(item).then((res) => {
-        let title = specialMenu.value.find((sp) => {
-          return sp.id == res.moduleTypeId;
-        })?.title;
-        if (title) {
-          treeData.value[index].name = item.name = item.name + ' （' + title + ')';
+    setTimeout(() => {
+      treeData.value.forEach((item, index) => {
+        let moduleDetail = allModuleDetail.value.find((detail) => {
+          return detail.id == item.id;
+        });
+        if (moduleDetail) {
+          let title = specialMenu.value.find((sp) => {
+            return sp.id == moduleDetail.moduleTypeId;
+          })?.title;
+          if (title) {
+            treeData.value[index].name = item.name = item.name + ' （' + title + ')';
+          }
         }
       });
-    });
-
+    }, 500);
     // 展开全部
     nextTick(() => {
       unref(asyncExpandTreeRef)?.expandAll(true);
     });
   }
 
-  async function getMenuDetailById(node) {
-    return await getMenuDetail({
-      id: node.id,
-    });
-  }
-
   function handleSelect(keys) {
     emit('select', keys[0]);
   }
@@ -120,10 +118,15 @@
   async function specialData() {
     specialMenu.value = await getSpecialData();
   }
+  const allModuleDetail = ref();
+  async function funGetAllModuleDetail() {
+    allModuleDetail.value = await getAllModuleDetail();
+  }
 
   onMounted(() => {
-    fetch();
+    funGetAllModuleDetail();
     specialData();
+    fetch();
   });
   defineExpose({
     fetch,
diff --git a/src/views/demo/system/specialcolumn/index.vue b/src/views/demo/system/specialcolumn/index.vue
index fed60feb..0705dafe 100644
--- a/src/views/demo/system/specialcolumn/index.vue
+++ b/src/views/demo/system/specialcolumn/index.vue
@@ -54,6 +54,7 @@
 <script setup lang="ts">
   import { ref, onMounted, reactive, watch, createVNode, unref } from 'vue';
   import { Modal, message } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
   import { useModal } from '@/components/Modal';
   import { BasicTable, useTable } from '@/components/Table';
   import { PermissionBtn } from '@/components/PermissionBtn/index';
@@ -92,7 +93,7 @@
   // 分页信息
   let nowPage = 0;
   let nowLimit = 0;
-  let total = 0;
+  const total = ref(0);
   // 表格数据
   const registerTableData = ref([]);
 
@@ -121,11 +122,21 @@
       // 分页信息
       nowPage = pagination.current;
       nowLimit = pagination.pageSize || pagination.defaultPageSize;
-      total = pagination.total;
+      if (pagination.total) {
+        total.value = pagination.total;
+      } else {
+        getTotal();
+      }
       // 表格数据
       registerTableData.value = res;
     },
   });
+  // 分页信息-总数
+  async function getTotal() {
+    let res = await LoadDataBaseInfo({ page: nowPage, limit: nowLimit });
+    total.value = res.total;
+  }
+
   // 修改是否显示状态
   const changeIsShow = (record) => {
     UpdateIsShow({ id: record.id, isshow: record.isShow })
@@ -155,7 +166,7 @@
           appShow: false,
           isExternal: false,
           linkOrApi: '',
-          sort: total + 1,
+          sort: total.value + 1,
           imgUrl: '',
         };
         openModal(true, temp_add);
@@ -175,9 +186,21 @@
           message.warning('请选择一条数据');
           return;
         }
-        await DeleteEntity({ id: getSelectRows()[0].id });
-        closeModal();
-        reload();
+        Modal.confirm({
+          title: '是否确认删除?',
+          icon: createVNode(ExclamationCircleOutlined),
+          onCancel() {},
+          onOk() {
+            DeleteEntity({ id: getSelectRows()[0].id }).then((res) => {
+              if (res) {
+                reload();
+                setTimeout(() => {
+                  getTotal();
+                }, 500);
+              }
+            });
+          },
+        });
         break;
     }
   };
@@ -186,6 +209,9 @@
     await AddOrUpdateForm(data);
     closeModal();
     reload();
+    setTimeout(() => {
+      getTotal();
+    }, 500);
   }
   // 向上排序
   async function sortUp(index, record) {

From 6e6d6e2fc3b9cb65314daa68947bd261ea5afe67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=A6=8D?= <1455167345@qq.com>
Date: Sat, 9 Nov 2024 09:49:58 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/redlinesupervision/auditinfo/AuditProgress/index.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/demo/redlinesupervision/auditinfo/AuditProgress/index.vue b/src/views/demo/redlinesupervision/auditinfo/AuditProgress/index.vue
index c5cb583d..aef9f519 100644
--- a/src/views/demo/redlinesupervision/auditinfo/AuditProgress/index.vue
+++ b/src/views/demo/redlinesupervision/auditinfo/AuditProgress/index.vue
@@ -171,7 +171,7 @@
             <div class="info-data-data">{{ item.receivetask }}</div>
           </div>
           <div class="info-data-item">
-            <div class="info-data-label">非粮化</div>
+            <div class="info-data-label">举证违法</div>
             <div class="info-data-data">{{ item.nonfoodcase }}</div>
           </div>
           <!-- <div style="width: 1px;margin-right:15px;margin-left:30px;background-color:#EDEDED;height: 15px;"></div> -->

From 4499faa9ab7dfaa711a70fe745f390ca877a9bb3 Mon Sep 17 00:00:00 2001
From: zhufu <17863654727@163.com>
Date: Sat, 9 Nov 2024 15:32:52 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E5=88=A4=E8=AF=BB=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/audit/index.ts               | 4 ++++
 src/views/demo/audit/audit/index.vue | 1 +
 src/views/demo/audit/util.ts         | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/api/audit/index.ts b/src/api/audit/index.ts
index 9b83926c..4577f02c 100644
--- a/src/api/audit/index.ts
+++ b/src/api/audit/index.ts
@@ -37,6 +37,8 @@ const typeObj = {
   '重点问题I类': '/api/DroneCaseInfoZdwt1/',
   '重点问题II类': '/api/DroneCaseInfoZdwt2/',
   '巡察审计': '/api/DroneCaseInfoXcsj/',
+  '生态保护红线监管': '/api/DroneCaseInfoSTHX/',
+  '生态修复': '/api/DroneCaseInfoSTXF/',
 }
 const infoShpData = {
   '违法用地': 'UpdateCaseInfoShpData',
@@ -55,6 +57,8 @@ const closeCaseApi = {
   '重点问题I类': 'CloseCaseInfoZdwt1',
   '重点问题II类': 'CloseCaseInfoZdwt2',
   '巡察审计': 'CloseCaseInfoXCSJ',
+  '生态保护红线监管': 'CloseSTHXCaseInfo',
+  '生态修复': 'CloseSTXFCaseInfo',
 }
 
 export function LoadCaseInfoLists(type, params){
diff --git a/src/views/demo/audit/audit/index.vue b/src/views/demo/audit/audit/index.vue
index c361910c..8bd736fb 100644
--- a/src/views/demo/audit/audit/index.vue
+++ b/src/views/demo/audit/audit/index.vue
@@ -254,6 +254,7 @@ const showProgress = () => {
 const preview = () => {
   LoadCaseImportInfoLast({ subjectname: type}).then(res => {
     console.log(res)
+    if(res == "") return message.warning("当前没有未导入数据")
     picihao.value = res
     openImportModal.value = true
   })
diff --git a/src/views/demo/audit/util.ts b/src/views/demo/audit/util.ts
index c3ff517d..09f8cd92 100644
--- a/src/views/demo/audit/util.ts
+++ b/src/views/demo/audit/util.ts
@@ -22,7 +22,7 @@ export const SubjectKeyObj = {
   '耕地非粮化': 'Subject_GDFLH', //耕地非粮化
   '重点问题I类': 'Subject_ZDWT1', //重点问题I类
   '重点问题II类': 'Subject_ZDWT2', //重点问题II类
-  '生态保护红线监管': 'Subject_STBHHXJG',  //生态保护红线监管
+  '生态保护红线监管': 'Subject_STHX',  //生态保护红线监管
   '生态修复': 'Subject_STXF',  //生态修复
 }
 export const codeObj = {

From d57cef6cd10eb054232eea84380f4521ef862ca2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=A6=8D?= <1455167345@qq.com>
Date: Sat, 9 Nov 2024 16:29:48 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/redlinesupervision/auditinfo/AuditProgress/index.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/demo/redlinesupervision/auditinfo/AuditProgress/index.vue b/src/views/demo/redlinesupervision/auditinfo/AuditProgress/index.vue
index aef9f519..eee07969 100644
--- a/src/views/demo/redlinesupervision/auditinfo/AuditProgress/index.vue
+++ b/src/views/demo/redlinesupervision/auditinfo/AuditProgress/index.vue
@@ -172,7 +172,7 @@
           </div>
           <div class="info-data-item">
             <div class="info-data-label">举证违法</div>
-            <div class="info-data-data">{{ item.nonfoodcase }}</div>
+            <div class="info-data-data">{{ item.illegal }}</div>
           </div>
           <!-- <div style="width: 1px;margin-right:15px;margin-left:30px;background-color:#EDEDED;height: 15px;"></div> -->
           <div class="info-data-item">

From 86f2acc1cf55b51f241d41acd846b2119ad1c047 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=95=E5=B5=A9?= <17854119262@163.com>
Date: Sat, 9 Nov 2024 16:37:35 +0800
Subject: [PATCH 7/7] =?UTF-8?q?system=E6=BC=8F=E6=8E=89=E7=9A=84api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/demo/system.ts                  | 2 ++
 src/views/demo/system/menu/MenuTree.vue | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/api/demo/system.ts b/src/api/demo/system.ts
index 1c0b4ab7..633c91eb 100644
--- a/src/api/demo/system.ts
+++ b/src/api/demo/system.ts
@@ -42,6 +42,7 @@ enum Api {
   DeleteMenu = '/api/Modules/Delete',
   DeleteButton = '/api/Modules/DeleteMenu',
   MenuDetail = '/api/Modules/ModuleById',
+  AllModuleDetail = '/api/Modules/AllModule',
   PositionList = '/api/SysPosition/Load',
   AddPosition = '/api/SysPosition/Add',
   PosGroupList = '/api/SysPosGroup/Load',
@@ -296,6 +297,7 @@ export function assignModule(params) {
 }
 
 export const getMenuDetail = (params?: MenuParams) => defHttp.get({ url: Api.MenuDetail, params });
+export const getAllModuleDetail = () => defHttp.get({ url: Api.AllModuleDetail });
 
 export const getMenuList = (params?: MenuParams) =>
   defHttp.get<MenuListGetResultModel>({ url: Api.MenuList, params });
diff --git a/src/views/demo/system/menu/MenuTree.vue b/src/views/demo/system/menu/MenuTree.vue
index c7271178..1b4c3f73 100644
--- a/src/views/demo/system/menu/MenuTree.vue
+++ b/src/views/demo/system/menu/MenuTree.vue
@@ -35,7 +35,7 @@
     treeData.value = (await getMenuList()) as unknown as TreeItem[];
     setTimeout(() => {
       treeData.value.forEach((item, index) => {
-        let moduleDetail = allModuleDetail.value.find((detail) => {
+        let moduleDetail = allModuleDetail.value?.find((detail) => {
           return detail.id == item.id;
         });
         if (moduleDetail) {