王子文 专项培养

ui/src/views/training/spec/seasonalfeedback/index.vue

@@ -68,17 +68,17 @@
           border
           :cell-style="tableCellStyle"
         >
-          <el-table-column label="时间" align="center" :show-overflow-tooltip="true" width="180">
+          <el-table-column label="时间" align="center" :show-overflow-tooltip="true">
             <template slot-scope="scope">
               <span>{{scope.row.feedbackYear}}年{{scope.row.feedbackMonth}}月</span>
             </template>
           </el-table-column>
-          <el-table-column label="培养内容" align="center" :show-overflow-tooltip="true" prop="plantName"/>
-          <el-table-column label="开始日期" align="center" :show-overflow-tooltip="true" width="150" prop="startDate"/>
-          <el-table-column label="结束日期" align="center" :show-overflow-tooltip="true" width="150" prop="endDate"/>
-          <el-table-column label="实际完成日期" align="center" :show-overflow-tooltip="true" width="150" prop="dateOfCompletion"/>
-          <el-table-column label="学习状态" align="center" :show-overflow-tooltip="true" width="120" prop="studyState"/>
-          <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="300">
+          <el-table-column label="培养内容" align="center" :show-overflow-tooltip="true" prop="plantName" width="400"/>
+          <el-table-column label="开始日期" align="center" :show-overflow-tooltip="true" prop="startDate"/>
+          <el-table-column label="结束日期" align="center" :show-overflow-tooltip="true" prop="endDate"/>
+          <el-table-column label="实际完成日期" align="center" :show-overflow-tooltip="true" prop="dateOfCompletion"/>
+          <el-table-column label="学习状态" align="center" :show-overflow-tooltip="true" prop="studyState"/>
+          <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button
                 size="mini"
@@ -93,24 +93,24 @@
         <h3>汇报展示PPT</h3>
         <div>
           <el-upload
-            ref="doc"
-            :limit="50"
-            :headers="doc.headers"
-            :action="doc.url + '?pType=' + doc.pType + '&pId=' + doc.pId"
-            :disabled="doc.isUploading"
-            :on-progress="handleFileDocProgress"
-            :on-success="handleFileDocSuccess"
-            :auto-upload="true"
-            drag
-              style="display:inline-block;"
-          >
-            <i class="el-icon-upload"></i>
-            <div class="el-upload__text">
-              {{ $t('将文件拖到此处，或') }}
-              <em>{{ $t('点击上传') }}</em>
-            </div>
-          </el-upload>
-          <el-table :data="doc.commonfileList" border>
+              ref="doc"
+              :headers="doc.headers"
+              class="upload-demo"
+              action="doc.url + '?pType=' + doc.pType + '&pId=' + doc.pId"
+              :disabled="doc.isUploading"
+              :on-progress="handleFileDocProgress"
+              :on-success="handleFileDocSuccess"
+              :auto-upload="true"
+              :on-preview="handlePreview"
+              :on-remove="handleRemove"
+              :before-remove="beforeRemove"
+              multiple
+              :limit="3"
+              :on-exceed="handleExceed"
+              :file-list="fileList">
+              <el-button size="small" type="primary" style="margin-bottom:10px;">点击上传汇报展示PPT</el-button>
+            </el-upload>
+          <el-table :data="doc.commonfileList" border style="width:50%;">
             <el-table-column :label="$t('文件名')" align="center" prop="fileName" :show-overflow-tooltip="true">
               <template slot-scope="scope">
                 <a  class="link-type"  @click="handleDownload(scope.row)">
@@ -118,8 +118,8 @@
                 </a>
               </template>
             </el-table-column>
-            <el-table-column :label="$t('大小(Kb)')" align="center" prop="fileSize" :show-overflow-tooltip="true" width="80" />
-            <el-table-column :label="$t('上传人')" align="center" prop="creator" :show-overflow-tooltip="true" width="120"/>
+            <!-- <el-table-column :label="$t('大小(Kb)')" align="center" prop="fileSize" :show-overflow-tooltip="true" width="80" />
+            <el-table-column :label="$t('上传人')" align="center" prop="creator" :show-overflow-tooltip="true" width="120"/> -->
             <el-table-column :label="$t('操作')" align="center" width="120" class-name="small-padding fixed-width">
               <template slot-scope="scope">
                 <el-button
@@ -145,7 +145,7 @@
             </el-table-column>
           </el-table>
         </div>
-        <div style="display:inline-block;width:45%;">
+        <div style="display:inline-block;width:40%;">
           <h3 style="margin-bottom:0px;">学员表现</h3>
           <div class="question">
             1、学员的现场表现、语言表达、汇报逻辑如何？
@@ -204,7 +204,7 @@
             </el-radio-group>
           </div>
         </div>
-        <div style="display:inline-block;width:45%;">
+        <div style="display:inline-block;width:40%;">
           <div class="question">
             6、学员的汇报内容是否具有一定的意义，与学员的现阶段表现是否一致？
           </div>
@@ -250,7 +250,7 @@
             </el-radio-group>
           </div>
           <div class="question">
-            10、学员本次汇报将较于上次是否有提升？
+            10、学员本次汇报相较于上次是否有提升？
           </div>
           <div class="answer">
             <el-radio-group v-model="radio10" size="small">
@@ -265,12 +265,12 @@
         <div>
           <el-form>
             <el-form-item>
-              <editor :min-height="192"/>
+              <editor :min-height="300"/>
             </el-form-item>
           </el-form>
         </div>
         <div style="text-align:center; margin:30px 0px;">
-          <el-button>保存</el-button>
+          <el-button size="medium" type="success">保存</el-button>
         </div>
       </el-tab-pane>
       <el-tab-pane label="朱晶">
@@ -328,6 +328,7 @@
         <el-form>
           <el-form-item>
             <editor :min-height="192" v-model="mentorFeedback"/>
+            <!-- <p v-html="mentorFeedback" /> -->
           </el-form-item>
         </el-form>
         <div style="text-align:center;">