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

src/components/userSelector/index.vue

@@ -38,10 +38,10 @@
             <!-- 搜索 -->
             <template slot="searchs">
               <el-form-item  prop="ruleId" label="用户账号">
-                <el-input v-model="search.username"></el-input>
+                <el-input v-model="search.username" clearable></el-input>
               </el-form-item>
               <el-form-item prop="name" label="用户姓名">
-                <el-input v-model="search.name"></el-input>
+                <el-input v-model="search.name" clearable></el-input>
               </el-form-item>
               <el-form-item>
                 <el-button

src/views/check/dialog.edit.vue

@@ -19,6 +19,7 @@
             <el-col :span="6">
               <el-form-item prop="planName" label="任务名称:">
                 <el-input
+                :disabled="isChildren()"
                   v-model.trim="formData.planName"
                   :maxlength="50"
                   name="planName"

src/views/check/task/index.vue

@@ -211,9 +211,10 @@
           >
             <template slot-scope="r">
               <span>
-                <i class="circle" :style="statusColor(r.row.status, true)" />
-                <label :style="statusColor(r.row.status, false)">
-                  {{
+                <!-- <i class="circle" :style="statusColor(r.row.status, true)" /> -->
+                <!-- <label :style="statusColor(r.row.status, false)"> -->
+                  <label >
+                 {{
                     getLabel(dict.type.safety_check_status, r.row.status)
                   }}</label
                 >

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

@@ -1,6 +1,6 @@
 <template>
   <DialogCom
-    title="选择学习附件"
+    title="选取知识库文件"
     :visible.sync="isShow"
     class="g-dialog-select-safe-check"
     :close-on-click-modal="false"
@@ -22,11 +22,11 @@
       >
         <!-- 搜索 -->
         <template slot="searchs">
-          <el-form-item prop="title" label="资料标题">
-            <el-input v-model="search.title"></el-input>
+          <el-form-item prop="title" label="资料名称">
+            <el-input v-model="search.title" placeholder="请输入资料名称"/>
           </el-form-item>
           <el-form-item prop="fileName" label="文件名称">
-            <el-input v-model="search.fileName"></el-input>
+            <el-input v-model="search.fileName" placeholder="请输入文件名称"/>
           </el-form-item>
         </template>
 

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

@@ -12,12 +12,12 @@
                  label-width="100px">
 
           <el-form-item label="培训主题" prop="planName">
-            <el-input v-model="queryParams.planName" placeholder="请输入培训主题" clearable
+            <el-input v-model="queryParams.planName" placeholder="请输入关键字" clearable
                       maxlength="50"
                       @keyup.enter.native="handleQuery"/>
           </el-form-item>
           <el-form-item label="机构类型" prop="execOrgType">
-            <el-select v-model="queryParams.execOrgType" placeholder="请选择培训机构类型" clearable>
+            <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>
@@ -82,11 +82,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="200" prop="planName"/>
+          <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" width="180" prop="belongOrgName"/> -->
-          <el-table-column label="机构类型" align="center" width="180" prop="execOrgType">
+          <el-table-column label="机构类型" align="center" width="150" prop="execOrgType">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.sys_org_type" :value="scope.row.execOrgType"/>
             </template>
@@ -117,7 +117,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="备注" align="center" prop="remark"/>
+<!--          <el-table-column label="备注" align="center" prop="remark"/>-->
           <el-table-column label="操作" width="220" 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"
@@ -214,7 +214,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="受训机构类型" prop="execOrgType">
-              <el-select style="width: 100%" v-model="form.execOrgType" placeholder="请选择受训机构类型"
+              <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>

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

@@ -64,7 +64,7 @@
                         </el-col>
                         <!-- 培训截止时间 -->
                         <el-col :span="12">
-                            <el-form-item prop="trainingEndDateTime" label="培训截止时间">{{
+                            <el-form-item prop="trainingEndDateTime" label="培训结束时间">{{
                                 formData.trainingEndDateTime
                             }}</el-form-item>
                         </el-col>
@@ -117,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" /> -->
@@ -126,7 +126,7 @@
 
                         <!-- 文件 -->
                       <el-col :span="24">
-                        <el-form-item label="资料附件" prop="fileList">
+                        <el-form-item label="资料文件" prop="fileList">
                           <K-file-upload ref="upload" :isShowUploadBtn="false"
                                          :defaultValue="formFileListDefualtValue"
                                          v-model="formData.fileList"/>

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

@@ -65,14 +65,14 @@
                 <k-textarea v-model="formData.note" placeholder="请输入培训总结" :length="2000"/>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="12">
               <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="请选择参会人员"
                           @select="absenceUserSelectChanged"></k-select>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item prop="absentList" label="缺席人员">
                 <k-select :multiple="true"  style="width: 100%" v-model="formData.absentList" url="/user/find/all"
                           :params="{ orgId: formData.orgId }" @select="absentUserSelectChanged"

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

@@ -11,7 +11,7 @@
           <el-form-item label="培训主题" prop="title">
             <el-input
               v-model="queryParams.title"
-              placeholder="请输入培训主题"
+              placeholder="请输入关键字"
               clearable
               maxlength="50"
               @keyup.enter.native="handleQuery"
@@ -87,8 +87,8 @@
           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="培训进度" align="center" prop="status" width="150">
+          <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>

src/views/core/materials/index.vue

@@ -15,7 +15,7 @@
           <el-form-item label="资料名称" prop="title">
             <el-input
               v-model="queryParams.title"
-              placeholder="请输入资料名称"
+              placeholder="请输入关键字"
               clearable
               maxlength="50"
               @keyup.enter.native="handleQuery"
@@ -62,11 +62,11 @@
           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="序号" 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="资料类型" align="center" width="180" prop="knowledgeId">
+          <el-table-column label="资料类型" align="center" width="120" prop="knowledgeId">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.edu_materials_type" :value="parseInt(scope.row.knowledgeId)"/>
             </template>
@@ -75,17 +75,17 @@
           <!--          <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" header-align="center" prop="isOpen">
+          <el-table-column label="资料状态" width="100" align="center" header-align="center" prop="isOpen">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.materials_status" :value="scope.row.isOpen"/>
             </template>
           </el-table-column>
 
-          <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="创建人" align="center" width="120" prop="createBy"/>
+          <el-table-column label="创建时间" align="center" width="200" 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">
+          <el-table-column label="操作"  fixed="right" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <!-- 公开 按钮显示逻辑: 仅当前用户上传的学习资料且处于未公开状态-->
               <el-button

src/views/resumption/ruleManager/index.vue

@@ -314,4 +314,8 @@ export default {
     width: 60px !important;
   }
 }
+::v-deep .el-table__expanded-cell[class*="cell"] {
+  padding: 0;
+  padding-left: 47px;
+}
 </style>

src/views/safetycheck/ruleManager/index.vue

@@ -27,7 +27,7 @@
           v-show="showSearch && rule"
           label-width="100px"
         >
-          <el-form-item prop="itemName" label="检查项">
+          <el-form-item prop="itemName" label="检查项" class="search_itemname">
             <el-input
               v-model="queryParams.itemName"
               placeholder="请输入内容"
@@ -43,7 +43,10 @@
               clearable
             ></el-input>
           </el-form-item>
-          <el-form-item>
+        </el-form>
+        <!--    按纽    -->
+        <el-row :gutter="10" class="mb8"  v-show="showSearch && rule">
+          <el-col :span="1.5">
             <el-button
               type="primary"
               icon="el-icon-search"
@@ -55,13 +58,9 @@
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
               >重置</el-button
             >
-          </el-form-item>
-        </el-form>
-        <!--    按纽    -->
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
             <el-button
               type="primary"
+              size="mini"
               @click="onAddItem()"
               :disabled="rule ? false : true"
               v-hasPermi="['safetycheck:ruleManager:add']"
@@ -76,6 +75,7 @@
             <el-button
               type="warning"
               @click="dakai"
+              size="mini"
               :disabled="rule ? false : true"
               >{{ expandAll ? "收起所有行" : "展开所有行" }}</el-button
             >
@@ -113,10 +113,6 @@
                   v-if="columns[4].visible"
                 >
                 </el-table-column>
-                <!-- <el-table-column prop="dataTypeName" label="数据类型">
-                </el-table-column>
-                <el-table-column prop="degreeRiskName" label="风险等级">
-                </el-table-column> -->
               </el-table>
             </template>
           </el-table-column>
@@ -129,8 +125,6 @@
           </el-table-column>
           <el-table-column prop="name" label="检查项" v-if="columns[1].visible">
           </el-table-column>
-          <!-- <el-table-column prop="itemDesc" label="标准及要求">
-          </el-table-column> -->
           <el-table-column
             prop="pointNums"
             label="检查内容数量"
@@ -379,71 +373,13 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.show-ellipsis {
-  display: block;
-  width: 180px;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-.search {
-  display: flex;
-  flex-wrap: wrap;
-  & > div {
-    width: 25%;
-    display: flex;
-    align-items: center;
-    margin-bottom: 12px;
-    & > span:first-child {
-      display: inline-block;
-      min-width: 70px;
-      font-size: 14px;
-      color: #606266;
-    }
-    &:nth-child(2),
-    &:nth-child(3) {
-      margin-left: 15px;
-    }
-    &:nth-child(3) > span {
-      display: inline-block;
-      min-width: 100px;
-      font-size: 14px;
-      color: #606266;
-    }
-    &:nth-child(1) > span {
-      display: inline-block;
-      min-width: 100px;
-      font-size: 14px;
-      color: #606266;
-    }
-    &:nth-child(1) {
-    }
-  }
-}
-.box {
-  border: 1px solid #eee;
-  margin-bottom: 20px;
-  border-radius: 5px;
-  padding: 10px;
-  min-height: 120px;
-  & > p {
-    font-size: 16px;
-    font-weight: bold;
-    margin-bottom: 15px;
+.search_itemname {
+  ::v-deep .el-form-item__label {
+    width: 60px !important;
   }
 }
-.item {
-  margin-bottom: 14px;
-}
 ::v-deep .el-table__expanded-cell[class*="cell"] {
   padding: 0;
   padding-left: 47px;
 }
-::v-deep .formbox {
-  display: flex;
-  flex-wrap: wrap;
-  .el-form-item {
-    width: 50%;
-  }
-}
 </style>

src/views/safetycheck/taskManager/components/register.vue

@@ -31,24 +31,29 @@
           style="width: 80%; margin-top: -8px"
           placeHolder="请输入检查组成员"
           v-model="taskInfo.checkTeam"
+          maxlength="255"
           v-if="isRegister"
         ></el-input>
         <span v-else>{{ taskInfo.checkTeam }}</span>
       </el-descriptions-item>
       <el-descriptions-item label="检查状态"
-        >{{ dayjs(taskInfo.planStartTime).format("YYYY-MM-DD") }}
+        >{{ getLabel(dict.type.safety_check_status,taskInfo.status) }}
       </el-descriptions-item>
     </el-descriptions>
-    <div>
-      <span style="margin-right: 20px">巡检区域</span>
-      <el-button
-        type="primary"
-        size="mini"
-        @click="onAddPoint()"
-        v-if="isRegister"
-        >新增检查内容</el-button
-      >
-    </div>
+    <el-row class="el-row-button">
+      <el-col>
+        <span style="margin-right: 20px">巡检区域</span>
+        <el-button
+          type="primary"
+          size="mini"
+          @click="onAddPoint()"
+          v-if="isRegister"
+          >新增检查内容</el-button
+        >
+      </el-col>
+      
+    </el-row>
+    
     <div class="content">
       <div class="area_content" v-for="area in taskInfo.checkList">
         <div>
@@ -204,7 +209,7 @@ export default {
       mode: null,
     };
   },
-  dicts: ["rectification_deadline", "sys_user_is_lock"],
+  dicts: ["rectification_deadline", "sys_user_is_lock","safety_check_status"],
   components: { SelectPoint, imgUpload, UserSelector },
   computed: {
     ...mapGetters(["orgId", "roleList", "userId"]),
@@ -409,6 +414,9 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.el-row-button{
+    margin-top:20px;
+  }
 .content {
   max-height: calc(100% - 300px);
   overflow-y: auto;