From c8e23745b75911d2017d34b93d9f4713db7e75a0 Mon Sep 17 00:00:00 2001
From: yanfeiyong <2060201549@qq.com>
Date: Tue, 27 May 2025 14:11:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/permission.js                             |  19 +--
 src/views/{tongjifenxi => Home}/index.vue     | 117 +++++++++---------
 src/views/compilation/handbook/index.vue      |  11 +-
 src/views/compilation/handbook/yulan.vue      |  60 ---------
 .../{onecailiao => monolithic}/index.vue      |   2 +-
 src/views/evalute/configtable/index.vue       |   1 +
 src/views/index.vue                           |   2 +-
 src/views/manage-info/index.vue               |  73 ++++++++---
 src/views/manage/index.vue                    |   1 +
 src/views/models/badlist/index.vue            |   1 +
 src/views/orientedtwo/content/index.vue       |   1 +
 src/views/orientedtwo/subdivide/index.vue     |   1 +
 12 files changed, 128 insertions(+), 161 deletions(-)
 rename src/views/{tongjifenxi => Home}/index.vue (65%)
 delete mode 100644 src/views/compilation/handbook/yulan.vue
 rename src/views/compilation/{onecailiao => monolithic}/index.vue (99%)

diff --git a/src/permission.js b/src/permission.js
index 5b2db54..a14b5a5 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -32,9 +32,7 @@ router.beforeEach((to, from, next) => {
   const signature = params.get("signature");
   const timespan = params.get("timespan");
 
-  // =============================
-  // 🔑 新增：处理 clienttoken 登录企业单点登录逻辑
-  // =============================
+  // clienttoken 企业单点登录
   if (window.location.href.includes("clienttoken=")) {
     const reg = /[?&]clienttoken=([^&#]+)/;
     const match = window.location.href.match(reg);
@@ -58,9 +56,6 @@ router.beforeEach((to, from, next) => {
           .dispatch("SingleSignOnGetInfo", { clientToken: clienttoken })
           .then(() => {
             isRelogin.show = false;
-            console.log("✅ 单点登录成功");
-            console.log("当前 token:", getToken());
-            console.log("当前角色:", store.getters.roles);
             // 清除 URL 中的 clienttoken 并刷新页面
             window.history.replaceState({}, "", modifiedUrl);
 
@@ -75,8 +70,8 @@ router.beforeEach((to, from, next) => {
             // console.error("单点登录失败:", err);
             store.dispatch("LogOut").then(() => {
               Message.error("单点登录失败，请重试");
-              // window.location.href =
-              //   "https://qytt.sipac.gov.cn/ecobrainportal/index.html";
+              window.location.href =
+                "https://qytt.sipac.gov.cn/ecobrainportal/index.html";
             });
           });
 
@@ -85,9 +80,7 @@ router.beforeEach((to, from, next) => {
     }
   }
 
-  // =============================
-  // 📦 原有政务参数处理逻辑
-  // =============================
+  // 政务单点登录
   if (from.path === to.path && store.getters.token) {
     next();
     return;
@@ -155,9 +148,7 @@ router.beforeEach((to, from, next) => {
     return;
   }
 
-  // =============================
-  // 🔐 原始本地登录逻辑
-  // =============================
+  //调用原始登录
   if (getToken()) {
     to.meta.title && store.dispatch("settings/setTitle", to.meta.title);
     /* has token*/
diff --git a/src/views/tongjifenxi/index.vue b/src/views/Home/index.vue
similarity index 65%
rename from src/views/tongjifenxi/index.vue
rename to src/views/Home/index.vue
index 91eee4f..2602779 100644
--- a/src/views/tongjifenxi/index.vue
+++ b/src/views/Home/index.vue
@@ -20,19 +20,32 @@
       <div class="itemhead">
         <span>关联项目</span>
       </div>
-      <div class="mainarea" style="height: 22rem; overflow: auto;">
+      <div class="mainarea" style="height: 22rem; overflow: auto">
         <div v-if="postList.length > 0">
-          <div class="mainareaitem" v-for="(item, index) in postList" :key="index">
+          <div
+            class="mainareaitem"
+            v-for="(item, index) in postList"
+            :key="index"
+          >
             <div class="itemleft">
-              <div class="xmmctitle" @click="getInfo(item, 'detail')">{{ item.name }}</div>
+              <div class="xmmctitle" @click="getInfo(item, 'detail')">
+                {{ item.name }}
+              </div>
               <div class="lefttwo">
-                <div style="display: flex;">
-                  现状分类：<dict-tag :options="dict.type.xzfl" :value="item.xzfl" />
+                <div style="display: flex">
+                  现状分类：<dict-tag
+                    :options="dict.type.xzfl"
+                    :value="item.xzfl"
+                  />
                 </div>
                 <div>总投资额：{{ item.ztze }}</div>
                 <div>填报时间：{{ item.updateTime }}</div>
-                <div style="display: flex;align-items: center;">
-                  状态：<dict-tag :options="dict.type.tbzt" :value="item.status" />
+                <div style="display: flex; align-items: center">
+                  状态：
+                  <dict-tag
+                    :options="dict.type.tbzt"
+                    :value="item.status"
+                  />
                 </div>
               </div>
             </div>
@@ -41,9 +54,7 @@
             </div>
           </div>
         </div>
-        <div v-else class="no-data">
-          暂无数据
-        </div>
+        <div v-else class="no-data">暂无数据</div>
       </div>
     </div>
     <div class="grid-item item-2">
@@ -59,39 +70,28 @@
 </template>
 
 <script>
-import AllArea2 from '@/views/components/analysis/allcompany.vue'
-import Message2 from '@/views/components/analysis/messagecompany.vue'
-import daiban from '@/views/components/analysis/daiban.vue'
+import AllArea2 from "@/views/components/analysis/allcompany.vue";
+import Message2 from "@/views/components/analysis/messagecompany.vue";
+import daiban from "@/views/components/analysis/daiban.vue";
 import { getBasicInformationPage } from "@/api/ManageApi/index";
 
 export default {
   name: "Pc2FbEcharts",
-  dicts:['xzfl','tbzt'],
+  dicts: ["xzfl", "tbzt"],
   components: {
     AllArea2,
     Message2,
-    daiban
+    daiban,
   },
   data() {
     return {
       // 项目表格数据
       postList: [],
-      // 状态颜色映射
-      statusColors: {
-        '审核通过': '#6EDABE',
-        '待填报': '#FFBF6B',
-        '待审核': '#7693D8'
-      },
       // 状态文本映射
       statusMap: {
-        1: '待填报',
-        2: '待审核',
-        3: '审核通过'
-      },
-      xzflMap: {
-        1: '已建',
-        2: '在建',
-        3: '拟建'
+        1: "待填报",
+        2: "待审核",
+        3: "审核通过",
       },
       // 遮罩层
       loading: true,
@@ -105,27 +105,32 @@ export default {
     getInfo(row, type) {
       this.$store.commit("SET_CRUMBS", "项目详情");
       const id = row.id || this.ids[0];
-      this.$router.push({ path: `/manage-info/${id}`, query: { action: type } });
+      this.$router.push({
+        path: `/manage-info/${id}`,
+        query: { action: type },
+      });
     },
     getStatusClass(status) {
       const statusClasses = {
-        1: 'status-red',     
-        2: 'status-yellow',  
-        3: 'status-green'    
+        1: "status-red",
+        2: "status-yellow",
+        3: "status-green",
       };
-      return statusClasses[status] || '';
+      return statusClasses[status] || "";
     },
     /** 查询项目列表 */
     getList() {
       this.loading = true;
 
-      getBasicInformationPage().then((response) => {
-        this.postList = response.data.records;
-        this.loading = false;
-      }).catch(error => {
-        console.error('查询失败:', error);
-        this.loading = false;
-      });
+      getBasicInformationPage()
+        .then((response) => {
+          this.postList = response.data.records;
+          this.loading = false;
+        })
+        .catch((error) => {
+          console.error("查询失败:", error);
+          this.loading = false;
+        });
     },
   },
 };
@@ -135,25 +140,21 @@ export default {
 .grid-container {
   display: grid;
   grid-template-columns: repeat(2, 1fr);
-  /* 三列 */
   grid-template-rows: auto auto auto;
-  /* 三行 */
   gap: 1rem;
-  /* 模块之间的间隔 */
   padding: 1rem;
-  /* 容器内边距 */
 }
 
 .grid-item {
-  background-color: #FFFFFF;
+  background-color: #ffffff;
   border-radius: 0.5rem 0.5rem 0.5rem 0.5rem;
 }
 
-.item-2{
+.item-2 {
   width: auto;
 }
 .itemhead {
-  border-left: 0.25rem solid #2B62F1;
+  border-left: 0.25rem solid #2b62f1;
   margin: 0.94rem 0;
   height: 1.25rem;
   display: flex;
@@ -165,7 +166,7 @@ export default {
   font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
   font-weight: 600;
   font-size: 1rem;
-  color: #3D424C;
+  color: #3d424c;
   line-height: 1.69rem;
   text-align: left;
   font-style: normal;
@@ -180,9 +181,7 @@ export default {
   gap: 1rem;
 }
 
-/* 第一行：第一个模块占两列 */
 .item-1 {
-  /* background-image: url(@/src/assets/images/allbg.png); */
   background-size: 100% 100%;
   background-repeat: no-repeat;
 }
@@ -193,10 +192,8 @@ export default {
   padding: 1rem 1.5rem;
 }
 
-/* 最后一行：一个模块占一整行 */
 .item-6 {
   grid-column: span 3;
-  /* 占三列 */
 }
 
 .mainareaitem {
@@ -207,7 +204,7 @@ export default {
 }
 
 .itemleft {
-  padding: .5rem 0 .5rem .5rem;
+  padding: 0.5rem 0 0.5rem 0.5rem;
   display: flex;
   flex-direction: column;
   width: 70%;
@@ -233,15 +230,15 @@ export default {
 }
 
 .status-red {
-  background-color: #FFC77C;
+  background-color: #ffc77c;
 }
 
 .status-yellow {
-  background-color: #7F99DB;
+  background-color: #7f99db;
 }
 
 .status-green {
-  background-color: #74DCC1;
+  background-color: #74dcc1;
 }
 
 .bottombox {
@@ -249,7 +246,7 @@ export default {
 }
 
 .xmmctitle {
-  color: #2B62F1;
+  color: #2b62f1;
   cursor: pointer;
 }
 
@@ -258,7 +255,7 @@ export default {
   justify-content: space-between;
   align-items: center;
 }
-.no-data{
+.no-data {
   color: gray;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/compilation/handbook/index.vue b/src/views/compilation/handbook/index.vue
index f777e0b..9cc8b6e 100644
--- a/src/views/compilation/handbook/index.vue
+++ b/src/views/compilation/handbook/index.vue
@@ -50,7 +50,6 @@
         <!-- <el-button
           type="primary"
           icon="el-icon-plus"
-          
           :loading="exportLoading"
           @click="handleExport"
           >项目手册导出</el-button
@@ -213,7 +212,7 @@
               ></el-input>
             </div>
           </div>
-          <div class="form-row">
+          <!-- <div class="form-row">
             <div class="form-col-full">
               <label class="form-label">封面图片</label>
               <file-upload
@@ -223,7 +222,7 @@
                 :file-type="['png', 'jpg', 'jpeg', 'gif']"
               ></file-upload>
             </div>
-          </div>
+          </div> -->
         </div>
       </div>
 
@@ -353,7 +352,7 @@
 
       <div v-if="activeStep === 3" class="step-content">
         <div class="cover-form">
-          <div class="form-row">
+          <!-- <div class="form-row">
             <div class="form-col-full">
               <label class="form-label">封尾图片</label>
               <file-upload
@@ -363,7 +362,7 @@
                 :file-type="['png', 'jpg', 'jpeg', 'gif']"
               ></file-upload>
             </div>
-          </div>
+          </div> -->
           <div class="form-row" style="margin-bottom: 10px">
             <div class="form-col">
               <label class="form-label">单位名称</label>
@@ -405,6 +404,8 @@
                 placeholder="请输入"
               ></el-input>
             </div>
+            <div class="form-col">
+            </div>
           </div>
         </div>
       </div>
diff --git a/src/views/compilation/handbook/yulan.vue b/src/views/compilation/handbook/yulan.vue
deleted file mode 100644
index b12e719..0000000
--- a/src/views/compilation/handbook/yulan.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-  <div>
-    <!-- 显示当前页 -->
-    <pdf
-      v-if="show"
-      :src="pdfUrl"
-      @num-pages="pageCount = $event"
-      @link-clicked="gotoPage($event)"
-      style="border: 1px solid black;"
-    ></pdf>
-
-    <!-- 控制按钮 -->
-    <button @click="prevPage">上一页</button>
-    {{ currentPage }} / {{ pageCount }}
-    <button @click="nextPage">下一页</button>
-  </div>
-</template>
-
-<script>
-import pdf from "vue-pdf";
-
-export default {
-  components: {
-    pdf,
-  },
-  data() {
-    return {
-      show: false, // 是否加载完成
-      pdfUrl: "", // PDF 文件路径
-      currentPage: 1, // 当前页码
-      pageCount: 0, // 总页数
-    };
-  },
-  mounted() {
-    this.loadPdf();
-  },
-  methods: {
-    loadPdf() {
-      // 设置 PDF 路径
-      this.pdfUrl = "pdf/模板.pdf";
-      this.show = true;
-    },
-    gotoPage(pageNumber) {
-      if (pageNumber >= 1 && pageNumber <= this.pageCount) {
-        this.currentPage = pageNumber;
-      }
-    },
-    prevPage() {
-      if (this.currentPage > 1) {
-        this.currentPage--;
-      }
-    },
-    nextPage() {
-      if (this.currentPage < this.pageCount) {
-        this.currentPage++;
-      }
-    },
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/views/compilation/onecailiao/index.vue b/src/views/compilation/monolithic/index.vue
similarity index 99%
rename from src/views/compilation/onecailiao/index.vue
rename to src/views/compilation/monolithic/index.vue
index 76d988d..63f0f85 100644
--- a/src/views/compilation/onecailiao/index.vue
+++ b/src/views/compilation/monolithic/index.vue
@@ -114,7 +114,7 @@ export default {
         title: undefined,
         startTime: undefined,
       },
-      // 所有数据（模拟从后端获取）
+      // 该页面使用默认数据
       allPostList: [
         {
           id: 1,
diff --git a/src/views/evalute/configtable/index.vue b/src/views/evalute/configtable/index.vue
index 26a0181..e88fa6b 100644
--- a/src/views/evalute/configtable/index.vue
+++ b/src/views/evalute/configtable/index.vue
@@ -208,6 +208,7 @@ export default {
       this.$modal.confirm(`是否确认删除"${pjys}"的数据项？`).then(() => {
         return deleteProjectEvaluation(postIds);
       }).then(() => {
+        this.queryParams.current = 1;
         this.getList();
         this.$modal.msgSuccess('删除成功');
       }).catch(() => { });
diff --git a/src/views/index.vue b/src/views/index.vue
index 6a9bc69..3294d2a 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -18,7 +18,7 @@ export default {
       this.$router.push({path:"/statistics"})
     }else{
       //企业人员
-      this.$router.push({path:"/tongjifenxi"})
+      this.$router.push({path:"/Home"})
     }
   }
 };
diff --git a/src/views/manage-info/index.vue b/src/views/manage-info/index.vue
index a7b47ce..c5f0626 100644
--- a/src/views/manage-info/index.vue
+++ b/src/views/manage-info/index.vue
@@ -252,6 +252,9 @@ export default {
         zjzmj: 0,
         ztze: 0,
         zydmj: 0,
+        jhtze: "",
+        ml: "",
+        xfcy: "",
       },
       planInformation: {
         bzcjzmj: 0,
@@ -314,7 +317,7 @@ export default {
     }
   },
   methods: {
-        async fetchOtherInfo() {
+    async fetchOtherInfo() {
       try {
         const response = await getzwBasicInformationById(this.projectId);
         const data = response.data;
@@ -457,7 +460,6 @@ export default {
     },
     // 提交数据
     async submitAll() {
-
       // 创建全局加载动画
       const loading = this.$loading({
         lock: true,
@@ -465,14 +467,52 @@ export default {
         spinner: "el-icon-loading",
         background: "rgba(0, 0, 0, 0.7)",
       });
-
+ // 校验 basicInformation
+      const basicRequiredFields = [
+        "acceptanceTime",
+        "begainTime",
+        "endTime",
+        "fj",
+        "introduction",
+        "issuingTime",
+        "jsdd",
+        "jsjd",
+        "jsms",
+        "label",
+        "latitude",
+        "longitude",
+        "name",
+        "nature",
+        "phone",
+        "prioritize",
+        "projectLeader",
+        "sgdw",
+        "sjdw",
+        "ssgnq",
+        "tyshxydm",
+        "unitIntroduction",
+        "xmfrdwxz",
+        "xzfl",
+        "ztze",
+        "jhtze",
+        "ml",
+        "xfcy",
+      ];
+      const basicMissingFields = basicRequiredFields.filter(
+        (field) => !this.basicInformation[field]
+      );
+      if (basicMissingFields.length > 0) {
+        this.$message.error("请填写完整的基本信息");
+        loading.close();
+        return;
+      }
       // 校验建筑信息是否填写
       if (!this.hasBuildingData) {
         this.$message.error("请填写建筑信息");
         loading.close();
         return;
       }
-      
+
       // 校验 wysmxInformations
       if (
         this.wysmxInformations.length === 0 ||
@@ -496,8 +536,16 @@ export default {
         "zydmj",
         "rjl",
         "zjzmj",
+        "bzcjzmj",
+        "jrjljzmj",
+        "jzmd",
+        "ldl",
         "jzds",
+        "dsjzmj",
+        "dxjzmj",
         "zgjzcs",
+        "jdctcw",
+        "fjdctcw",
         "fhdj",
       ];
       const planMissingFields = planRequiredFields.filter(
@@ -509,22 +557,7 @@ export default {
         return;
       }
 
-      // 校验 basicInformation
-      const basicRequiredFields = [
-        "ssgnq",
-        "begainTime",
-        "endTime",
-        "xzfl",
-        "jsms",
-      ];
-      const basicMissingFields = basicRequiredFields.filter(
-        (field) => !this.basicInformation[field]
-      );
-      if (basicMissingFields.length > 0) {
-        this.$message.error("请填写完整的基本信息");
-        loading.close();
-        return;
-      }
+     
 
       // 准备数据并提交
       const submitData = this.prepareSubmitData();
diff --git a/src/views/manage/index.vue b/src/views/manage/index.vue
index 5dcc14d..c0986dd 100644
--- a/src/views/manage/index.vue
+++ b/src/views/manage/index.vue
@@ -669,6 +669,7 @@ export default {
           return deleteBasicInformation(ids);
         })
         .then(() => {
+          this.queryParams.current = 1;
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
diff --git a/src/views/models/badlist/index.vue b/src/views/models/badlist/index.vue
index fb13433..d59637a 100644
--- a/src/views/models/badlist/index.vue
+++ b/src/views/models/badlist/index.vue
@@ -299,6 +299,7 @@ export default {
           return deleteBasicInformation(ids);
         })
         .then(() => {
+          this.queryParams.current = 1; // 重置页码
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
diff --git a/src/views/orientedtwo/content/index.vue b/src/views/orientedtwo/content/index.vue
index 477117d..afd77c2 100644
--- a/src/views/orientedtwo/content/index.vue
+++ b/src/views/orientedtwo/content/index.vue
@@ -476,6 +476,7 @@ export default {
           return deleteCatalog([catalogIds]);
         })
         .then(() => {
+          this.queryParams.current = 1; 
           this.getList(catalogIds);
           this.$modal.msgSuccess("删除成功");
         })
diff --git a/src/views/orientedtwo/subdivide/index.vue b/src/views/orientedtwo/subdivide/index.vue
index ce71205..16c041e 100644
--- a/src/views/orientedtwo/subdivide/index.vue
+++ b/src/views/orientedtwo/subdivide/index.vue
@@ -491,6 +491,7 @@ export default {
           return deleteXfcygl([catalogIds]);
         })
         .then(() => {
+          this.queryParams.current = 1;
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })