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

src/views/ProjectManagement.vue

@@ -76,8 +76,9 @@
     </div>
 <!-- 搜索栏结束 -->
       
+      
 <!-- 循环展示框列表开始 -->
-    <div class="projectBlock">
+    <div class="projectBlock core_dialogue">
       <div class="classBlock" v-for="(item,index) in items" :key="index">
         <div class="projectBlockPosition">
           {{ item.finish }}

src/views/makerActvity.vue

@@ -79,42 +79,47 @@
         <el-table-column
           prop="projectPerson"
           label="负责人"
+          align="center"
           min-width="7%">
         </el-table-column>
         <el-table-column
           prop="relevancy"
+          align="center"
           label="关联项目"
           min-width="9%">
         </el-table-column>
         <el-table-column
           prop="budget"
+          align="center"
           label="预算经费"
           min-width="8%">
         </el-table-column>
         <el-table-column
           prop="useBudget"
+          align="center"
           label="实际使用(元)"
           min-width="8%">
         </el-table-column>
         <el-table-column
           prop="dept"
+          align="center"
           label="所在部门"
           min-width="8%">
         </el-table-column>
         <el-table-column
-          prop="status"
+          prop="state"
           label="状态"
+          align="center"
           min-width="7%">
           <!-- <template #default="scope"> -->
-            <div>
                 <!-- {{scope.row.name + (scope.row.status==0?"":"(已屏蔽)")}} -->
-                {{ status?"未报销":"已报销"}}
-            </div>
+                {{status?"未报销":"已报销"}}
         <!-- </template> -->
 
         </el-table-column>
         <el-table-column
           prop="date"
+          align="center"
           label="活动时间"
           min-width="10%">
         </el-table-column>
@@ -129,7 +134,7 @@
                   <!-- <el-button type="primary" > -->
                         <el-button type="primary"  @click="MADetails" size="mini">查看详情</el-button>
                         <el-button type="primary"  @click="audi" size="mini">审核</el-button>
-                        <el-button type="primary"  size="mini" @click="edit(scope.row.id,scope.row.status)">申请表</el-button>
+                        <el-button type="primary"  size="mini" @click="edit(scope)">申请表</el-button>
                         <el-button type="primary"  size="mini" @click="end" >完结</el-button>
                   <!-- </el-button> -->
               </div>
@@ -139,70 +144,8 @@
     </div>
 <!-- 表格结束 -->
 
-<!-- 完结对话框开始 -->
-    <!-- <el-dialog
-      title="提示"
-      :visible.sync="endDialog"
-      width="600px"
-      class="projectApplicationfundAddDialog"
-      :before-close="init">
-      <div class="addDialogLogo">LOGO</div>
-      <div class="deleteContent">"智能分链机器公开赛"项目活动，是否确定完结？</div>
-      <div class="deleteContent1">上次活动完结报告</div>
-      <div class="download">
-        <div>智能分链机器公开赛.pdf 点击下载</div>
-      </div>
-      <div class="addMoneyBtn">
-          <div class="jia">+</div>添加
-      </div>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="init" class="btn5" size="mini">确认提交</el-button>
-        <el-button @click="init" class="btn5" style="background:#cccccc" size="mini">取消</el-button>
-      </div>
-    </el-dialog> -->
-    <!-- 完结对话框结束 -->
-
-<!-- 审核对话框开始 -->
-
-      <!-- 审核对话框 -->
-      <!-- <el-dialog
-        title="活动审核"
-        :visible.sync="auditDialog"
-        width="600px"
-        :modal="false"
-        :close-on-click-modal="true"
-        :before-close="init">
-      
-        <div class="diaTit" style="margin-top: 0;">
-              <div class="spans">项目名称:</div><div class="msgData" style="margin-right: 30px;">人工智能分链机器</div>
-              <div class="spans">项目负责人:</div><div class="msgData">徐晓霞</div>
-          </div>
 
-          <div class="diaInpBlock">
-            <div class="diaLabel">所在部门</div>
-            <div>
-              <el-input v-model="input"  placeholder="信通学院"></el-input>
-            </div>
-          </div>
 
-          <div class="diaInpBlock">
-            <div class="diaLabel">预算总经费</div>
-            <div class="diaTit2">
-              <el-input v-model="input"  placeholder="6000"></el-input>
-            </div>
-          </div>
-
-          <div class="diaInpBlock">
-            <div class="diaLabel">联系电话</div>
-            <div>
-              <el-input v-model="input" placeholder="13854449525"></el-input>
-            </div>
-          </div>
-          <div slot="footer" class="dialog-footer">
-            <el-button @click="commit" class="diaBtn" style="background: #0e72e6;color: #fff;" size="small">确认提交</el-button>
-            <el-button @click="init" class="diaBtn" style="background: #cccccc;color: #000;" size="small">取消</el-button>
-          </div>
-      </el-dialog> --> 
 
 
       <!-- 活动审核对话框开始 -->
@@ -307,9 +250,28 @@
       </el-dialog>
       <!-- 驳回提交对话框结束 -->
 
-
-
-
+    <!-- 完结对话框开始 -->
+    <el-dialog
+      title="提示"
+      :visible.sync="endDialog"
+      width="600px"
+      class="endDialog"
+      :before-close="init">
+      <div class="addDialogLogo">LOGO</div>
+      <div class="deleteContent">"智能分链机器公开赛"项目活动，是否确定完结？</div>
+      <div class="deleteContent1">上次活动完结报告</div>
+      <div class="download">
+        <div>智能分链机器公开赛.pdf 点击下载</div>
+      </div>
+      <div class="addMoneyBtn">
+          <div class="jia">+</div>添加
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="ending" class="btn5" size="mini">确认提交</el-button>
+        <el-button @click="init" class="btn5" style="background:#cccccc" size="mini">取消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 完结对话框结束 -->
 
 
   </div>
@@ -340,7 +302,7 @@
             useBudget:'10000',
             date:'2022年-11月-12日',
             tel:'16625153432',
-            status:'已报销',
+            state:'已报销',
             dept:'中德制造'
           },
           ],
@@ -379,15 +341,15 @@
         edit(){
 
         },
-        // 创客活动申请按钮
-        makerActvityApply(){
-          this.$router.push('/makerActvityApplyMain')
+        ending(){   //完结
+          this.endDialog=false;
         },
-        handleSelectionChange(val) {
-          this.multipleSelection = val;
+        
+        makerActvityApply(){  // 创客活动申请按钮
+          this.$router.push('/makerActvityApplyMain')
         },
-        // 查看详情
-        MADetails(){
+   
+        MADetails(){   // 查看详情
           this.$router.push('/makerActvityDetails')
         },
         // 审核按钮
@@ -490,178 +452,91 @@
         }
   }
 
+  .endDialog{  //完结对话框的
 
-
-
-
-
-
-
-
-
-
-
-
-
-//   .el-dialog{
-//       border-radius:5px;
-//       overflow: hidden;
-//     }
-
-//   .projectApplicationfundAddDialog{  //完结对话框的
-
-//     .el-dialog__header{
-//     background: #32455b;
-//     }
-//     .el-dialog__title{
-//       color:rgb(246, 247, 246);
-//     }
-
-//     .deleteContent{
-//       width: 100%;
-//       text-align: left;
-//       font-size: 20px;
-//       color: #000;
-//       box-sizing: border-box;
-//       padding: 0 20px;
-//     }
-//     .deleteContent1{
-//       width: 100%;
-//       text-align: left;
-//       font-size: 18px;
-//       font-weight: bold;
-//       color: #000;
-//       margin-top: 30px;
-//     }
-//     .download{
-//       margin: 20px 15px;
-//       width: 100%;
-//       text-align: left;
-//       font-size: 14px;
-//       font-weight: bold;
-//       color: #5391fd;
-//     }
-//     .addMoneyBtn{
-//       width: 150px;
-//       height: 40px;
-//       border: #000 1px dashed;
-//       border-radius: 5px;
-//       margin: 15px 10px 30px;
-//       display: flex;
-//       justify-content: center;
-//       line-height: 40px;
-//           .jia{
-//               border-radius: 50%;
-//               border: 1.5px #ccc solid;
-//               font-size: 25px;
-//               line-height: 26px;
-//               font-weight: 10;
-//               margin-top: 6px;
-//               margin-right: 5px;
-//               height: 27px;
-//               width: 27px;
-//               color: #ccc;
-//           }
-//     }
-//     .addDialogLogo{
-//       width: 60px;
-//       height: 30px;
-//       line-height: 30px;
-//       background: #f2f2f2;
-//       position: absolute;
-//       left: 10px;
-//       top: 10px;
-//       text-align: center;
-//     }
+    .el-dialog__header{
+    background: #32455b;
+    }
+    .el-dialog__title{
+      color:rgb(246, 247, 246);
+    }
+    .el-dialog{
+          width: 600px;
+          border-radius: 5px;
+          overflow: hidden;
+        }
+    .deleteContent{
+      width: 100%;
+      text-align: left;
+      font-size: 20px;
+      color: #000;
+      box-sizing: border-box;
+      padding: 0 20px;
+    }
+    .deleteContent1{
+      width: 100%;
+      text-align: left;
+      font-size: 18px;
+      font-weight: bold;
+      color: #000;
+      margin-top: 30px;
+    }
+    .download{
+      margin: 50px 0 20px;
+      width: 100%;
+      text-align: left;
+      font-size: 16px;
+      font-weight: bold;
+      color: #5391fd;
+    }
+    .addMoneyBtn{
+      width: 120px;
+      height: 40px;
+      border: #000 1px dashed;
+      border-radius: 5px;
+      margin: 30px 0;
+      display: flex;
+      justify-content: center;
+      line-height: 40px;
+          .jia{
+              border-radius: 50%;
+              border: 1.5px #ccc solid;
+              font-size: 25px;
+              line-height: 26px;
+              font-weight: 10;
+              margin-top: 6px;
+              margin-right: 5px;
+              height: 27px;
+              width: 27px;
+              color: #ccc;
+          }
+    }
+    .addDialogLogo{
+      width: 60px;
+      height: 30px;
+      line-height: 30px;
+      background: #f2f2f2;
+      position: absolute;
+      left: 10px;
+      top: 10px;
+      text-align: center;
+    }
     
-//     .addDialogMid{
-//       box-sizing: border-box;
-//       padding:0 60px 0 10px;
-//       .addDialogTit{
-//         display: flex;
-//         div{
-//           width: 80px;
-//           line-height: 40px;
-//           text-align: left;
-//         }
-//       }
-//     .addDialogTit1{
-//       display: flex;
-//       justify-content: space-between;
-//       margin-bottom: 15px;
-//     }
-//     .addDialogTit2{
-//       margin-top: 10px;
-//       font-size: 18px;
-//       color: #000;
-//       text-indent: 2em;
-//     }
-//     .addDialogCon{
-//       margin-top: 20px;
-//     }
-//   }
-  
-// }
-// .dialog-footer{    //对话框按钮
-//     display: flex;
-//     justify-content: center;
-//     .btn5{
-//       height: 40px;
-//       background: #0e72e6;
-//       width: 200px;
-//       font-size: 16px;
-//     }
-//     .diaBtn{
-//       width: 200px;
-//       height: 40px;
-//       font-size: 16px;
-//     }
-//   }
-
-//     .el-dialog__header{
-//       background: #32455b;
-
-//     }
-//     .el-dialog__title{
-//       color: #fff;
-//       font-size: 18px;
-//       position: relative;
-//       top: -3px;
-//     }
-  
-//     .diaTit{
-//       width: 100%;
-//       display: flex;
-//       font-size: 16px;
-//       justify-content: flex-start;
-//     }
-//     .diaInpBlock{
-//       display: flex;
-//       margin-top: 20px;
-//       font-size: 16px;
-//       .el-input__inner {
-//         width: 300px;
-//       }
-//     }
-//     .spans{
-//       color: #000;
-//       box-sizing: border-box;
-//       padding-right: 10px;
-//     }
-//     .diaLabel{
-//       color: #000;
-//       min-width: 100px;
-//       margin-right: 5px;
-//       display: inline-block;
-//       text-align: justify;
-//       // font-weight: bold;
-//       text-justify:distribute-all-lines;
-//       text-align-last: justify;
-//       transform: translate(0,22%);
-//       padding-right: 15px;
-//     }
-// }
-// .msgData{    //对话框人物名称颜色
-//   color: rgb(173, 173, 173);
+.dialog-footer{    //对话框按钮
+    display: flex;
+    justify-content: center;
+    .btn5{
+      height: 40px;
+      background: #0e72e6;
+      width: 200px;
+      font-size: 16px;
+    }
+    .diaBtn{
+      width: 200px;
+      height: 40px;
+      font-size: 16px;
+    }
+  }
+  }
 }
 </style>

src/views/resultsShow.vue

@@ -77,7 +77,7 @@
     
     
     <!-- 循环展示框列表开始 -->
-    <div class="classBlocks">
+    <div class="classBlocks core_dialogue">
       <div class="classBlock" v-for="(item,index) in items" :key="index">
         <div class="projectBlockPosition">
           {{ item.finish }}