update

src/components/tool/getWord.js

@@ -198,8 +198,8 @@ function getMakerSpaceWord(wordData){
                 ed:wordData['stateName']=='已建设'?"√":"□",  //待建设
                 projectName:wordData['projectName'],//项目名称
                 college:wordData['collegeName'],//所在学院
-                begin_at:wordData['begin_at'],//项目开始时间
-                plannedEnd_at:wordData['plannedEnd_at'],//计划完成时间
+                begin_at:wordData['begin_at'].split(' ')[0],//项目开始时间
+                plannedEnd_at:wordData['plannedEnd_at'].split(' ')[0],//计划完成时间
                 pro_leader:wordData['pro_leader'],//项目负责人
                 lead_leader:wordData['lead_leader'],//学院牵头领导
                 people:(wordData['teacher'].filter(i=>i.name!='').length+wordData['student'].filter(i=>i.name!='').length),//项目组人数
@@ -208,14 +208,14 @@ function getMakerSpaceWord(wordData){
                 teacher:wordData['teacher'],   //教师组//name：姓名  speciality：专业  title：职称 education：学历    section：所在教研室    work：项目组角色分工
                 student:wordData['student'],   //学生组//name：姓名    class：班级 age：年龄   work：项目组任务分工
                 brief:wordData['brief'],//项目简介
-                Construction:wordData['Construction'].replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),//建设内容
-                ProjectBasis:wordData['ProjectBasis'].replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),//立项依据
-                development:wordData['development'].replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),//创客空间物理环境、制度建设及软件设施建设情况
-                studio:wordData['studio'].replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),//学生创客工作室建设情况
-                studentTeam:wordData['studentTeam'].replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),//学生创客团队（人才）培养预期成果、数量
-                studentActivities:wordData['studentActivities'].replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),//学生创客活动组织实施情况
-                Transforming:wordData['Transforming'].replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),//学生创客团队孵化、转化创业项目情况
-                condition:wordData['condition'].replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),//立 项基 础及条 件
+                Construction:wordData['Construction'].replace(/(<img src=")([^"]+)(" style="max-width:100%;")\/>/g, '（图片链接：$2）').replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),//建设内容
+                ProjectBasis:wordData['ProjectBasis'].replace(/(<img src=")([^"]+)(" style="max-width:100%;")\/>/g, '（图片链接：$2）').replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),//立项依据
+                development:wordData['development'].replace(/(<img src=")([^"]+)(" style="max-width:100%;")\/>/g, '（图片链接：$2）').replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),//创客空间物理环境、制度建设及软件设施建设情况
+                studio:wordData['studio'].replace(/(<img src=")([^"]+)(" style="max-width:100%;")\/>/g, '（图片链接：$2）').replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),//学生创客工作室建设情况
+                studentTeam:wordData['studentTeam'].replace(/(<img src=")([^"]+)(" style="max-width:100%;")\/>/g, '（图片链接：$2）').replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),//学生创客团队（人才）培养预期成果、数量
+                studentActivities:wordData['studentActivities'].replace(/(<img src=")([^"]+)(" style="max-width:100%;")\/>/g, '（图片链接：$2）').replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),//学生创客活动组织实施情况
+                Transforming:wordData['Transforming'].replace(/(<img src=")([^"]+)(" style="max-width:100%;")\/>/g, '（图片链接：$2）').replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),//学生创客团队孵化、转化创业项目情况
+                condition:wordData['condition'].replace(/(<img src=")([^"]+)(" style="max-width:100%;")\/>/g, '（图片链接：$2）').replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),//立 项基 础及条 件
                 fund:[wordData['fund']],//预算经费
                     //total：总经费     
                     //小型仪器设备费：device        deviceRemarks
@@ -541,7 +541,6 @@ function getWord2(val){
 			let doc=new Docxtemplater().loadZip(zip);
 			// return console.log(val);
 			// let FundAll=
-			// return console.log(val);
 			//填写数据
 			doc.setData({
 					nowTime:getNowDate(1),//申请日期
@@ -563,25 +562,25 @@ function getWord2(val){
 					appPeason:val.applyParsonName,
 					school:val.dp,
 					tel:val.tel,
-					begin_at:val.btime,
-					plannedEnd_at:val.etime,
+					begin_at:val.btime.split(' ')[0],
+					plannedEnd_at:val.etime.split(' ')[0],
 					allnum:val.studentS.filter(i=>i.name!='').length+val.teacherS.filter(i=>i.name!='').length,
 					snum:val.studentS.filter(i=>i.name!='').length,
 					tnum:val.teacherS.filter(i=>i.name!='').length,
 					student:val.studentS,
 					teacher:val.teacherS,
 					brief:val.brief,
-					back:val.introduce.back.replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),
-					innovate:val.introduce.innovate.replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),
-					path:val.introduce.path.replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),
-					scene:val.introduce.scene.replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),
-					worth:val.introduce.worth.replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),
-					team:val.introduce.team.replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),
-					cost:val.introduce.cost.replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),
-					expectResults:val.introduce.expectResults.replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),
-					expectResultsTeacher:val.introduce.expectResultsTeacher.replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),
-					expectConversion:val.introduce.expectConversion.replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),
-					plan:val.introduce.plan.replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),
+					back:val.introduce.back.replace(/(<img src=")([^"]+)(" style="max-width:100%;")\/>/g, '（图片链接：$2）').replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),
+					innovate:val.introduce.innovate.replace(/(<img src=")([^"]+)(" style="max-width:100%;")\/>/g, '（图片链接：$2）').replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),
+					path:val.introduce.path.replace(/(<img src=")([^"]+)(" style="max-width:100%;")\/>/g, '（图片链接：$2）').replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),
+					scene:val.introduce.scene.replace(/(<img src=")([^"]+)(" style="max-width:100%;")\/>/g, '（图片链接：$2）').replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),
+					worth:val.introduce.worth.replace(/(<img src=")([^"]+)(" style="max-width:100%;")\/>/g, '（图片链接：$2）').replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),
+					team:val.introduce.team.replace(/(<img src=")([^"]+)(" style="max-width:100%;")\/>/g, '（图片链接：$2）').replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),
+					cost:val.introduce.cost.replace(/(<img src=")([^"]+)(" style="max-width:100%;")\/>/g, '（图片链接：$2）').replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),
+					expectResults:val.introduce.expectResults.replace(/(<img src=")([^"]+)(" style="max-width:100%;")\/>/g, '（图片链接：$2）').replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),
+					expectResultsTeacher:val.introduce.expectResultsTeacher.replace(/(<img src=")([^"]+)(" style="max-width:100%;")\/>/g, '（图片链接：$2）').replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),
+					expectConversion:val.introduce.expectConversion.replace(/(<img src=")([^"]+)(" style="max-width:100%;")\/>/g, '（图片链接：$2）').replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),
+					plan:val.introduce.plan.replace(/(<img src=")([^"]+)(" style="max-width:100%;")\/>/g, '（图片链接：$2）').replace(/<\/?.+?\/?>/g,"").replace(/&nbsp;/gi,' '),
 					total:val.fund.device*1 + val.fund.Material*1+val.fund.processing*1+ val.fund.Collaboration*1+val.fund.APPRAISAL*1+ val.fund.entery*1+val.fund.activities*1+val.fund.Transaction*1,
 					facility:val.fund.device,
 					materials:val.fund.Material,

src/components/tool/wangEnduit.vue

@@ -88,7 +88,7 @@ export default {
         // "emoticon",
         "image",
         // "video",
-        "table",
+        // "table",
         // "code",
         // "splitLine",
         "undo",

src/views/home.vue

@@ -299,12 +299,15 @@ export default {
         this.$store.state.userInfo.type == 3 ||
         this.$store.state.userInfo.type == 4
       ) {
-        this.$router.push("/resultsShow");
+
+        // this.$router.push("/resultsShow");
+				this.$router.push("/commission")
       } else if (
         this.$store.state.userInfo.type == 5 ||
         this.$store.state.userInfo.type == 6
       ) {
-        this.$router.push("/messageNotification");
+				this.$router.push("/commission")
+        // this.$router.push("/messageNotification");
       }
     },
     setNavList() {
@@ -513,27 +516,27 @@ export default {
         this.$store.state.userInfo.type == 4
       ) {
         this.navList.push(
-          {
-            id: 7,
-            label: "成果展示",
-            goto: "/resultsShow",
-            icon: "iconfont icon-xiangmuguanli2",
-            group: [],
-          },
-          {
-            id: 9,
-            label: "消息通知",
-            goto: "/messageNotification",
-            icon: "iconfont icon-xiaoxitongzhi3",
-            group: [],
-          },
-          {
-            id: 10,
-            label: "数据监测",
-            goto: "/echarts",
-            icon: "iconfont icon-qushi",
-            group: [],
-          },
+          // {
+          //   id: 7,
+          //   label: "成果展示",
+          //   goto: "/resultsShow",
+          //   icon: "iconfont icon-xiangmuguanli2",
+          //   group: [],
+          // },
+          // {
+          //   id: 9,
+          //   label: "消息通知",
+          //   goto: "/messageNotification",
+          //   icon: "iconfont icon-xiaoxitongzhi3",
+          //   group: [],
+          // },
+          // {
+          //   id: 10,
+          //   label: "数据监测",
+          //   goto: "/echarts",
+          //   icon: "iconfont icon-qushi",
+          //   group: [],
+          // },
           {
             id: 11,
             label: "待办公文",
@@ -547,13 +550,13 @@ export default {
         this.$store.state.userInfo.type == 6
       ) {
         this.navList.push(
-          {
-            id: 9,
-            label: "消息通知",
-            goto: "/messageNotification",
-            icon: "iconfont icon-xiaoxitongzhi3",
-            group: [],
-          },
+          // {
+          //   id: 9,
+          //   label: "消息通知",
+          //   goto: "/messageNotification",
+          //   icon: "iconfont icon-xiaoxitongzhi3",
+          //   group: [],
+          // },
           {
             id: 11,
             label: "待办公文",