From aea8fa4c8704c2952e1138743eca0596db084fbb Mon Sep 17 00:00:00 2001
From: liweikun <1920346024@qq.com>
Date: Mon, 11 Mar 2024 17:00:29 +0800
Subject: [PATCH] ..

---
 .../src/views/project/report/index.vue        |  4 ++--
 .../src/views/project/special/index.vue       |  4 ++--
 .../project/special/options/basePage.vue      | 19 +++++++++++++++----
 .../project/special/options/documentPage.vue  |  2 +-
 .../project/special/options/resultsPage.vue   |  3 ++-
 .../project/special/options/taskPage.vue      |  7 ++++---
 6 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/jwtech-admin-page/src/views/project/report/index.vue b/jwtech-admin-page/src/views/project/report/index.vue
index 06e5f738..98646557 100644
--- a/jwtech-admin-page/src/views/project/report/index.vue
+++ b/jwtech-admin-page/src/views/project/report/index.vue
@@ -13,7 +13,7 @@
     <el-row :gutter="20" v-show="showSearch">
       <el-col :span="22">
         <!-- 搜索条件 -->
-        <el-form :model="queryParams" :inline="true" label-width="68px">
+        <el-form :model="queryParams" :inline="true" label-width="80px">
           <el-form-item label="项目名称" prop="projectName">
             <el-input
               v-model="queryParams.data.projectName"
@@ -476,7 +476,7 @@
               /> -->
               <el-upload
                 class="upload-demo"
-                action="http://127.0.0.1/thinking/common/upload"
+                action="thinking/common/upload"
                 :headers="headers"
                 :on-preview="handleAttachmentPreview"
                 :on-remove="handleAttachmentRemove"
diff --git a/jwtech-admin-page/src/views/project/special/index.vue b/jwtech-admin-page/src/views/project/special/index.vue
index b5c06071..8e3e8286 100644
--- a/jwtech-admin-page/src/views/project/special/index.vue
+++ b/jwtech-admin-page/src/views/project/special/index.vue
@@ -480,7 +480,7 @@ export default {
     openOptions() {
       this.routeList.push({
         path: "/project/special/options",
-        routeName: "专题基础信息",
+        routeName: "专题基本信息",
         isEdit: false,
       });
       // 存储面包屑信息
@@ -588,7 +588,7 @@ export default {
       getProjectinfo(id).then((response) => {
         this.routeList.push({
           path: "/project/special/options",
-          routeName: "专题基础信息",
+          routeName: "专题基本信息",
           isEdit: true,
         });
 
diff --git a/jwtech-admin-page/src/views/project/special/options/basePage.vue b/jwtech-admin-page/src/views/project/special/options/basePage.vue
index e1c78852..70bb4c33 100644
--- a/jwtech-admin-page/src/views/project/special/options/basePage.vue
+++ b/jwtech-admin-page/src/views/project/special/options/basePage.vue
@@ -164,11 +164,11 @@
               :headers="headers"
               :on-preview="handlePreview"
               :on-remove="(file) => handleRemove(file, 'fileList1')"
-              :before-remove="beforeRemove"
               multiple
               :on-exceed="handleExceed"
               :on-success="(_, fileList) => submitUpload(fileList, 'fileList1')"
               :file-list="fileList1"
+              :before-upload="beforeUpload"
             >
               <el-button size="small" type="primary" plain>
                 <i class="el-icon-upload el-icon--right"></i>
@@ -450,9 +450,20 @@ export default {
         } 个文件`
       );
     },
-    beforeRemove(file, fileList) {
-      return this.$confirm(`确定移除 ${file.name}？`);
-    },
+    // 上传文件之前的钩子，参数为上传的文件
+    beforeUpload(file) {
+      let size = Number(file.size / 1024 / 1024);
+      if (size > 100) {
+          this.$message.warning("文件大小不能超过100MB");
+          return false;
+      }
+      // 检测上传文件格式
+      var type = file.name.substring(file.name.lastIndexOf(".") + 1);
+      if (['png', 'jpg', 'pdf', 'word', 'excel'].indexOf(type) === -1) {
+          this.$message.warning("请上传指定格式的文件!");
+          return false;
+      }
+        },
   },
 };
 </script>
diff --git a/jwtech-admin-page/src/views/project/special/options/documentPage.vue b/jwtech-admin-page/src/views/project/special/options/documentPage.vue
index 0738dff8..6e40d160 100644
--- a/jwtech-admin-page/src/views/project/special/options/documentPage.vue
+++ b/jwtech-admin-page/src/views/project/special/options/documentPage.vue
@@ -302,7 +302,7 @@
           </el-descriptions-item>
 
           <el-descriptions-item span="2">
-            <template slot="label"> 可行性研究报告相关附件 </template>
+            <template slot="label"> 规划项目验收文档附件 </template>
             <template v-if="this.documentMsg.acceptDocumentAttachment">
               <div
                 v-for="(item, index) in JSON.parse(
diff --git a/jwtech-admin-page/src/views/project/special/options/resultsPage.vue b/jwtech-admin-page/src/views/project/special/options/resultsPage.vue
index 134027ea..54811304 100644
--- a/jwtech-admin-page/src/views/project/special/options/resultsPage.vue
+++ b/jwtech-admin-page/src/views/project/special/options/resultsPage.vue
@@ -131,7 +131,8 @@
         label="评价内容"
         align="center"
         prop="evaluationContent"
-        min-width="180"
+        min-width="300"
+        :show-overflow-tooltip="true"
       />
 
       <el-table-column
diff --git a/jwtech-admin-page/src/views/project/special/options/taskPage.vue b/jwtech-admin-page/src/views/project/special/options/taskPage.vue
index 1e95b2fb..5bdfa720 100644
--- a/jwtech-admin-page/src/views/project/special/options/taskPage.vue
+++ b/jwtech-admin-page/src/views/project/special/options/taskPage.vue
@@ -139,12 +139,12 @@
         prop="projectName"
         min-width="180"
       />
-      <el-table-column
+      <!-- <el-table-column
         label="项目编号"
         align="center"
         prop="proNo"
         min-width="180"
-      />
+      /> -->
       <el-table-column
         label="规划上报日期"
         align="center"
@@ -211,7 +211,8 @@
         label="批复意见"
         align="center"
         prop="replyOpinion"
-        min-width="180"
+        min-width="300"
+        :show-overflow-tooltip="true"
       />
       <el-table-column
         label="意见附件"