Procházet zdrojové kódy

Merge remote-tracking branch 'origin/master'

徐明浩 před 3 roky
rodič
revize
9846107832

binární
ui/src/assets/img/AEU.png


binární
ui/src/assets/img/EBO框.png


binární
ui/src/assets/img/left 进箭头.png


binární
ui/src/assets/img/三拐弯细箭头.png


binární
ui/src/assets/img/二拐弯底部箭头.png


binární
ui/src/assets/img/二拐弯箭头.png


binární
ui/src/assets/img/冷炼炉 拷贝 2.png


binární
ui/src/assets/img/冷炼炉-red.png


binární
ui/src/assets/img/冷炼炉-yellow.png


binární
ui/src/assets/img/压缩机.png


binární
ui/src/assets/img/左上箭头3.png


binární
ui/src/assets/img/椭圆框.png


binární
ui/src/assets/img/炉子.png


binární
ui/src/assets/img/粗箭头5.png


binární
ui/src/assets/img/细出箭头-PGU流向.png


binární
ui/src/assets/img/细出箭头1.png


binární
ui/src/assets/img/细出箭头2.png


+ 1 - 1
ui/src/main.js

@@ -13,7 +13,7 @@ import App from './App'
 import store from './store'
 import router from './router'
 import permission from './directive/permission'
-
+import '@/style/common.scss'
 import '@/assets/icons' // icon
 import './permission' // permission control
 import { getDicts } from "@/api/system/dict/data";

+ 180 - 0
ui/src/style/common.scss

@@ -0,0 +1,180 @@
+#materialBalance {
+    padding: 0.2rem;
+    height: 8.7rem;
+    min-width: 3.75rem;
+    border-radius: 0.0625rem;
+    .bg-color-black {
+        height: 8.5rem;
+        border-radius: 0.125rem;
+      }
+      .text {
+        color: #c3cbde;
+      }
+      .chart-box {
+        margin-top: 0.2rem;
+        width: 2.125rem;
+        height: 2.125rem;
+        .active-ring-name {
+          padding-top: 0.125rem;
+        }
+      }
+  
+      .bottom-data {
+        .item-box {
+          float: right;
+          position: relative;
+          width: 50%;
+          color: #d3d6dd;
+          // 金币
+          .coin {
+            position: absolute;
+            left: 0.1rem;
+            top: 0.2125rem;
+            font-size: 0.25rem;
+            color: #ffc107;
+          }
+          .colorYellow {
+            color: yellowgreen;
+          }
+        }
+      }
+      .arrow {
+        width: 120px;
+        height: 20px;
+        background: skyblue;
+        // transform: rotate(-10deg);
+        // animation:  ;
+        background-color: red; /* 针对不支持渐变的浏览器 */
+        background-image: linear-gradient(to right, black, skyblue);
+      }
+    .layout {
+        display: flex;
+        flex-direction: row;
+        .layout_left {
+            display: flex;
+            flex-direction: column;
+            flex-wrap: nowrap;
+            align-content: center;
+            align-items: flex-start;
+            justify-content: flex-start;
+            padding-top: 20px;
+            img {
+              width: 6em;
+              height: 4.8em;
+              margin-bottom: 1.2em;
+              padding-bottom: 1.6em;
+            }
+        }
+        .layout_center {
+            display: flex;
+            flex-direction: column;
+            flex-wrap: nowrap;
+            align-content: center;
+            align-items: flex-start;
+            justify-content: flex-start;
+            padding-top: 20px;
+            padding-left: 23px;
+            img {
+              width: 6em;
+              height: 4.8em;
+              margin-bottom: 1.2em;
+              padding-bottom: 1.6em;
+            }
+        }
+        .layout_right {
+            padding-top: 2em;
+            // padding-left: 23px;
+            border: 1px dashed;
+            width: 25em;
+            margin-left: 2em;
+            .row {
+                width: 100%;
+                display: flex;
+                flex-direction: row;
+                .col {
+                    img {
+                      width: 6em;
+                      height: 7.8em;
+                      padding-bottom: 0.9em;
+                    }
+                }
+            }
+        }
+        .layout_arrow {
+            margin-left: 2em;
+            img {
+              position: relative;
+              top: 26em;
+              /* right: 0em; */
+              padding-bottom: 1.2em;
+              width: 12em;
+              width: 10em;
+              height: 4.8em;
+            }
+        }
+        .layout_EOB {
+          .thin_EOB {
+            width: 7em;
+            height: 5.8em;
+            margin-bottom: 1.2em;
+            padding-bottom: 1.6em;
+            position: relative;
+            right: 1em;
+          }
+        }
+        .layout_thin_arrow {
+          position: relative;
+          right: 10em;
+          bottom: 2em;
+          .thin_arrow {
+            width: 2em;
+            height: 18em;
+            position: relative;
+            left: 4em;
+            top: 7em;
+          }
+          img {
+            position: relative;
+            top: 18em;
+            right: -1em;
+            padding-bottom: 0.9em;
+            width: 4.9em;
+          }
+        }
+        .layout_stove {
+          img {
+            position: relative;
+            right: 9em;
+            top: 4.5em;
+            padding-bottom: 1em;
+            width: 12em;
+          }
+        }
+        .layout_cricle_stove {
+          .stove_1 {
+            position: relative;
+            top: 22.3em;
+            right: 19em;
+          }
+          .stove_2 {
+            position: relative;
+            top: 22.3em;
+            right: 8em;
+          }
+          .stove_3 {
+            position: relative;
+            right: 13em;
+            top: 5em;
+          }
+          .stove_4 {
+            position: relative;
+            top: 40em;
+            left: -33.7em;
+          }
+          img {
+            padding-bottom: 0.9em;
+            width: 4.9em;
+          }
+        }
+    }
+}

+ 2 - 2
ui/src/views/bccHome.vue

@@ -1,5 +1,5 @@
 <template>
-    <div id="front">
+    <div id="front" style="width: 100%; height: 100%">
       <dv-loading v-if="loading">Loading...</dv-loading>
       <div v-else class="host-body bg">
         <div class="d-flex jc-center">
@@ -62,7 +62,7 @@
               <material-balance />
             </div>
             <div>
-              <chart-right />
+              <chart-right/>
             </div>
           </div>
           <div class="three-bototm-box">

+ 105 - 49
ui/src/views/front/materialBalance.vue

@@ -9,15 +9,112 @@
           <span class="fs-xl text mx-2">物料平衡表</span>
         </div>
       </div>
-      <div style="text-align: center">
-        <img src="@/assets/image/liBlack.png" style="height: 8.2rem; width: 1300px">
-        <!--<video-player  class="video-player vjs-custom-skin"
-                       ref="videoPlayer"
-                       :playsinline="true"
-                       :options="playerOptions"
-        ></video-player>-->
+      <div style="text-align: center; background-color: rgba($color: #ffffff, $alpha: 0.3);
+        height: 100%;">
+        <span class="layout">
+          <span class="layout_left" style="">
+            <img src="@/assets/img/EBO框.png" style="">
+            <img src="@/assets/img/EBO框.png" style="">
+            <img src="@/assets/img/EBO框.png" style="">
+            <img src="@/assets/img/EBO框.png" style="">
+            <img src="@/assets/img/EBO框.png" style="">
+          </span>
+          <!-- 需要做动效 -->
+          <span class="layout_center">
+            <img src="@/assets/img/left 进箭头.png" style="">
+            <img src="@/assets/img/left 进箭头.png" style="">
+            <img src="@/assets/img/left 进箭头.png" style="">
+            <img src="@/assets/img/left 进箭头.png" style="">
+            <img src="@/assets/img/left 进箭头.png" style="">
+          </span>
+          <span class="layout_right">
+            <el-row class="row"> 
+              <el-col class="col" :span="8">
+                <img src="@/assets/img/冷炼炉 拷贝 2.png" style="">
+              </el-col>
+              <el-col class="col" :span="8">
+                <img src="@/assets/img/冷炼炉 拷贝 2.png" style="">
+              </el-col>
+              <el-col class="col" :span="8">
+                <img src="@/assets/img/冷炼炉 拷贝 2.png" style="">
+              </el-col>
+            </el-row>
+            <el-row class="row"> 
+              <el-col class="col" :span="8">
+                <img src="@/assets/img/冷炼炉 拷贝 2.png" style="">
+              </el-col>
+              <el-col class="col" :span="8">
+                <img src="@/assets/img/冷炼炉 拷贝 2.png" style="">
+              </el-col>
+              <el-col class="col" :span="8">
+                <img src="@/assets/img/冷炼炉-red.png" style="">
+              </el-col>
+            </el-row>
+            <el-row class="row"> 
+              <el-col class="col" :span="8">
+                <img src="@/assets/img/冷炼炉-yellow.png" style="">
+              </el-col>
+              <el-col class="col" :span="8">
+                <img src="@/assets/img/冷炼炉 拷贝 2.png" style="">
+              </el-col>
+              <el-col class="col" :span="8">
+                <img src="@/assets/img/冷炼炉 拷贝 2.png" style="">
+              </el-col>
+            </el-row>
+            <el-row class="row"> 
+              <el-col class="col" :span="8">
+                <img src="@/assets/img/冷炼炉 拷贝 2.png" style="">
+              </el-col>
+              <el-col class="col" :span="8">
+                <img src="@/assets/img/冷炼炉 拷贝 2.png" style="">
+              </el-col>
+              <el-col class="col" :span="8">
+                <img src="@/assets/img/冷炼炉 拷贝 2.png" style="">
+              </el-col>
+            </el-row>
+            <!-- <img src="@/assets/img/冷炼炉 拷贝 2.png" style="">
+            <img src="@/assets/img/冷炼炉 拷贝 2.png" style=""> -->
+            <!-- <img src="@/assets/img/冷炼炉-yellow.png" style="">
+            <img src="@/assets/img/冷炼炉-yellow.png" style="">
+            <img src="@/assets/img/冷炼炉-yellow.png" style="">
+            <img src="@/assets/img/冷炼炉-red.png" style="">
+            <img src="@/assets/img/冷炼炉-red.png" style="">
+            <img src="@/assets/img/冷炼炉 拷贝 2.png" style="">
+            <img src="@/assets/img/冷炼炉 拷贝 2.png" style="">
+            <img src="@/assets/img/冷炼炉 拷贝 2.png" style=""> -->
+          </span>
+          <!-- 需要做动效 -->
+          <span class="layout_arrow">
+            <img src="@/assets/img/粗箭头5.png" alt="">
+          </span>
+          <span class="layout_EOB">
+            <img class="thin_EOB" src="@/assets/img/EBO框.png" style="">
+          </span>
+          <span class="layout_thin_arrow">
+            <!-- 需要做动效 -->
+            <img class="thin_arrow" src="@/assets/img/细出箭头1.png" alt="">
+            <img src="@/assets/img/炉子.png" alt="">
+          </span>
+          <span>
+            <!-- 需要做动效 -->
+            <img src="@/assets/img/左上箭头3.png" alt="" style="width: width: 20px;
+            height: 10em;
+            position: relative;
+            right: 10em;
+            top: 10em;">
+          </span>
+          <span class="layout_stove">
+            <img src="@/assets/img/压缩机.png" alt="">
+          </span>
+          <span class="layout_cricle_stove">
+            <img class="stove_1" src="@/assets/img/炉子.png" alt="">
+            <img class="stove_2" src="@/assets/img/炉子.png" alt="">
+            <img class="stove_3" src="@/assets/img/炉子.png" alt="">
+            <img class="stove_4" src="@/assets/img/炉子.png" alt="">
+          </span>
+          <span class="layout__right"></span>
+        </span>
       </div>
-    <!--</div>-->
   </div>
 </template>
 
@@ -32,45 +129,4 @@
 </script>
 
 <style lang="scss">
-  #materialBalance {
-    padding: 0.2rem;
-    height: 8.7rem;
-    min-width: 3.75rem;
-    border-radius: 0.0625rem;
-    .bg-color-black {
-      height: 8.5rem;
-      border-radius: 0.125rem;
-    }
-    .text {
-      color: #c3cbde;
-    }
-    .chart-box {
-      margin-top: 0.2rem;
-      width: 2.125rem;
-      height: 2.125rem;
-      .active-ring-name {
-        padding-top: 0.125rem;
-      }
-    }
-
-    .bottom-data {
-      .item-box {
-        float: right;
-        position: relative;
-        width: 50%;
-        color: #d3d6dd;
-        // 金币
-        .coin {
-          position: absolute;
-          left: 0.1rem;
-          top: 0.2125rem;
-          font-size: 0.25rem;
-          color: #ffc107;
-        }
-        .colorYellow {
-          color: yellowgreen;
-        }
-      }
-    }
-  }
 </style>

+ 2 - 2
ui/src/views/index.vue

@@ -1,7 +1,7 @@
 <template>
 
   <bcchome v-if="homeType== 1"></bcchome>
-  <semshome v-else="homeType== 2"></semshome>
+  <semshome v-else-if="homeType == 2"></semshome>
 </template>
 
 <script>
@@ -22,7 +22,7 @@
     },
     mounted() {
       console.log(this.$store.state.user.homeType)
-      this.homeType = this.$store.state.user.homeType
+      this.homeType = 1
     },
     beforeDestroy(){
     },

+ 3 - 3
ui/src/views/index2.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="app-main" style="background: #11285a">
   <div class="dashboard-editor-container" style="width:100%;height:100%">
-
-    <!--<panel-group @handleSetLineChartData="handleSetLineChartData" />
+<!-- 
+    <panel-group @handleSetLineChartData="handleSetLineChartData" />
 
     <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
       <line-chart :chart-data="lineChartData" />
-    </el-row>-->
+    </el-row> -->
 
     <el-row :gutter="10">
 

+ 10 - 1
ui/src/views/plant/targetlist/index.vue

@@ -153,7 +153,7 @@
           <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :placeholder="$t('请选择') + $t('归属部门')" />
         </el-form-item>
         <el-form-item :label="$t('父级目录')" prop="parentId">
-          <treeselect v-model="form.parentId" :options="targetlistOptions" :normalizer="normalizer" :placeholder="$t('请选择') + $t('父级目录')" />
+          <treeselect v-model="form.parentId" :options="targetlistOptions" :normalizer="normalizer" :placeholder="$t('请选择') + $t('父级目录')" @change="changeParentId"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -594,6 +594,15 @@ export default {
       this.upload.title = this.$t('用户导入');
       this.upload.open = true;
     },
+    /** 父级菜单变更 */
+    changeParentId() {
+      console.info("111:" + this.form.parentId)
+      if (this.form.parentId === 0) {
+        this.rules = this.rulesOne
+      }else {
+        this.rules = this.rulesTwo
+      }
+    },
     /** 公司目标按钮操作 */
     handleCompany() {
       this.target.title = this.$t('公司目标');

+ 1 - 1
ui/src/views/sems/specanalysis/ApproveChart.vue

@@ -27,7 +27,7 @@ import {devApproveData} from "@/api/sems/home";
       },
       height: {
         type: String,
-        default: '320px'
+        default: '160px'
       }
     },
     data() {

+ 217 - 0
ui/src/views/sems/specanalysis/centerChart.vue

@@ -0,0 +1,217 @@
+<template>
+  <div>
+    <div class="text-container" :style="{height:height,width:width}">
+      <div class="inner-container">
+        <p class="text"
+           v-for="(text, index) in arr"
+           :key="index"
+           v-on:mouseover="changeActive"
+           v-on:mouseout="removeActive"
+           @click="chooseWarn(text)">
+          {{text}}</p>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {devApproveData} from "@/api/sems/home";
+import {listUnNotice} from "@/api/system/notice";
+  const totalDuration = 2000;
+
+  export default {
+    name: "WarnChart",
+    props: {
+      width: {
+        type: String,
+        default: '100%'
+      },
+      height: {
+        type: String,
+        default: '160px'
+      }
+    },
+    data() {
+      return {
+        arr: [],
+        number: 0,
+        // 查询参数
+        queryParams: {},
+      }
+    },
+    computed: {
+      text() {
+        return {
+          id: this.number,
+          val: this.arr[this.number]
+        }
+      }
+    },
+    created() {
+    },
+    mounted() {
+      this.startMove()
+    },
+    methods: {
+      /** 查询报警记录管理列表 */
+      devCenterData(plantIds ,unitIds) {
+        this.loading = true;
+        let params = {
+          'plantIds': plantIds,
+          'unitIds': unitIds
+        }
+        listUnNotice().then(response => {
+          for (let i = 0; i < response.length; i++) {
+            this.arr.push(response[i].noticeTitle)
+          }
+          //设置文字滚动一轮时间
+          let elem = document.querySelector('.inner-container');
+          let state = elem.style['animation'];
+          let time = this.arr.length * 1.5 + 5
+          elem.style['animation'] = 'myMove ' + time + 's linear infinite';
+          //设置文字无缝滚动高度
+          let param = this.arr.length * 60
+          let myFirstkeyframes = "@keyframes myMove{0% {transform: translateY(200px);}100% {transform: translateY(-" + param +"px);}}";
+          let style = document.createElement("style");
+          style.setAttribute("type", "text/css");
+          document.head.appendChild(style);
+          const sheet = style.sheet;
+          sheet.insertRule(myFirstkeyframes, 0);
+          this.loading = false;
+        });
+      },
+      // 鼠标移入
+      changeActive() {
+        let elem = document.querySelector('.inner-container');
+        let state = elem.style['animationPlayState'];
+        elem.style['animationPlayState'] = 'paused';
+      },
+      // 鼠标移出
+      removeActive() {
+        let elem = document.querySelector('.inner-container');
+        let state = elem.style['animationPlayState'];
+        elem.style['animationPlayState'] = 'running';
+      },
+      //点击事件
+      chooseWarn(data) {
+        var warnType = data.split("(")
+        var type = warnType[0];
+        if (type === '安全阀清单') {
+          this.$router.push("/reliability/safetyvavle");
+        }else if (type === "环保批文清单") {
+          this.$router.push("/ehs/environapproval");
+        }else if (type === "消防批文清单") {
+          this.$router.push("/ehs/fireapproval");
+        }else if (type === "安全批文清单") {
+          this.$router.push("/ehs/safetyapproval");
+        }else if (type === "故障管理跟踪") {
+          this.$router.push("/reliability/list");
+        }else if (type === "MSDS管理") {
+          this.$router.push("/ehs/msds");
+        }else if (type === "管线清单") {
+          this.$router.push("/reliability/pipe");
+        }else if (type === "装置程序清单") {
+          this.$router.push("/document/plantproglist");
+        }else if (type === "PPE发放登记") {
+          this.$router.push("/affair/ppe");
+        }else if (type === "压力管道" || type === "锅炉证" || type === "加氢工艺" || type === "裂化工艺") {
+          this.$router.push("/training/workcertificate");
+        }else if (type === "上岗证一览表") {
+          this.$router.push("/training/worklicense");
+        }else if (type === "灭火器") {
+          this.$router.push("/ehs/fireextinguisher");
+        }else if (type === "洗眼器") {
+          this.$router.push("/ehs/eyewasher");
+        }else if (type === "消防水带箱") {
+          this.$router.push("/ehs/firehose");
+        }else if (type === "消防栓") {
+          this.$router.push("/ehs/firehydrant");
+        }else if (type === "高压消防炮") {
+          this.$router.push("/ehs/highpresfire");
+        }else if (type === "自动喷淋系统") {
+          this.$router.push("/ehs/autosprinkler");
+        }else if (type === "消防竖管") {
+          this.$router.push("/ehs/firestandpipe");
+        }
+      },
+      startMove() {
+        if (this.remove === true) {
+          let timer = setTimeout(() => {
+            if (this.number === 3) {
+              this.number = 0;
+            } else {
+              this.number += 1;
+            }
+            this.startMove();
+          }, totalDuration)
+        }
+      },
+    },
+  }
+</script>
+
+<style scoped>
+  .text-container {
+    line-height: 30px;
+    /*border: 1px solid cornflowerblue;*/
+    overflow: hidden;
+  }
+  .text {
+    margin: 0 0 0 10px;
+    cursor: pointer;  /*鼠标悬停变小手*/
+    color: #ffffff;
+  }
+  p:hover {
+    background-color: #296b9bb5;
+  }
+  .inner-container {
+    /*animation: myMove 10s linear infinite;*/
+    animation-fill-mode: forwards;
+  }
+  /*文字无缝滚动*/
+  /*@keyframes myMove {
+    0% {
+      transform: translateY(200px);
+    }
+    100% {
+      transform: translateY(-400px);
+    }
+  }*/
+  /*文字停顿滚动*/
+  @keyframes myMove2 {
+    0% {
+      transform: translateY(0);
+    }
+    10% {
+      transform: translateY(-30px);
+    }
+    20% {
+      transform: translateY(-30px);
+    }
+    30% {
+      transform: translateY(-60px);
+    }
+    40% {
+      transform: translateY(-60px);
+    }
+    50% {
+      transform: translateY(-90px);
+    }
+    60% {
+      transform: translateY(-90px);
+    }
+    70% {
+      transform: translateY(-120px);
+    }
+    80% {
+      transform: translateY(-120px);
+    }
+    90% {
+      transform: translateY(-150px);
+    }
+    100% {
+      transform: translateY(-150px);
+    }
+  }
+
+</style>

+ 49 - 5
ui/src/views/sems/specanalysis/index.vue

@@ -232,6 +232,25 @@
           <div class="up">
             <dv-border-box-12>
               <div id="approveModule">
+                <div class="bg-color-spec">
+                  <div class="d-flex pt-2 pl-2">
+                    <span style="color:#96d1d5">
+                      <icon name="chart-bar"></icon>
+                    </span>
+                    <div class="d-flex">
+                      <span class="fs-xl text mx-2">{{ $t('未读消息') }}</span>
+                    </div>
+                  </div>
+                  <div>
+                    <center-chart ref="centerChart"/>
+                  </div>
+                </div>
+              </div>
+            </dv-border-box-12>
+          </div>
+          <div class="center">
+            <dv-border-box-12>
+              <div id="centerModule">
                 <div class="bg-color-spec">
                   <div class="d-flex pt-2 pl-2">
                     <span style="color:#96d1d5">
@@ -266,7 +285,6 @@
             </dv-border-box-12>
           </div>
         </div>
-
       </div>
     </div>
   </div>
@@ -281,6 +299,7 @@ import ylrqChart from "./YlrqChart";
 import ylgdChart from "./YlgdChart";
 import liftChart from "./LiftChart"
 import approveChart from "./ApproveChart"
+import centerChart from "./centerChart"
 import finishChart from "./FinishChart"
 import {listPlant, listUnit, mylistPlant} from "@/api/system/plant";
 import {devData, devGlPerData} from "@/api/sems/home";
@@ -295,7 +314,8 @@ export default {
     pvChart,
     boilerChart,
     ppChart,
-    ylgdChart
+    ylgdChart,
+    centerChart
   },
   data() {
     return {
@@ -394,6 +414,7 @@ export default {
         this.$refs.ylrqChart.devYlrqSafeData(this.plantIds, this.unitIds);
         this.$refs.ylgdChart.devYlgdSafeData(this.plantIds, this.unitIds);
         this.$refs.approveChart.devApproveData(this.plantIds, this.unitIds);
+        this.$refs.centerChart.devCenterData(this.plantIds, this.unitIds);
         this.devGlPerData()
       });
     },
@@ -414,6 +435,7 @@ export default {
       this.$refs.ylrqChart.devYlrqSafeData(this.plantIds, this.unitIds);
       this.$refs.ylgdChart.devYlgdSafeData(this.plantIds, this.unitIds);
       this.$refs.approveChart.devApproveData(this.plantIds, this.unitIds);
+      this.$refs.centerChart.devCenterData(this.plantIds, this.unitIds);
       this.devGlPerData()
     },
     devData() {
@@ -505,6 +527,14 @@ export default {
   justify-content: space-around;
 }
 
+.center {
+  padding: 0.07rem 0.05rem;
+  padding-bottom: 0;
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+}
+
 .down {
   padding: 0.07rem 0.05rem;
   padding-bottom: 0;
@@ -571,12 +601,26 @@ export default {
 
 #approveModule {
   padding: 0.15rem 0.15rem 0.15rem 0.15rem;
-  height: 4.5rem;
+  height: 2.35rem;
   min-width: 3.75rem;
   border-radius: 0.0625rem;
 
   .bg-color-spec {
-    height: 4.2rem;
+    height: 2.1rem;
+  }
+
+  .text {
+    color: #a9b3d5;
+  }
+}
+
+#centerModule {
+  padding: 0.15rem 0.15rem 0.15rem 0.15rem;
+  height: 2.35rem;
+  border-radius: 0.0625rem;
+
+  .bg-color-spec {
+    height: 2.1rem;
   }
 
   .text {
@@ -587,7 +631,7 @@ export default {
 #finishModule {
   padding-left: 0.1rem;
   padding-right: 0.1rem;
-  height: 3.5rem;
+  height: 3.3rem;
   border-radius: 0.0625rem;
 
   .text {

+ 1 - 1
ui/src/views/training/regular/index.vue

@@ -68,7 +68,7 @@
     </el-row>
 
     <el-row class="colorMark">
-      <svg-icon icon-class="rectangleLightgreen" class="rectangleLightgreen"></svg-icon>{{ $t('cc') }}
+      <svg-icon icon-class="rectangleLightgreen" class="rectangleLightgreen"></svg-icon>{{ $t('需要培训') }}
       <svg-icon icon-class="rectangleFlesh" class="rectangleFlesh"></svg-icon>{{ $t('指定人员') }}
       <svg-icon icon-class="rectangleYellow" class="rectangleYellow"></svg-icon>{{ $t('当被此项目涉及到时,如MOC、事件调查,需要培训') }}
     </el-row>

+ 1 - 1
ui/src/views/training/trainingrecords/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item :label="$t('姓名')" prop="name">
         <el-input
           v-model="queryParams.name"