教育、预案 界面调整

src/views/core/drill/drillDictionary/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <!--机构数据-->
       <el-col :span="4" :xs="24">
         <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
@@ -119,7 +119,7 @@
     </el-row>
     <!-- 添加或修改预案演练库对话框 -->
     <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="90px">
         <el-form-item label="演练项目" prop="drillType" style="width:100%;">
           <el-select v-model="form.drillType" placeholder="请选择演练项目" style="width:100%;">
             <el-option

src/views/core/drill/plan/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <!--机构数据-->
       <el-col :span="4" :xs="24">
         <org-tree v-model="queryParams.belongOrgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
@@ -106,7 +106,7 @@
           </el-table-column>
         </el-table>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+        <pagination :total="total" :page.sync="queryParams.pageNum"
                     :limit.sync="queryParams.pageSize"
                     @pagination="getList"/>
         </div>

src/views/core/drill/task/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <el-col :span="4" :xs="24">
         <org-tree v-model="queryParams.orgId" @defaultOrg="getDefaultOrg" @checkChange="checkChange"
                   @click="clickTreeNode" businessTree></org-tree>

src/views/core/edu/plan/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <!--机构数据-->
       <el-col :span="4" :xs="24">
         <org-tree v-model="queryParams.belongOrgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
@@ -116,20 +116,20 @@
                         </template>
                       </template>
                     </el-table-column>-->
-          <el-table-column label="任务周期" align="center" width="100" prop="planCycle">
+          <el-table-column label="任务周期" align="center" width="90" prop="planCycle">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.edu_plan_cycle" :value="scope.row.planCycle"/>
             </template>
           </el-table-column>
-          <el-table-column label="任务次数" align="center" width="100" prop="execTimes"/>
-          <el-table-column label="任务状态" align="center" width="100" prop="planStatus">
+          <el-table-column label="任务次数" align="center" width="90" prop="execTimes"/>
+          <el-table-column label="任务状态" align="center" width="90" prop="planStatus">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.edu_plan_status" :value="parseInt(scope.row.planStatus)"/>
             </template>
           </el-table-column>
 
 <!--          <el-table-column label="备注" align="center" prop="remark"/>-->
-          <el-table-column label="操作" width="180" align="left" header-align="center" fixed="right" class-name="small-padding fixed-width">
+          <el-table-column label="操作" width="200" align="left" header-align="center" fixed="right" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button v-if="checkCanPublish(scope.row)" size="mini" type="text" icon="el-icon-arrow-down"
                          @click="handlePublish(scope.row)" v-hasPermi="['core:plan:edit']">下发

src/views/core/edu/task/dialog.newTask.vue

@@ -8,11 +8,11 @@
 
             <!-- 培训主题 -->
             <el-col :span="24">
-              <el-form-item prop="title" label="培训主题">
+              <el-form-item prop="title" label="任务名称">
                 <el-input
                   v-model="formData.title"
                   :maxlength="32"
-                  placeholder="请输入培训主题"
+                  placeholder="请输入任务名称"
                   clearable
                 />
               </el-form-item>
@@ -85,6 +85,13 @@
           </el-row>
 
           <el-row>
+           
+            <el-col :span="24">
+              <el-form-item prop="imageList" label="培训图片">
+                <imgUpload ref="uploadimage" type="more" :value="formData.imageList"
+                           @input="imageListChanged"></imgUpload>
+              </el-form-item>
+            </el-col>
             <el-col :span="10">
               <el-form-item label="培训资料" prop="fileList">
                 <K-file-upload ref="upload" :defaultValue="formFileListDefualtValue" v-model="formData.fileList"/>
@@ -95,12 +102,7 @@
                 <el-button type="primary" @click="showSelectFile">选取知识库文件</el-button>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item prop="imageList" label="培训图片">
-                <imgUpload ref="uploadimage" type="more" :value="formData.imageList"
-                           @input="imageListChanged"></imgUpload>
-              </el-form-item>
-            </el-col>
+            
           </el-row>
         </el-form>
       </div>
@@ -140,14 +142,14 @@ export default {
       isShow: false,
       formData: this.reset(),
       formDataRules: {
-        title: [{required: true, message: "请输入培训主题"}],
+        title: [{required: true, message: "请输入任务名称"}],
         content: [{required: true, message: "请输入培训内容"}],
         absenceList: [{required: true, type: "array", message: "请选择参会人员"}],
         startDate: [{required: true, message: "请输入培训开始时间"}],
         endDate: [{required: true, message: "请输入培训结束时间"}],
         note: [{required: true, message: "请输入培训总结"}],
         imageList: [{required: true, message: "请上传培训图片"}],
-        fileList: [{required: true, message: "请上传培训文件"}],
+        // fileList: [{required: true, message: "请上传培训文件"}],
       },
       startDatepickerOptions: {
         disabledDate(time) {

src/views/core/edu/task/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <el-col :span="4" :xs="24">
         <org-tree v-model="queryParams.orgId" @defaultOrg="getDefaultOrg" @checkChange="checkChange"
                   @click="clickTreeNode" businessTree></org-tree>
@@ -10,7 +10,7 @@
           <div class="main-search-box">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
 
-          <el-form-item label="培训主题" prop="title">
+          <el-form-item label="任务名称" prop="title">
             <el-input
               v-model="queryParams.title"
               placeholder="请输入关键字"
@@ -105,7 +105,7 @@
           height="650"
           size="small" v-loading="loading" :data="eduTaskList" @selection-change="handleSelectionChange">
           <el-table-column label="序号" align="center" width="70" prop="no"/>
-          <el-table-column label="培训主题" width="315" align="left" header-align="center" prop="title"/>
+          <el-table-column label="任务名称" width="315" align="left" header-align="center" prop="title"/>
           <el-table-column label="受训机构" width="315" align="left" header-align="center" prop="orgName"/>
           <el-table-column label="任务进度" align="center" prop="status" width="150">
             <template slot-scope="scope">

src/views/core/materials/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <!--机构数据-->
       <el-col :span="4" :xs="24">
         <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
@@ -158,7 +158,7 @@
     </el-row>
     <!-- 添加或修改学习资料对话框 -->
     <DialogCom :title="title" :visible.sync="open" @close="cancel" width="700px" append-to-body>
-      <el-form :disabled="title=='知识库详情'" ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form :disabled="title=='知识库详情'" ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="资料名称" prop="title" class="endItem">
           <el-input v-model="form.title" placeholder="请输入资料名称" maxlength="50" show-word-limit/>
         </el-form-item>
@@ -174,7 +174,7 @@
                   <el-input v-model="form.content" placeholder="请输入资料内容" maxlength="200" show-word-limit/>
                 </el-form-item>-->
 
-        <el-form-item label="资料附件" prop="fileList">
+        <el-form-item label="上传文件" prop="fileList">
           <K-file-upload ref="upload" :isShowUploadBtn="title!='知识库详情'"
                          :defaultValue="formFileListDefualtValue"
                          v-model="form.fileList"/>