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

src/components/DictTag/index.vue

@@ -16,6 +16,7 @@
           :index="index"
           :type="item.raw.listClass == 'primary' ? '' : item.raw.listClass"
           :class="item.raw.cssClass"
+          effect="dark"
         >
           {{ item.label + " " }}
         </el-tag>

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

@@ -9,20 +9,18 @@
       <!--搜索栏-->
       <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-                 label-width="68px">
+                 label-width="100px">
 
-          <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 label="培训主题" prop="planName">
+            <el-input v-model="queryParams.planName" placeholder="请输入培训主题" clearable
+                      @keyup.enter.native="handleQuery"/>
           </el-form-item>
-          <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"
+          <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>          
           <el-form-item label="计划状态" prop="planStatus">
             <el-select v-model="queryParams.planStatus" placeholder="请选择计划状态" clearable>
               <el-option v-for="dict in dict.type.plan_status" :key="dict.value" :label="dict.label"
@@ -35,10 +33,12 @@
                          :value="item.roleId"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="培训主题" prop="planName">
-            <el-input v-model="queryParams.planName" placeholder="请输入培训主题" clearable
-                      @keyup.enter.native="handleQuery"/>
-          </el-form-item>
+          <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>
+          </el-form-item>       
 
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -79,27 +79,17 @@
         <el-table
           border
           height="550"
-          size="small" :data="planList" @selection-change="handleSelectionChange" row-key="id"
-                  :tree-props="{ children: 'children' }">
+          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" 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="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>
           </el-table-column>
-          <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="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">
@@ -114,10 +104,19 @@
               </template>
             </template>
           </el-table-column>
+          <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">
+            <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" prop="updateBy"/>          
           <el-table-column label="备注" align="center" prop="remark"/>
-          <el-table-column label="修改人" align="center" prop="updateBy"/>
-
           <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-down"

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

@@ -16,7 +16,17 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="任务时间" prop="rangen">
+      <el-form-item label="培训进度" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择培训进度" clearable>
+            <el-option
+              v-for="dict in dict.type.edu_task_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+      </el-form-item>
+      <el-form-item label="计划时间" prop="rangen">
         <el-date-picker
           v-model="queryParams.range"
           type="daterange"
@@ -34,16 +44,7 @@
             />
           </el-select>
       </el-form-item>-->
-      <el-form-item label="培训状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择培训状态" clearable>
-            <el-option
-              v-for="dict in dict.type.edu_task_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </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>
@@ -56,8 +57,20 @@
       height="600"
       size="small" v-loading="loading" :data="eduTaskList" @selection-change="handleSelectionChange">
       <el-table-column label="序号" align="center" prop="no" />
+      <el-table-column label="培训主题" width="200" align="left" prop="title" />
       <el-table-column label="培训机构" width="200" align="left" prop="orgName" />
-      <el-table-column label="培训角色" width="180" align="center" >
+      <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" prop="status" >
+        <template slot-scope="scope">
+            <dict-tag :options="dict.type.edu_task_status" :value="scope.row.status"/>
+          </template>
+      </el-table-column>
+      <el-table-column label="培训登记时间" align="center" prop="trainingStartDateTime" width="180">
+      </el-table-column>
+
+      <!-- <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(',')"
@@ -66,27 +79,18 @@
               </el-tag>
             </template>
           </template>
-      </el-table-column>
-      <el-table-column label="培训主题" width="200" align="left" prop="title" />
+      </el-table-column> -->
+      
 <!--      <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="主持人" 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">
 
-      </el-table-column>
-      <el-table-column label="培训时间" align="center" prop="trainingStartDateTime" width="180">
-      </el-table-column>
-      <el-table-column label="培训状态" align="center" prop="status" >
-        <template slot-scope="scope">
-            <dict-tag :options="dict.type.edu_task_status" :value="scope.row.status"/>
-          </template>
-      </el-table-column>
+      <el-table-column label="主持人" width="140" align="center" prop="hostName" />-->
+    
+
+      
       <el-table-column label="操作" fixed="right" width="120px" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

src/views/core/knowledge/index.vue

@@ -7,7 +7,6 @@
           placeholder="请输入名称"
           clearable
           maxlength="50"
-          show-word-limit
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>

src/views/core/materials/index.vue

@@ -12,6 +12,16 @@
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
                  label-width="68px">
 
+          <el-form-item label="资料名称" prop="title">
+            <el-input
+              v-model="queryParams.title"
+              placeholder="请输入资料名称"
+              clearable
+              maxlength="50"
+              @keyup.enter.native="handleQuery"
+            />
+          </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>
@@ -19,23 +29,13 @@
           </el-form-item>
 
 
-          <el-form-item label="发布状态" prop="isOpen">
-            <el-select v-model="queryParams.isOpen" placeholder="请选择发布状态" clearable>
+          <el-form-item label="资料状态" prop="isOpen">
+            <el-select v-model="queryParams.isOpen" placeholder="请选择资料状态" clearable>
               <el-option v-for="item in openOption" :key="item.value" :label="item.label"
                          :value="item.value"></el-option>
             </el-select>
           </el-form-item>
 
-          <el-form-item label="资料标题" prop="title">
-            <el-input
-              v-model="queryParams.title"
-              placeholder="请输入资料标题"
-              clearable
-              maxlength="50"
-              show-word-limit
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
 
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -98,15 +98,15 @@
           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="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="fileNames"/>
-          <el-table-column label="发布状态" align="center" prop="isOpen">
-            <template slot-scope="r">{{ r.row.isOpen == 0 ? '未发布' : '发布' }}</template>
+          <!-- <el-table-column label="资料附件"  width="200" align="left" prop="fileNames"/> -->
+          <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="createBy"/>
+          <el-table-column label="创建时间" align="center" prop="createTime"/>
           <el-table-column width="250" scoped-slot="remark" align="center" prop="remark" label="备注"></el-table-column>
 
           <el-table-column label="操作" width="180" fixed="right" align="center" class-name="small-padding fixed-width">
@@ -175,8 +175,8 @@
     <!-- 添加或修改学习资料对话框 -->
     <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 label="资料名称" prop="title">
+          <el-input v-model="form.title" placeholder="请输入资料名称" maxlength="50" show-word-limit/>
         </el-form-item>
 
         <el-form-item label="资料类型" prop="knowledgeId">
@@ -274,7 +274,7 @@ export default {
       // 表单校验
       rules: {
         title: [
-          {required: true, message: "资料标题不能为空", trigger: "blur"}
+          {required: true, message: "资料名称不能为空", trigger: "blur"}
         ],
         knowledgeId: [
           {required: true, message: "资料类型不能为空", trigger: "blur"}
@@ -287,11 +287,11 @@ export default {
       defaultKeys: [],
       knowledgeList: [],
       openOption: [{
-        label: "发布",
-        value: 1
-      }, {
-        label: "取消发布",
+        label: "待发布",
         value: 0
+      }, {
+        label: "已发布",
+        value: 1
       }],
     };
   },
@@ -357,7 +357,7 @@ export default {
         title: null,
         knowledgeId: null,
         content: null,
-        orgId: this.queryParams.orgId,
+        orgId: this.$store.getters.orgId,
         isOpen: null,
         remark: null,
         fileNames:null,

src/views/core/task/index.vue

@@ -8,7 +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="68px">
-
+<!--
       <el-form-item label="调阅周期" prop="cycle">
         <el-select v-model="queryParams.cycle" placeholder="请选择周期" clearable>
           <el-option
@@ -23,7 +23,7 @@
         <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>-->
 
       <el-form-item label="计划时间" prop="planStartTime">
         <el-date-picker
@@ -87,11 +87,11 @@
         </template>
       </el-table-column>
       <el-table-column label="任务名称" align="center" prop="taskName" width="220"/>
-      <el-table-column label="调阅周期" align="center" prop="cycle" >
+<!--      <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>-->
       <el-table-column label="开始时间" align="center" prop="planStartTime" width="160">
 <!--        <template slot-scope="scope">
           <span>{{ parseTime(scope.row.planStartTime, '{y}-{m}-{d}') }}</span>
@@ -102,25 +102,23 @@
           <span>{{ parseTime(scope.row.planEndTime, '{y}-{m}-{d}') }}</span>
         </template>-->
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="status">
+      <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"/>
 
-      <el-table-column label="调阅角色" align="center" prop="roleName" width="160"/>
+<!--      <el-table-column label="调阅角色" align="center" prop="roleName" width="160"/>
 
       <el-table-column label="调阅开始时间" align="center" prop="startTime" width="160">
-<!--        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
-        </template>-->
+
       </el-table-column>
       <el-table-column label="调阅结束时间" align="center" prop="endTime" width="160">
-<!--        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
-        </template>-->
-      </el-table-column>
+
+      </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="操作" fixed="right" style="width: 100px" align="center" class-name="small-padding fixed-width">
@@ -321,7 +319,25 @@ export default {
       this.download('core/retrievalTask/export', {
         ...this.queryParams
       }, `${this.orgName+'-监控调阅任务记录-'+this.formatTime(new Date(),'YYYYMMhh')}.xlsx`)
-    }
+    },
+    statusColor(status) {
+      let color = "";
+      switch (status) {
+        case "0":
+          color = "#00B0F0";
+          break;
+        case "1":
+          color = "#FFC000";
+          break;
+        case "2":
+          color = "#00B050";
+          break;
+        case "3":
+          color = "#FF0000";
+          break;
+      }
+        return "color:" + color;
+    },
   }
 };
 </script>