LY 苯乙烯

master/src/main/java/com/ruoyi/project/plant/controller/TStaffmgrController.java

@@ -588,8 +588,10 @@ public class TStaffmgrController extends BaseController
     public AjaxResult reLeft(@PathVariable Long id)
     {
         TTrainingrecords tTrainingrecords = tTrainingrecordsService.selectTTrainingrecordsBystaffId(id);
-        tTrainingrecords.setDelFlag(0l);
-        tTrainingrecordsService.updateTTrainingrecords(tTrainingrecords);
+        if(tTrainingrecords!=null){
+            tTrainingrecords.setDelFlag(0l);
+            tTrainingrecordsService.updateTTrainingrecords(tTrainingrecords);
+        }
         return toAjax(tStaffmgrService.reLeftTStaffmgrByIds(id));
     }
 

master/src/main/resources/mybatis/common/TCommonfileMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.common.mapper.TCommonfileMapper">
-    
+
     <resultMap type="TCommonfile" id="TCommonfileResult">
         <result property="id"    column="id"    />
         <result property="pId"    column="p_id"    />
@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTCommonfileById" parameterType="Long" resultMap="TCommonfileResult">
         <include refid="selectTCommonfileVo"/>
         where id = #{id}
@@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="pDate != null "> and p_date = #{pDate}</if>
             and d.del_flag = 0
         </where>
-        order by p_date desc
+        order by p_date desc , d.createdate desc
     </select>
 
     <insert id="insertTCommonfile" parameterType="TCommonfile">
@@ -134,5 +134,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

ui/src/assets/icons/svg/roudGrey.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1668389542451" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2035" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M512 512m-512 0a100 100 0 1 0 1024 0 100 100 0 1 0-1024 0Z" p-id="2036" fill="#707070"></path></svg>

ui/src/assets/icons/svg/roundGrey.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1668389542451" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2035" width="400" height="400" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M512 512m-512 0a100 100 0 1 0 1024 0 100 100 0 1 0-1024 0Z" p-id="2036" fill="#707070"></path></svg>

ui/src/assets/icons/svg/roundYellow.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1668408676313" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3106" xmlns:xlink="http://www.w3.org/1999/xlink" width="400" height="400"><path d="M512 512m-512 0a100 100 0 1 0 1024 0 100 100 0 1 0-1024 0Z" p-id="3107" fill="#f9bb47" data-spm-anchor-id="a313x.7781069.0.i8" class="selected"></path></svg>

ui/src/views/components/PlantProgList/index.vue

@@ -99,7 +99,8 @@
       </el-table-column>
       <el-table-column :label="$t('下次修订日期')" align="center" prop="nexteditdate" width="100">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.nexteditdate, '{y}-{m}-{d}') }}</span>
+          <span style="vertical-align:middle">{{ parseTime(scope.row.nexteditdate, '{y}-{m}-{d}') }}</span>
+          <svg-icon v-if="scope.row.item !== 5" :icon-class="changeColorPiont(scope.row.nexteditdate)" style="font-size: 8px"></svg-icon>
         </template>
       </el-table-column>
       <el-table-column :label="$t('回顾频率')" align="center" prop="reviewFrequency" :show-overflow-tooltip="true" v-if="this.itemNum !== '5'"/>
@@ -111,7 +112,8 @@
       <el-table-column :label="$t('回顾结果')" align="center" prop="reviewResult" width="150" :show-overflow-tooltip="true" v-if="this.itemNum !== '5'"/>
       <el-table-column :label="$t('下次回顾日期')" align="center" prop="nextreviewdate" width="100" v-if="this.itemNum !== '5'">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.nextreviewdate, '{y}-{m}-{d}') }}</span>
+          <span style="vertical-align:middle">{{ parseTime(scope.row.nextreviewdate, '{y}-{m}-{d}') }}</span>
+          <svg-icon v-if="scope.row.item !== 5" :icon-class="changeColorPiont(scope.row.nextreviewdate)" style="font-size: 8px"></svg-icon>
         </template>
       </el-table-column>
       <el-table-column :label="$t('密级分类')" align="center" prop="classify" width="100" v-if="this.itemNum !== '5'" :formatter="classifyFormat" />
@@ -708,11 +710,11 @@ export default {
     },
     //根据分数显示颜色提示
     tableCellClassName({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex == 7 && row.item !== 5) {
-        return this.changeColor(row.nexteditdate)
-      }else if (columnIndex == 11 && row.item !== 5) {
-        return this.changeColor(row.nextreviewdate)
-      }
+      // if (columnIndex == 7 && row.item !== 5) {
+      //   return this.changeColor(row.nexteditdate)
+      // }else if (columnIndex == 11 && row.item !== 5) {
+      //   return this.changeColor(row.nextreviewdate)
+      // }
     },
     changeColor (value) {
       var timeInterval = Date.parse(value) - Date.parse(new Date());
@@ -722,6 +724,14 @@ export default {
         return 'cellCare'
       }
     },
+    changeColorPiont (value) {
+      var timeInterval = Date.parse(value) - Date.parse(new Date());
+      if (timeInterval <= 15 * 24 * 3600 * 1000){
+        return 'roundRed'
+      }else if (timeInterval <= 30 * 24 * 3600 * 1000) {
+        return 'roundYellow'
+      }
+    },
     /** 查询部门下拉树结构 */
     getTreeselect() {
       treeselect().then(response => {

ui/src/views/ehs/environapproval/index.vue

@@ -149,7 +149,8 @@
       <el-table-column :label="$t('回顾结果')" align="center" prop="reviewResult" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('下次回顾日期')" align="center" prop="nextreviewdate" width="100">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.nextreviewdate, '{y}-{m}-{d}') }}</span>
+          <span style="vertical-align:middle">{{ parseTime(scope.row.nextreviewdate, '{y}-{m}-{d}') }}</span>
+          <svg-icon :icon-class="changeColorPiont(scope.row.nextreviewdate)" style="font-size: 8px"></svg-icon>
         </template>
       </el-table-column>
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
@@ -788,6 +789,14 @@ export default {
     getUrl(value){
       return value
     },
+    changeColorPiont (value) {
+      var timeInterval = Date.parse(value) - Date.parse(new Date());
+      if (timeInterval <= 15 * 24 * 3600 * 1000){
+        return 'roundRed'
+      }else if (timeInterval <= 30 * 24 * 3600 * 1000) {
+        return 'roundYellow'
+      }
+    },
     /** 查询环保批文清单列表 */
     getList() {
       this.loading = true;

ui/src/views/ehs/fireapproval/index.vue

@@ -113,7 +113,8 @@
       <el-table-column :label="$t('回顾结果')" align="center" prop="reviewResult" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('下次回顾日期')" align="center" prop="nextreviewdate" width="100">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.nextreviewdate, '{y}-{m}-{d}') }}</span>
+          <span style="vertical-align:middle">{{ parseTime(scope.row.nextreviewdate, '{y}-{m}-{d}') }}</span>
+          <svg-icon :icon-class="changeColorPiont(scope.row.nextreviewdate)" style="font-size: 8px"></svg-icon>
         </template>
       </el-table-column>
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
@@ -678,6 +679,14 @@ export default {
         this.loading = false;
       });
     },
+    changeColorPiont (value) {
+      var timeInterval = Date.parse(value) - Date.parse(new Date());
+      if (timeInterval <= 15 * 24 * 3600 * 1000){
+        return 'roundRed'
+      }else if (timeInterval <= 30 * 24 * 3600 * 1000) {
+        return 'roundYellow'
+      }
+    },
     getReviewer(year) {
       this.staffmgrQueryParams.leftYear = year
       listAllStaffmgr(this.staffmgrQueryParams).then(response => {

ui/src/views/ehs/healthapproval/index.vue

@@ -117,7 +117,8 @@
       <el-table-column :label="$t('回顾结果')" align="center" prop="reviewResult" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('下次回顾日期')" align="center" prop="nextreviewdate" width="100">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.nextreviewdate, '{y}-{m}-{d}') }}</span>
+          <span style="vertical-align:middle">{{ parseTime(scope.row.nextreviewdate, '{y}-{m}-{d}') }}</span>
+          <svg-icon :icon-class="changeColorPiont(scope.row.nextreviewdate)" style="font-size: 8px"></svg-icon>
         </template>
       </el-table-column>
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
@@ -605,6 +606,14 @@ export default {
         this.total = response.total;
         this.loading = false;
       });
+    },
+    changeColorPiont (value) {
+      var timeInterval = Date.parse(value) - Date.parse(new Date());
+      if (timeInterval <= 15 * 24 * 3600 * 1000){
+        return 'roundRed'
+      }else if (timeInterval <= 30 * 24 * 3600 * 1000) {
+        return 'roundYellow'
+      }
     },
      /** 查询部门下拉树结构 */
      getTreeselect() {

ui/src/views/ehs/jobticket/index.vue

@@ -474,7 +474,7 @@
               v-for="dict in userUnitOptions"
               :key="dict.dictValue"
               :label="dict.dictLabel"
-              :value="parseInt(dict.dictValue)"
+              :value="dict.dictValue"
             ></el-option>
           </el-select>
         </el-form-item>

ui/src/views/ehs/rcaudit/index.vue

@@ -102,7 +102,7 @@
               <a :href="scope.row.link" v-if="scope.row.link !== null">
                 <svg-icon icon-class="roundGreen"></svg-icon>
               </a>
-              <svg-icon icon-class="roundRed" v-if="scope.row.link === null"></svg-icon>
+              <svg-icon icon-class="roundGrey" v-if="scope.row.link === null"></svg-icon>
             </template>
           </el-table-column>
           <el-table-column :label="$t('操作')" align="center" fixed="right" width="190" class-name="small-padding fixed-width">

ui/src/views/ehs/safetyapproval/index.vue

@@ -113,7 +113,8 @@
       <el-table-column :label="$t('回顾结果')" align="center" prop="reviewResult" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('下次回顾日期')" align="center" prop="nextreviewdate" width="100">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.nextreviewdate, '{y}-{m}-{d}') }}</span>
+          <span style="vertical-align:middle">{{ parseTime(scope.row.nextreviewdate, '{y}-{m}-{d}') }}</span>
+          <svg-icon :icon-class="changeColorPiont(scope.row.nextreviewdate)" style="font-size: 8px"></svg-icon>
         </template>
       </el-table-column>
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
@@ -686,6 +687,14 @@ export default {
         this.total = response.total;
         this.loading = false;
       });
+    },
+    changeColorPiont (value) {
+      var timeInterval = Date.parse(value) - Date.parse(new Date());
+      if (timeInterval <= 15 * 24 * 3600 * 1000){
+        return 'roundRed'
+      }else if (timeInterval <= 30 * 24 * 3600 * 1000) {
+        return 'roundYellow'
+      }
     },
      /** 查询部门下拉树结构 */
      getTreeselect() {

ui/src/views/invoice/bookingworkticket/index.vue

@@ -1372,7 +1372,7 @@ export default {
     //合并单元格
     mergeMethod({row, column, rowIndex, columnIndex}) {
       // console.log(row)
-      if ([1, 2, 3, 4, 5, 11, 12, 13, 14, 27].includes(columnIndex)) {
+      if ([1, 2, 3, 4, 5, 11, 12, 13, 14, 28].includes(columnIndex)) {
         const _row = this.setTable(this.bookingworkticketList).merge[rowIndex];
         const _col = _row > 0 ? 1 : 0;
         return {

ui/src/views/login.vue

@@ -158,8 +158,8 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  //background-image: url("../assets/image/CPMS20210107.jpg");
-  background-image: url("../assets/image/cpms-test.jpg");
+  background-image: url("../assets/image/CPMS20210107.jpg");
+  //background-image: url("../assets/image/cpms-test.jpg");
   background-size: cover;
 }
 .title {

ui/src/views/plant/organization/branch.vue

@@ -1,5 +1,5 @@
 <template>
-    <ul :class="{'double': dataArray.length > 17}">
+    <ul :class="{'double': isHaveChild(dataArray)}">
       <li v-for="(item, index) in dataArray" :key="index" v-if="!item.level">
         <div class="branch-box" @click.prevent="clickHandle(item)">
           <div class="branch-title">{{item.post}}</div>
@@ -120,6 +120,14 @@ export default {
   methods: {
     clickHandle (obj) {
       this.bus.$emit('info', obj)
+    },
+    isHaveChild(arr){
+      for (let i = 0; i < arr.length; i++) {
+        if (arr[i].children) {
+          return false
+        }
+      }
+      return true
     }
   }
 }

ui/src/views/training/byxWorkcertificate/index.vue

@@ -104,17 +104,17 @@
           <span>{{ parseTime(scope.row.fireFacilitiesDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('身份证件号')" align="center" prop="idnum" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('复证日期')" align="center" prop="reviewdate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.reviewdate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('证书有效期')" align="center" prop="pipevalidity" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.pipevalidity, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
+<!--      <el-table-column :label="$t('身份证件号')" align="center" prop="idnum" :show-overflow-tooltip="true"/>-->
+<!--      <el-table-column :label="$t('复证日期')" align="center" prop="reviewdate" width="100">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.reviewdate, '{y}-{m}-{d}') }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column :label="$t('证书有效期')" align="center" prop="pipevalidity" width="100">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.pipevalidity, '{y}-{m}-{d}') }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column :label="$t('监护人专项培训')" align="center" prop="guardian" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('证件号')" align="center" prop="guardianIdnum" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('证书有效期')" align="center" prop="boilvalidity" width="100">
@@ -260,25 +260,25 @@
                           :placeholder="$t('请选择') + $t('证件有效期')">
           </el-date-picker>
         </el-form-item>
-        <el-form-item :label="$t('身份证件号')" prop="idnum">
-          <el-input v-model="form.idnum" :placeholder="$t('请输入') + $t('员工姓名')" />
-        </el-form-item>
-        <el-form-item :label="$t('复证日期')" prop="reviewdate">
-          <el-date-picker clearable size="small" style="width: 200px"
-                          v-model="form.reviewdate"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          :placeholder="$t('请选择') + $t('复证日期')">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item :label="$t('证书有效期')" prop="pipevalidity">
-          <el-date-picker clearable size="small" style="width: 200px"
-                          v-model="form.pipevalidity"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          :placeholder="$t('请选择') + $t('证书有效期')">
-          </el-date-picker>
-        </el-form-item>
+<!--        <el-form-item :label="$t('身份证件号')" prop="idnum">-->
+<!--          <el-input v-model="form.idnum" :placeholder="$t('请输入') + $t('员工姓名')" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="$t('复证日期')" prop="reviewdate">-->
+<!--          <el-date-picker clearable size="small" style="width: 200px"-->
+<!--                          v-model="form.reviewdate"-->
+<!--                          type="date"-->
+<!--                          value-format="yyyy-MM-dd"-->
+<!--                          :placeholder="$t('请选择') + $t('复证日期')">-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item :label="$t('证书有效期')" prop="pipevalidity">-->
+<!--          <el-date-picker clearable size="small" style="width: 200px"-->
+<!--                          v-model="form.pipevalidity"-->
+<!--                          type="date"-->
+<!--                          value-format="yyyy-MM-dd"-->
+<!--                          :placeholder="$t('请选择') + $t('证书有效期')">-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
         <el-form-item :label="$t('监护人专项培训')" prop="guardian">
           <el-input v-model="form.guardian" :placeholder="$t('请输入') + $t('监护人专项培训')" />
         </el-form-item>