标准库修改

spring

2025-04-03 7d828bee5a6468b494f57a7984b0a52ec49b1356

标准库修改

 src/views/index.vue

@@ -5,30 +5,37 @@
        <div class="left-1">
          <div class="say">
            <div style="display: flex;align-items: center;flex-wrap: wrap;">
              <div class="say-1">{{nickName}} 您好！祝您开心每一天</div>
              <div class="say-2">当前时间： {{now}}</div>
              <div class="say-1">{{ nickName }} 您好！祝您开心每一天</div>
              <div class="say-2">当前时间： {{ now }}</div>
            </div>
          </div>
        </div>
        <div class="left-2 card" v-loading="workLoading" style="overflow: hidden;">
          <div class="left-2-item" v-for="(item,index) in workDay" :key="index">
          <div class="left-2-item" v-for="(item, index) in workDay" :key="index">
            <div class="left-item-title">
              <span style="font-size: 18px;">{{ item }}</span>
              <span style="font-size: 14px;color: #999999;">{{ weekdays[index] }}</span>
              <el-tag style="margin-top: 6px;" size="small">{{workList[index].length}} 条</el-tag>
              <el-tag style="margin-top: 6px;" size="small">{{ workList[index].length }} 条</el-tag>
            </div>
            <div class="left-item-body">
              <div class="body-item" v-for="(m,i) in workList[index]" :key="i" :class="{color0:m.type==0,color1:m.type==1,color2:m.type==2}">
              <div class="body-item" v-for="(m, i) in workList[index]" :key="i"
                :class="{ color0: m.type == 0, color1: m.type == 1, color2: m.type == 2 }">
                <div>
                  <span style="font-size: 12px;margin-bottom: 17px;">{{ m.text }}</span>
                  <div style="display: flex">
                    <span class="body-item-name">{{ m.name }}</span>
                    <span v-if="m.state == 0" class="body-item-insState" style="background-color: #909399;font-size: 12px;">待检验</span>
                    <span v-if="m.state == 1" class="body-item-insState" style="background-color: #E6A23C;font-size: 12px;">检验中</span>
                    <span v-if="m.state == 2" class="body-item-insState" style="background-color: #67C23A;font-size: 12px;">已检验</span>
                    <span v-if="m.state == 3" class="body-item-insState" style="background-color: #E6A23C;font-size: 12px;">待复核</span>
                    <span v-if="m.state == 4" class="body-item-insState" style="background-color: #F56C6C;font-size: 9px;">复核未通过</span>
                    <span v-if="m.state == 5" class="body-item-insState" style="background-color: #67C23A;font-size: 10px;">复核通过</span>
                    <span v-if="m.state == 0" class="body-item-insState"
                      style="background-color: #909399;font-size: 12px;">待检验</span>
                    <span v-if="m.state == 1" class="body-item-insState"
                      style="background-color: #E6A23C;font-size: 12px;">检验中</span>
                    <span v-if="m.state == 2" class="body-item-insState"
                      style="background-color: #67C23A;font-size: 12px;">已检验</span>
                    <span v-if="m.state == 3" class="body-item-insState"
                      style="background-color: #E6A23C;font-size: 12px;">待复核</span>
                    <span v-if="m.state == 4" class="body-item-insState"
                      style="background-color: #F56C6C;font-size: 9px;">复核未通过</span>
                    <span v-if="m.state == 5" class="body-item-insState"
                      style="background-color: #67C23A;font-size: 10px;">复核通过</span>
                  </div>
                </div>
              </div>
@@ -40,11 +47,7 @@
        <div class="right-2 card">
          <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom: 10px">
            <span style="color: #333333;font-size: 16px;">工时统计</span>
            <el-date-picker
              v-model="time.month"
              type="month"
              date-format="yyyy-MM"
              value-format="yyyy-MM"
            <el-date-picker v-model="time.month" type="month" date-format="yyyy-MM" value-format="yyyy-MM"
              placeholder="选择月" size="mini" @change="changeTime" style="width: 130px;">
            </el-date-picker>
          </div>
@@ -52,26 +55,26 @@
            <el-col :span="12">
              <div class="right-time-1">
                <div style="text-align: center;font-size: 14px;color: #606266;line-height: 60px;">总工时(小时)</div>
                <div style="text-align: center;font-family: DIN Alternate, DIN Alternate;font-weight: 700;font-size: 26px;color: #3D3D3D;line-height: 40px;">{{totalHour}}</div>
                <div
                  style="text-align: center;font-family: DIN Alternate, DIN Alternate;font-weight: 700;font-size: 26px;color: #3D3D3D;line-height: 40px;">
                  {{ totalHour }}</div>
              </div>
            </el-col>
            <el-col :span="12">
              <Echarts ref="chart"
                       :legend="pieLegend"
                       :series="materialPieSeries"
                       :tooltip="pieTooltip"
                       style="height: 150px;width: 100%;"></Echarts>
              <Echarts ref="chart" :legend="pieLegend" :series="materialPieSeries" :tooltip="pieTooltip"
                style="height: 150px;width: 100%;"></Echarts>
            </el-col>
          </el-row>
        </div>
        <div class="right-3 card" style="overflow: hidden;">
          <div class="right-3-tab">
            <div class="tab-item">待办事项</div>
            <div class="tab-item2">{{'您有' + total + '项任务待完成'}}</div>
            <div class="tab-item2">{{ '您有' + total + '项任务待完成' }}</div>
          </div>
          <div v-loading="listLoading" class="right-3-list">
            <scroll-pagination v-if="list.length>0||listLoading" :finishLoding="finishLoding" :list="list" @load="getList">
              <div v-for="(m,i) in list" :key="i" class="list3-item">
            <scroll-pagination v-if="list.length > 0 || listLoading" :finishLoding="finishLoding" :list="list"
              @load="getList">
              <div v-for="(m, i) in list" :key="i" class="list3-item">
                <div class="list3-item-title">
                  <span class="blue-dot">{{ m.theme }}</span>
                  <el-link class="blue-dot1" @click="goAddList(m)">查看</el-link>
@@ -84,7 +87,8 @@
                </div>
              </div>
            </scroll-pagination>
            <div v-if="list.length<1&&!listLoading" style="color:#909399;font-size:14px;text-align: center;margin-top:80px" >暂无数据</div>
            <div v-if="list.length < 1 && !listLoading"
              style="color:#909399;font-size:14px;text-align: center;margin-top:80px">暂无数据</div>
          </div>
        </div>
      </el-col>
@@ -94,9 +98,9 @@

<script>
import ScrollPagination from '@/components/index/scroll-paging.vue'
import {calendarWorkByWeek, currentUserWorkHourCount, msgRoll, page} from "@/api/index/report";
import { calendarWorkByWeek, currentUserWorkHourCount, msgRoll, page } from "@/api/index/report";
import Echarts from "@/components/echarts/echarts.vue";
import {mapGetters} from "vuex";
import { mapGetters } from "vuex";
export default {
  components: {
    Echarts,
@@ -107,21 +111,21 @@
    return {
      now: null,
      calendarValue: new Date(),
      workLoading:false,
      workList:[],
      workDay:[],
      weekdays:[],
      listScheduleByMe:[],
      scheduleLoading:false,
      list:[],
      currentPage:1,
      workLoading: false,
      workList: [],
      workDay: [],
      weekdays: [],
      listScheduleByMe: [],
      scheduleLoading: false,
      list: [],
      currentPage: 1,
      pageSize: 8, // 一页7条
      total: 0,
      listLoading: true, // 组件loading的展示,默认为true
      finishLoding: false, // 加载完成，显示已经没有更多了
      timer:null,
      keyMap:{},
      sonLaboratory:null,
      timer: null,
      keyMap: {},
      sonLaboratory: null,
      totalHour: 0,
      materialPieSeries: [
        {
@@ -150,20 +154,20 @@
            length2: 10,
          },
          data: [
            { value: 0, name: '辅助工时', itemStyle: {color: '#A4EEDA'} },
            { value: 0, name: '产量工时', itemStyle: {color: '#86C1F4'} },
            { value: 0, name: '辅助工时', itemStyle: { color: '#A4EEDA' } },
            { value: 0, name: '产量工时', itemStyle: { color: '#86C1F4' } },
          ]
        }
      ],
      pieLegend: {show: false},
      pieLegend: { show: false },
      pieTooltip: {
        trigger: 'item'
      },
      type:'月',
      time:{
        week:'',
        month:'',
        year:'',
      type: '月',
      time: {
        week: '',
        month: '',
        year: '',
      },
    }
  },
@@ -181,34 +185,34 @@
    this.keyMap = {}
    this.list = [];
    this.getList();
    this.initEchart()
    this.timer&&clearInterval(this.timer)
    // this.initEchart()
    this.timer && clearInterval(this.timer)
    this.timer = setInterval(() => {
      this.init();
      this.currentPage = 1;
      this.keyMap = {}
      this.list = [];
      this.getList();
    },1000*60*10)
    }, 1000 * 60 * 10)
  },
  methods: {
    // 跳转页面
    goAddList(m) {
      this.$router.push({name: m.jumpPath, query: { activeName: m.jumpId }})
      this.$router.push({ name: m.jumpPath, query: { activeName: m.jumpId } })
    },
    getList(){
    getList() {
      const key = `_${this.currentPage}`
      const value = this.keyMap[key]
      // 如果value存在，表示缓存有值，那么阻止请求
      if(value) {
      if (value) {
        return
      }
      // value不存在，表示第一次请求,设置占位
      this.keyMap[key] = 'temp'
      if(this.currentPage==1){
      if (this.currentPage == 1) {
        this.listLoading = true
      }
      if(this.list.length==0){
      if (this.list.length == 0) {
        this.finishLoding = false;
      }
      const params = {
@@ -218,20 +222,20 @@
      msgRoll(params).then(res => {
        let list = res.data.records;
        this.total = res.data.total;
        if(list.length==0){
        if (list.length == 0) {
          this.finishLoding = true;
        }else{
          if(list.length<this.pageSize){
        } else {
          if (list.length < this.pageSize) {
            this.finishLoding = true;
          }
          this.list = this.list.concat(list)
          if(this.total==this.list.length){
          if (this.total == this.list.length) {
            this.finishLoding = true;
          }
          this.currentPage++;
        }
        this.listLoading = false
      }).catch(err=>{
      }).catch(err => {
        this.listLoading = false
      })
    },
@@ -262,19 +266,19 @@
      this.now = y + "-" + m + "-" + d + "  " + h + ":" + min + ":" + s;
    },
    // 获取日历任务图
    init(){
    init() {
      this.workLoading = true;
      calendarWorkByWeek().then(res => {
        this.workLoading = false;
        this.workList = [];
        for(let i=0;i<7;i++){
        for (let i = 0; i < 7; i++) {
          this.workList.push(res.data[`work${i}`])
        }
        this.workDay = res.data.weekDays.map(m=>{
        this.workDay = res.data.weekDays.map(m => {
          let arr = m.split('-')
          return arr[2]
        })
      }).catch(err=>{
      }).catch(err => {
        this.workLoading = false;
      })
    },
@@ -287,8 +291,8 @@
        weekdays.push(day);
      }
      weekdays.reverse()
      weekdays = weekdays.map(m=>{
        let day =''
      weekdays = weekdays.map(m => {
        let day = ''
        switch (m) {
          case 0:
            day = '星期天'
@@ -316,7 +320,7 @@
      })
      return weekdays;
    },
    goNoticeDetail(row){
    goNoticeDetail(row) {
      // this.$axios.put(this.$api.informationNotification.triggerModificationStatusToRead+'/'+row.id).then(res => {
      //   row.num = Math.random(100);
      //   this.$bus.$emit("change", JSON.stringify(row));
@@ -329,10 +333,10 @@
      //   },29);
      // })
    },
    changeTime(m){
    changeTime(m) {
      this.initEchart(m)
    },
    async initEchart(m){
    async initEchart(m) {
      let month = ''
      if (m) {
        month = m
@@ -359,8 +363,8 @@
      })
    },
  },
  deactivated(){
    this.timer&&clearInterval(this.timer)
  deactivated() {
    this.timer && clearInterval(this.timer)
  }
}
</script>
@@ -381,6 +385,7 @@
  margin-bottom: 16px;
  border-radius: 16px;
}

.right-time-1 {
  background: url("~@/assets/images/bg1.png") no-repeat;
  background-size: 100% 100%;
@@ -420,51 +425,60 @@
  border-radius: 3px;
}

.card{
.card {
  background: #FFFFFF;
  border-radius: 16px;
  width: 100%;
  box-sizing: border-box;
}

.right-1-item .mun{
.right-1-item .mun {
  margin-left: 6px;
  color: #0166E2;
}

.right-2{
.right-2 {
  padding: 10px;
  margin-bottom: 20px;
}

>>>.el-calendar__header {
  display: none;
}
>>>.el-calendar__body{

>>>.el-calendar__body {
  padding: 0;
}

>>>.el-calendar-table:not(.is-range) td.next {
  /*隐藏下个月的日期*/
  display: none;
}
>>>.el-calendar-day{

>>>.el-calendar-day {
  height: 40px;
}
>>>.el-calendar-table td{

>>>.el-calendar-table td {
  border: 0;
  font-size: 14px;
}
>>>.el-calendar-table tr td:first-child{

>>>.el-calendar-table tr td:first-child {
  border-left: 0;
}

.right-3 {
  height: 600px;
}
.right-3-tab{

.right-3-tab {
  padding: 20px 20px 10px 20px;
  display: flex;
  justify-content: space-between;
}
.tab-item{

.tab-item {
  font-weight: 500;
  font-size: 18px;
  color: #3D3D3D;
@@ -473,27 +487,32 @@
  font-style: normal;
  text-transform: none;
}
.tab-item2{

.tab-item2 {
  font-weight: 500;
  font-size: 14px;
  color: #FD8504;
}
.right-3-list{

.right-3-list {
  padding: 0 20px 20px 20px;
  box-sizing: border-box;
  height: 544px;
  overflow-y: auto;
}
.list3-item{

.list3-item {
  padding: 10px;
  margin: 8px 0;
  height: 94px;
  background: #F7F7F7;
}
.list3-item:hover{
  background: rgba(58, 123, 250,0.05);

.list3-item:hover {
  background: rgba(58, 123, 250, 0.05);
}
.list3-item-title{

.list3-item-title {
  margin-bottom: 6px;
  font-weight: 600;
  font-size: 14px;
@@ -501,20 +520,27 @@
  display: flex;
  justify-content: space-between;
}

.blue-dot::before {
  content: "•"; /* 这是小蓝点的字符 */
  color: #3A7BFA; /* 设置颜色为蓝色 */
  font-size: 20px; /* 设置大小 */
  content: "•";
  /* 这是小蓝点的字符 */
  color: #3A7BFA;
  /* 设置颜色为蓝色 */
  font-size: 20px;
  /* 设置大小 */
  line-height: 20px;
  margin-right: 5px; /* 与<span>内容之间的间距 */
  margin-right: 5px;
  /* 与<span>内容之间的间距 */
  vertical-align: middle;
}

.blue-dot1 {
  font-weight: 500;
  font-size: 14px;
  color: #3A7BFA;
}
.list3-item-info{

.list3-item-info {
  display: flex;
  flex-direction: column;
  justify-content: space-between;
@@ -523,35 +549,43 @@
  color: #3D3D3D;
  height: 60%;
}

.ellipsis-multiline {
  font-weight: 400;
  font-size: 14px;
  color: #3D3D3D;
}

.createTime-info {
  font-weight: 400;
  font-size: 12px;
  color: #9F9F9F;
}
.left-2{

.left-2 {
  display: grid;
  grid-template-columns: repeat(7, 1fr);
  height: 777px;
}
.left-2-item{

.left-2-item {
  border-right: 1px solid #F1F1F1;
  overflow: hidden !important;
}
.left-2-item:nth-last-child(1){

.left-2-item:nth-last-child(1) {
  border-right: 0;
}
.left-2-item:hover{
  background: rgba(58,123,250,0.05);

.left-2-item:hover {
  background: rgba(58, 123, 250, 0.05);
}
.left-2-item:hover .left-item-title span{

.left-2-item:hover .left-item-title span {
  color: #3A7BFA !important;
}
.left-item-title{

.left-item-title {
  border-bottom: 1px solid #F1F1F1;
  display: flex;
  flex-direction: column;
@@ -559,36 +593,43 @@
  justify-content: center;
  padding: 20px 0;
}
.left-item-body{

.left-item-body {
  box-sizing: border-box;
  padding: 5px;
  height: 693px;
  overflow-y: auto;
}
.body-item{

.body-item {
  background: #70A090;
  border-radius: 16px;
  overflow: hidden;
  margin-bottom: 8px;
}
.body-item.color0{

.body-item.color0 {
  background: #70A090;
}
.body-item.color1{

.body-item.color1 {
  background: #EBD476;
}
.body-item.color2{

.body-item.color2 {
  background: #FF3838;
}
.body-item>div{

.body-item>div {
  height: calc(100% - 16px);
  margin-top: 16px;
  background: rgba(255, 255, 255,0.9);
  background: rgba(255, 255, 255, 0.9);
  padding: 8px 8px 16px;
  display: flex;
  flex-direction: column;
}
>>>.el-calendar-day span{

>>>.el-calendar-day span {
  display: inline-block;
  width: 30px;
  height: 30px;
@@ -596,26 +637,33 @@
  text-align: center;
  border-radius: 4px;
}
>>>.is-selected{

>>>.is-selected {
  background: transparent !important;
}
>>>.is-selected .el-calendar-day{

>>>.is-selected .el-calendar-day {
  background: transparent !important;
}
>>>.is-selected .el-calendar-day span{

>>>.is-selected .el-calendar-day span {
  background: #3A7BFA !important;
  color: #fff !important;
}
>>>.el-calendar-day:hover{

>>>.el-calendar-day:hover {
  background: transparent;
}
>>>.el-calendar-day span:hover{

>>>.el-calendar-day span:hover {
  background: #3A7BFA !important;
  color: #fff !important;
}
>>>.el-tag--dark{

>>>.el-tag--dark {
  border: 0;
}

.body-item-name {
  display: inline-block;
  height: 22px;
@@ -627,10 +675,12 @@
  color: #fff;
  font-size: 12px
}

.body-item-insState {
  margin-left: 2px;
  display: inline-block;
  height: 22px;width: 60px;
  height: 22px;
  width: 60px;
  border-radius: 10px;
  line-height: 22px;
  text-align: center;

 src/views/standard/standardLibrary/index.vue

@@ -34,8 +34,7 @@
            </el-col>
            <el-col v-if="
              checkPermi(['standard:standardLibrary:delStandardTree']) &&
              (node.data.children === null ||
                node.data.children === undefined)
              data.level == 7
            " :span="2" style="text-align: right">
              <el-button size="mini" type="text" @click.stop="editTreeName(node.data)" v-if="!auditId">
                <i class="el-icon-edit"></i>
@@ -43,8 +42,7 @@
            </el-col>
            <el-col v-if="
              checkPermi(['standard:standardLibrary:delStandardTree']) &&
              (node.data.children === null ||
                node.data.children === undefined)
              data.level == 7
            " :span="2" style="text-align: right">
              <el-button size="mini" type="text" @click.stop="remove(node, data)" v-if="!auditId">
                <i class="el-icon-delete"></i>
@@ -58,7 +56,7 @@
      <el-row class="title" style="width: 100%">
        <el-col :span="19" style="font-size: 14px; color: #999"><span>{{
          selectTree
        }} </span></el-col>
            }} </span></el-col>
        <el-col :span="5" style="position: absolute;top: -3px;right: -25px;" v-if="!auditId && !standardCkeck">
          <el-button size="small" type="primary" @click="submitReview" :loading="submitReviewLoad">提交变更</el-button>
          <el-button v-if="isShowCopy" size="small" type="primary" @click="openCopyDia">批量复制</el-button>
@@ -616,7 +614,11 @@
        this.selectTree = "";
        // 拼接树路径
        this.selectTree = this.getReversedTreePath(node);
        delStandardTree({ tree: this.selectTree }).then((res) => {
        delStandardTree({
          tree: this.selectTree,
          level: data.level,
          id: data.value
        }).then((res) => {
          this.$message.success("已删除");
          let arr = this.selectTree.split(" - ");
          this.deleteStandard(this.list, arr[arr.length - 1]);

 src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue

@@ -148,7 +148,7 @@
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
          <!-- <el-col :span="12">
            <el-form-item label="试验方法：" prop="method">
              <el-select v-model="editForm.method" clearable multiple placeholder="请选择" size="small"
                style="width: 100%">
@@ -156,8 +156,8 @@
                  :value="item.label"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
          <!-- <el-col :span="12">
          </el-col> -->
          <el-col :span="12">
            <el-form-item label="试验条件：" prop="radiusList">
              <el-select v-model="editForm.radiusList" allow-create default-first-option filterable multiple
                placeholder="请选择" size="small" style="width: 100%">
@@ -165,9 +165,7 @@
                  :value="item.value"></el-option>
              </el-select>
            </el-form-item>
          </el-col> -->
        </el-row>
        <el-row>
          </el-col>
          <el-col :span="12">
            <el-form-item label="收费标准(元/次)：" prop="rates">
              <el-input v-model="editForm.rates" clearable size="small"></el-input>