消息通知

src/views/messageNotification.vue

@@ -82,29 +82,23 @@
     <el-dialog
       title="添加全站通知"
       :visible.sync="dialogVisible"
-      width="600px"
+      width="1000px"
       class="addDialog">
       <div class="addDialogLogo">LOGO</div>
       <div class="addDialogMid">
         <div class="addDialogTit">
-          <span>通知标题</span>
+          <div class="addLabel">通知标题</div>
           <el-input v-model="addMess.tit" placeholder="请输入内容"></el-input>
         </div>
         <div class="addDialogTit addDialogCon">
-          <span style="position: relative;top: -8px;">通知内容</span>
-          <el-input
-            type="textarea"
-            :rows="10"
-            resize="none"
-            placeholder="请输入内容"
-            v-model="addMess.con">
-          </el-input>
+          <div class="addLabel" style="position: relative;top: -8px;margin-right: -5px;width: 105px;">通知内容</div>
+          <vue-editor v-model="addMess.con" style="margin-bottom: 30px;" :editorToolbar="customToolbar"></vue-editor>
         </div>
       </div>
-      <span slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="confirmAdd" >确认添加</el-button>
         <el-button @click="init" >取 消</el-button>
-      </span>
+      </div>
     </el-dialog>
 <!-- 添加全站通知结束-->
 
@@ -116,11 +110,11 @@
       width="600px"
       class="delDialog">
       <div class="addDialogLogo">LOGO</div>
-      <span class="deleteContent">确定删除通知?</span>
-      <span slot="footer" class="dialog-footer">
+      <div class="deleteContent">确定删除通知?</div>
+      <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="confirmDel" >确认删除</el-button>
         <el-button @click="dialogVisible1=false"  >取消</el-button>
-      </span>
+      </div>
     </el-dialog>
 <!-- 删除通知结束-->
 
@@ -128,7 +122,7 @@
     <el-dialog
       title="查看通知"
       :visible.sync="dialogVisible2"
-      width="600px"
+      width="800px"
       class="addDialog">
       <div class="addDialogLogo">LOGO</div>
       <div class="addDialogMid">
@@ -138,12 +132,13 @@
         </div>
         <hr>
         <div class="addDialogTit2">
-              {{ messageCon.brief }}
+          <vue-editor v-model="messageCon.brief"  :editorToolbar="customToolbar"></vue-editor>
+              <!-- {{ messageCon.brief }} -->
         </div>
       </div>
-      <span slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="dialogVisible2=false" class="btn5">关闭</el-button>
-      </span>
+      </div>
     </el-dialog>
 <!-- 查看通知结束 -->
 
@@ -151,9 +146,20 @@
 </template>
 
 <script>
+  import { VueEditor } from "vue2-editor";
+
     export default {
+      props:["data","next",'back'],
+      components:{
+          VueEditor
+        },
       data() {
         return {
+          customToolbar: [
+              ["bold", "italic", "underline"], [{ list: "ordered" }, { list: "bullet" }],
+              [{ align: "" }, { align: "center" }, { align: "right"}, { align: "justify"}],
+              [{header:[false,1,2,3,4]}]
+            ],
           textarea:'',
           //查询框
           selectInput:"",
@@ -381,12 +387,12 @@
         padding:0 60px 0 10px;
         .addDialogTit{
           display: flex;
-          span{
+
+          div{
             width: 80px;
             font-size: 16px;
             line-height: 40px;
             text-align: left;
-            
           }
         }
         .addDialogTit1{
@@ -398,8 +404,8 @@
           margin-top: 10px;
           font-size: 16px;
           color: #000;
-          text-indent: 2em;
-          text-align: left;
+          // text-indent: 2em;
+          // text-align: left;
           line-height: 1.7em;
         }
         .addDialogCon{
@@ -430,6 +436,9 @@
         position: absolute;
         left: 20px; top: 15px; 
       }
+      .quillWrapper{
+        width: 100%;
+      }
       .el-dialog__header{
         background: #32455b;
       }
@@ -446,14 +455,13 @@
         padding:0 30px 0 10px;
         .addDialogTit{
           display: flex;
-          justify-content: center;
-          span{
-            width: 90px;
+          .addLabel{
+            width: 100px;
             font-size: 16px;
             line-height: 40px;
             text-align: left;
-            
           }
+          
         }
         .addDialogTit1{
           display: flex;
@@ -464,8 +472,8 @@
           margin-top: 10px;
           font-size: 16px;
           color: #000;
-          text-indent: 2em;
-          text-align: left;
+          // text-indent: 2em;
+          // text-align: left;
           line-height: 1.7em;
         }
         .addDialogCon{

src/views/projectManage/ProjectManagement.vue

@@ -111,10 +111,10 @@
 
               <el-button type="primary" v-show="item.isupload==0"  class="bt1" @click="$message.error('请先进行项目立项审核')" size="mini">结项</el-button>
               
-              <el-button type="primary" v-show="item.isupload==1" class="bt1" size="mini"  @click="finish(item.courseId,item.title)">结项</el-button>
+              <!-- <el-button type="primary" v-show="item.isupload==1" class="bt1" size="mini"  @click="finish(item.courseId,item.title)">结项</el-button> -->
 
-              <!-- <el-button type="primary" v-show="item.isupload==1 && item.endFile==''" class="bt1" size="mini"  @click="finish(item.courseId,item.title)">结项</el-button> -->
-              <!-- <el-button type="primary" v-show="item.isupload==1 && item.endFile!=''" class="bt1" size="mini"  @click="finish(item.courseId,item.title)">修改结项</el-button> -->
+              <el-button type="primary" v-show="item.isupload==1 && item.endFile==null" class="bt1" size="mini"  @click="finish(item.courseId,item.title)">结项</el-button>
+              <el-button type="primary" v-show="item.isupload==1 && item.endFile!=null" class="bt1" size="mini"  @click="finish(item.courseId,item.title)">修改结项</el-button>
               <el-button type="primary" v-show="item.isupload==2" class="bt1" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;"   size="mini">已结项</el-button>
                           
             </div>

src/views/projectSettlement/projectSettlement.vue

@@ -346,13 +346,13 @@
       .addDialogLogo{
         width: 60px;
         height: 30px;
+        display: flex;
+        justify-content: center;
         line-height: 30px;
         border-radius: 5px;
         background: #f2f2f2;
         position: absolute;
-        left: 10px;
-        top: 10px;
-        text-align: center;
+        left: 20px; top: 15px; 
       }
       .el-dialog__header{
       background: #32455b;