0615修改

src/App.vue

@@ -612,7 +612,8 @@ hr {
 .showFileArea {
   //在线查看文档内容居中
   width: 100%;
-  height: 70vh;
+  height: 100%;
+  // height: 70vh;
   display: flex;
   justify-content: center;
 }
@@ -653,6 +654,7 @@ hr {
     display: flex;
     justify-content: center;
     flex-wrap: wrap;
+    height: 100%;
     align-items: center;
   }
   .el-input.is-disabled .el-input__inner {
@@ -769,4 +771,28 @@ hr {
     justify-content: center;
   }
 }
+.DialogBox{
+  display: flex;
+  justify-content: center;
+  align-items: flex-start;
+  position: relative;
+  width: 100%;
+  height: 100%;
+  // background-color: red;
+  .DialogTitle{
+    color: white;
+    font-size: 18px;
+  }
+  .changeFull{
+    color: gray;
+    cursor: pointer;
+    position: absolute;
+    right: 3%;
+    font-size: 1em;
+    &:hover{
+      color: white;
+    }
+  }
+}
+
 </style>

src/router/index.js

@@ -138,7 +138,7 @@ const routes = [{
                 name: 'messageNotification',
                 path: '/messageNotification',
                 component: () =>import ('@/views/messageNotification.vue'),
-                meta: { isAuth: true,checkPower:true }
+                meta: { isAuth: true,checkPower:false }
 
             },
 

src/views/activityManage/components/NomMarkerWord.vue

@@ -175,7 +175,7 @@
                     style="width: 100%;"
                     resize="none"
                     v-model.number="wordData['expenditureMothPlan'][index]"
-                    @input="checkExpenditureMothPlan(index)">
+                    >
                   </el-input>
                 </td>
             </tr>
@@ -334,14 +334,14 @@
               console.log(err);
             })
           },
-          checkExpenditureMothPlan(index){
-            let count = 0;
-            this.wordData['expenditureMothPlan'].forEach(item=>count+=Number(item))
-            if(count>this.total){
-              this.$message.error("总经费月支出计划不能大于总经费");
-              this.wordData['expenditureMothPlan'][index]=0;
-            }
-          },
+          // checkExpenditureMothPlan(index){
+          //   let count = 0;
+          //   this.wordData['expenditureMothPlan'].forEach(item=>count+=Number(item))
+          //   if(count>this.total){
+          //     this.$message.error("总经费月支出计划不能大于总经费");
+          //     this.wordData['expenditureMothPlan'][index]=0;
+          //   }
+          // },
           goto(str){
             document.querySelector(str).scrollIntoView({ behavior: "smooth" });
           },

src/views/activityManage/components/markeractivityWord.vue

@@ -209,7 +209,7 @@
                     style="width: 100%;"
                     resize="none"
                     v-model.number="wordData['expenditureMothPlan'][index]"
-                    @input="checkExpenditureMothPlan(index)">
+                    >
                   </el-input>
                 </td>
             </tr>
@@ -401,14 +401,14 @@
               return this.$message.error("活动总经费不能超过项目剩余总预算")
             }
           },
-          checkExpenditureMothPlan(index){
-            let count = 0;
-            this.wordData['expenditureMothPlan'].forEach(item=>count+=Number(item))
-            if(count>this.total){
-              this.$message.error("总经费月支出计划不能大于总经费");
-              this.wordData['expenditureMothPlan'][index]=0;
-            }
-          },
+          // checkExpenditureMothPlan(index){
+          //   let count = 0;
+          //   this.wordData['expenditureMothPlan'].forEach(item=>count+=Number(item))
+          //   if(count>this.total){
+          //     this.$message.error("总经费月支出计划不能大于总经费");
+          //     this.wordData['expenditureMothPlan'][index]=0;
+          //   }
+          // },
           getProjectFund(){
             if(this.wordData['associatedProjects']=='')return;
             this.ajax.get(this.$store.state.api+"/getProjectFund",{

src/views/activityManage/makerActivityWordDetail.vue

@@ -12,7 +12,7 @@
         <markeractivityWordShow v-if="wordData['state']!=0" :wordData="wordData" :total="total"/>
         <div>
             <el-button type="primary" @click="getActivityWord">下载表单</el-button>
-            <el-button type="primary" v-if="wordData['state']==0&& $store.state.userInfo.type!=0" @click="test">立即修改</el-button>
+            <el-button type="primary" v-if="wordData['state']==0 && $store.state.userInfo.type!=0" @click="test">立即修改</el-button>
         </div>
         <el-dialog
           title="提示"
@@ -163,7 +163,7 @@
                       }
                       break;
                     case "activityTime":
-                      if(cEmpty.test(this.wordData[i][0])){
+                      if(this.wordData[i].length<=0){
                         this.$message.error("请选择活动时间")
                         document.querySelector('#four').scrollIntoView({ behavior: "smooth" });
                         return false;;

src/views/activityManage/newMarkerActivity.vue

@@ -125,13 +125,13 @@
                   return false;
                 }
                 break;
-              case "activityTime":
-                if(cEmpty.test(this.wordData[i][0])){
-                  this.$message.error("请选择活动时间")
-                  document.querySelector('#four').scrollIntoView({ behavior: "smooth" });
-                  return false;;
-                }
-                break;
+                case "activityTime":
+                  if(this.wordData[i].length<=0){
+                    this.$message.error("请选择活动时间")
+                    document.querySelector('#four').scrollIntoView({ behavior: "smooth" });
+                    return false;;
+                  }
+                  break;
               // case "member":
               //     let num = 0;
               //     this.wordData[i].forEach(item=>{

src/views/activityManage/newNomMarkerActivity.vue

@@ -115,13 +115,13 @@ export default {
                 return false;
               }
               break;
-            case "activityTime":
-              if(cEmpty.test(this.wordData[i][0])){
-                this.$message.error("请选择活动时间")
-                document.querySelector('#four').scrollIntoView({ behavior: "smooth" });
-                return false;;
-              }
-              break;
+              case "activityTime":
+                if(this.wordData[i].length<=0){
+                  this.$message.error("请选择活动时间")
+                  document.querySelector('#four').scrollIntoView({ behavior: "smooth" });
+                  return false;;
+                }
+                break;
             // case "member":
             //     let num = 0;
             //     this.wordData[i].forEach(item=>{

src/views/echarts/components/RankingTable.vue

@@ -46,7 +46,7 @@
             align="center">
             <template #default="scope">
               <div>
-                {{ scope.row.fund/1000 }}
+                {{ scope.row.fund/10000 }}
               </div>
             </template>
           </el-table-column>

src/views/firm.vue

@@ -121,10 +121,18 @@
     <el-dialog
       title="展示文件"
       :visible.sync="showFile"
+      top="50px"
       width="70vw"
+      :fullscreen="fullShow"
       class="addDialog showDialog"
-    >
-      
+    > 
+    <template slot="title">
+      <div class="DialogBox">
+        <div class="DialogTitle">展示文件</div>
+        <span class="changeFull el-icon-zoom-in" @click="fullShow = !fullShow"></span>
+      </div>
+    </template>
+    <!-- <el-button type="primary" style="margin-bottom: 20px;" @click="fullShow=!fullShow">全屏查看</el-button> -->
       <div class="showFileArea">
         
         <vword
@@ -150,11 +158,13 @@
 import beUpload from "@/components/tool/beUpload.vue";
 import vpdf from "@/components/vpdf.vue";
 import vword from "@/components/vword.vue";
+import full from "core-js/full";
 // import { Header } from 'element-ui';
 export default {
   components: { beUpload, vpdf, vword },
   data() {
     return {
+      fullShow:false,
       accept: "*",
       // showFileType: 0,
       dialogVisible1: false,

src/views/fundManage/newNomMarkerFundApply.vue

@@ -5,7 +5,7 @@
         <div class="titleOne">创客活动资金申请</div>
     </div> -->
     <div class="pAHeader">
-        <div class="pAHeader1">创客活动资金申请</div>
+        <div class="pAHeader1">个人创客资金申请</div>
       </div>
     <hr>
     <!-- 项目名称、类型开始 -->

src/views/home.vue

@@ -20,7 +20,7 @@
                       <div class="submenu" v-for="(item2,ind2) in item['group']" :key="ind2">
                         <el-menu-item :index="ind2.toString()" @click="goto(item2.goto)">
                           <template slot="title">
-                            <div class="subTitle" :style="$route.path.indexOf(item2.goto)!=-1?'color:#40aaff':''">
+                            <div class="subTitle subItem" :style="$route.path.indexOf(item2.goto)!=-1?'color:#40aaff':''">
                               <i :class="item2.icon" style="margin-right: 15px;width: 15px;"></i>
                               {{ item2.label }}
                             </div>
@@ -28,7 +28,7 @@
                         </el-menu-item>
                       </div>
                     </el-submenu>
-                    <el-menu-item :index="ind.toString()" v-else-if="$store.state.userInfo.type==0" @click="goto(item.goto)">
+                    <el-menu-item :index="ind.toString()" v-else-if="$store.state.userInfo.type==0 || !item['power']" @click="goto(item.goto)">
                       <template slot="title">
                         <div class="subTitle" :style="$route.path.indexOf(item.goto)!=-1?'color:#40aaff':''">
                           <i :class="item.icon" style="margin-right: 15px;width: 15px;" :style="$route.path.indexOf(item.goto)!=-1?'color:#40aaff':''"></i>
@@ -70,7 +70,7 @@
             // {id:6,label:"学分登记",goto:"/credit",icon:"iconfont icon-yonghu"},
             {id:7,label:"成果展示",power:true,goto:"/resultsShow",icon:"iconfont icon-xiangmuguanli2",group:[]},
             {id:8,label:"创业公司登记",power:true,goto:"/firm",icon:"iconfont icon-zuzhijiegou",group:[]},
-            {id:9,label:"消息通知",power:true,goto:"/messageNotification",icon:"iconfont icon-xiaoxitongzhi3",group:[]},
+            {id:9,label:"消息通知",power:false,goto:"/messageNotification",icon:"iconfont icon-xiaoxitongzhi3",group:[]},
             {id:10,label:"数据监测",power:true,goto:"/echarts",icon:"iconfont icon-qushi",group:[]},
           ]
         }
@@ -172,6 +172,9 @@
   padding-left: 20%;
   // background-color: red;
 }
+.subItem{
+  padding-left: 13%;
+}
 :deep(.el-menu-item.is-active){
   color: #333 !important;
   i{

src/views/messageNotification.vue

@@ -13,7 +13,7 @@
               <el-button type="primary" class="btn2" @click="getCourseManagement">查询</el-button>
           </div>
       </div>
-        <el-button type="primary" class="btn" @click="addMessage" size="mini">新建全站通知</el-button>
+        <el-button v-if="$store.state.userInfo.type==0" type="primary" class="btn" @click="addMessage" size="mini">新建全站通知</el-button>
     </div>
     
 
@@ -58,7 +58,7 @@
             <div class="operations">
                 <!-- <el-button type="primary" > -->
                     <el-button type="primary"  size="mini" @click="lookIntro(scope.row.newId)">查看信息</el-button>
-                    <el-button type="primary" size="mini"  @click="del(scope.row.newId)" style="width: 85px;">删除</el-button>
+                    <el-button type="primary" size="mini" v-if="$store.state.userInfo.type==0"  @click="del(scope.row.newId)" style="width: 85px;">删除</el-button>
                 <!-- </el-button> -->
             </div>
         </template>

src/views/resultShow/components/resultDetail_MakerSpace.vue

@@ -18,16 +18,21 @@
                 </div>
       
                 <div class="rsHead2Tit personListUL">
-                    <!-- 老师 -->
-                    <img src="@/assets/img/doctorialHat.svg" style="margin-right: 10px;width:25px;height: 25px;">
-                    <div class="personListLI">
+                   <!-- 老师 -->
+                   <img src="@/assets/img/doctorialHat.svg" style="margin-right: 10px;width:25px;height: 25px;">
+                    <el-tooltip class="item" effect="light" :content="TitleMessage.teacher.reduce((prev,cur)=>prev+=' '+cur.name,'')" placement="top-start">
+                        <div class="personListLI">
                         <span v-for="(item,index) in TitleMessage.teacher" :key="index">{{ item.name }}</span>
                     </div>
+                    </el-tooltip>
+                    
                     <!-- 学生 -->
                     <img src="@/assets/img/student.svg" style="margin: 0px 10px;width:25px;height: 25px;">
-                    <div class="personListLI">
-                        <span v-for="(item,index) in TitleMessage.student" :key="index">{{ item.name }}</span>
-                    </div>
+                    <el-tooltip class="item" effect="light" :content="TitleMessage.student.reduce((prev,cur)=>prev+=' '+cur.name,'')" placement="top-start">
+                        <div class="personListLI">
+                            <span v-for="(item,index) in TitleMessage.student" :key="index">{{ item.name }}</span>
+                        </div>
+                    </el-tooltip>
                     
                 </div>
             </div>

src/views/resultShow/components/resultDetail_student.vue

@@ -18,15 +18,19 @@
                 <div class="rsHead2Tit personListUL">
                     <!-- 老师 -->
                     <img src="@/assets/img/doctorialHat.svg" style="margin-right: 10px;width:25px;height: 25px;">
-                    <div class="personListLI">
+                    <el-tooltip class="item" effect="light" :content="TitleMessage.teacher.reduce((prev,cur)=>prev+=' '+cur.name,'')" placement="top-start">
+                        <div class="personListLI">
                         <span v-for="(item,index) in TitleMessage.teacher" :key="index">{{ item.name }}</span>
                     </div>
+                    </el-tooltip>
+                    
                     <!-- 学生 -->
                     <img src="@/assets/img/student.svg" style="margin: 0px 10px;width:25px;height: 25px;">
-                    <div class="personListLI">
-                        <span v-for="(item,index) in TitleMessage.student" :key="index">{{ item.name }}</span>
-                    </div>
-                    
+                    <el-tooltip class="item" effect="light" :content="TitleMessage.student.reduce((prev,cur)=>prev+=' '+cur.name,'')" placement="top-start">
+                        <div class="personListLI">
+                            <span v-for="(item,index) in TitleMessage.student" :key="index">{{ item.name }}</span>
+                        </div>
+                    </el-tooltip>
                 </div>
             </div>
             <!-- <el-button class="backBtn" type="primary" @click="$router.back()">返回</el-button> -->
@@ -337,7 +341,8 @@
                                       <i class="el-icon-date"></i>
                                       活动开展时间
                                     </template>
-                                    {{ JSON.parse(item.begin_at)[0]+"\t至\t"+JSON.parse(item.begin_at)[1] }}
+                                    <!-- {{ JSON.parse(item.begin_at) }} -->
+                                    {{ JSON.parse(item.begin_at)[0].split(' ')[0]+"\t至\t"+JSON.parse(item.begin_at)[1].split(' ')[0] }}
                                   </el-descriptions-item>
                                   <el-descriptions-item>
                                     <template slot="label">