zengyicheng 1 ano atrás
pai
commit
10251a2c72

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/css/293.290006cf.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/css/876.8e06e1be.css


+ 1 - 1
dist/index.html

@@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>双创学院管理系统</title><script defer="defer" src="/js/chunk-vendors.c0eb00f6.js"></script><script defer="defer" src="/js/app.70fc8ad2.js"></script><link href="/css/chunk-vendors.0225060a.css" rel="stylesheet"><link href="/css/app.3ebe307b.css" rel="stylesheet"></head><body><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>双创学院管理系统</title><script defer="defer" src="/js/chunk-vendors.c0eb00f6.js"></script><script defer="defer" src="/js/app.f521c156.js"></script><link href="/css/chunk-vendors.0225060a.css" rel="stylesheet"><link href="/css/app.3ebe307b.css" rel="stylesheet"></head><body><div id="app"></div></body></html>

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/293.539eba9c.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/293.539eba9c.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/617.b89da2fb.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/617.b89da2fb.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/876.f7215333.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/876.f7215333.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/app.f521c156.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/app.f521c156.js.map


+ 9 - 7
src/views/projectManage/ProjectManagement.vue

@@ -428,10 +428,6 @@
         :iid="iid"
       ></Closingstatement>
 
-      <el-button type="primary" @click="getWord" class="AllDialogBtn"
-        >下载表格</el-button
-      >
-
       <div
         slot="footer"
         class="dialog-footer"
@@ -443,6 +439,9 @@
         <el-button @click="endDialog = false" class="AllDialogBtn"
           >取消</el-button
         >
+        <el-button type="primary" @click="getWord" class="AllDialogBtn"
+          >下载表格</el-button
+        >
       </div>
     </el-dialog>
     <!-- 结项书结束 -->
@@ -466,7 +465,7 @@
 import beUpload from "../../components/tool/beUpload";
 import Closingstatement from "./components/Closingstatement.vue";
 //下载pdf
-import {downloadPDF} from '@/components/tool/pdf'
+import { downloadPDF } from "@/components/tool/pdf";
 export default {
   components: { beUpload, Closingstatement },
   data() {
@@ -934,8 +933,11 @@ export default {
           }
         );
     },
-    getWord(){
-      downloadPDF(this.$refs.finalClo.$refs.downPDF,this.myArrayProp[0].title + '申报书');
+    getWord() {
+      downloadPDF(
+        this.$refs.finalClo.$refs.downPDF,
+        this.myArrayProp[0].title + "申报书"
+      );
     },
   },
 

+ 54 - 32
src/views/projectManage/components/Closingstatement.vue

@@ -197,7 +197,7 @@
         v-show="myArrayProp[0].typeid == '5e21b204-c206-11ed-a4cd-509a4c5b67cf'"
       >
         <td><span v-text="item.name"></span></td>
-        <td ><span v-html="item.collage"></span></td>
+        <td><span v-html="item.collage"></span></td>
         <td colspan="5"><span v-text="item.work"></span></td>
       </tr>
 
@@ -215,7 +215,7 @@
         v-show="myArrayProp[0].typeid == '5e21b204-c206-11ed-a4cd-509a4c5b67cf'"
       >
         <td><span v-text="item.name"></span></td>
-        <td ><span v-html="item.collage"></span></td>
+        <td><span v-html="item.collage"></span></td>
         <td colspan="5"><span v-text="item.work"></span></td>
       </tr>
       <!-- 特色创客空间建设项目 -->
@@ -237,8 +237,8 @@
         v-show="myArrayProp[0].typeid == '5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"
       >
         <td><span v-text="item.name"></span></td>
-        <td ><span v-html="item.class"></span></td>
-        <td ><span v-html="item.age"></span></td>
+        <td><span v-html="item.class"></span></td>
+        <td><span v-html="item.age"></span></td>
         <td colspan="5"><span v-text="item.work"></span></td>
       </tr>
 
@@ -262,10 +262,10 @@
         v-show="myArrayProp[0].typeid == '5f7a66d5-c206-11ed-a4cd-509a4c5b67cf'"
       >
         <td><span v-text="item.name"></span></td>
-        <td ><span v-html="item.speciality"></span></td>
-        <td ><span v-html="item.title"></span></td>
-        <td ><span v-html="item.education"></span></td>
-        <td ><span v-html="item.section"></span></td>
+        <td><span v-html="item.speciality"></span></td>
+        <td><span v-html="item.title"></span></td>
+        <td><span v-html="item.education"></span></td>
+        <td><span v-html="item.section"></span></td>
         <td colspan="5"><span v-text="item.work"></span></td>
       </tr>
 
@@ -276,10 +276,10 @@
         </td>
       </tr>
       <tr>
-        <td colspan="7" style="text-align: left;height: auto;">
+        <td colspan="7" style="text-align: left; height: auto">
           <p>一、项目研发内容简介(200字以内)</p>
-          <div v-html="myArrayProp[0].brief"></div>
-          <!-- <el-input
+          <!-- <div class="textCss" v-html="myArrayProp[0].brief"></div> -->
+          <el-input
             type="textarea"
             maxlength="200"
             show-word-limit
@@ -287,59 +287,68 @@
             placeholder="请输入内容"
             v-model="myArrayProp[0].brief"
           >
-          </el-input> -->
+          </el-input>
         </td>
       </tr>
       <tr>
-        <td colspan="7" style="text-align: left;height: auto;">
+        <td colspan="7" style="text-align: left; height: auto">
           <p>目标计划:</p>
-          <div v-html="myArrayProp[0]['ClosingstatementData'].plan"></div>
-          <!-- <el-input
+          <!-- <div class="textCss" v-html="myArrayProp[0]['ClosingstatementData'].plan.replace(/ /g, '&nbsp;')"></div> -->
+          <el-input
             type="textarea"
             :autosize="{ minRows: 6 }"
             placeholder="请输入内容"
             v-model="myArrayProp[0]['ClosingstatementData'].plan"
           >
-          </el-input> -->
+          </el-input>
         </td>
       </tr>
       <tr>
-        <td colspan="7" style="text-align: left;height: auto;">
+        <td colspan="7" style="text-align: left; height: auto">
           <p>二、拟解决的关键技术问题</p>
-          <div v-html="myArrayProp[0]['ClosingstatementData'].technology"></div>
-          <!-- <el-input
+          <!-- <div
+            class="textCss"
+            v-html="myArrayProp[0]['ClosingstatementData'].technology.replace(/ /g, '&nbsp;')"
+          ></div> -->
+          <el-input
             type="textarea"
             :autosize="{ minRows: 6 }"
             placeholder="请输入内容"
             v-model="myArrayProp[0]['ClosingstatementData'].technology"
           >
-          </el-input> -->
+          </el-input>
         </td>
       </tr>
       <tr>
-        <td colspan="7" style="text-align: left;height: auto;">
+        <td colspan="7" style="text-align: left; height: auto">
           <p>三、项目的商业(公益)价值评估</p>
-          <div v-html="myArrayProp[0]['ClosingstatementData'].business"></div>
-          <!-- <el-input
+          <!-- <div
+            class="textCss"
+            v-html="myArrayProp[0]['ClosingstatementData'].business.replace(/ /g, '&nbsp;')"
+          ></div> -->
+          <el-input
             type="textarea"
             :autosize="{ minRows: 6 }"
             placeholder="请输入内容"
             v-model="myArrayProp[0]['ClosingstatementData'].business"
           >
-          </el-input> -->
+          </el-input>
         </td>
       </tr>
       <tr>
-        <td colspan="7" style="text-align: left;height: auto;">
+        <td colspan="7" style="text-align: left; height: auto">
           <p>四、项目创新点评估</p>
-          <div v-html="myArrayProp[0]['ClosingstatementData'].innovate"></div>
-          <!-- <el-input
+          <!-- <div
+            class="textCss"
+            v-html="myArrayProp[0]['ClosingstatementData'].innovate.replace(/ /g, '&nbsp;')"
+          ></div> -->
+          <el-input
             type="textarea"
             :autosize="{ minRows: 6 }"
             placeholder="请输入内容"
             v-model="myArrayProp[0]['ClosingstatementData'].innovate"
           >
-          </el-input> -->
+          </el-input>
         </td>
       </tr>
 
@@ -642,16 +651,19 @@
         </td>
       </tr>
       <tr>
-        <td colspan="7" style="text-align: left;height: auto;">
+        <td colspan="7" style="text-align: left; height: auto">
           <p>目标计划:</p>
-          <div v-html="myArrayProp[0]['ClosingstatementData'].targetPlan"></div>
-          <!-- <el-input
+          <!-- <div
+            class="textCss"
+            v-html="myArrayProp[0]['ClosingstatementData'].targetPlan.replace(/ /g, '&nbsp;')"
+          ></div> -->
+          <el-input
             type="textarea"
             :autosize="{ minRows: 6 }"
             placeholder="请输入内容"
             v-model="myArrayProp[0]['ClosingstatementData'].targetPlan"
           >
-          </el-input> -->
+          </el-input>
         </td>
       </tr>
       <tr>
@@ -1441,6 +1453,16 @@ table {
     box-sizing: border-box;
     padding: 10px;
     position: relative;
+    .textCss{
+      word-break: break-word;
+      white-space: pre-line;
+    }
+    // :deep(.el-textarea.is-disabled .el-textarea__inner) {
+    //   background-color: unset;
+    //   border-color: unset;
+    //   color: rgb(0, 0, 0);
+    //   cursor: unset;
+    // }
     .noFileBox {
       width: 98%;
       min-height: 200px;

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff