yuanyiming преди 2 години
родител
ревизия
7da6671e48

+ 6 - 4
src/App.vue

@@ -93,6 +93,7 @@
         display: flex;
         font-size: 16px;
         display: flex;
+        border-radius: 5px;
         justify-content: center;
         align-items: center;
       }
@@ -124,11 +125,11 @@
       color: #fff !important;
       display: flex;
       position: absolute;
-      top: -6px;
+      top: -8px;
       right: 0;
       border-radius: 5px;
       box-sizing: border-box;
-      padding: 8px 0;
+      padding: 9px 0;
       justify-content: center;
       font-size: 16px;
       width: 100px;
@@ -164,9 +165,9 @@
           display: flex;
           position: absolute;
           right: 0;
-          top: -4px;
+          top: -7px;
           box-sizing: border-box;
-          padding: 8px 0;
+          padding: 9px 0;
           justify-content: center;
           font-size: 16px;
           width: 100px;
@@ -182,6 +183,7 @@
       flex-shrink: 0;
       [type='button']{
         font-size: 14px;
+        border-radius: 5px;
       }
     }
   }

BIN
src/assets/img/AlCClass.jpg


BIN
src/assets/img/catHome.png


BIN
src/assets/img/cocoClass.png


BIN
src/assets/img/color.png


+ 19 - 18
src/views/ProjectManagement.vue

@@ -83,7 +83,7 @@
         <div class="projectBlockPosition">
           {{ item.finish }}
         </div>
-        <img src='../assets/img/login-bg-autumn.jpg' alt="">
+        <img :src='item.pic' alt="">
         <div class="classBlock1">
             <div class="classBlock2">{{ item.projectName }}</div>
             <div class="classBlock3">
@@ -120,41 +120,42 @@
         return {
           input:'',
           items:[
-             
               {
                 finish:'已结题',
-                projectName:'疯狂星期四',
-                person:'袁一鸣',
-                school:'深技师',
+                pic:require('../assets/img/cocoClass.png'),
+                projectName:'濠江可可派社团课',
+                person:'刘丹璐',
+                school:'深圳技师学院',
                 blogs:'个人博客',
                 num:'JK123245679'
               },
               {
-                finish:'已结题',
-                projectName:'疯狂星期四',
-                person:'袁一鸣',
-                school:'深技师',
+                finish:'未结题',
+                projectName:'流浪猫救助屋',
+                person:'刘丹璐',
+                pic:require('../assets/img/catHome.png'),
+                school:'深圳技师学院',
                 blogs:'个人博客',
                 num:'JK123245679'
               },
               {
-                projectName:'疯狂星期四',
+                projectName:'人工智能领航班培训',
                 finish:'已结题',
-
-                person:'袁一鸣',
-                school:'深技师',
+                pic:require('../assets/img/AlCClass.jpg'),
+                person:'赖甲坎',
+                school:'深技师学院',
                 blogs:'个人博客',
                 num:'JK123245679'
               },
               {
-                projectName:'疯狂星期四',
+                projectName:'1216演奏小星星的',
                 finish:'已结题',
-
-                person:'袁一鸣',
-                school:'深技师',
+                pic:require('../assets/img/color.png'),
+                person:'郎朗',
+                school:'深技师学院',
                 blogs:'个人博客',
                 num:'JK123245679'
-              }
+              },
           ],
           options:[],
           options1:[],

+ 1 - 1
src/views/ProjectManagement1.vue

@@ -162,7 +162,7 @@
             label: '中德学院'
           }],
           value: '中德学院',
-          input:'3D智能演奏工具',
+          input:'',
           textarea:'',
           tableData:[{
             Name:'徐晓慧',

+ 11 - 6
src/views/ProjectManagement3.vue

@@ -24,6 +24,7 @@
         :data="tableData"
         tooltip-effect="dark"
         stripe
+        width="100%"
         class="fontSize"
         :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
         >
@@ -38,6 +39,7 @@
         <el-table-column
           prop="person"
           label="负责人"
+          min-width="60%"
           align="center"
           >
         </el-table-column>
@@ -45,12 +47,15 @@
         <el-table-column
           prop="relationProject"
           label="关联项目"
+          min-width="60%"
           align="center"
           >
         </el-table-column>
         <el-table-column
           prop="fund"
           label="预算经费"
+          min-width="30%"
+
           align="center"
           >
         </el-table-column>
@@ -73,7 +78,7 @@
           prop="operation"
           label="操作"
           align="center"
-          width="200"
+          width="220"
           >
           <template #default="scope">
               <div class="operations">
@@ -97,16 +102,16 @@
             section:'信通',
             date:'2022年11月12日',
             fund:'50k',
-            relationProject:'疯狂星期四',
-            person:'袁一鸣',
+            relationProject:'人工智能',
+            person:'姬发',
             },
             {
-              projectName:'创业孵化基地企业情况信息表',
+              projectName:'围棋培训',
               section:'信通',
               date:'2022年11月12日',
               fund:'50k',
-              relationProject:'疯狂星期四',
-              person:'袁一鸣',
+              relationProject:'围棋',
+              person:'柯洁',
             }
             ],
           }

+ 4 - 4
src/views/makerActvityApplyMain.vue

@@ -15,12 +15,12 @@ import makerActvityApply2 from './makerActvityApply2.vue';
                 status:0,
                 makerActvityApply:{
                     select:{
-                        projectName:'疯狂星期四',
-                        person:'袁一鸣',
-                        tel:'16625153432',
+                        projectName:'人工智能分链机器',
+                        person:'',
+                        tel:'',
                         date:'2023-11-12',
                         fund:'300000',
-                        value:'肯德基'
+                        value:''
                     },
                     introduce:'福利大放送',
 

+ 2 - 2
src/views/projectApplication.vue

@@ -192,7 +192,7 @@
           </div>
 
           <div class="diaTit1">
-            <div class="spans1">撤回意见</div>
+            <div class="spans1" style="position: relative;top:-20px">撤回意见</div>
             <div>
               <el-input
                 type="textarea"
@@ -382,7 +382,7 @@
           overflow: hidden;
         }
         .el-dialog__body{
-          padding:30px 0px 30px 90px ;
+          padding:30px 0px 30px 70px ;
         }
         
         .el-dialog__header{

+ 2 - 2
src/views/projectApplicationApply3.vue

@@ -196,7 +196,7 @@
       </div>
       <div class="dialogTop">
           <div class="dagSpan">项目类型</div>
-          <el-select v-model="data.dialog.type" placeholder="请选择">
+          <el-select v-model="data.dialog.value" placeholder="请选择">
             <el-option
               v-for="item in data.dialog.typeOptions"
               :key="item.value"
@@ -213,7 +213,7 @@
       <div class="dagInpS">
         <div class="dagInpS1">
           <div class="dagSpan">支出类别</div>
-          <el-input v-model="data.dialog.sort" placeholder="请输入内容"></el-input>
+          <el-input v-model="data.dialog.type" placeholder="请输入内容"></el-input>
         </div>
         <div class="dagInpS1">
           <div class="dagSpan">支出项目</div>

+ 15 - 15
src/views/projectApplicationApplyMain.vue

@@ -66,12 +66,12 @@
             submitHint:false,
             projectApplicationApply1:{   //立项基础信息
                 select:{
-                  projectName:'疯狂星期四',
-                  person:'袁一鸣',
+                  projectName:'人工智能分链机器',
+                  person:'',
                   Data:'2023-3-2',
                   value:"中德学院",
                   fund:'300000',
-                  tel:'16625153232',
+                  tel:'',
                   value1:"2023-11-12"
                 },
                 options: [{
@@ -85,7 +85,7 @@
                 ],
                 textarea:'每周星期四为活动时间',
                 Member:{
-                    name:'袁一鸣',
+                    name:'伯邑考',
                     Class:'21通信',
                     phone:'1234567898'
                 },
@@ -95,18 +95,18 @@
                     tel:'13751177411',
                   },
                   {
-                    Name:'铠甲',
+                    Name:'张扬',
                     Class:'22电子通信G5',
                     tel:'13751177411',
                   },
                 ],
             },
             projectApplicationApply2:{  //项目内容
-                contentOne:'疯狂星期四',
-                contentTwo:'疯狂星期四',
-                contentThree:'疯狂星期四',
-                contentFour:'疯狂星期四',
-                contentFive:'疯狂星期四',
+                contentOne:'',
+                contentTwo:'',
+                contentThree:'',
+                contentFour:'',
+                contentFive:'',
             },
             projectApplicationApply3:{  //预算经费
                 fund:"1000",
@@ -127,14 +127,14 @@
                 ],
                 //对话框
                 dialog:{
-                  textarea:'谁请我吃?',
+                  textarea:'',
                   fund:'300000',
                   content:'',
                   value: '',   //下拉框
-                  disburseProject:'肯德基',
-                  sort:'餐饮',
-                  type:'第三产业',
-                  projectName:'疯狂星期四',
+                  disburseProject:'Al智能生活',
+                  sort:'',
+                  type:'智能家居',
+                  projectName:'Al智能生活',
                   nameOptions: [ 
                   {
                     value: '1',

+ 37 - 34
src/views/resultsShow.vue

@@ -82,7 +82,7 @@
         <div class="projectBlockPosition">
           {{ item.finish }}
         </div>
-        <img src='../assets/img/login-bg-autumn.jpg' alt="">
+        <img :src='item.pic' alt="">
         <div class="classBlock1">
             <div class="classBlock2">{{ item.projectName }}</div>
             <div class="classBlock3">
@@ -118,39 +118,42 @@
         return {
           input:'',
           items:[
-           
-            {
-              finish:'已结题',
-              projectName:'吃饭',
-              person:"袁一鸣",
-              school:"通信学院",
-              blogs:"个人创客",
-              num:"JK006641123"
-            },
-            {
-              finish:'已结题',
-              projectName:'吃饭',
-              person:"袁一鸣",
-              school:"通信学院",
-              blogs:"个人创客",
-              num:"JK006641123"
-            },
-            {
-              finish:'已结题',
-              projectName:'吃饭',
-              person:"袁一鸣",
-              school:"通信学院",
-              blogs:"个人创客",
-              num:"JK006641123"
-            },
-            {
-              finish:'已结题',
-              projectName:'吃饭',
-              person:"袁一鸣",
-              school:"通信学院",
-              blogs:"个人创客",
-              num:"JK006641123"
-            },
+              {
+                finish:'已结题',
+                pic:require('../assets/img/cocoClass.png'),
+                projectName:'濠江可可派社团课',
+                person:'刘丹璐',
+                school:'深圳技师学院',
+                blogs:'个人博客',
+                num:'JK123245679'
+              },
+              {
+                finish:'未结题',
+                projectName:'流浪猫救助屋',
+                person:'刘丹璐',
+                pic:require('../assets/img/catHome.png'),
+                school:'深圳技师学院',
+                blogs:'个人博客',
+                num:'JK123245679'
+              },
+              {
+                projectName:'人工智能领航班培训',
+                finish:'已结题',
+                pic:require('../assets/img/AlCClass.jpg'),
+                person:'赖甲坎',
+                school:'深圳技师学院',
+                blogs:'个人博客',
+                num:'JK123245679'
+              },
+              {
+                projectName:'1216演奏小星星的',
+                finish:'已结题',
+                pic:require('../assets/img/color.png'),
+                person:'郎朗',
+                school:'深圳技师学院',
+                blogs:'个人博客',
+                num:'JK123245679'
+              },
           ], //项目展示小方块
           options:[],
           options1:[],