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

src/views/activityManage/makerActvity.vue

@@ -561,6 +561,8 @@ import beUpload from '../../components/tool/beUpload'
     }
     .el-dialog__title{
       color:rgb(246, 247, 246);
+      display: flex;
+      justify-content: center;
     }
     .el-dialog{
           width: 600px;
@@ -600,7 +602,7 @@ import beUpload from '../../components/tool/beUpload'
       background: #f2f2f2;
       position: absolute;
       left: 10px;
-      top: 10px;
+      top: 15px;
       text-align: center;
     }
   }

src/views/projectApply/projectApplication2.vue

@@ -123,7 +123,9 @@ import { VueEditor } from "vue2-editor";
               this.ajax
                     .get(this.$store.state.api+'/GetProjectDetailMessage',param)
                     .then(res=>{
+                      // console.log(res);
                       let GetData=JSON.parse(res.data[0][0].chapters)
+                      console.log(GetData);
                       this.data=GetData
                     },err=>{
                       console.log(err);

src/views/projectManage/ProjectManagement.vue

@@ -180,6 +180,7 @@
           this.$router.push(`/ProjectManagement1`)
         },
         fundStatus(Id){     //资金情况
+          localStorage.setItem('pid',JSON.stringify(Id))
           this.$router.push(`/ProjectManagementFund1`)
         },
         init(){       //对话框重置

src/views/projectManage/ProjectManagement3.vue

@@ -61,13 +61,11 @@
         <el-table-column
           prop="name"
           label="所在部门"
-          width="140"
           align="center"
           >
         </el-table-column>
         <el-table-column
           prop="date"
-          width="160"
           label="活动时间"
           align="center"
           >
@@ -181,8 +179,10 @@
           back(){
             this.$router.push('/ProjectManagement')
           },
-          detail(){
-            this.$router.push('/ProjectManagement3_1')
+          detail(Id){
+            // this.$router.push('/ProjectManagement3_1')
+            this.$router.push(`/ProjectManagement3_1?Id=${Id}`)
+
           },    
         },
         mounted(){

src/views/projectManage/ProjectManagement3_1.vue

@@ -24,33 +24,33 @@
       <div class="select">
                 <div class="selectTop">
                   <div class="label">项目名称</div>
-                  <el-input v-model="input" placeholder="请输入内容"></el-input>
+                  <el-input v-model="selects.projectName" placeholder="请输入内容"></el-input>
                 </div>
                 <div class="selectMid">
                   <div class="selectLeft">
                       <div class="inpBlock" style="position: relative;">
                           <div class="label">预算经费</div>
-                          <el-input v-model="input" placeholder="请输入内容"></el-input>
+                          <el-input v-model="selects.fund" placeholder="请输入内容"></el-input>
                           <div style="position: absolute;top: 8px;right: -30px;">(万)</div>
                       </div>
                       <div class="inpBlock">
                           <div class="label">负责人</div>
-                          <el-input v-model="input" placeholder="请输入内容"></el-input>
+                          <el-input v-model="selects.leader" placeholder="请输入内容"></el-input>
                       </div>
                       <div class="inpBlock">
                           <div class="label">所在部门</div>
-                          <el-select v-model="input" style="width: 100%;" placeholder="请选择">
+                          <el-select v-model="selects.department" style="width: 100%;" placeholder="请选择">
                             <el-option
-                              v-for="item in options"
-                              :key="item.value"
-                              :label="item.label"
-                              :value="item.value">
+                              v-for="item in selectInput"
+                              :key="item.id"
+                              :label="item.name"
+                              :value="item.id">
                             </el-option>
                           </el-select>
                       </div>
                       <div class="inpBlock">
                           <div class="label">联系电话</div>
-                          <el-input v-model="input" placeholder="请输入内容"></el-input>
+                          <el-input v-model="selects.tel" placeholder="请输入内容"></el-input>
                       </div>
                   </div>
 
@@ -58,15 +58,15 @@
                     <div class="inpBlock">
                           <div class="label">项目开始时间</div>
                           <el-date-picker
-                            v-model="value"
-                            type="date"
+                            v-model="selects.beginDate"
+                            type="datetime"
                             style="width: 100%;"
                             placeholder="选择日期">
                           </el-date-picker>
                       </div>
                       <div class="inpBlock">
-                          <div class="label">预算总经费</div>
-                          <el-input v-model="input" placeholder="请输入内容"></el-input>
+                          <div class="label">参与学生人数</div>
+                          <el-input v-model="selects.studentNum" placeholder="请输入内容"></el-input>
                       </div>
                       
                   </div>
@@ -97,14 +97,14 @@
          >
         </el-table-column>
         <el-table-column
-          prop="className"
+          prop="work"
           label="工作单位"
           align="center"
           >
         </el-table-column>
 
         <el-table-column
-          prop="division"
+          prop="takeCharge"
           label="活动分工"
           align="center"
           >
@@ -125,70 +125,34 @@
       <!-- 指导老师结束 -->
 
     <!-- 多行文本框区域开始 -->
+      
       <div class="tabTit">
             <div><p>活动介绍</p></div>
       </div>
       <div class="textArea">
-        <el-input
-          type="textarea"
-          :rows="6"
-          class="textArea"
-          resize="none"
-          placeholder="请输入内容"
-          v-model="textarea">
-        </el-input>
-      </div>
-      <div class="tabTit">
-            <div><p>活动介绍</p></div>
-      </div>
-      <div class="textArea">
-        <el-input
-          type="textarea"
-          :rows="6"
-          class="textArea"
-          resize="none"
-          placeholder="请输入内容"
-          v-model="textarea">
-        </el-input>
+        <vue-editor  :editorToolbar="customToolbar" v-model="textareaS[0]"></vue-editor>
+
       </div>
       <div class="tabTit">
             <div><p>预期目标</p></div>
       </div>
       <div class="textArea">
-        <el-input
-          type="textarea"
-          :rows="6"
-          resize="none"
-          class="textArea"
-          placeholder="请输入内容"
-          v-model="textarea">
-        </el-input>
+        <vue-editor  :editorToolbar="customToolbar" v-model="textareaS[1]"></vue-editor>
+
       </div>
       <div class="tabTit">
             <div><p>活动受面</p></div>
       </div>
       <div class="textArea">
-        <el-input
-          type="textarea"
-          :rows="6"
-          class="textArea"
-          resize="none"
-          placeholder="请输入内容"
-          v-model="textarea">
-        </el-input>
+        <vue-editor  :editorToolbar="customToolbar" v-model="textareaS[2]"></vue-editor>
+
       </div>
       <div class="tabTit">
             <div><p>经费支出计划</p></div>
       </div>
       <div class="textArea">
-        <el-input
-          type="textarea"
-          :rows="6"
-          class="textArea"
-          resize="none"
-          placeholder="请输入内容"
-          v-model="textarea">
-        </el-input>
+        <vue-editor  :editorToolbar="customToolbar" v-model="textareaS[3]"></vue-editor>
+
       </div>
     <!-- 多行文本框区域结束 -->
 
@@ -230,42 +194,81 @@
 </template>
 
   <script>
+  import { VueEditor } from "vue2-editor";
+  import { uuid } from 'vue-uuid';
       export default {
+        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]}]
+            ],
           addMemberDialog:false,
-          textarea:'',
-            options: [{
-              value: '选项1',
-              label: '中德学院'
-            }],
+          tableData:[],  //活动指导老师列表
+          selects:{      //基础信息
+            projectName:'',
+            fund:'',
+            leader:'',
+            department:'',
+            tel:'',
+            beginDate:'',
+            studentNum:''
+          },
+
+          textareaS:[],
+          selectInput: [], //部门下拉框
             Member:{
               name:'袁一鸣',
               className:'21通信',
               Division:'ui'
           },
             value: '中德学院',
-           input:'',
-            tableData:[{
-              Name:'徐晓慧',
-              className:'22电子通信G5',
-              division:'前端',
-            },
-            {
-              Name:'林凡文',
-              className:'22电子通信G5',
-              division:'后端',
-            },
-            ],
+            input:'',
           }
         },
         methods:{
-          handleClose(){
+       
+        getData(){       //获取基础信息
+          this.ajax.get(this.$store.state.api+"/GetActivityDetail",{
+            uid:this.$store.state.userInfo.userid,
+            // aId:this.$route.query["Id"]
+            aId:this.$route.query["Id"]
+
+          }).then(res=>{
+            if(!res.data[0][0])return this.$message.error("错误")
+            let data = res.data[0][0];
+            console.log(data);
+            this.selects.projectName=data.title;
+            this.selects.fund=data.money;
+            this.selects.leader=data.pro_leader;
+            this.selects.tel=data.phone;
+            this.selects.beginDate=data.create_at;
+            this.selects.studentNum=data.students;
+            this.selects.department=data.classid;
+            this.tableData=JSON.parse(data.course_teacher)
+            this.textareaS=JSON.parse(data.chapters)
+          }).catch(err=>{
+            this.$message.error(err.message)
+          })
+        },
+        getAllClass(){
+          this.ajax.get(this.$store.state.api+"/SelectAllDepartment",{
+              uid:this.$store.state.userInfo.userid,
+          }).then(res=>{
+              this.selectInput = res.data[0];
+          }).catch(err=>{
+              this.$message.error(err.message)
+          })
+      },
+        handleClose(){
           this.addMemberDialog=false
         },
         addMember(){
           this.addMemberDialog=true
-         
         },
           commit(){
           this.addMemberDialog=false;
@@ -299,8 +302,11 @@
           },
          
         },
-        created(){
+        mounted(){
           // this.value=(this.options[0].value)
+          this.getData();
+          this. getAllClass();
+          console.log(this.$route.query["Id"]);
         }
       }
   </script>

src/views/projectManage/ProjectManagement4.vue

@@ -25,12 +25,21 @@
         :data="tableData"
         tooltip-effect="dark"
         stripe
+        style="height: 550px;"
         class="fontSize"
         :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
         >
        
+
         <el-table-column
-          prop="projectName"
+          prop="title"
+          label="项目名称"
+          align="center"
+          >
+        </el-table-column>
+
+        <el-table-column
+          prop="fileName"
           label="项目中期报告"
           align="center"
           >
@@ -44,7 +53,7 @@
         </el-table-column>
        
         <el-table-column
-          prop="date"
+          prop="uploadTime"
           label="时间"
           align="center"
           >
@@ -64,6 +73,18 @@
         </el-table-column>
         </el-table>
         <!-- 表格结束 -->
+
+        <!-- 分页 -->
+        <el-pagination
+            @current-change="handleCurrentChange"
+            :current-page="table.currentPage"
+            :page-size="table.packageSize"
+            layout=" prev, pager, next"
+            background
+            class="pagination"
+            :total="table.total">
+          </el-pagination>
+        <!-- 分页结束 -->
     </div>
   </template>
   
@@ -71,21 +92,40 @@
       export default {
         data() {
           return {
-           
-            tableData:[{
-              projectName:'创业孵化基地企业情况信息表',
-              date:'2022年11月12日',
-              size:'50k'
-              },
-              {
-                projectName:'创业孵化基地企业情况信息表',
-                size:'50k',
-                date:'2022年11月12日',
-              }
-            ],
+            table:{         // 分页数据
+              total:0,
+              packageSize:8,
+              currentPage:1
+            }, 
+            tableData:[],
           }
         },
         methods:{
+          handleCurrentChange(val) {   //当页数发生改变的时候调用获取列表数据请求
+          // console.log(`当前页: ${val}`);
+          this.table.currentPage=val
+          this.getData()
+        },
+          getData(){       //获取基础信息
+              let param={
+                uid:this.$store.state.userInfo.userid,
+                pid:JSON.parse(localStorage.getItem('pid')),
+                page:this.table.currentPage,
+                lim:this.table.packageSize
+              }
+              // console.log(param);
+              this.ajax
+                    .get(this.$store.state.api+'/GetActivityFileByProjectId',param)
+                    .then(res=>{
+                      console.log(res.data);
+                      let { title: f, reportFile: l } = res.data[0][0];
+                      let k= Object.assign({title:f},JSON.parse(l))
+                      this.tableData=[k]
+                      console.log(this.tableData);
+                    },err=>{
+                      console.log(err);
+                    })
+          },
           content(){
             this.$router.push('/ProjectManagement1')
           },
@@ -110,15 +150,18 @@
             this.$router.push('/ProjectManagement')
           },
         },
-        created(){
-          // this.value=(this.options[0].value)
+        mounted(){
+          this.getData()
         }
       }
   </script>
   
   <style lang="less">
   .ProjectManagement4{
-
+    .pagination{
+      float: right;
+      margin: 20px 55px 10px;
+    }
   
 
    

src/views/projectManage/ProjectManagementFund1.vue

@@ -43,73 +43,73 @@
               :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
               >
               <el-table-column
-                prop="projectName"
+                prop="one"
                 label="1月"
                 align="center"
                 >
               </el-table-column>
               <el-table-column
-                prop="projectName"
+                prop="two"
                 label="2月"
                 align="center"
                 >
               </el-table-column>
               <el-table-column
-                prop="projectName"
+                prop="three"
                 label="3月"
                 align="center"
                 >
               </el-table-column>
               <el-table-column
-                prop="projectName"
+                prop="four"
                 label="4月"
                 align="center"
                 >
               </el-table-column>
               <el-table-column
-                prop="projectName"
+                prop="five"
                 label="5月"
                 align="center"
                 >
               </el-table-column>
               <el-table-column
-                prop="projectName"
+                prop="six"
                 label="6月"
                 align="center"
                 >
               </el-table-column>
               <el-table-column
-                prop="projectName"
+                prop="seven"
                 label="7月"
                 align="center"
                 >
               </el-table-column>
               <el-table-column
-                prop="projectName"
+                prop="eight"
                 label="8月"
                 align="center"
                 >
               </el-table-column>
               <el-table-column
-                prop="projectName"
+                prop="nine"
                 label="9月"
                 align="center"
                 >
               </el-table-column>
               <el-table-column
-                prop="projectName"
+                prop="ten"
                 label="10月"
                 align="center"
                 >
               </el-table-column>
               <el-table-column
-                prop="projectName"
+                prop="eleven"
                 label="11月"
                 align="center"
                 >
               </el-table-column>
               <el-table-column
-                prop="projectName"
+                prop="twelve"
                 label="12月"
                 align="center"
                 >
@@ -125,7 +125,7 @@
 
           <!-- 经费明细开始 -->
             <div class="tabTit">
-              <div><p>经费月支出计划(元)</p></div>
+              <div><p>经费明细</p></div>
               <el-button type="primary" @click="addBtn" >设置</el-button>
             </div>
 
@@ -200,20 +200,8 @@
           fundDetail:false,
     
 
-          tableData:[{
-            projectName:'-',
-            date:'2022年11月12日',
-            size:'50k'
-            },
-          ],
-          tableData2:[{
-            sort:'人工智能设备购买',
-            Fund:'20000.00',
-            projectName:'项目协作费用',
-            remark:'',
-            state:'已使用'
-            },
-          ],
+          tableData:[],  //经费月支出经费计划
+          tableData2:[],  //
           textarea:'',
           input:'',
           value: '',
@@ -221,7 +209,23 @@
         }
       },
       methods:{
-
+        getData(){   //初始化完成获取基本数据进行填充
+            let param={
+              uid:this.$store.state.userInfo.userid,
+              pid:JSON.parse(localStorage.getItem('pid'))
+            }
+              this.ajax
+                    .get(this.$store.state.api+'/GetProjectDetailMessage',param)
+                    .then(res=>{
+                      // console.log(res);
+                      let GetData=JSON.parse(res.data[0][0].chapters)
+                      console.log(GetData[1][1]);
+                      // this.data=GetData
+                      this.tableData=[GetData[1][0]]
+                    },err=>{
+                      console.log(err);
+                    })
+          },
         lookDetail(){
 
         },
@@ -237,6 +241,9 @@
         back(){
           this.$router.push('/ProjectManagement')
         }
+      },
+      mounted(){
+        this.getData()
       }
     }
 </script>

src/views/projectSettlement/projectSettlement.vue

@@ -132,9 +132,9 @@
           >
           <template #default="scope">
               <div class="operations">
-                        <el-button type="primary" class="bt1" size="mini" @click="details">详情</el-button>
-                        <el-button type="primary" class="bt1" size="mini">审核</el-button>
-                        <el-button type="primary" class="bt1" size="mini" @click="edit(scope.row.id,scope.row.status)"  style="background: #477edd">成果查看</el-button>
+                        <el-button type="primary" class="bt1" size="mini" @click="details">查看详情</el-button>
+                        <!-- <el-button type="primary" class="bt1" size="mini">审核</el-button> -->
+                        <el-button type="primary" class="bt1" size="mini" @click="edit(scope.row.id,scope.row.status)"  >成果查看</el-button>
               </div>
           </template>
         </el-table-column>
@@ -160,7 +160,7 @@
             budget:'200万',
             date:'2022年-11月-12日',
             tel:'16625153432',
-            state:'已审核',
+            state:'已结项',
           },
           {
             projectName:'北极运冰',
@@ -169,7 +169,7 @@
             budget:'500万',
             date:'2022年-11月-12日',
             tel:'16625153432',
-            state:'未审核',
+            state:'已结项',
           }
           ],
           pavalues:{