Преглед на файлове

Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/ssti-CollegeManage

Q-ABAB преди 2 години
родител
ревизия
84cacbb544
променени са 4 файла, в които са добавени 177 реда и са изтрити 27 реда
  1. 2 2
      src/views/activityManage/makerActvity.vue
  2. 82 4
      src/views/firm.vue
  3. 8 5
      src/views/messageNotification.vue
  4. 85 16
      src/views/projectApply/projectApplication.vue

+ 2 - 2
src/views/activityManage/makerActvity.vue

@@ -262,8 +262,8 @@
           <div class="jia">+</div>添加
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="ending" class="diaBtn" style="background: #0e72e6;color: #fff;" size="mini">确认提交</el-button>
-        <el-button @click="init" class="diaBtn" style="background:#cccccc" size="mini">取消</el-button>
+        <el-button type="primary" @click="ending" class="diaBtn">确认提交</el-button>
+        <el-button @click="init" class="diaBtn">取消</el-button>
       </div>
     </el-dialog>
     <!-- 完结对话框结束 -->

+ 82 - 4
src/views/firm.vue

@@ -55,13 +55,28 @@
           <template #default="scope">
               <div class="operations">
                       <el-button type="primary" class="bt1" size="mini" >查看信息</el-button>
-                      <el-button type="primary" class="bt1" size="mini" @click="edit(scope)" >删除</el-button>
+                      <el-button type="primary" class="bt1" size="mini" @click="del(scope)" >删除</el-button>
               </div>
           </template>
         </el-table-column>
       </el-table>
    
       </div>
+      
+<!-- 删除通知开始 -->
+    <el-dialog
+      title="删除文件"
+      :visible.sync="dialogVisible1"
+      width="600px"
+      class="addDialog">
+      <div class="addDialogLogo">LOGO</div>
+      <span class="deleteContent">确定删除文件?</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogVisible1=false" class="btn5">确认删除</el-button>
+        <el-button @click="dialogVisible1=false" class="btn5" >取消</el-button>
+      </span>
+    </el-dialog>
+<!-- 删除通知结束-->
     </div>
   </template>
   
@@ -69,6 +84,7 @@
       export default {
         data() {
           return {
+            dialogVisible1:false,
             input:'',
             options:[],
             options1:[],
@@ -96,8 +112,8 @@
           }
         },
         methods:{
-          edit(data){
-            this.tableData = this.tableData.filter(item=>item.date!=data.date);
+          del(){
+            this.dialogVisible1=true
           },
           selectFile(){
             let input = document.createElement('input');
@@ -141,7 +157,69 @@
       }
     }
 
-    
+.addDialog{
+  font-size: 18px;
+  .el-dialog{
+    border-radius: 5px;
+    overflow: hidden;
+  }
+  .deleteContent{
+    margin: 30px 0;
+    font-size: 22px;
+    color: #000;
+  }
+  .addDialogLogo{
+    width: 60px;
+    height: 30px;
+    line-height: 30px;
+    background: #f2f2f2;
+    position: absolute;
+    left: 20px; top: 15px; 
+  }
+  .el-dialog__header{
+  background: #32455b;
+  }
+  .el-dialog__title{
+    color:#fff;
+    font-size: 22px;
+  }
+  .addDialogMid{
+    box-sizing: border-box;
+    padding:0 60px 0 10px;
+    .addDialogTit{
+      display: flex;
+      span{
+        width: 80px;
+        font-size: 16px;
+        line-height: 40px;
+        text-align: left;
+        
+      }
+    }
+    .addDialogTit1{
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 15px;
+    }
+    .addDialogTit2{
+      margin-top: 10px;
+      font-size: 16px;
+      color: #000;
+      text-indent: 2em;
+    }
+    .addDialogCon{
+      margin-top: 20px;
+    }
+  }
+  .dialog-footer{
+    display: flex;
+    justify-content: center;
+    box-sizing: border-box;
+    .btn5{
+      font-size: 16px;
+    }
+  }
+}
     
       
     .btn{   //上传文件

+ 8 - 5
src/views/messageNotification.vue

@@ -58,7 +58,7 @@
             <div class="operations">
                 <!-- <el-button type="primary" > -->
                     <el-button type="primary"  size="mini" @click="lookIntro(scope)">查看信息</el-button>
-                    <el-button type="primary" size="mini"  @click="deletes" >删除</el-button>
+                    <el-button type="primary" size="mini"  @click="del" >删除</el-button>
                 <!-- </el-button> -->
             </div>
         </template>
@@ -106,7 +106,7 @@
       width="600px"
       class="addDialog">
       <div class="addDialogLogo">LOGO</div>
-      <span class="deleteContent">确定删除通知</span>
+      <span class="deleteContent">确定删除通知?</span>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="dialogVisible1=false" class="btn5">确认删除</el-button>
         <el-button @click="dialogVisible1=false" class="btn5" >取消</el-button>
@@ -185,8 +185,9 @@
         }
       },
       methods:{
-        deletes(){
+        del(){
           this.dialogVisible1=true;
+          
         },
         init(){
           //重置
@@ -235,6 +236,10 @@
 
 .addDialog{
   font-size: 18px;
+  .el-dialog{
+    border-radius: 5px;
+    overflow: hidden;
+  }
   .deleteContent{
     margin: 30px 0;
     font-size: 22px;
@@ -287,8 +292,6 @@
     display: flex;
     justify-content: center;
     box-sizing: border-box;
-    padding-left: 50px;
-    // background-color: red;
     .btn5{
       font-size: 16px;
     }

+ 85 - 16
src/views/projectApply/projectApplication.vue

@@ -251,7 +251,20 @@
             </div>
       </el-dialog>
 <!-- 立项审核对话框结束 -->
-
+<!-- 删除通知开始 -->
+<el-dialog
+      title="删除项目"
+      :visible.sync="dialogVisible2"
+      width="600px"
+      class="addDialog">
+      <div class="addDialogLogo">LOGO</div>
+      <span class="deleteContent">确定删除项目?</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogDel" class="btn5">确认删除</el-button>
+        <el-button @click="init" class="btn5" >取消</el-button>
+      </span>
+    </el-dialog>
+<!-- 删除通知结束-->
   </div>
 </template>
 
@@ -264,6 +277,7 @@
           status:-1,
           dialogVisible:false,//立项审核
           dialogVisible1:false,//立项撤回提交
+          dialogVisible2:false,//删除
           options:[],//项目筛选
           options1:[],//部门
           options2:[],//分类
@@ -296,6 +310,7 @@
         init(){
           this.dialogVisible=false;
           this.dialogVisible1=false;
+          this.dialogVisible2=false;
         },
         audit(){
           if(this.status==-1){
@@ -350,21 +365,10 @@
         //       })  
         },
         del() {
-          this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            this.$message({
-              type: 'success',
-              message: '删除成功!'
-            });
-          }).catch(() => {
-            this.$message({
-              type: 'info',
-              message: '已取消删除'
-            });          
-          });
+          this.dialogVisible2=true
+        },
+        dialogDel(){
+          this.dialogVisible2=false
         }
       },
       watch:{
@@ -386,6 +390,71 @@
 <style lang="less">
 .projectApplication{
 
+
+  .addDialog{   //删除框
+  font-size: 18px;
+  .el-dialog{
+    border-radius: 5px;
+    overflow: hidden;
+  }
+  .deleteContent{
+    margin: 30px 0;
+    font-size: 22px;
+    color: #000;
+  }
+  .addDialogLogo{
+    width: 60px;
+    height: 30px;
+    line-height: 30px;
+    background: #f2f2f2;
+    position: absolute;
+    left: 20px; top: 15px; 
+  }
+  .el-dialog__header{
+  background: #32455b;
+  }
+  .el-dialog__title{
+    color:#fff;
+    font-size: 22px;
+  }
+  .addDialogMid{
+    box-sizing: border-box;
+    padding:0 60px 0 10px;
+    .addDialogTit{
+      display: flex;
+      span{
+        width: 80px;
+        font-size: 16px;
+        line-height: 40px;
+        text-align: left;
+        
+      }
+    }
+    .addDialogTit1{
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 15px;
+    }
+    .addDialogTit2{
+      margin-top: 10px;
+      font-size: 16px;
+      color: #000;
+      text-indent: 2em;
+    }
+    .addDialogCon{
+      margin-top: 20px;
+    }
+  }
+  .dialog-footer{
+    display: flex;
+    justify-content: center;
+    box-sizing: border-box;
+    .btn5{
+      font-size: 16px;
+    }
+  }
+}
+
   .dialogWidth{
       .el-input__inner{
         width: 300px;