Merge branch 'dev' of http://222.212.85.86:8222/bdzl2/bxztApp into dev

packages/screen/src/router/index.js

@@ -170,16 +170,16 @@ const routes = [
     }
   },
   // 线下帮扶台账 - 法规处
-  // {
+  {
-  //   path: '/ledgerManagement3',
+    path: '/ledgerManagement3',
-  //   name: 'ledgerManagement3',
+    name: 'ledgerManagement3',
-  //   component: () => import('../views/LedgerManagement/index.vue'),
+    component: () => import('../views/LedgerManagement/helpLedger/index.vue'),
-  //   meta: {
+    meta: {
-  //     title: '驻地台账',
+      title: '线下帮扶台账',
-  //     breadcrumb: true,
+      breadcrumb: true,
-  //     parentRoute: 'warningManagement3'
+      parentRoute: 'warningManagement3'
-  //   }
+    }
-  // },
+  },
 
 
   // 项目管理 - 区县

packages/screen/src/views/LedgerManagement/helpLedger/index.js

@@ -0,0 +1,254 @@
+import { h, ref, onMounted, reactive, watch, toRaw, nextTick } from "vue";
+import { request } from "@/utils/request";
+import { useRoute, useRouter } from 'vue-router'
+
+const tableData = ref([]); // 表格数据
+
+const modelVisible = ref(false); // 弹窗状态
+const drawerVisible = ref(false); // 抽屉状态
+// 弹窗内容
+const model = reactive({
+    title: '',
+    content: null,
+    props: {},
+    onCancel: null,
+    onConfirm: null,
+    width: '',
+});
+const form = reactive({
+});
+const INIT_FORM = {
+
+};
+// 抽屉内容
+const drawer = reactive({
+    title: '',
+    content: null,
+    props: {},
+    onCancel: null,
+    onConfirm: null,
+    direction: 'rtl',
+    size: '50%'
+});
+const dialogRef = ref(null); // 弹窗实例
+const drawerRef = ref(null); // 抽屉实例
+
+const columns = [
+    {
+        prop: "helpTime",
+        label: "帮扶时间",
+        // formatter: (row) => `${row.helpTime || ''} - ${row.helpTimeEnd || ''}`,
+    },
+    {
+        prop: "helpCounty",
+        label: "帮扶区县",
+    },
+    {
+        prop: "helpPerson",
+        label: "帮扶人员",
+    },
+    {
+        prop: "helpUnit",
+        label: "帮扶单位",
+    },
+    {
+        prop: "helpStatus",
+        label: "帮扶情况",
+    },
+    {
+        prop: "attachmentUrl",
+        label: "附件",
+        render: (row) => {
+            if (row.attachmentUrl) {
+                return h(ElButton, {
+                    text: 'true',
+                    type: 'primary',
+                    onClick: () => downloadAttachment(row.attachmentUrl)
+                }, '附件下载');
+            } else {
+                return h('span', {}, '---');
+            }
+        }
+    },
+    {
+        prop: "uploadTime",
+        label: "上传时间",
+    },
+    {
+        prop: "remark",
+        label: "备注",
+    },
+]
+
+// 过滤条件
+const filterData = reactive({})
+// 分页
+const pagination = reactive({
+    current: 1,
+    pageSize: 10,
+    total: 0,
+    pageSizes: [10, 20, 50],
+    layout: "prev, pager, next, jumper",
+    onChange: (page, pageSize) => {
+        pagination.current = page;
+        pagination.pageSize = pageSize;
+        getTableData(filterData);
+    },
+});
+
+// 获取列表
+const getTableData = async (filterData = {}) => {
+    try {
+        // 过滤空字符串属性
+        const filteredParams = {};
+        Object.keys(filterData).forEach(key => {
+            if (filterData[key] !== '' && filterData[key] != null) {
+                filteredParams[key] = filterData[key];
+            }
+        });
+        const res = await request({
+            url: '/snow-ops-platform/fgc-xxbf/list',
+            method: "GET",
+            params: {
+                ...filteredParams,
+                pageNum: pagination.current,
+                pageSize: pagination.pageSize,
+            }
+        })
+        if (res.code === '00000') {
+            tableData.value = res.data.records
+            pagination.total = res.data.total
+        } else {
+            throw new Error(res.message)
+        }
+    } catch (error) {
+        ElMessage.error(error.message)
+        console.error('获取列表失败:', error);
+    }
+}
+
+// 下载附件
+const downloadAttachment = (url) => {
+    if (!url) {
+        ElMessage.warning('无附件地址');
+        return;
+    }
+    // 直接使用 window.open 触发下载
+    window.open(url, '_blank');
+}
+
+// 预警类型选项
+const eventTypeOptions = [
+    { label: "全部", value: "" },
+    { label: "台风预警", value: "台风预警" },
+    { label: "暴雨预警", value: "暴雨预警" },
+    { label: "寒潮预警", value: "寒潮预警" },
+    { label: "大雾预警", value: "大雾预警" },
+    { label: "暴雪预警", value: "暴雪预警" },
+    { label: "道路结冰预警", value: "道路结冰预警" },
+    { label: "雷电预警", value: "雷电预警" },
+    { label: "强对流预警", value: "强对流预警" },
+];
+
+// 预警级别选项
+const severityOptions = [
+    { label: "全部", value: "" },
+    { label: "红色预警", value: "红色预警" },
+    { label: "橙色预警", value: "橙色预警" },
+    { label: "黄色预警", value: "黄色预警" },
+    { label: "蓝色预警", value: "蓝色预警" },
+]
+
+// 响应情况选项
+const responseOptions = [
+    { label: "全部", value: "" },
+    { label: "未响应", value: "未响应" },
+    { label: "部分响应", value: "部分响应" },
+    { label: "全部响应", value: "全部响应" },
+]
+
+
+const downloadFile = async () => {
+    window.open('/snow-ops-platform/fgc-xxbf/template', '_blank');
+}
+
+const uploadFile = async (file) => {
+    if (!file) {
+        ElMessage.warning('请选择要上传的文件');
+        return;
+    }
+
+    try {
+        // 创建FormData对象
+        const formData = new FormData();
+        formData.append('file', file);
+
+        const loading = ElLoading.service({
+            lock: true,
+            text: '操作中',
+            background: 'rgba(0, 0, 0, 0.7)',
+        })
+
+        // 发送POST请求
+        const res = await request({
+            url: '/snow-ops-platform/fgc-xxbf/upload',
+            method: 'POST',
+            data: formData,
+            headers: {
+                'Content-Type': 'multipart/form-data'
+            }
+        });
+
+        // 关闭加载提示
+        loading.close();
+
+        if (res.code === '00000') {
+            ElMessage.success('文件上传成功');
+            // 刷新表格数据
+            getTableData(filterData);
+        } else {
+            throw new Error(res.message || '上传失败');
+        }
+    } catch (error) {
+        ElMessage.error(error.message || '文件上传失败');
+        console.error('文件上传失败:', error);
+    }
+}
+
+
+export default () => {
+
+    onMounted(() => {
+        getTableData();
+    })
+
+
+    watch(filterData, (val) => {
+        getTableData(filterData);
+    }, { deep: true })
+
+
+    return {
+        modelVisible,
+        model,
+        drawerVisible,
+        drawer,
+        dialogRef,
+        drawerRef,
+
+        eventTypeOptions,
+        severityOptions,
+        responseOptions,
+
+
+        tableData,
+        filterData,
+        pagination,
+        columns,
+
+        downloadFile,
+        uploadFile,
+
+
+    }
+}

packages/screen/src/views/LedgerManagement/helpLedger/index.vue

@@ -0,0 +1,81 @@
+<template>
+    <div class="root">
+        <div class="search-box">
+            <el-input v-model="script.filterData.headline" style="width: 240px; margin-right: 10px" size="large"
+                placeholder="预警标题" :suffix-icon="Search" />
+            <el-select v-model="script.filterData.eventType" style="width: 240px; margin-right: 10px" size="large"
+                placeholder="预警类型" :suffix-icon="ArrowDown" :options="script.eventTypeOptions" clearable />
+            <el-select v-model="script.filterData.severity" style="width: 240px; margin-right: 10px" size="large"
+                placeholder="预警级别" :suffix-icon="ArrowDown" :options="script.severityOptions" clearable />
+            <el-select v-model="script.filterData.responseStatus" style="width: 240px; margin-right: 10px" size="large"
+                placeholder="响应情况" :suffix-icon="ArrowDown" :options="script.responseOptions" clearable />
+        </div>
+        <div class="event-box">
+            <el-button type="primary" @click="triggerFileSelect">上传线下帮扶</el-button>
+            <el-button type="primary" @click="script.downloadFile">线下帮扶模板下载</el-button>
+            <input type="file" ref="fileInput" style="display: none" @change="handleFileSelect" accept=".*"></input>
+        </div>
+        <DynamicTable :dataSource="script.tableData.value" :columns="script.columns" :autoHeight="true"
+            :pagination="script.pagination">
+
+        </DynamicTable>
+        <div class="model-box">
+            <MyDialog v-model="script.modelVisible.value" :title="script.model?.title"
+                :dynamicComponent="script.model?.content" :component-props="script.model?.props"
+                :onConfirm="script.model?.onConfirm" :onCancel="script.model?.onCancel" ref="dialogRef"
+                :width="script.model?.width">
+            </MyDialog>
+            <MyDrawer v-model="script.drawerVisible.value" :title="script.drawer?.title"
+                :dynamicComponent="script.drawer?.content" :component-props="script.drawer?.props"
+                :onConfirm="script.drawer?.onConfirm" :onCancel="script.drawer?.onCancel" ref="drawerRef"
+                :direction="script.drawer?.direction" :size="script.drawer?.size"></MyDrawer>
+        </div>
+    </div>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+import DynamicTable from "../../../component/DynamicTable";
+import { Search, ArrowDown, CaretBottom } from "@element-plus/icons-vue";
+import MyDialog from "../../../component/MyDialog";
+import MyDrawer from "../../../component/MyDrawer";
+
+import scriptFn from "./index.js";
+const script = scriptFn();
+const { dialogRef, drawerRef } = script;
+const fileInput = ref(null);
+
+// 触发文件选择
+const triggerFileSelect = () => {
+    fileInput.value.click();
+};
+
+// 处理文件选择
+const handleFileSelect = (event) => {
+    const file = event.target.files[0];
+    if (file) {
+        script.uploadFile(file);
+    }
+    // 清空input值，确保相同文件可以重复选择
+    event.target.value = '';
+};
+</script>
+
+<style scoped>
+.search-box {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 10px;
+}
+
+.root {
+    height: 100%;
+    padding: 25px;
+}
+
+.event-box {
+    margin: 20px 0;
+    display: flex;
+    justify-content: flex-start;
+}
+</style>

packages/screen/src/views/ProjectManagement_Rebuild/district/index.js

@@ -372,15 +372,15 @@ export default () => {
         getTableData();
     })
 
-// 新增填报
+    // 新增填报
-const newAdd = () => {
+    const newAdd = () => {
-  router.push({
+        router.push({
-    name: 'projectAdd',
+            name: 'projectAdd',
-    params: {
+            params: {
-      mode: 'add'
+                mode: 'add'
+            }
+        })
     }
-  })
-}
 
 
     watch(filterData, (val) => {

packages/screen/src/views/WarningManagement/law/index.js

@@ -213,7 +213,7 @@ export default () => {
     const router = useRouter();
     const gotoLedgerPage = () => {
         router.push({
-            path: '/ledgerManagement2'
+            path: '/ledgerManagement3'
         });
     };
 

packages/screen/src/views/WarningManagement/law/index.vue

@@ -13,8 +13,8 @@
         <div class="event-box">
             <el-button type="primary" @click="">生成报告</el-button>
             <el-button type="primary" @click="">发布预警</el-button>
-            <el-button type="primary" @click="">上传线下帮扶</el-button>
+            <!-- <el-button type="primary" @click="">上传线下帮扶</el-button> -->
-            <el-button type="primary" @click="">线下帮扶台账</el-button>
+            <el-button type="primary" @click="script.gotoLedgerPage">线下帮扶台账</el-button>
             <el-button type="primary" color="#952DE6" @click="">导出</el-button>
             <!-- <el-button type="primary" @click="script.gotoLedgerPage">驻地台账</el-button> -->
             <!-- <el-button type="primary" @click="script.openAddDialog">上报项目</el-button> -->