#

src/router/index.js

@@ -280,6 +280,8 @@ const routes = [{
 ]
 
 const router = new VueRouter({
+    mode: 'history',
+    base: process.env.BASE_URL,
     routes,
 })
 

src/views/firm.vue

@@ -182,7 +182,7 @@ export default {
   methods: {
     //展示文件
     checkFileType(url) {
-    
+    console.log(url );
     this.showFileUrl = url;
       this.showFile = true;
 

src/views/projectApply/components/projectApplicationApply.vue

@@ -65,6 +65,10 @@
                               <div class="label">联系电话</div>
                               <el-input type="number" v-model="data.select.tel"  @blur="getText(data.select.tel)" placeholder="请输入联系方式"></el-input>
                           </div>
+                          <div class="inpBlock">
+                              <div class="label">选择分类</div>
+                              <el-cascader v-model="pageType" style="width: 100%;" disabled :options="sortOptions" clearable></el-cascader>
+                          </div>
                       </div>
 
                       <div class="selectRight">
@@ -387,7 +391,7 @@
 <script>
     import BeUpload from "@/components/tool/beUpload.vue";
     export default { 
-      props:["data","next",'back','addPerson'],
+      props:["data","next",'pageType','addPerson'],
       components: {
         BeUpload,
       },
@@ -452,7 +456,30 @@
                       label: '入驻学校孵化基地的初创企业法人'
                     }
           ],
-
+          sortOptions: [      //选择分类下拉框数据
+                    {
+                      value:"",
+                      label: '',
+                      children: [{
+                        value: 0,
+                        label: '创意组',
+                      },
+                       {
+                        value: 1,
+                        label: '初创组',
+                      }
+                    ]}, 
+                    {
+                    value:"",
+                    label: '',
+                    children: [{
+                      value: 0,
+                      label: '已建设',
+                    }, {
+                      value: 1,
+                      label: '待建设',
+                    }]
+                  }],
         }
       },
       
@@ -620,7 +647,25 @@
             this.next();
         },
 
-       
+        getProjectTypeData(){  //获取项目立项申请基础信息页面分类数据
+              let param={
+                uid:this.$store.state.userInfo.userid
+              }
+                this.ajax
+                      .get(this.$store.state.api+'/SelectAllType',param)
+                      .then(res=>{
+                        // console.log(res.data[0]);
+                        let p=res.data[0]
+                        this.sortOptions[0].value=p[0].id
+                        this.sortOptions[0].label=p[0].name
+                        this.sortOptions[1].value=p[1].id
+                        this.sortOptions[1].label=p[1].name
+                        // console.log(pageType);
+                      },err=>{
+                        console.log(err);
+                      })
+            },
+            //立项基础信息页面删除功能在它自己页面人员信息
         toPage(val){
             if (val==1) {
               document.getElementById("1").scrollIntoView({ behavior: "smooth" });
@@ -637,6 +682,9 @@
             }
         }
       },
+      mounted(){
+        this.getProjectTypeData()
+      }
     }
 </script>
 

src/views/projectApply/projectApplicationApplyMain.vue

@@ -24,7 +24,7 @@
         <!-- 学生创客项目 5e21b204-c206-11ed-a4cd-509a4c5b67cf -->
         <!-- 特色创客空间建设项目 5f7a66d5-c206-11ed-a4cd-509a4c5b67cf -->
         <!-- <projectApplicationApply :data="projectApplicationApply1" :next="next"  :back="back"/> -->
-        <projectApplicationApply :data="projectApplicationApply1" :next="next"  :back="back" v-if="status==0 && pageType[0]=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"/>
+        <projectApplicationApply :data="projectApplicationApply1" :next="next"  :pageType="pageType" v-if="status==0 && pageType[0]=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"/>
         <projectApplicationApply2 :data="projectApplicationApply2" :next="next" :back="back" v-if="status==1 && pageType[0]=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'"/>
         <projectApplicationApply3 :data="projectApplicationApply3" :confirmSetFund="confirmSetFund" :data2="pageType[0]=='5e21b204-c206-11ed-a4cd-509a4c5b67cf'?projectApplicationApply1:MakerSpace" :next="next" :back="back" :submitBtn="submitBtn" v-show="status==2"/> 
 

src/views/projectManage/components/ProjectManagement4.vue

@@ -163,7 +163,7 @@
           checkFile(url) {
             this.showFileUrl = url;
             this.showFile = true;
-
+            // console.log(url);
             if(typeof url=='undefined')return {type:"",name:""};
                 let urlSplit = url.split(".");
                 const type = urlSplit[urlSplit.length-1]
@@ -179,6 +179,7 @@
                 else return this.Wordss={type:type,name:type}
           },
           getFile(val) {    //上传文件
+            console.log(val);
             this.file = val;
             let oldData = [];
             if (this.tableData!=null) {

src/views/resultShow/components/resultDetail_student.vue

@@ -284,7 +284,7 @@
                     </div>
                 </div>
                 <div class="BaseTitle" type="1">
-                    <span>预期成果</span>
+                    <span>实施计划</span>
                 </div>
                 <div class="brief">
                     <!-- <div class="brief_title" type="1.1">