调整教育培训、预案演练 列宽

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

@@ -7,7 +7,7 @@
                   @click="clickTreeNode" wholeTree></org-tree>
       </el-col>
       <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
           <!-- <el-form-item label="编号" prop="id">
             <el-input v-model="queryParams.id" placeholder="请输入编号" clearable
                       @keyup.enter.native="handleQuery"/>
@@ -64,14 +64,14 @@
 
         <el-table border height="555px" v-loading="loading" :data="drillDictionaryList" @selection-change="handleSelectionChange">
           <el-table-column label="序号" type="index" align="center" width="60"/>
-          <el-table-column label="机构名称" align="left" header-align="center" prop="orgName" />
+          <el-table-column label="机构名称" align="left" header-align="center" width="250" prop="orgName" />
 
-          <el-table-column label="演练项目" align="left" header-align="center" prop="drillType">
+          <el-table-column label="演练项目" align="left" header-align="center" width="180" prop="drillType">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.core_drill_type" :value="scope.row.drillType"/>
             </template>
           </el-table-column>
-          <el-table-column  label="演练场景" scoped-slot="drillProjects" align="center" prop="drillProjects">
+          <el-table-column  label="演练场景" scoped-slot="drillProjects" align="center" width="180" prop="drillProjects">
             <template slot-scope="scope">
               <div class="ellipsis" :title="scope.row.drillProjects">{{ scope.row.drillProjects }}</div>
             </template>
@@ -81,7 +81,7 @@
               <div class="ellipsis" :title="scope.row.defaultCause">{{ scope.row.defaultCause }}</div>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <el-table-column label="操作" align="center" header-align="center" width="150" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button
                 size="mini"

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

@@ -8,8 +8,8 @@
       </el-col>
       <!--搜索栏-->
       <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-                 label-width="68px">
+        <div class="main-search-box">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
           <el-form-item label="任务名称" prop="planName">
             <el-input v-model="queryParams.planName" placeholder="请输入关键字" clearable
                       @keyup.enter.native="handleQuery"/>
@@ -61,8 +61,8 @@
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-
-        <el-table height="555px" border :data="planList" @selection-change="handleSelectionChange"
+        </div>
+        <el-table height="640px" border :data="planList" @selection-change="handleSelectionChange"
                   row-key="id"
                   :tree-props="{ children: 'children' }">
           <el-table-column label="序号" align="center" width="60" prop="no"/>
@@ -89,10 +89,10 @@
           <!-- <el-table-column label="修改人" align="center" width="100" prop="updateBy"/> -->
           <el-table-column label="操作" 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-edit-outline"
+              <el-button v-if="checkCanPublish(scope.row)" size="mini" type="text" icon="el-icon-arrow-down"
                          @click="handlePublish(scope.row)" v-hasPermi="['core:drillPlan:publish']">下发
               </el-button>
-              <el-button v-if="checkCanRevocation(scope.row)" size="mini" type="text" icon="el-icon-down"
+              <el-button v-if="checkCanRevocation(scope.row)" size="mini" type="text" icon="el-icon-top-left"
                          @click="handleRevocation(scope.row)" v-hasPermi="['core:plan:edit']">撤回
               </el-button>
               <el-button v-if="checkCanEdit(scope.row)" size="mini" type="text" icon="el-icon-edit-outline"

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

@@ -6,8 +6,7 @@
                   @click="clickTreeNode" businessTree></org-tree>
       </el-col>
       <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-                 label-width="68px">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
           <el-form-item label="任务名称" prop="title">
             <el-input v-model="queryParams.title" placeholder="请输入关键字" clearable/>
           </el-form-item>

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

@@ -8,8 +8,7 @@
       </el-col>
       <!--搜索栏-->
       <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-                 label-width="100px">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
 
           <el-form-item label="培训主题" prop="planName">
             <el-input v-model="queryParams.planName" placeholder="请输入关键字" clearable
@@ -41,17 +40,27 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item>
+          <!-- <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
             <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
                        v-hasPermi="['core:plan:add']">新增任务
             </el-button>
-          </el-form-item>
+          </el-form-item> -->
         </el-form>
 
         <el-row :gutter="10" class="mb8">
-
+          <el-col :span="1.5">
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
+                       v-hasPermi="['core:plan:add']">新增任务
+            </el-button>
+          </el-col>
           <!--   <el-col :span="1.5">
                <el-button type="success" plain icon="el-icon-edit-outline" size="mini" :disabled="single" @click="handleUpdate"
                           v-hasPermi="['core:plan:edit']">修改
@@ -82,11 +91,11 @@
           size="small" :data="planList" @selection-change="handleSelectionChange" row-key="id">
           <!-- :tree-props="{ children: 'children' }" -->
           <el-table-column label="序号" align="center" prop="no" width="60"/>
-          <el-table-column label="培训主题" align="left" header-align="center" width="170" prop="planName"/>
-          <el-table-column label="创建机构" align="left" header-align="center" width="180" prop="createOrgName"/>
-          <el-table-column label="行社名称" align="left" header-align="center" width="180" prop="belongOrgName"/>
+          <el-table-column label="培训主题" align="left" header-align="center" width="240" prop="planName"/>
+          <el-table-column label="创建机构" align="left" header-align="center" width="240" prop="createOrgName"/>
+          <el-table-column label="行社名称" align="left" header-align="center" width="240" prop="belongOrgName"/>
           <!-- <el-table-column label="所属机构" align="left" width="180" prop="belongOrgName"/> -->
-          <el-table-column label="机构类型" align="center" width="150" prop="execOrgType">
+          <el-table-column label="机构类型" align="center" width="120" prop="execOrgType">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.sys_org_type" :value="scope.row.execOrgType"/>
             </template>
@@ -105,25 +114,25 @@
                         </template>
                       </template>
                     </el-table-column>-->
-          <el-table-column label="任务周期" align="center" prop="planCycle">
+          <el-table-column label="任务周期" align="center" width="100" 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" prop="execTimes"/>
-          <el-table-column label="任务状态" align="center" prop="planStatus">
+          <el-table-column label="任务次数" align="center" width="100" prop="execTimes"/>
+          <el-table-column label="任务状态" align="center" width="100" 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="220" fixed="right" align="center" class-name="small-padding fixed-width">
+          <el-table-column label="操作" width="180" 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-down"
+              <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']">下发
               </el-button>
-              <el-button v-if="checkCanRevocation(scope.row)" size="mini" type="text" icon="el-icon-down"
+              <el-button v-if="checkCanRevocation(scope.row)" size="mini" type="text" icon="el-icon-top-left"
                          @click="handleRevocation(scope.row)" v-hasPermi="['core:plan:edit']">撤回
               </el-button>
               <el-button v-if="checkCanEdit(scope.row)" size="mini" type="text" icon="el-icon-edit-outline"

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

@@ -46,16 +46,25 @@
                     </el-select>
                 </el-form-item>-->
 
-          <el-form-item>
+          <!-- <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
             <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddTask">临时登记</el-button>
             <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">导出数据</el-button>
-          </el-form-item>
+          </el-form-item> -->
         </el-form>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddTask">临时登记</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">导出数据</el-button>
           </el-col>
           <!--   <el-col :span="1.5">
                <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
@@ -86,8 +95,8 @@
           height="600"
           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="250" align="left" header-align="center" prop="title"/>
-          <el-table-column label="受训机构" width="250" align="left" header-align="center" prop="orgName"/>
+          <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">
               <dict-tag :options="dict.type.edu_training_do_status" :value="scope.row.status"/>
@@ -133,7 +142,7 @@
                 <el-table-column label="主持人" width="140" align="center" prop="hostName" />-->
 
 
-          <el-table-column  style="width: auto" label="操作" fixed="right"
+          <el-table-column  label="操作" fixed="right" header-align="center"
                            class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button
@@ -151,14 +160,14 @@
                 v-if="canPerform(scope.row)"
                 @click="handleRecorded(scope.row.id)"
                 v-hasPermi="['core:eduTask:remove']"
-              >培训登记
+              >任务登记
               </el-button>
               <el-button
                 icon="el-icon-document-copy"
                 type="text"
                 v-if="scope.row.pdfUrl"
                 @click="onDown(scope.row.pdfUrl)"
-              >登记簿
+              >培训登记簿
               </el-button>
             </template>
           </el-table-column>

src/views/core/materials/index.vue

@@ -9,8 +9,7 @@
       <!--用户数据-->
       <el-col :span="20" :xs="24">
 
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-                 label-width="68px">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
 
           <el-form-item label="资料名称" prop="title">
             <el-input
@@ -37,13 +36,19 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item>
+          <!-- <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item>
+          </el-form-item> -->
         </el-form>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-col>
+          <el-col :span="1.5">
             <el-button
               type="primary"
               icon="el-icon-plus"
@@ -62,11 +67,11 @@
           height="600"
           size="small"
           v-loading="loading" :data="materialsList" @selection-change="handleSelectionChange">
-          <el-table-column label="序号" type="index" align="center" width="80"/>
-          <el-table-column label="创建机构" align="left" width="180" prop="orgName"/>
-          <el-table-column label="资料名称" align="left" width="170" prop="title"/>
+          <el-table-column label="序号" type="index" align="center" width="68"/>
+          <el-table-column label="创建机构" align="left" header-align="center" width="250" prop="orgName"/>
+          <el-table-column label="资料名称" align="left" header-align="center" width="250" prop="title"/>
 
-          <el-table-column label="资料类型" align="center" width="120" prop="knowledgeId">
+          <el-table-column label="资料类型" align="center" width="180" prop="knowledgeId">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.edu_materials_type" :value="parseInt(scope.row.knowledgeId)"/>
             </template>
@@ -81,11 +86,11 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="创建人" align="center" width="120" prop="createBy"/>
-          <el-table-column label="创建时间" align="center" width="200" prop="createTime"/>
+          <el-table-column label="创建人" align="center" width="150" prop="createBy"/>
+          <el-table-column label="创建时间" align="center" width="180" prop="createTime"/>
 <!--          <el-table-column width="250" scoped-slot="remark" align="center" prop="remark" label="备注"></el-table-column>-->
 
-          <el-table-column label="操作"  fixed="right" align="center" class-name="small-padding fixed-width">
+          <el-table-column label="操作"  fixed="right" header-align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <!-- 公开 按钮显示逻辑: 仅当前用户上传的学习资料且处于未公开状态-->
               <el-button