Merge branch 'master' of http://gitlab.bridata.com:8090/root/jt_front

src/router/routes.js

@@ -16,14 +16,14 @@ const routes = [
   {
     path: "/",
     name: "首页",
-    redirect: "/building",
+    redirect: "/message",
     component: MainLayout,
     children: [
       {
-        path: "/information",
-        name: "information",
+        path: "/message",
+        name: "message",
         title: "消息中心",
-        component: () => import("@/views/homePage/building.vue"),
+        component: () => import("@/views/systemManage/message.vue"),
       },
       {
         path: "/homePage",

src/views/projectManage/addProject.vue

@@ -10,15 +10,15 @@
                                 <div class="header-right">
                                     <el-button type="default" @click="backClick">返回</el-button>
                                     <template v-if="!loading && !isPreview">
-                                        <el-button type="primary" v-if="formData.projectLzType == 1 || !formData.projectLzType" @click="saveClick('save')">保存</el-button>
-                                        <el-button type="primary" v-if="formData.projectLzType == 1" @click="saveClick('submit')">发起立项填报</el-button>
+                                        <el-button type="primary" v-if="formData.projectLzType == '1' || !formData.projectLzType" @click="saveClick('save')">保存</el-button>
+                                        <el-button type="primary" v-if="formData.projectLzType == '1'" @click="saveClick('submit')">发起立项填报</el-button>
                                     </template>
                                 </div>
                             </div>
                             <el-tabs v-model="lxTabActiveName">
                                 <el-tab-pane label="基本信息" name="基本信息">
                                     <div class="tab-content">
-                                        <el-form :model="formData" :label-width="150" :disabled="isPreview || (formData.projectLzType <= 5 && formData.projectLzType != 1)">
+                                        <el-form :model="formData" :label-width="150" :disabled="isPreview || (Number(formData.projectLzType) <= 5 && Number(formData.projectLzType) != 1)">
                                             <el-collapse v-model="activeCollapse">
                                                 <el-collapse-item title="项目基本信息" name="项目基本信息">
                                                     <el-row :gutter="20">
@@ -591,7 +591,7 @@
                                 </el-tab-pane>
                                 <el-tab-pane label="立项批复" name="立项批复">
                                     <div class="tab-content">
-                                        <el-form :model="formData" :label-width="150" :disabled="isPreview || (formData.projectLzType <= 5 && formData.projectLzType != 1)">
+                                        <el-form :model="formData" :label-width="150" :disabled="isPreview || (Number(formData.projectLzType) <= 5 && Number(formData.projectLzType) != 1)">
                                             <el-collapse v-model="activeCollapse">
                                                 <el-collapse-item title="项目投资总额（全口径）" name="项目投资总额（全口径）">
                                                     <el-table :data="tzzeqkjData" style="width: 100%" empty-text="暂无数据"
@@ -865,7 +865,7 @@
                         </div>
                     </el-tab-pane>
                     <el-tab-pane label="决策信息填报" name="决策信息填报"
-                        v-if="formData.projectLzType == 5 || formData.projectLzType == 7"
+                        v-if="formData.projectLzType === '5' || formData.projectLzType === '7'"
                         :lazy="true"
                     >
                         <div class="project-tab-content">
@@ -875,7 +875,7 @@
                                     <el-button type="default" @click="backClick">返回</el-button>
                                     <template v-if="!loading && !isPreview">
                                         <el-button type="primary" @click="saveClick('save')">保存</el-button>
-                                        <el-button type="primary" v-if="jcFormData.projectLzType == 7" @click="saveClick('submit')">发起决策信息填报</el-button>
+                                        <el-button type="primary" v-if="jcFormData.projectLzType === '7'" @click="saveClick('submit')">发起决策信息填报</el-button>
                                     </template>
                                 </div>
                             </div>
@@ -3498,7 +3498,7 @@
     }
     // 保存数据
     const saveClick = (type) => {
-        if (!formData.projectLzType || formData.projectLzType == 1) {
+        if (!formData.projectLzType || formData.projectLzType === '1') {
             let url = formData.id ? type === "submit" ? "startLixiang" : "saveProjectPreLixiang" : "createProject";
             let gdxxNewArr = JSON.parse(JSON.stringify(gdxxData));
             gdxxNewArr.splice(-1);
@@ -3524,7 +3524,7 @@
                     router.push("/projectDraft");
                 }
             })
-        } else if (jcFormData.projectLzType == 5 || jcFormData.projectLzType == 7) {
+        } else if (jcFormData.projectLzType === "5" || jcFormData.projectLzType === "7") {
             let url = type === "submit" ? "startJuece" : "saveJuece";
             let gdxxNewArr = JSON.parse(JSON.stringify(jcGdxxData));
             gdxxNewArr.splice(-1);

src/views/projectManage/projectAllPage.vue

@@ -79,9 +79,9 @@
             width: 120,
             align: "center",
             formatter: (data) => {
-                return data.projectLzType === 1 ? "待立项" : data.projectLzType === 3 ? "立项审批中" :
-                    data.projectLzType === 5 ? "已立项" : data.projectLzType === 7 ? "决策填报中" :
-                        data.projectLzType === 8 ? "决策审批中" : data.projectLzType === 9 ? "已决策" : "待立项"
+                return data.projectLzType === "1" ? "待立项" : data.projectLzType === "3" ? "立项审批中" :
+                    data.projectLzType === "5" ? "已立项" : data.projectLzType === "7" ? "决策填报中" :
+                        data.projectLzType === "8" ? "决策审批中" : data.projectLzType === "9" ? "已决策" : "待立项"
             }
         },
         {
@@ -130,9 +130,9 @@
                 width: 120,
                 align: "center",
                 formatter: (data) => {
-                    return data.projectLzType === 1 ? "待立项" : data.projectLzType === 3 ? "立项审批中" :
-                        data.projectLzType === 5 ? "已立项" : data.projectLzType === 7 ? "决策填报中" :
-                            data.projectLzType === 8 ? "决策审批中" : data.projectLzType === 9 ? "已决策" : "待立项"
+                    return data.projectLzType === "1" ? "待立项" : data.projectLzType === "3" ? "立项审批中" :
+                        data.projectLzType === "5" ? "已立项" : data.projectLzType === "7" ? "决策填报中" :
+                            data.projectLzType === "8" ? "决策审批中" : data.projectLzType === "9" ? "已决策" : "待立项"
                 }
             }
         ]);

src/views/projectManage/projectArgument.vue

@@ -60,9 +60,9 @@
             width: 120,
             align: "center",
             formatter: (data) => {
-                return data.projectLzType === 1 ? "待立项" : data.projectLzType === 3 ? "立项审批中" :
-                    data.projectLzType === 5 ? "已立项" : data.projectLzType === 7 ? "决策填报中" :
-                        data.projectLzType === 8 ? "决策审批中" : data.projectLzType === 9 ? "已决策" : "待立项"
+                return data.projectLzType === "1" ? "待立项" : data.projectLzType === "3" ? "立项审批中" :
+                    data.projectLzType === "5" ? "已立项" : data.projectLzType === "7" ? "决策填报中" :
+                        data.projectLzType === "8" ? "决策审批中" : data.projectLzType === "9" ? "已决策" : "待立项"
             }
         },
         {

src/views/projectManage/projectDecision.vue

@@ -59,9 +59,9 @@
             width: 120,
             align: "center",
             formatter: (data) => {
-                return data.projectLzType === 1 ? "待立项" : data.projectLzType === 3 ? "立项审批中" :
-                    data.projectLzType === 5 ? "已立项" : data.projectLzType === 7 ? "决策填报中" :
-                        data.projectLzType === 8 ? "决策审批中" : data.projectLzType === 9 ? "已决策" : "待立项"
+                return data.projectLzType === "1" ? "待立项" : data.projectLzType === "3" ? "立项审批中" :
+                    data.projectLzType === "5" ? "已立项" : data.projectLzType === "7" ? "决策填报中" :
+                        data.projectLzType === "8" ? "决策审批中" : data.projectLzType === "9" ? "已决策" : "待立项"
             }
         },
         {

src/views/projectManage/projectDraft.vue

@@ -25,7 +25,7 @@
                 >
                     <template #operations="{ row, index }">
                         <el-button link type="primary" size="small" @click="previewProject(row)">查看</el-button>
-                        <el-button link type="primary" size="small" @click="editProject(row)">发起立项</el-button>
+                        <el-button link type="primary" size="small" @click="editProject(row)">编辑</el-button>
                         <el-button link type="danger" size="small" @click="deleteProject(row)">删除</el-button>
                     </template>
                 </common-table>
@@ -63,9 +63,9 @@
             width: 120,
             align: "center",
             formatter: (data) => {
-                return data.projectLzType === 1 ? "待立项" : data.projectLzType === 3 ? "立项审批中" :
-                    data.projectLzType === 5 ? "已立项" : data.projectLzType === 7 ? "决策填报中" :
-                        data.projectLzType === 8 ? "决策审批中" : data.projectLzType === 9 ? "已决策" : "待立项"
+                return data.projectLzType === "1" ? "待立项" : data.projectLzType === "3" ? "立项审批中" :
+                    data.projectLzType === "5" ? "已立项" : data.projectLzType === "7" ? "决策填报中" :
+                        data.projectLzType === "8" ? "决策审批中" : data.projectLzType === "9" ? "已决策" : "待立项"
             }
         },
         {

src/views/projectManage/projectSetUp.vue

@@ -24,12 +24,12 @@
                     <template #operations="{ row, index }">
                         <!-- 立项审批中 -->
                         <el-button link type="primary" size="small"
-                            v-if="row.projectLzType === 3"
+                            v-if="row.projectLzType === '3'"
                             :loading="row.loading" @click="getResult(row)"
                         >查询审批结果</el-button>
                         <!-- 已立项 -->
                         <el-button link type="primary" size="small"
-                            v-if="row.projectLzType === 5"
+                            v-if="row.projectLzType === '5'"
                             @click="fillDecision(row)"
                         >决策填报</el-button>
                     </template>
@@ -66,9 +66,9 @@
             width: 120,
             align: "center",
             formatter: (data) => {
-                return data.projectLzType === 1 ? "待立项" : data.projectLzType === 3 ? "立项审批中" :
-                    data.projectLzType === 5 ? "已立项" : data.projectLzType === 7 ? "决策填报中" :
-                        data.projectLzType === 8 ? "决策审批中" : data.projectLzType === 9 ? "已决策" : "待立项"
+                return data.projectLzType === "1" ? "待立项" : data.projectLzType === "3" ? "立项审批中" :
+                    data.projectLzType === "5" ? "已立项" : data.projectLzType === "7" ? "决策填报中" :
+                        data.projectLzType === "8" ? "决策审批中" : data.projectLzType === "9" ? "已决策" : "待立项"
             }
         },
         {

src/views/systemManage/message.vue

+<template>
+    <div class="system-manage-container message-container" v-loading="loading">
+        <div class="system-manage-content manage-content">
+            <common-table
+                :autoHeight="true"
+                :maxRows="10"
+                :rowHeight="40"
+                :data="tableData"
+                :columns="tableColumns"
+                :total="total"
+                :current-page="currentPage"
+                :page-size="pageSize"
+                title=""
+                :index="true"
+                :border="true"
+                @size-change="handleSizeChange"
+                @current-page-change="handleCurrentPageChange"
+            >
+                <template #operations="{ row, index }">
+                    <el-button link type="primary" size="small" @click="handlePreview(row, index)">
+                        查看
+                    </el-button>
+                    <el-button link type="danger" size="small" @click="handleDelete(row, index)">
+                        删除
+                    </el-button>    
+                </template>
+            </common-table>
+        </div>
+    </div>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted, getCurrentInstance, computed, nextTick } from "vue";
+import { ElMessage, ElMessageBox } from "element-plus";
+import CommonTable from "@/components/common/commonTable.vue";
+const { proxy } = getCurrentInstance();
+const loading = ref(false);
+// 表格数据
+const tableData = ref([]);
+const total = ref(0);
+const currentPage = ref(1);
+const pageSize = ref(10);
+// 表格列配置
+const tableColumns = [
+  {
+    prop: "name",
+    label: "标题",
+    minWidth: 100
+  },
+  {
+    prop: "operations",
+    label: "操作",
+    width: 100,
+    slot: "operations",
+    fixed: "right",
+    align: "center",
+  }
+];
+const loadTableData = () => {
+  loading.value = true;
+  proxy.$post({
+    url: "/api/message/getUserMessages",
+    data: {
+      page: currentPage.value,
+      pageSize: pageSize.value,
+    },
+    callback: (data) => {
+      tableData.value = data.rows;
+      total.value = data.count;
+      loading.value = false;
+    },
+    error: (err) => {
+      loading.value = false;
+      ElMessage.error("加载数据失败");
+    },
+  });
+};
+const handleSizeChange = (size) => {
+  pageSize.value = size;
+  currentPage.value = 1;
+  loadTableData();
+};
+
+const handleCurrentPageChange = (page) => {
+  currentPage.value = page;
+  loadTableData();
+};
+onMounted(() => {
+  loadTableData();
+});
+</script>
+
+<style lang="less">
+@import "@/styles/manage.less";
+</style>