Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/assets/styles/element-ui.scss

@@ -101,3 +101,7 @@
 .el-checkbox__inner{
   border: 1px solid #008CD6 !important;
 }
+
+.table-header_cell{
+  text-align: center !important;
+}

src/store/getters.js

@@ -13,6 +13,7 @@ const getters = {
   orgId: state => state.user.orgId,
   orgType: state => state.user.orgType,
   orgName: state => state.user.orgName,
+  orgShortName: state => state.user.orgShortName,
   introduction: state => state.user.introduction,
   roles: state => state.user.roles,
   roleList: state => state.user.roleList,

src/store/modules/user.js

@@ -13,6 +13,7 @@ const user = {
     roleList:[],
     permissions: [],
     orgName: '',
+    orgShortName: '',
     //用户机构树
     orgTree: [],
     //行社机构树
@@ -55,6 +56,9 @@ const user = {
     SET_ORG_NAME: (state, val) => {
       state.orgName = val
     },
+    SET_ORG_SHORT_NAME: (state, val) => {
+      state.orgShortName = val
+    },
     SET_ORGTREE: (state, val) => {
       state.orgTree = val
     },
@@ -133,6 +137,7 @@ const user = {
           commit('SET_AVATAR', avatar)
           commit('SET_ORG_ID', user.orgId)
           commit('SET_ORG_NAME', user.orgName)
+          commit('SET_ORG_SHORT_NAME', user.orgShortName)
           commit('SET_ORG_TYPE', user.orgType)
           resolve(res)
         }).catch(error => {
@@ -189,7 +194,7 @@ const user = {
       })
     },
 
-    
+
 
 
     // 刷新token

src/views/core/edu/plan/dialog.select.file.vue

@@ -13,7 +13,7 @@
         ref="st"
         url="/core/materials/fileList"
         method="post"
-        :search-data="search"        
+        :search-data="search"
         :pageable="true"
         :select="true"
         :select-default="selectList"
@@ -25,7 +25,7 @@
           <el-form-item prop="title" label="资料标题">
             <el-input v-model="search.title"></el-input>
           </el-form-item>
-          <el-form-item prop="fileName" label="附件名称">
+          <el-form-item prop="fileName" label="文件名称">
             <el-input v-model="search.fileName"></el-input>
           </el-form-item>
         </template>
@@ -34,12 +34,12 @@
         <template slot="columns">
           <el-table-column
             prop="orgName"
-            label="资料上传机构"
+            label="上传机构"
             width="250"
           ></el-table-column>
-          <el-table-column label="资料标题" prop="title" width="300"> </el-table-column>
+          <el-table-column label="资料名称" prop="title" width="300"> </el-table-column>
           <el-table-column
-            label="资料附件"
+            label="文件名称"
           >
           <template slot-scope="scope">
             <template v-if="scope.row.fileList">
@@ -124,7 +124,7 @@ export default {
         if(process.env.VUE_APP_BASE_API!=='/')
         {
           url=process.env.VUE_APP_BASE_API+url;
-        }        
+        }
         const a = document.createElement("a");
         a.setAttribute("download", name);
         a.setAttribute("target", "_blank");

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

@@ -16,14 +16,14 @@
                       maxlength="50"
                       @keyup.enter.native="handleQuery"/>
           </el-form-item>
-          <el-form-item label="培训机构类型" prop="execOrgType">
+          <el-form-item label="机构类型" prop="execOrgType">
             <el-select v-model="queryParams.execOrgType" placeholder="请选择培训机构类型" clearable>
               <el-option v-for="dict in dict.type.sys_org_type" :key="dict.value" :label="dict.label"
                          :value="dict.value"/>
             </el-select>
           </el-form-item>
-          <el-form-item label="计划状态" prop="planStatus">
-            <el-select v-model="queryParams.planStatus" placeholder="请选择计划状态" clearable>
+          <el-form-item label="任务状态" prop="planStatus">
+            <el-select v-model="queryParams.planStatus" placeholder="请选择任务状态" clearable>
               <el-option v-for="dict in dict.type.edu_plan_status" :key="dict.value" :label="dict.label"
                          :value="dict.value"/>
             </el-select>
@@ -34,8 +34,8 @@
                                    :value="item.roleId"></el-option>
                       </el-select>
                     </el-form-item>-->
-          <el-form-item label="计划周期" prop="planCycle">
-            <el-select v-model="queryParams.planCycle" placeholder="请选择计划周期" clearable>
+          <el-form-item label="任务周期" prop="planCycle">
+            <el-select v-model="queryParams.planCycle" placeholder="请选择任务周期" clearable>
               <el-option v-for="dict in dict.type.edu_plan_cycle" :key="dict.value" :label="dict.label"
                          :value="dict.value"/>
             </el-select>
@@ -50,7 +50,7 @@
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
             <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
-                       v-hasPermi="['core:plan:add']">新增
+                       v-hasPermi="['core:plan:add']">新增任务
             </el-button>
           </el-col>
           <!--   <el-col :span="1.5">
@@ -85,8 +85,9 @@
           <el-table-column label="序号" align="center" prop="no" width="60"/>
           <el-table-column label="培训主题" align="left" header-align="center" width="200" 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" width="180" prop="belongOrgName"/> -->
-          <el-table-column label="培训机构类型" align="center" width="180" prop="execOrgType">
+          <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>
@@ -105,18 +106,18 @@
                         </template>
                       </template>
                     </el-table-column>-->
-          <el-table-column label="计划周期" align="center" prop="planCycle">
+          <el-table-column label="任务周期" align="center" 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" prop="execTimes"/>
+          <el-table-column label="任务状态" align="center" 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="updateBy"/>
+
           <el-table-column label="备注" align="center" prop="remark"/>
           <el-table-column label="操作" width="160" fixed="right" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
@@ -154,8 +155,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="计划周期" prop="planCycle">
-              <el-select style="width: 100%" v-model="form.planCycle" placeholder="请选择计划周期">
+            <el-form-item label="任务周期" prop="planCycle">
+              <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>
@@ -206,8 +207,8 @@
 
         <el-row>
           <el-col :span="12">
-            <el-form-item label="机构类型" prop="execOrgType">
-              <el-select style="width: 100%" v-model="form.execOrgType" placeholder="请选择执行机构类型"
+            <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>
@@ -215,7 +216,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="培训次数" prop="execTimes">
+            <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>
@@ -232,7 +233,7 @@
                       </el-form-item>
                     </el-col>-->
           <el-col :span="12">
-            <el-form-item v-show="form.execOrgType" label="培训机构" prop="planExecOrgIdList">
+            <el-form-item v-show="form.execOrgType" label="受训机构" prop="planExecOrgIdList">
               <org-tree-select v-model="form.planExecOrgIdList" :queryData="form.execOrgType"
                                ref="orgTreeSelect" :enabledCheckOrgTypes="form.execOrgType" :disable="true">
               </org-tree-select>
@@ -255,7 +256,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="">
-              <el-button type="primary" @click="showSelectFile">从学习资料中选择</el-button>
+              <el-button type="primary" @click="showSelectFile">选取知识库文件</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -561,7 +562,7 @@ export default {
       this.initRoleList();
       this.reset();
       this.open = true;
-      this.title = "添加教育培训计划";
+      this.title = "新增培训任务";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -578,7 +579,7 @@ export default {
         this.form.planExecOrgIdList = this.form.planExecOrgIdList.map(element => element.toString());
         this.formFileListDefualtValue = this.form.fileList;
         this.open = true;
-        this.title = "修改教育培训计划";
+        this.title = "修改培训任务";
       });
     },
     /** 提交按钮 */

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

@@ -1,6 +1,6 @@
 <template>
     <div class="edu-training-edit">
-        <DialogCom title="教育培训详情" :visible.sync="isShow" width="960px">
+        <DialogCom title="培训任务详情" :visible.sync="isShow" width="960px">
             <div class="page-body">
                 <el-form :model="formData" size="small" ref="form" label-position="right" label-width="120px"
                     label-suffix=":">
@@ -8,13 +8,23 @@
 
                         <!-- 培训主题 -->
                         <el-col :span="12">
-                            <el-form-item prop="type" label="培训主题">{{
+                            <el-form-item prop="type" label="任务名称">{{
                                 formData.title
                             }}</el-form-item>
                         </el-col>
+                      <el-col :span="12">
+                        <el-form-item prop="statusText" label="任务进度">{{
+                            formData.statusText
+                          }}</el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item prop="startDate" label="任务时间">{{
+                            formData.startDate}}-{{formData.endDate}}
+                          </el-form-item>
+                      </el-col>
 
                         <!-- 机构 -->
-                        <el-col :span="12">
+                      <el-col :span="12">
                             <el-form-item label="培训机构">{{
                                 formData.orgName
                             }}</el-form-item>
@@ -41,7 +51,7 @@
                         </el-col>
                         <!-- 记录人 -->
                         <el-col :span="12">
-                            <el-form-item prop="recorderId" label="记录人">{{
+                            <el-form-item prop="recorderId" label="登记人">{{
                                 formData.recorderName
                             }}</el-form-item>
                         </el-col>
@@ -78,7 +88,7 @@
                         </el-col>
                         <!-- 总结 -->
                         <el-col :span="24">
-                            <el-form-item prop="note" label="总结">{{
+                            <el-form-item prop="note" label="培训总结">{{
                                 formData.note
                             }}</el-form-item>
                         </el-col>
@@ -86,7 +96,7 @@
 
                         <!-- 参与人数 -->
                         <el-col :span="12">
-                            <el-form-item prop="dueCount" label="参与人员">{{
+                            <el-form-item prop="dueCount" label="参会人员">{{
                                 formData.taskUserList ? formData.taskUserList.filter((x) => x.type === 1)
                                     .map((v) => v.userName).join(",") : ""
                             }}</el-form-item>
@@ -107,7 +117,7 @@
                         </el-col>
                         <!-- 图片 -->
                         <el-col :span="24">
-                            <el-form-item prop="imageList" label="参与人员签名图片">
+                            <el-form-item prop="imageList" label="参与人员签名">
                                 <ImageListPreview v-model="formData.signImageList"></ImageListPreview>
                                 <!-- <k-multi-upload :disabled="!!id" v-model="formData.imageList" limit="4" byModule
                                     moduleName="edu-training" v-if="isShow" /> -->

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

@@ -1,6 +1,6 @@
 <template>
   <div class="edu-training-edit">
-    <DialogCom :title="'新增培训任务'" :close="onHide" :visible.sync="isShow" width="960px">
+    <DialogCom :title="'培训任务临时登记'" :close="onHide" :visible.sync="isShow" width="960px">
       <div class="page-body">
         <el-form :model="formData" :rules="formDataRules" size="small" ref="newTask" label-position="right"
                  label-width="120px">
@@ -61,14 +61,14 @@
             </el-col>
 
             <el-col :span="24">
-              <el-form-item prop="note" label="总结">
-                <k-textarea v-model="formData.note" placeholder="请输入总结" :length="2000"/>
+              <el-form-item prop="note" label="培训总结">
+                <k-textarea v-model="formData.note" placeholder="请输入培训总结" :length="2000"/>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item prop="absenceList" label="参与人员">
+              <el-form-item prop="absenceList" label="参会人员">
                 <k-select :multiple="true" style="width: 100%" v-model="formData.absenceList" url="/user/find/all"
-                          :params="{ orgId: formData.orgId }" placeholder="请选择参与人员"
+                          :params="{ orgId: formData.orgId }" placeholder="请选择参会人员"
                           @select="absenceUserSelectChanged"></k-select>
               </el-form-item>
             </el-col>
@@ -84,17 +84,17 @@
 
           <el-row>
             <el-col :span="10">
-              <el-form-item label="上传文件" prop="fileList">
+              <el-form-item label="培训资料" prop="fileList">
                 <K-file-upload ref="upload" :defaultValue="formFileListDefualtValue" v-model="formData.fileList"/>
               </el-form-item>
             </el-col>
             <el-col :span="14">
               <el-form-item label="">
-                <el-button type="primary" @click="showSelectFile">从学习资料中选择</el-button>
+                <el-button type="primary" @click="showSelectFile">选取知识库文件</el-button>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item prop="imageList" label="上传图片">
+              <el-form-item prop="imageList" label="培训图片">
                 <imgUpload ref="uploadimage" type="more" :value="formData.imageList"
                            @input="imageListChanged"></imgUpload>
               </el-form-item>
@@ -140,12 +140,12 @@ export default {
       formDataRules: {
         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: "请上传文件"}],
+        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: "请上传培训文件"}],
       },
       startDatepickerOptions: {
         disabledDate(time) {

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

@@ -6,7 +6,7 @@
                  label-width="120px" label-prefix=":">
           <el-row>
             <!-- 培训主题 -->
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item prop="title" label="培训主题">
                 <!-- <el-input
                         v-model="formData.title"
@@ -19,11 +19,11 @@
                 {{ formData.title }}
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+<!--           <el-col :span="12">
               <el-form-item prop="orgName" label="培训机构">
                 {{ formData.orgName }}
               </el-form-item>
-            </el-col>
+            </el-col>-->
             <!-- 类型 -->
             <!--            <el-col :span="24">
                           <el-form-item prop="type" label="类型">
@@ -62,14 +62,14 @@
             </el-col>
 
             <el-col :span="24">
-              <el-form-item v-if="formData.id" prop="note" label="总结">
-                <k-textarea v-model="formData.note" placeholder="请输入总结" :length="2000"/>
+              <el-form-item v-if="formData.id" prop="note" label="培训总结">
+                <k-textarea v-model="formData.note" placeholder="请输入培训总结" :length="2000"/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item prop="absenceList" label="参与人员">
+              <el-form-item prop="absenceList" label="参会人员">
                 <k-select :multiple="true" v-model="formData.absenceList" url="/user/find/all"
-                          :params="{ orgId: formData.orgId }" placeholder="请选择参与人员"
+                          :params="{ orgId: formData.orgId }" placeholder="请选择参会人员"
                           @select="absenceUserSelectChanged"></k-select>
               </el-form-item>
             </el-col>
@@ -82,7 +82,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="资料附件" prop="fileList">
+              <el-form-item label="培训资料" prop="fileList">
                 <K-file-upload ref="upload"
                                :defaultValue="formFileListDefualtValue"
                                v-model="formData.fileList"/>
@@ -90,11 +90,11 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="">
-                <el-button type="primary" @click="showSelectFile">从学习资料中选择</el-button>
+                <el-button type="primary" @click="showSelectFile">选取知识库文件</el-button>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item prop="imageList" label="上传图片">
+              <el-form-item prop="imageList" label="培训图片">
                 <imgUpload ref="uploadimage" type="more" :value="formData.imageList"
                            @input="imageListChanged"></imgUpload>
               </el-form-item>
@@ -137,12 +137,12 @@ export default {
       formData: this.reset(),
       formDataRules: {
         type: [{required: true, message: "请选择类型"}],
-        content: [{required: true, message: "请输入内容"}],
-        absenceList: [{required: true, type: "array", message: "请选择参与人员"}],
-        trainingStartDateTime: [{required: true, message: "请输入培训时间"}],
-        trainingEndDateTime: [{required: true, message: "请输入培训时间"}],
-        note: [{required: true, message: "请输入总结"}],
-        imageList: [{required: true, message: "请上传图片"}],
+        content: [{required: true, message: "请输入培训内容"}],
+        absenceList: [{required: true, type: "array", message: "请选择参会人员"}],
+        trainingStartDateTime: [{required: true, message: "请输入培训开始时间"}],
+        trainingEndDateTime: [{required: true, message: "请输入培训结束时间"}],
+        note: [{required: true, message: "请输入培训总结"}],
+        imageList: [{required: true, message: "请上传培训图片"}],
       },
       startDatepickerOptions: {
         disabledDate(time) {

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

@@ -18,8 +18,8 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="培训进度" prop="status">
-            <el-select v-model="queryParams.status" placeholder="请选择培训进度" clearable>
+          <el-form-item label="任务进度" prop="status">
+            <el-select v-model="queryParams.status" placeholder="请选择任务进度" clearable>
               <el-option
                 v-for="dict in dict.type.edu_training_do_status"
                 :key="dict.value"
@@ -28,7 +28,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="任务时间段" prop="rangen">
+          <el-form-item label="任务时间" prop="rangen">
             <el-date-picker
               v-model="queryParams.range"
               type="daterange"
@@ -50,13 +50,13 @@
           <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>
         <el-row :gutter="10" class="mb8">
           <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="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
@@ -88,29 +88,32 @@
           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="150" align="left" header-align="center" prop="orgName"/>
-          <!-- <el-table-column label="开始时间" align="center" prop="startDate" width="180">
-          </el-table-column>
-          <el-table-column label="截止时间" align="center" prop="endDate" width="180"></el-table-column> -->
-          <el-table-column label="任务时间" align="center" width="300">
-            <template slot-scope="scope">
-              {{ scope.row.startDate ? dayjs(scope.row.startDate).format("YYYY-MM-DD") + " ~ " + dayjs(scope.row.endDate).format("YYYY-MM-DD") : '' }}
-            </template>
-          </el-table-column>
+          <el-table-column label="培训机构" width="250" 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"/>
             </template>
           </el-table-column>
-          <el-table-column label="培训时间" align="center" prop="trainingStartDateTime" width="300">
+          <!-- <el-table-column label="开始时间" align="center" prop="startDate" width="180">
+          </el-table-column>
+          <el-table-column label="截止时间" align="center" prop="endDate" width="180"></el-table-column> -->
+          <el-table-column label="任务时间" align="center" width="300">
             <template slot-scope="scope">
               {{
-                scope.row.trainingStartDateTime
-                  ? (scope.row.trainingStartDateTime + " ~ " + scope.row.trainingEndDateTime) : ''
+                scope.row.startDate ? dayjs(scope.row.startDate).format("YYYY年MM月DD日") + " ~ " + dayjs(scope.row.endDate).format("YYYY年MM月DD日") : ''
               }}
             </template>
           </el-table-column>
 
+          <!--          <el-table-column label="培训时间" align="center" prop="trainingStartDateTime" width="300">
+                      <template slot-scope="scope">
+                        {{
+                          scope.row.trainingStartDateTime
+                            ? (scope.row.trainingStartDateTime + " ~ " + scope.row.trainingEndDateTime) : ''
+                        }}
+                      </template>
+                    </el-table-column>-->
+
           <!-- <el-table-column label="培训角色" width="180" align="center" >
             <template slot-scope="scope">
                 <template v-if="scope.row.taskRoleNameList  ">
@@ -131,7 +134,7 @@
                 <el-table-column label="主持人" width="140" align="center" prop="hostName" />-->
 
 
-          <el-table-column label="操作" fixed="right" width="160px" align="center"
+          <el-table-column label="操作" fixed="right"
                            class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button
@@ -152,7 +155,11 @@
                 v-hasPermi="['core:eduTask:remove']"
               >培训登记
               </el-button>
-              <el-button type="text" v-if="scope.row.pdfUrl" @click="onDown(scope.row.pdfUrl)"
+              <el-button
+                icon="el-icon-document-copy"
+                type="text"
+                v-if="scope.row.pdfUrl"
+                @click="onDown(scope.row.pdfUrl)"
               >培训登记簿
               </el-button>
             </template>
@@ -274,10 +281,10 @@ export default {
       this.clearQueryForm();
       this.handleQuery();
     },
-    clearQueryForm(){
-      this.queryParams.title=null;
-      this.queryParams.status=null;
-      this.queryParams.range=[];
+    clearQueryForm() {
+      this.queryParams.title = null;
+      this.queryParams.status = null;
+      this.queryParams.range = [];
     },
 
     //单选框状态改变
@@ -347,12 +354,12 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/eduTask/export', {
+      this.download('core/eduTask/export', {
         ...this.queryParams
-      }, `eduTask_${new Date().getTime()}.xlsx`)
+      }, this.$store.getters.orgShortName+`_培训任务_${new Date().getTime()}.xlsx`)
     },
     canPerform(row) {
-      console.log("row.status",row.status)
+      console.log("row.status", row.status)
       if (row.status != 0 && row.status != 4) return false;
       let isCur = row.orgId == this.$store.getters.orgId;
       let isOver = this.isNotOverOrUnStart(row);

src/views/core/materials/index.vue

@@ -23,11 +23,13 @@
           </el-form-item>
 
           <el-form-item label="资料类型" prop="knowledgeId">
-            <el-select v-model="queryParams.knowledgeId" placeholder="请选择资料类型" clearable>
-              <el-option v-for="item in knowledgeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+            <el-select v-model="queryParams.knowledgeId" placeholder="请选择资料类型" style="width: 100%;" clearable>
+              <el-option v-for="dict in dict.type.edu_materials_type" :key="dict.value" :label="dict.label"
+                         :value="parseInt(dict.value)"></el-option>
             </el-select>
           </el-form-item>
 
+
           <el-form-item label="资料状态" prop="isOpen">
             <el-select v-model="queryParams.isOpen" placeholder="请选择资料状态" style="width: 100%;" clearable>
               <el-option v-for="dict in dict.type.materials_status" :key="dict.value" :label="dict.label"
@@ -35,7 +37,6 @@
             </el-select>
           </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>
@@ -49,7 +50,7 @@
               size="mini"
               @click="handleAdd"
               v-hasPermi="['core:materials:add']"
-            >新增
+            >新增资料
             </el-button>
           </el-col>
 
@@ -108,7 +109,7 @@
               </el-button>
               <!-- 编辑与删除按钮显示逻辑: 仅当前用户上传的学习资料且处于未公开状态-->
               <el-button
-                v-if="checkCanEditOrDel(scope.row)"
+                v-if="checkCanEdit(scope.row)"
                 size="mini"
                 type="text"
                 icon="el-icon-edit-outline"
@@ -116,7 +117,7 @@
                 v-hasPermi="['core:materials:edit']"
               >编辑
               </el-button>
-              <el-button
+<!--              <el-button
                 v-if="checkCanShowInfo(scope.row)"
                 size="mini"
                 type="text"
@@ -124,9 +125,9 @@
                 @click="handleInfo(scope.row)"
                 v-hasPermi="['core:materials:edit']"
               >详情
-              </el-button>
+              </el-button>-->
               <el-button
-                v-if="checkCanEditOrDel(scope.row)"
+                v-if="checkCanDel(scope.row)"
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
@@ -307,12 +308,20 @@ export default {
         this.deptOptions = response.data;
       });
     },
-
-    checkCanEditOrDel(row) {
-      return row.createId == this.$store.getters.userId && row.isOpen == 0;
+    checkCanEdit(row) {
+      if (row.isOpen == 0 || row.isOpen == 2) {
+        return true;
+      }
+      return false;
+    },
+    checkCanDel(row) {
+      if (row.isOpen == 0 || row.isOpen == 2) {
+        return true;
+      }
+      return false;
     },
     checkCanShowInfo(row) {
-      return row.isOpen == 1;
+      return row.isOpen == 2;
     },
     checkCanEditOpen(row) {
       return row.createId == this.$store.getters.userId;
@@ -431,7 +440,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "新增资料";
+      this.title = "新增资料文件";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -441,7 +450,7 @@ export default {
         this.form = response.data;
         this.formFileListDefualtValue = this.form.fileList;
         this.open = true;
-        this.title = "修改知识库";
+        this.title = "修改资料文件";
       });
     },
     /** 详情按钮操作 */

src/views/core/task/dialog.info.vue

@@ -32,12 +32,12 @@
                           }}</el-form-item>
                       </el-col>
                       <el-col :span="12">
-                        <el-form-item prop="dueCount" label="调阅角色">{{
+                        <el-form-item prop="dueCount" label="调阅人员">{{
                             formData.roleName
                           }}</el-form-item>
                       </el-col>
                       <el-col :span="12">
-                        <el-form-item prop="dueCount" label="调阅人">{{
+                        <el-form-item prop="dueCount" label="登记人">{{
                             formData.retrievalUserName
                           }}</el-form-item>
                       </el-col>
@@ -61,9 +61,9 @@
                         <span>{{scope.$index + 1}}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="视频主机" align="center" prop="hostName" />
-                    <el-table-column label="视频通道" align="center" prop="channelName" />
-                    <el-table-column label="项目" align="center" prop="project" >
+                    <el-table-column label="硬盘录像机" align="center" prop="hostName" />
+                    <el-table-column label="通道名称" align="center" prop="channelName" />
+                    <el-table-column label="调阅项目" align="center" prop="project" >
                       <template slot-scope="scope">
                         <dict-tag :options="dict.type.core_registration_project" :value="scope.row.project"/>
                       </template>

src/views/core/task/index.vue

@@ -18,12 +18,8 @@
             :value="dict.value"
           />
         </el-select>
-      </el-form-item>
-      <el-form-item label="调阅角色" prop="roleId">
-        <el-select v-model="queryParams.roleId" placeholder="请选择">
-          <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-        </el-select>
       </el-form-item>-->
+
       <el-form-item label="任务名称" prop="taskName">
         <el-input
           v-model="queryParams.taskName"
@@ -32,6 +28,11 @@
           @keyup.enter.native="handleQuery"
           maxlength="50"  />
       </el-form-item>
+      <el-form-item label="调阅人员" prop="roleId">
+        <el-select v-model="queryParams.roleId" placeholder="请选择调阅人员" clearable>
+          <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="任务进度" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择进度" clearable>
           <el-option
@@ -88,29 +89,40 @@
         </template>
       </el-table-column>
       <el-table-column label="任务名称" align="center" prop="taskName" width="220"/>
+      <el-table-column label="调阅机构" align="center" prop="orgName"  width="220"/>
+      <el-table-column label="调阅人员" align="center" prop="roleName" width="160"/>
+      <el-table-column label="任务进度" align="center" prop="status">
+        <template slot-scope="scope">
+          <span :style="statusColor(scope.row.status)">
+          <dict-tag :options="dict.type.retrieval_task_status" :value="scope.row.status"/>
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="任务时间" align="center" width="220">
+        <template slot-scope="scope">
+          {{scope.row.planStartTime}}~{{scope.row.planEndTime}}
+        </template>
+      </el-table-column>
+
+      <el-table-column label="异常数" align="center" prop="exceptionCount" />
+
 <!--      <el-table-column label="调阅周期" align="center" prop="cycle" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_access_cycle" :value="scope.row.cycle" />
         </template>
       </el-table-column>-->
-      <el-table-column label="开始时间" align="center" prop="planStartTime" width="160">
+<!--      <el-table-column label="开始时间" align="center" prop="planStartTime" width="160">-->
 <!--        <template slot-scope="scope">
           <span>{{ parseTime(scope.row.planStartTime, '{y}-{m}-{d}') }}</span>
         </template>-->
-      </el-table-column>
-      <el-table-column label="截止时间" align="center" prop="planEndTime" width="160">
-<!--        <template slot-scope="scope">
+<!--      </el-table-column>-->
+<!--      <el-table-column label="截止时间" align="center" prop="planEndTime" width="160">
+&lt;!&ndash;        <template slot-scope="scope">
           <span>{{ parseTime(scope.row.planEndTime, '{y}-{m}-{d}') }}</span>
-        </template>-->
-      </el-table-column>
-      <el-table-column label="任务进度" align="center" prop="status">
-        <template slot-scope="scope">
-          <span :style="statusColor(scope.row.status)">
-          <dict-tag :options="dict.type.retrieval_task_status" :value="scope.row.status"/>
-          </span>
-        </template>
-      </el-table-column>
-      <el-table-column label="调阅机构" align="center" prop="orgName"  width="220"/>
+        </template>&ndash;&gt;
+      </el-table-column>-->
+
+
 
 <!--      <el-table-column label="调阅角色" align="center" prop="roleName" width="160"/>
 
@@ -120,8 +132,8 @@
       <el-table-column label="调阅结束时间" align="center" prop="endTime" width="160">
 
       </el-table-column>-->
-      <el-table-column label="调阅人" align="center" prop="retrievalUserName" width="140"/>
-      <el-table-column label="异常数" align="center" prop="exceptionCount" />
+<!--      <el-table-column label="调阅人" align="center" prop="retrievalUserName" width="140"/>-->
+
       <el-table-column label="操作" fixed="right" style="width: 100px" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -320,7 +332,7 @@ export default {
      console.log(this);
       this.download('core/retrievalTask/export', {
         ...this.queryParams
-      }, `${this.orgName+'-监控调阅任务记录-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+      }, `${'【'+this.orgName+'】-【调阅情况跟踪】-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
     },
     statusColor(status) {
       let color = "";