Ver Fonte

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

yuanyiming há 1 ano atrás
pai
commit
2f6eb4f752
2 ficheiros alterados com 257 adições e 155 exclusões
  1. 255 154
      src/components/MakerSpaceWord.vue
  2. 2 1
      src/views/test.vue

+ 255 - 154
src/components/MakerSpaceWord.vue

@@ -15,15 +15,8 @@
               placeholder="请输入项目名称"
               v-model="wordData['projectName']">
             </el-input>
-            <!-- <editableDiv v-model="wordData['projectName']"/> -->
-            <!-- {{wordData['projectName']}} -->
-            <!-- <div class="InputDiv" contenteditable="true" v-text="wordData['projectName']" v-editableDiv="wordData['projectName']"></div> -->
-            <!-- <el-input v-model="wordData['projectName']"></el-input> -->
         </div>
           <div class="label">所在学院</div><div class="value">
-            <!-- <div class="InputDiv" contenteditable="true" v-text="wordData['college']"></div> -->
-            <!-- <el-input v-model="wordData['college']"></el-input> -->
-            <!-- {{wordData['college']}} -->
             <el-select v-model="wordData['college']" style="width: 100%;" placeholder="请选择所在学院">
               <el-option
                 v-for="item in DepartmentData"
@@ -40,13 +33,11 @@
             <div class="statusHan">
               <div class="DescribeLabel">
                 <el-radio v-model="wordData['state']" label="00a3aa2f-f51e-11ed-a3f6-509a4c5b67cf">已建设</el-radio>
-                <!-- <el-checkbox v-model="wordData['ing']" @click.stop="changeState('00a3aa2f-f51e-11ed-a3f6-509a4c5b67cf')">已建设</el-checkbox> -->
             </div><div class="DescribeValue">指二级学院已获得政府或学校资助(例:设计学院、信通学院、珠宝学院),已有双创空间(创客实践室)场地、设备设施并已投入运营,需对空间环境优化、规章制度建设、小型设施设备添置、创客项目物料增补,需拓展创客项目培训、辅导,创客讲座、沙龙、论坛,创客路演、竞赛、集市及成果参评、参展等方面的工作而提出的资助申请。</div>
             </div>
             <div class="statusHan">
               <div class="DescribeLabel">
                 <el-radio v-model="wordData['state']" label="04692ef6-f51e-11ed-a3f6-509a4c5b67cf">待建设</el-radio>
-                <!-- <el-checkbox v-model="wordData['ed']" @click.stop="changeState('04692ef6-f51e-11ed-a3f6-509a4c5b67cf')">待建设</el-checkbox> -->
             </div><div class="DescribeValue">指二级学院拟立项开展学院特色创客空间建设项目,需进行项目前期调研论证、场馆规划、空间图纸设计、设备选型等方面的工作而进行的资助申请。</div>
             </div>
           </div>
@@ -60,8 +51,6 @@
               placeholder="请选择项目开始时间"
               value-format="yyyy-MM-dd HH:mm:ss">
             </el-date-picker>
-            <!-- <div class="InputDiv" contenteditable="true" v-text="wordData['begin_at']"></div> -->
-            <!-- {{wordData['begin_at']}} -->
           </div>
           <div class="label">计划完成时间</div><div class="value">
             <el-date-picker
@@ -71,7 +60,6 @@
               prefix-icon="none"
               value-format="yyyy-MM-dd HH:mm:ss">
             </el-date-picker>
-            <!-- {{wordData['plannedEnd_at']}} -->
           </div>
         </div>
         <div class="han">
@@ -83,9 +71,6 @@
               placeholder="请输入项目负责人"
               v-model="wordData['pro_leader']">
             </el-input>
-            <!-- {{wordData['pro_leader']}} -->
-            <!-- <editableDiv v-model="wordData['pro_leader']"/> -->
-            <!-- <div class="InputDiv" contenteditable="true" v-text="wordData['pro_leader']"></div> -->
           </div>
           <div class="label">学院牵头领导</div><div class="value">
             <el-input
@@ -95,9 +80,6 @@
               placeholder="请输入学院牵头领导"
               v-model="wordData['lead_leader']">
             </el-input>
-            <!-- <editableDiv v-model="wordData['lead_leader']"/> -->
-            <!-- <div class="InputDiv" contenteditable="true" v-text="wordData['lead_leader']"></div> -->
-            <!-- {{wordData['lead_leader']}} -->
           </div>
         </div>
         <div class="han">
@@ -112,7 +94,6 @@
             <span>(团队3人以上,</span>
             <span>至少应包含1名教</span>
             <span>研室主任)</span>
-            <!-- 项目组<br/>教师团队<br/>(团队3人以上,<br/>至少应包含1名教<br/>研室主任) -->
           </div>
           <div class="memberTable" :style="wordData['teacher'].length<4?'border-bottom:solid 1px black':''">
             <div class="memberHan">
@@ -122,6 +103,7 @@
               <div class="memberValue">学历</div>
               <div class="memberValue">所在教研室</div>
               <div class="memberValue">项目组角色分工</div>
+              <div></div>
             </div>
             <div class="memberHan" v-for="(item,index) in wordData['teacher']" :key="index">
               <div class="memberValue">
@@ -129,66 +111,58 @@
                   type="textarea"
                   autosize
                   resize="none"
+                  placeholder="姓名"
                   v-model="item['name']">
                 </el-input>
-                <!-- <editableDiv v-model="item['name']"/> -->
-                <!-- <div class="InputDiv" contenteditable="true">{{ item['name'] }}</div> -->
-                <!-- {{item['name']}} -->
               </div>
               <div class="memberValue">
                 <el-input
                   type="textarea"
                   autosize
                   resize="none"
+                  placeholder="专业"
                   v-model="item['speciality']">
                 </el-input>
-                <!-- <editableDiv v-model="item['speciality']"/> -->
-                <!-- <div class="InputDiv" contenteditable="true">{{ item['speciality'] }}</div> -->
-                <!-- {{item['speciality']}} -->
               </div>
               <div class="memberValue">
                 <el-input
                   type="textarea"
                   autosize
                   resize="none"
+                  placeholder="职称"
                   v-model="item['title']">
                 </el-input>
-                <!-- <editableDiv v-model="item['title']"/> -->
-                <!-- <div class="InputDiv" contenteditable="true" v-text="item['title']"></div> -->
-                <!-- {{item['title']}} -->
               </div>
               <div class="memberValue">
                 <el-input
                   type="textarea"
                   autosize
                   resize="none"
+                  placeholder="学历"
                   v-model="item['education']">
                 </el-input>
-                <!-- <editableDiv v-model="item['education']"/> -->
-                <!-- <div class="InputDiv" contenteditable="true" v-text="item['education']"></div> -->
-                <!-- {{ item['education'] }} -->
               </div>
               <div class="memberValue">
                 <el-input
                   type="textarea"
                   autosize
                   resize="none"
+                  placeholder="教研室"
                   v-model="item['section']">
                 </el-input>
-                <!-- <editableDiv v-model="item['section']"/> -->
-                <!-- <div class="InputDiv" contenteditable="true" v-text="item['section']"></div> -->
-                <!-- {{ item['section'] }} -->
               </div>
               <div class="memberValue">
                 <el-input
                   type="textarea"
                   autosize
                   resize="none"
+                  placeholder="项目组角色分工"
                   v-model="item['work']">
                 </el-input>
-                <!-- <editableDiv v-model="item['work']"/> -->
-                <!-- <div class="InputDiv" contenteditable="true" v-text="item['work']"></div> -->
-                <!-- {{ item['work'] }} -->
+              </div>
+              <div class="operate">
+                <el-button @click="addTeacher" v-if="wordData['teacher'].length==index+1" type="primary" size="mini">+</el-button>
+                <el-button v-if="wordData['teacher'].length!=1" @click="DelTeacher(index)" type="primary" size="mini">-</el-button>
               </div>
             </div>
           </div>
@@ -200,7 +174,6 @@
             <span>(团队5人以上,</span>
             <span>学生团队年级结构</span>
             <span>安排合理)</span>
-            <!-- 项目组<br/>教师团队<br/>(团队3人以上,<br/>至少应包含1名教<br/>研室主任) -->
           </div>
           <div class="memberTable" :style="wordData['student'].length<4?'border-bottom:solid 1px black':''">
             <div class="memberHan">
@@ -208,6 +181,7 @@
               <div class="memberValue">班级</div>
               <div class="memberValue">年龄</div>
               <div class="memberValue">项目组角色分工</div>
+              <div></div>
             </div>
             <div class="memberHan" v-for="(item,index) in wordData['student']" :key="index">
               <div class="memberValue">
@@ -215,44 +189,40 @@
                   type="textarea"
                   autosize
                   resize="none"
+                  placeholder="姓名"
                   v-model="item['name']">
                 </el-input>
-                <!-- <editableDiv v-model="item['name']"/> -->
-                <!-- <div class="InputDiv" contenteditable="true">{{item['name']}}</div> -->
-                <!-- {{item['name']}} -->
               </div>
               <div class="memberValue">
                 <el-input
                   type="textarea"
                   autosize
+                  placeholder="班级"
                   resize="none"
                   v-model="item['class']">
                 </el-input>
-                <!-- <editableDiv v-model="item['class']"/> -->
-                <!-- <div class="InputDiv" contenteditable="true" v-text="item['class']"></div> -->
-                <!-- {{ item['class'] }} -->
               </div>
               <div class="memberValue">
                 <el-input
                   type="textarea"
                   autosize
                   resize="none"
+                  placeholder="年龄"
                   v-model="item['age']">
                 </el-input>
-                <!-- <editableDiv v-model="item['age']"/> -->
-                <!-- <div class="InputDiv" contenteditable="true" v-text="item['age']"></div> -->
-                <!-- {{ item['age'] }} -->
               </div>
               <div class="memberValue">
                 <el-input
                   type="textarea"
                   autosize
                   resize="none"
+                  placeholder="项目组角色分工"
                   v-model="item['work']">
                 </el-input>
-                <!-- <editableDiv v-model="item['work']"/> -->
-                <!-- <div class="InputDiv" contenteditable="true" v-text="item['work']"></div> -->
-                <!-- {{item['work']}} -->
+              </div>
+              <div class="operate">
+                <el-button @click="addStudent" v-if="wordData['student'].length==index+1" type="primary" size="mini">+</el-button>
+                <el-button @click="DelStudent(index)" v-if="wordData['student'].length!=1"  type="primary" size="mini">-</el-button>
               </div>
             </div>
           </div>
@@ -273,7 +243,6 @@
                   maxlength="300"
                   v-model="wordData['brief']">
                 </el-input>
-                <!-- {{wordData['brief']}} -->
               </div>
               <div class="chaptersValue">
                 <span>建设内容(空间优化/场馆规划方面拟解决的关键问题及主要建设指标)</span><br/>
@@ -284,7 +253,6 @@
                   resize="none"
                   v-model="wordData['Construction']">
                 </el-input>
-                <!-- {{wordData['Construction']}} -->
               </div>
           </div>
         </div>
@@ -302,7 +270,6 @@
                   resize="none"
                   v-model="wordData['ProjectBasis']">
                 </el-input>
-                <!-- {{wordData['ProjectBasis']}} -->
               </div>
           </div>
         </div>
@@ -320,11 +287,9 @@
                   resize="none"
                   v-model="wordData['development']">
                 </el-input>
-                <!-- {{wordData['development']}} -->
               </div>
               <div class="chaptersValue">
                 <span>学生创客工作室建设情况(工作室数量及活动开展情况)</span><br/>
-                <!-- {{wordData['studio']}} -->
                 <el-input
                   type="textarea"
                   class="noCenter"
@@ -335,7 +300,6 @@
               </div>
               <div class="chaptersValue">
                 <span>学生创客团队(人才)培养预期成果、数量</span><br/>
-                <!-- {{wordData['studentTeam']}} -->
                 <el-input
                   type="textarea"
                   class="noCenter"
@@ -346,7 +310,6 @@
               </div>
               <div class="chaptersValue">
                 <span>学生创客活动组织实施情况</span><br/>
-                <!-- {{wordData['studentActivities']}} -->
                 <el-input
                   type="textarea"
                   class="noCenter"
@@ -357,7 +320,6 @@
               </div>
               <div class="chaptersValue">
                 <span>学生创客团队孵化、转化创业项目情况</span><br/>
-                <!-- {{wordData['Transforming']}} -->
                 <el-input
                   type="textarea"
                   class="noCenter"
@@ -385,7 +347,6 @@
           <div class="chaptersTable">
               <div class="chaptersValue">
                 <span>基础条件(物理环境/设备设施/项目实施/活动开展/技术力量/社会资源)</span><br/>
-                <!-- {{wordData['condition']}} -->
                 <el-input
                   type="textarea"
                   class="noCenter"
@@ -397,14 +358,14 @@
           </div>
         </div>
 
-        <div class="fund" v-for="(item,index) in wordData['fund']" :key="index">
+        <div class="fund">
           <div class="fundTitle">
             预算<br/>经费
           </div>
           <div class="fundTable">
             <div class="fundTotal">
               <div class="fundLabel">总经费</div>
-              <div class="fundValue">{{item['total']}}元</div>
+              <div class="fundValue">{{wordData['fund']['device']+wordData['fund']['Material']+wordData['fund']['processing']+wordData['fund']['Collaboration']+wordData['fund']['APPRAISAL']+wordData['fund']['entery']+wordData['fund']['activities']+wordData['fund']['Transaction']}}元</div>
             </div>
             <div class="fundHeader">
               <div class="HeaderLabel">支出类别</div>
@@ -417,26 +378,58 @@
               <div class="fundDataHan">
                 <div class="fundDataLie">
                   <div class="fundDataValue">小型仪器设备费</div>
-                  <div class="fundDataValue">{{ item['device'] }}</div>
-                  <div class="fundDataValue">{{item['deviceRemarks']}}</div>
+                  <div class="fundDataValue">
+                    <el-input
+                      type="textarea"
+                      autosize
+                      resize="none"
+                      placeholder="小型仪器设备费"
+                      v-model.number="wordData['fund']['device']"
+                      @change="convertNumber('device',wordData['fund']['device'])"></el-input>
+                  </div>
+                  <div class="fundDataValue"><span>项目开展所需的小型专用仪器设备、工具、配件购置或租赁费用。</span></div>
                 </div>
 
                 <div class="fundDataLie">
                   <div class="fundDataValue">材料费</div>
-                  <div class="fundDataValue">{{ item['Material'] }}</div>
-                  <div class="fundDataValue">{{ item['MaterialRemarks'] }}</div>
+                  <div class="fundDataValue">
+                    <el-input
+                      type="textarea"
+                      autosize
+                      resize="none"
+                      placeholder="材料费"
+                      v-model.number="wordData['fund']['Material']"
+                      @change="convertNumber('Material',wordData['fund']['Material'])"></el-input>
+                  </div>
+                  <div class="fundDataValue"><span>项目开展需消耗的各种原材料、辅助材料等低值易耗品的采购费用。</span></div>
                 </div>
 
                 <div class="fundDataLie">
                   <div class="fundDataValue">测试化验加工费</div>
-                  <div class="fundDataValue">{{item['processing']}}</div>
-                  <div class="fundDataValue">{{item['processingRemarks']}}</div>
+                  <div class="fundDataValue">
+                    <el-input
+                      type="textarea"
+                      autosize
+                      resize="none"
+                      placeholder="测试化验加工费"
+                      v-model.number="wordData['fund']['processing']"
+                      @change="convertNumber('processing',wordData['fund']['processing'])"></el-input>
+                  </div>
+                  <div class="fundDataValue"><span>项目开展过程中支付给外单位的检验、测试、化验、计算、分析及加工费等费用。</span></div>
                 </div>
 
                 <div class="fundDataLie">
                   <div class="fundDataValue">项目协作费</div>
-                  <div class="fundDataValue">{{item['Collaboration']}}</div>
-                  <div class="fundDataValue">{{item['CollaborationRemarks']}}</div>
+                  <div class="fundDataValue">
+                    <el-input
+                      type="textarea"
+                      autosize
+                      resize="none"
+                      placeholder="项目协作费"
+                      v-model.number="wordData['fund']['Collaboration']"
+                      @change="convertNumber('Collaboration',wordData['fund']['Collaboration'])"></el-input>
+                  </div>
+                  <div class="fundDataValue"><span>按合同规定支付给协作单位的费用</span></div>
                 </div>
                
               </div>
@@ -447,33 +440,64 @@
               <div class="fundDataHan">
                 <div class="fundDataLie">
                   <div class="fundDataValue">项目成果鉴定费</div>
-                  <div class="fundDataValue">{{item['APPRAISAL']}}</div>
-                  <div class="fundDataValue">{{item['APPRAISALRemarks']}}</div>
+                  <div class="fundDataValue">
+                    <el-input
+                      type="textarea"
+                      autosize
+                      resize="none"
+                      placeholder="项目成果鉴定费"
+                      v-model.number="wordData['fund']['APPRAISAL']"
+                      @change="convertNumber('APPRAISAL',wordData['fund']['APPRAISAL'])"></el-input>
+                  </div>
+                  <div class="fundDataValue"><span>学术会务费、评审费、鉴定费、成果集制作费等费用。</span></div>
                 </div>
 
                 <div class="fundDataLie">
                   <div class="fundDataValue">参展参赛费</div>
-                  <div class="fundDataValue">{{item['entery']}}</div>
-                  <div class="fundDataValue">{{item['enteryRemarks']}}</div>
+                  <div class="fundDataValue">
+                    <el-input
+                      type="textarea"
+                      autosize
+                      resize="none"
+                      placeholder="参展参赛费"
+                      v-model.number="wordData['fund']['entery']"
+                      @change="convertNumber('entery',wordData['fund']['entery'])"></el-input>
+                  </div>
+                  <div class="fundDataValue"><span>参加创客展会、竞赛等所需的报名费、展位费、布展费、宣传推广费及差旅费等费用。</span></div>
                 </div>
 
                 <div class="fundDataLie">
                   <div class="fundDataValue">创客交流活动费</div>
-                  <div class="fundDataValue">{{item['activities']}}</div>
-                  <div class="fundDataValue">{{item['activitiesRemarks']}}</div>
+                  <div class="fundDataValue">
+                    <el-input
+                      type="textarea"
+                      autosize
+                      resize="none"
+                      placeholder="创客交流活动费"
+                      v-model.number="wordData['fund']['activities']"
+                      @change="convertNumber('activities',wordData['fund']['activities'])"></el-input>
+                  </div>
+                  <div class="fundDataValue"><span>创客交流活动中支付给校外专家的指导费、咨询费、授课费等费用。</span></div>
                 </div>
 
                 <div class="fundDataLie">
                   <div class="fundDataValue">知识产权事务费</div>
-                  <div class="fundDataValue">{{item['Transaction']}}</div>
-                  <div class="fundDataValue">{{item['TransactionRemarks']}}</div>
+                  <div class="fundDataValue">
+                    <el-input
+                      type="textarea"
+                      autosize
+                      resize="none"
+                      placeholder="知识产权事务费"
+                      v-model.number="wordData['fund']['Transaction']"
+                      @change="convertNumber('Transaction',wordData['fund']['Transaction'])">
+                    </el-input>
+                  </div>
+                  <div class="fundDataValue"><span>论文版面费、专利及其他知识产权事务等费用。</span></div>
                 </div>
-               
               </div>
             </div>
           </div>
         </div>
-
         <div class="opinion">
           <div class="opinionLabel">所在学院/部门<br/> 意 见</div>
           <div class="opinionValue">
@@ -511,23 +535,6 @@
         <span>2.项目申报需附相关佐证材料。</span>
       </div>
       <el-button @click="test">测试</el-button>
-    <!-- <table id="tableData" border="1px" cellpadding="7" cellspacing="0">
-        <tr>
-            <td width="15%" colspan="1">项目名称</td>
-            <td width="45%" colspan="3">XX学院XX(名称)特色创客空间建设</td>
-            <td >所在学院</td>
-            <td colspan="2">xxxxxxxxxxxxxx</td>
-        </tr>
-        <tr>
-            <td width="15%" colspan="1" rowspan="2">项目状态</td>
-            <td width="15%" colspan="1">口已建设</td>
-            <td colspan="5">指二级学院已获得政府或学校资助(例:设计学院、信通学院、珠宝学院),已有双创空间(创客实践室)场地、设备设施并已投入运营,需对空间环境优化、规章制度建设、小型设施设备添置、创客项目物料增补,需拓展创客项目培训、辅导,创客讲座、沙龙、论坛,创客路演、竞赛、集市及成果参评、参展等方面的工作而提出的资助申请。</td>
-        </tr>
-        <tr>
-            <td width="15%" colspan="1">口待建设</td>
-            <td colspan="5">指二级学院拟立项开展学院特色创客空间建设项目,需进行项目前期调研论证、场馆规划、空间图纸设计、设备选型等方面的工作而进行的资助申请。</td>
-        </tr>
-    </table> -->
 </div>
 </template>
   
@@ -553,16 +560,16 @@
           studentNum:"",//参与学生人数
           teacher:[
               {name:"",speciality:"",title:"",education:"",section:"",work:""},
-              {name:"",speciality:"",title:"",education:"",section:"",work:""},
-              {name:"",speciality:"",title:"",education:"",section:"",work:""},
-              {name:"",speciality:"",title:"",education:"",section:"",work:""},
+              // {name:"",speciality:"",title:"",education:"",section:"",work:""},
+              // {name:"",speciality:"",title:"",education:"",section:"",work:""},
+              // {name:"",speciality:"",title:"",education:"",section:"",work:""},
               // {name:"",speciality:"",title:"",education:"",section:"",work:""},
           ],   //教师组//name:姓名  speciality:专业  title:职称 education:学历    section:所在教研室    work:项目组角色分工
           student:[
               {name:"",class:"",age:"",work:""},
-              {name:"",class:"",age:"",work:""},
-              {name:"",class:"",age:"",work:""},
-              {name:"",class:"",age:"",work:""},
+              // {name:"",class:"",age:"",work:""},
+              // {name:"",class:"",age:"",work:""},
+              // {name:"",class:"",age:"",work:""},
               // {name:"",class:"",age:"",work:""},
           ],   //学生组//name:姓名    class:班级 age:年龄   work:项目组任务分工
           brief:"",//项目简介
@@ -574,7 +581,16 @@
           studentActivities:"",//学生创客活动组织实施情况
           Transforming:"",//学生创客团队孵化、转化创业项目情况
           condition:"",//立 项基 础及条 件
-          fund:[],//预算经费
+          fund:{
+            device:"",
+            Material:"",
+            processing:"",
+            Collaboration:"",
+            APPRAISAL:"",
+            entery:"",
+            activities:"",
+            Transaction:"",
+          },//预算经费
           //total:总经费     
           //小型仪器设备费:device        deviceRemarks
           //材料费:Material             MaterialRemarks
@@ -600,33 +616,26 @@
       },
       test(){
         console.log(this.wordData)
+      },
+      addTeacher(){
+        this.wordData['teacher'].push({name:"",speciality:"",title:"",education:"",section:"",work:""});
+      },
+      DelTeacher(index){
+        this.wordData['teacher'].splice(index,1)
+      },
+      addStudent(){
+        this.wordData['student'].push({name:"",class:"",age:"",work:""});
+      },
+      DelStudent(index){
+        this.wordData['student'].splice(index,1)
+      },
+      convertNumber(type,str){
+        if(typeof str=='string'){
+          this.wordData['fund'][type] = Number(str.replace(/\D/g,''));
+        }
+        
       }
     },
-    // directives:{
-    //   editableDiv:{
-    //     bind(el,binding){
-    //       // 将初始数据赋值给元素的innerHTML
-    //       // el.innerText = binding.value;
-    //       // 监听元素的input事件,在输入时更新数据
-    //       console.log(this)
-    //       el.addEventListener('input',(event)=>{
-    //         console.log(el.innerText)
-    //         console.log(binding.value)
-    //         if (el.innerText !== binding.value) {
-    //           binding.value = el.innerText;
-    //           // this.wordData['projectName'] = el.innerText
-    //           el.dispatchEvent(new Event('input'));
-    //         }
-    //       });
-    //     },
-    //     update(el,binding){
-    //       //更新数据时更新元素的innerText
-    //       if(binding.value!==el.innerText){
-    //         el.innerText = binding.value;
-    //       }
-    //     }
-    //   }
-    // },
     mounted(){
       this.getProjectDepartmentData();
     }
@@ -640,13 +649,15 @@
     flex-direction: column;
     align-items: center;
     background-color: white;
+    padding:100px;
+    box-sizing:border-box;
     #title{
         width: 100%;
         display: flex;
         flex-direction: column;
         align-items: center;
         position: relative;
-        margin-top: 40px;
+        // margin-top: 40px;
         .school{
             font-size: 2.5em;
             font-weight: bold;
@@ -717,7 +728,6 @@
         justify-content: center;
         align-items: center;
         box-sizing: border-box;
-        // padding: 3.5px;
         border-right: solid 1px black;
         border-bottom: solid 1px black;
       }
@@ -762,7 +772,6 @@
         align-items: center;
         justify-content: center;
         box-sizing: border-box;
-        // padding: 3.5px;
         border-right: solid 1px black;
         border-bottom: solid 1px black;
         min-height: 200px;
@@ -775,8 +784,8 @@
           display: flex;
           box-sizing: border-box;
           border-bottom: solid 1px black;
+          position:relative;
           .memberValue{
-            // padding: 10px;
             box-sizing: border-box;
             flex: 1;
             display: flex;
@@ -784,11 +793,26 @@
             align-items: center;
             border-right: solid 1px black;
             min-height: 45px;
-            &:nth-last-child(1){
+            &:nth-last-child(2){
               border-right: none;
               flex: 3;
             }
-
+          }
+          .operate{
+            right:-100px;
+            width:100px;
+            height:40px;
+            display:flex;
+            // justify-content:center;
+            align-items:center;
+            position:absolute;
+            .el-button{
+              max-width:10px;
+              display:flex;
+              justify-content:center;
+              align-items:center;
+              margin-left:10px;
+            }
           }
         }
       }
@@ -822,6 +846,67 @@
         }
       }
     }
+    // .fund{
+    //   display: flex;
+    //   .fundTitle{
+    //     flex: 1;
+    //     display: flex;
+    //     justify-content: center;
+    //     align-items: center;
+    //     border-right:solid 1px black ;
+    //     border-bottom:solid 1px black ;
+    //   }
+    //   .fundTable{
+    //     flex: 5;
+    //     display: flex;
+    //     flex-direction: column;
+    //     .fundTotal{
+    //       min-height: 80px;
+    //       box-sizing: border-box;
+    //       border-bottom: solid 1px black;
+    //       font-weight: bold;
+    //       display: flex;
+    //       justify-content: center;
+    //       align-items: center;
+    //       .fundLabel{
+    //         flex: 1.5;
+    //         box-sizing: border-box;
+    //         border-right: solid 1px black;
+    //       }
+    //       .fundValue{
+    //         flex: 7;
+    //       }
+    //       div{
+    //         height: 100%;
+    //         display: flex;
+    //         justify-content: center;
+    //         align-items: center;
+    //       }
+    //     }
+    //     .fundHeader{
+    //       width: 100%;
+    //       display: flex;
+    //       min-height: 50px;
+    //       box-sizing: border-box;
+    //       border-bottom: solid 1px black;
+    //       .HeaderLabel{
+    //         flex: 2;
+    //         box-sizing: border-box;
+    //         border-right: solid 1px black;
+    //         display: flex;
+    //         justify-content: center;
+    //         align-items: center;
+    //         &:nth-of-type(1){
+    //           flex: 1.5;
+    //         }
+    //         &:nth-last-of-type(1){
+    //           flex: 3;
+    //           border:none;
+    //         }
+    //       }
+    //     }
+    //   }
+    // }
     .fund{
       display: flex;
       .fundTitle{
@@ -831,7 +916,6 @@
         align-items: center;
         justify-content: center;
         box-sizing: border-box;
-        // padding: 3.5px;
         border-right: solid 1px black;
         border-bottom: solid 1px black;
       }
@@ -839,6 +923,7 @@
         flex: 5;
         display: flex;
         flex-direction: column;
+        box-sizing: border-box;
         .fundTotal{
           height: 60px;
           box-sizing: border-box;
@@ -852,6 +937,7 @@
           }
           .fundLabel{
             flex: 1;
+            box-sizing: border-box;
             border-right:solid 1px black;
           }
           .fundValue{
@@ -866,6 +952,7 @@
           .HeaderLabel{
             flex: 1;
             display: flex;
+            box-sizing: border-box;
             justify-content: center;
             align-items: center;
             border-right: solid 1px black;
@@ -893,20 +980,24 @@
             .fundDataLie{
               display: flex;
               min-height: 40px;
+              flex: 4;
               box-sizing: border-box;
               border-bottom: solid 1px black;
               .fundDataValue{
                 flex: 1;
+                min-height: 40px;
                 display: flex;
-                justify-content: center;
-                align-items:center;
                 box-sizing: border-box;
-                border-right:solid 1px black;
+                justify-content: center;
+                align-items: center;
+                border-right: solid 1px black;
                 &:nth-last-child(1){
                   flex:2;
-                  justify-content: flex-start;
                   border: none;
-                  text-indent: 1em;
+                  justify-content: flex-start;
+                  span{
+                    padding: 10px 20px;
+                  }
                 }
               }
             }
@@ -914,6 +1005,16 @@
         }
       }
     }
+    // .fundTable{
+    //   tr{
+    //     td{
+    //       height: 50px;
+    //     }
+    //     &:nth-child(1){
+    //       flex: 1;
+    //     }
+    //   }
+    // }
     .opinion{
       display: flex;
       .opinionLabel{
@@ -989,19 +1090,19 @@
     width: 100%;
     height: 100%;
   }
-  .InputDiv{
-    width: 100%;
-    height: 100%;
-    word-break: break-all;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    box-sizing: border-box;
-    padding: 10px;
-    outline: none;
-    &:focus{
-      border:solid 1px #409eff ;
-    }
-  }
+  // .InputDiv{
+  //   width: 100%;
+  //   height: 100%;
+  //   word-break: break-all;
+  //   display: flex;
+  //   justify-content: center;
+  //   align-items: center;
+  //   box-sizing: border-box;
+  //   padding: 10px;
+  //   outline: none;
+  //   &:focus{
+  //     border:solid 1px #409eff ;
+  //   }
+  // }
 }
 </style>

+ 2 - 1
src/views/test.vue

@@ -51,10 +51,11 @@ export default {
 #test{
   width: 100vw;
   display: flex;
+  background:blue;
   justify-content: center;
 }
 #word{
-  width: 1000px;
+  width: 1200px;
   height: auto;
 }
 </style>