优化界面

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

@@ -76,13 +76,16 @@
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table max-height="550px" :data="planList" @selection-change="handleSelectionChange" row-key="id"
+        <el-table
+          border
+          height="550"
+          size="small" :data="planList" @selection-change="handleSelectionChange" row-key="id"
                   :tree-props="{ children: 'children' }">
-          <el-table-column label="序号" align="center" prop="no"/>
-          <el-table-column label="培训主题" align="center" prop="planName"/>
-          <el-table-column label="计划创建机构" align="center" prop="createOrgName"/>
-          <el-table-column label="计划所属机构" align="center" prop="belongOrgName"/>
-          <el-table-column label="培训机构类型" align="center" prop="execOrgType">
+          <el-table-column label="序号" align="center" prop="no" width="60"/>
+          <el-table-column label="培训主题" align="left" width="200" prop="planName"/>
+          <el-table-column label="创建机构" align="left" width="180" prop="createOrgName"/>
+          <el-table-column label="所属机构" align="left" width="180" prop="belongOrgName"/>
+          <el-table-column label="培训机构类型" align="center" width="180" prop="execOrgType">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.sys_org_type" :value="scope.row.execOrgType"/>
             </template>
@@ -92,7 +95,12 @@
               <dict-tag :options="dict.type.edu_plan_cycle" :value="scope.row.planCycle"/>
             </template>
           </el-table-column>
-          <el-table-column prop="planRoleNameList" label="培训角色">
+          <el-table-column label="计划状态" align="center" prop="planStatus">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.plan_status" :value="scope.row.planStatus"/>
+            </template>
+          </el-table-column>
+          <el-table-column prop="planRoleNameList" width="180" label="培训角色">
             <template slot-scope="scope">
               <template v-if="scope.row.planRoleNameList">
                 <el-tag size="mini" type="success"
@@ -109,18 +117,14 @@
           <el-table-column label="培训次数" align="center" prop="execTimes"/>
           <el-table-column label="备注" align="center" prop="remark"/>
           <el-table-column label="修改人" align="center" prop="updateBy"/>
-          <el-table-column label="计划状态" align="center" prop="planStatus">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.plan_status" :value="scope.row.planStatus"/>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+
+          <el-table-column label="操作" width="160" fixed="right" align="center" 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"
+              <el-button v-if="checkCanPublish(scope.row)" size="mini" type="text" icon="el-icon-down"
                          @click="handlePublish(scope.row)" v-hasPermi="['core:plan:edit']">下发
               </el-button>
               <el-button v-if="checkCanEdit(scope.row)" size="mini" type="text" icon="el-icon-edit"
-                         @click="handleUpdate(scope.row)" v-hasPermi="['core:plan:edit']">修改
+                         @click="handleUpdate(scope.row)" v-hasPermi="['core:plan:edit']">编辑
               </el-button>
               <el-button v-if="checkCanDel(scope.row)" size="mini" type="text" icon="el-icon-delete"
                          @click="handleDelete(scope.row)" v-hasPermi="['core:plan:remove']">删除
@@ -135,22 +139,34 @@
       </el-col>
     </el-row>
     <!-- 添加或修改教育培训计划对话框 -->
-    <DialogCom :title="title" :visible.sync="open" @close="cancel" width="800px" height="800px" append-to-body >
+    <DialogCom :title="title" :visible.sync="open" @close="cancel" width="850px" height="800px" append-to-body >
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-row>
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="培训主题" prop="planName">
               <el-input v-model="form.planName" maxlength="50" show-word-limit placeholder="请输入培训主题"/>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="计划周期" prop="planCycle">
-              <el-select v-model="form.planCycle" placeholder="请选择计划周期">
+              <el-select style="width: 100%" v-model="form.planCycle" placeholder="请选择计划周期">
                 <el-option v-for="dict in dict.type.edu_plan_cycle" :key="dict.value" :label="dict.label"
                            :value="parseInt(dict.value)"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="机构类型" prop="execOrgType">
+              <el-select style="width: 100%" v-model="form.execOrgType" placeholder="请选择执行机构类型" @change="execOrgTypeChanged()">
+
+                <el-option v-for="dict in getUserOrgType" :key="dict.value" :label="dict.label"
+                           :value="parseInt(dict.value)"></el-option>
+
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12" v-show="form.planCycle == 0">
@@ -163,7 +179,7 @@
           </el-col>
           <el-col :span="12" v-show="form.planCycle == 0">
             <el-form-item prop="endDate" label="结束日期">
-              <el-date-picker v-model="form.endDate" :picker-options="endDatepickerOptions" align="right" type="date"
+              <el-date-picker style="width: 100%"  v-model="form.endDate" :picker-options="endDatepickerOptions" align="right" type="date"
                               placeholder="选择结束日期">
               </el-date-picker>
             </el-form-item>
@@ -172,20 +188,20 @@
 
         <el-row>
           <el-col :span="12">
-            <el-form-item label="培训次数" prop="execTimes">
-              <template>
-                <el-input-number v-model="form.execTimes" :min="1" :max="10"></el-input-number>
-              </template>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
             <el-form-item label="计划状态" prop="planStatus">
-              <el-select v-model="form.planStatus" placeholder="请选择计划状态">
+              <el-select  style="width: 100%"  v-model="form.planStatus" placeholder="请选择计划状态">
                 <el-option v-for="dict in dict.type.plan_status" :key="dict.value" :label="dict.label"
                            :value="parseInt(dict.value)"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="培训次数" prop="execTimes">
+              <template>
+                <el-input-number style="width: 100%" v-model="form.execTimes" :min="1" :max="10"></el-input-number>
+              </template>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12" v-show="form.planCycle != 0">
@@ -196,48 +212,36 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-              <!-- <el-option v-for="dict in dict.type.sys_org_type" :key="dict.value" :label="dict.label"
-                           :value="parseInt(dict.value)"></el-option> -->
-            <el-form-item label="培训机构类型" prop="execOrgType">
-              <el-select v-model="form.execOrgType" placeholder="请选择执行机构类型" @change="execOrgTypeChanged()">
-              
-                           <el-option v-for="dict in getUserOrgType" :key="dict.value" :label="dict.label"
-                           :value="parseInt(dict.value)"></el-option>
-                           
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
             <el-form-item label="培训角色" prop="planRoleId">
-              <el-select v-model="form.planRoleId" placeholder="请选择" multiple>
+              <el-select style="width: 100%"  v-model="form.planRoleId" placeholder="请选择" multiple>
                 <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+        </el-row>
+        <el-row>
+          <el-col :span="24">
             <!--            <el-form-item label="培训机构" prop="planExecOrgIdList">
                           <tree-select v-model="form.planExecOrgIdList" :options="deptOptions" :show-count="true"
                                        :normalizer="tenantIdnormalizer" :props="{ checkStrictly: true, label: 'name' }"
                                        placeholder="请选择培训机构"/>
                         </el-form-item>-->
+
             <el-form-item v-show="form.execOrgType" label="培训机构" prop="planExecOrgIdList">
               <org-tree-select
                 v-model="form.planExecOrgIdList"
                 :queryData="form.execOrgType"
                 ref="orgTreeSelect"
                 @selectNode="queryNode"
-                :enabledCheckOrgTypes="form.execOrgType"
                 :disable="true">
               </org-tree-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" maxlength="200" show-word-limit placeholder="请输入备注"/>
+              <el-input v-model="form.remark" maxlength="200" type="textarea" show-word-limit placeholder="请输入备注"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -370,9 +374,9 @@ export default {
         disabledDate: this.disabledDate,
       },
     };
-  },  
+  },
   computed:{
-   getUserOrgType(){    
+   getUserOrgType(){
     console.log("computed allSysOrgTypes",this.dict.type.sys_org_type,this.$store.getters.orgType);
     let tempArry =[];
     this.dict.type.sys_org_type.forEach(x=>{
@@ -540,7 +544,6 @@ export default {
 
     /** 新增按钮操作 */
     handleAdd() {
-     
       this.initRoleList();
       this.reset();
       this.open = true;

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

@@ -51,10 +51,13 @@
     </el-form>
 
 
-    <el-table height="550px" v-loading="loading" :data="eduTaskList" @selection-change="handleSelectionChange">
+    <el-table
+      border
+      height="600"
+      size="small" v-loading="loading" :data="eduTaskList" @selection-change="handleSelectionChange">
       <el-table-column label="序号" align="center" prop="no" />
-      <el-table-column label="培训机构" align="center" prop="orgName" />
-      <el-table-column label="培训角色" align="center" >
+      <el-table-column label="培训机构" width="200" align="left" prop="orgName" />
+      <el-table-column label="培训角色" width="180" align="center" >
         <template slot-scope="scope">
             <template v-if="scope.row.taskRoleNameList  ">
               <el-tag size="mini" type="success" v-for="(item, index) in (scope.row.taskRoleNameList || '').split(',')"
@@ -64,14 +67,14 @@
             </template>
           </template>
       </el-table-column>
-      <el-table-column label="培训主题" align="center" prop="title" />
-      <el-table-column label="类型" align="center"  >
+      <el-table-column label="培训主题" width="200" align="left" prop="title" />
+      <el-table-column label="培训类型" width="180" align="center"  >
         <template slot-scope="scope">
             <dict-tag :options="dict.type.edu_type" :value="scope.row.type"/>
           </template>
       </el-table-column>
 
-      <el-table-column label="主持人" align="center" prop="hostName" />
+      <el-table-column label="主持人" width="140" align="center" prop="hostName" />
       <el-table-column label="开始时间" align="center" prop="startDate" width="180">
       </el-table-column>
       <el-table-column label="截止时间" align="center" prop="endDate" width="180">
@@ -84,7 +87,7 @@
             <dict-tag :options="dict.type.edu_task_status" :value="scope.row.status"/>
           </template>
       </el-table-column>
-      <el-table-column label="操作" width="120px" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" fixed="right" width="120px" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/core/knowledge/index.vue

@@ -73,7 +73,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['core:knowledge:edit']"
-          >修改</el-button>
+          >编辑</el-button>
           <el-button
             size="mini"
             type="text"

src/views/core/materials/index.vue

@@ -92,31 +92,32 @@
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
         <!-- 表格数据 -->
-        <el-table v-loading="loading" :data="materialsList" @selection-change="handleSelectionChange">
-          <el-table-column label="序号" align="center" prop="no"/>
-          <el-table-column label="资料标题" align="center" prop="title"/>
-          <el-table-column label="资料类型" align="center" prop="knowledgeName"/>
-          <el-table-column label="所属机构" align="center" prop="orgName"/>
+        <el-table
+          border
+          height="600"
+          size="small"
+          v-loading="loading" :data="materialsList" @selection-change="handleSelectionChange">
+          <el-table-column  label="序号"  type="index" align="center" width="60"/>
+          <el-table-column label="所属机构"  align="left" width="200" prop="orgName"/>
+          <el-table-column label="资料标题"   align="left" width="160" prop="title"/>
+          <el-table-column label="资料类型"  align="center" width="120" prop="knowledgeName"/>
+          <el-table-column label="资料附件"  width="200" align="left" prop="fileList"/>
           <el-table-column label="公开状态" align="center" prop="isOpen">
             <template slot-scope="r">{{ r.row.isOpen == 0 ? '未公开' : '公开' }}</template>
           </el-table-column>
           <el-table-column label="上传人" align="center" prop="createBy"/>
           <el-table-column label="上传时间" align="center" prop="createTime"/>
           <el-table-column label="附件" align="center" prop="fileNames"/>
-          <el-table-column scoped-slot="remark" align="center" prop="remark" label="备注">
-            <template slot-scope="scope">
-              <div class="ellipsis" :title="scope.row.remark">{{ scope.row.remark }}</div>
-            </template>
-          </el-table-column>
+          <el-table-column width="250" scoped-slot="remark" align="center" prop="remark" label="备注"></el-table-column>
 
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <el-table-column label="操作" width="180" fixed="right" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <!-- 公开 按钮显示逻辑: 仅当前用户上传的学习资料且处于未公开状态-->
               <el-button
                 v-if="checkCanEditOpen(scope.row)&&scope.row.isOpen==0"
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                icon="el-icon-folder-opened"
                 @click="handleOpen(scope.row,1)"
                 v-hasPermi="['core:materials:edit']"
               >公开
@@ -126,7 +127,7 @@
                 v-if="checkCanEditOpen(scope.row)&&scope.row.isOpen===1"
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                icon="el-icon-folder"
                 @click="handleOpen(scope.row,0)"
                 v-hasPermi="['core:materials:edit']"
               >取消公开
@@ -139,13 +140,13 @@
                 icon="el-icon-edit"
                 @click="handleUpdate(scope.row)"
                 v-hasPermi="['core:materials:edit']"
-              >修改
+              >编辑
               </el-button>
               <el-button
                 v-if="checkCanShowInfo(scope.row)"
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                icon="el-icon-info"
                 @click="handleInfo(scope.row)"
                 v-hasPermi="['core:materials:edit']"
               >详情
@@ -173,14 +174,14 @@
       </el-col>
     </el-row>
     <!-- 添加或修改学习资料对话框 -->
-    <DialogCom :title="title" :visible.sync="open" @close="cancel" width="500px" append-to-body>
+    <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-item label="资料标题" prop="title">
           <el-input v-model="form.title" placeholder="请输入资料标题" maxlength="50" show-word-limit/>
         </el-form-item>
 
         <el-form-item label="资料类型" prop="knowledgeId">
-          <el-select v-model="form.knowledgeId" placeholder="请选择资料类型">
+          <el-select style="width: 100%" v-model="form.knowledgeId" placeholder="请选择资料类型">
             <el-option v-for="item in knowledgeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
           </el-select>
         </el-form-item>
@@ -189,10 +190,10 @@
           <el-input v-model="form.content" placeholder="请输入资料内容" maxlength="200" show-word-limit/>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" maxlength="200" show-word-limit/>
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" maxlength="200" show-word-limit/>
         </el-form-item>
-        <el-form-item label="附件" prop="fileList">
-          <K-file-upload ref="upload"
+        <el-form-item label="资料附件" prop="fileList">
+          <K-file-upload  ref="upload"
           :defaultValue="formFileListDefualtValue"
           v-model="form.fileList"/>
         </el-form-item>
@@ -446,7 +447,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加学习资料";
+      this.title = "新增资料";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {

src/views/resumption/protection/index.vue

@@ -106,7 +106,7 @@
               @click="handleDelete"
               v-hasPermi="['system:user:remove']"
               >删除</el-button
-            > 
+            >
           </el-col>-->
 
           <right-toolbar
@@ -117,6 +117,7 @@
         </el-row>
 
         <el-table
+          border
           v-loading="loading"
           :data="pageData"
           @selection-change="handleSelectionChange"
@@ -184,7 +185,7 @@
                 icon="el-icon-edit"
                 @click="onEdit(r.row.id)"
                 v-hasPermi="['device:protection:edit']"
-                >修改</el-button
+                >编辑</el-button
               >
               <el-button
                 size="mini"
@@ -320,7 +321,7 @@ export default {
       if(b){
         this.$message.info("删除成功");
       }
-      
+
       this.getList();
     },
     updateStatus(id, status) {

src/views/system/dept/index.vue

@@ -128,7 +128,7 @@
           :data="deptList"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column label="序号" align="center" min-width="40">
+          <el-table-column label="序号" align="center" min-width="50">
             <template v-slot:default="scope">
               <span v-text="getPageIndex(scope.$index)"> </span>
             </template>
@@ -136,9 +136,9 @@
           <el-table-column
             prop="name"
             label="机构名称"
-            min-width="150"
+            min-width="200"
           ></el-table-column>
-          <el-table-column align="center" prop="type" label="机构类型">
+          <el-table-column align="center" prop="type" width="150" label="机构类型">
             <template v-slot="scope">
               <dict-tag
                 :options="dict.type.sys_org_type"
@@ -146,7 +146,7 @@
               />
             </template>
           </el-table-column>
-          <!-- <el-table-column prop="code" label="编码"></el-table-column> -->
+           <el-table-column prop="code" label="机构编码" width="120"></el-table-column>
 
           <el-table-column prop="isLock" align="center" label="状态">
             <template v-slot="scope">
@@ -158,8 +158,16 @@
           </el-table-column>
           <el-table-column
             align="center"
+            prop="sort"
+            label="排序"
+            min-width="60"
+            width="60"
+          ></el-table-column>
+          <el-table-column
+            align="center"
             prop="weatherCityCode"
             label="天气区域编码"
+            width="150"
           ></el-table-column>
           <!-- <el-table-column prop="address" label="地址"></el-table-column> -->
           <!-- <el-table-column label="负责人" align="center">
@@ -172,21 +180,19 @@
             align="center"
             prop="manager"
             label="负责人"
+            width="150"
           ></el-table-column>
           <el-table-column
             align="center"
             prop="managerPhone"
             label="负责人电话"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            prop="sort"
-            label="排序"
-            min-width="40"
+            width="150"
           ></el-table-column>
           <el-table-column
             label="操作"
             align="center"
+            fixed="right"
+            width="160"
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope">