Merge remote-tracking branch 'origin/master'

value

2024-04-26 5c9691cbb4dde05b003c418431cbe9411e54a944

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/components/tool/value-table.vue

 src/components/view/a5-laboratory-management.vue

@@ -192,7 +192,11 @@
                        type: 'text',
                        method: 'fileManagement'
                    }],
                    tagField: {},
                    tagField: {
                        type:{
              select:[]
            }
                    },
                    selectField: {},
                    requiredAdd: ['laboratoryName', 'laboratoryNumber', 'head', 'phoneNumber'],
                    requiredUp: ['laboratoryName', 'laboratoryNumber', 'head', 'phoneNumber']
@@ -211,11 +215,7 @@
                    showSelect: false,
                    select: false,
                    do: [],
                    tagField: {
            type:{
              select:[]
            }
          },
                    tagField: {},
                    selectField: {
            type:{
              select:[]
@@ -239,12 +239,12 @@
        props: { multiple: false,emitPath:false,},
        options:[
          {
            value:0,
            value:'实验室资质',
            label:'实验室资质',
            children:[]
          },
          {
            value:1,
            value:'额外类型',
            label:'额外类型',
            children:null
          },
@@ -278,7 +278,7 @@
                        return
                    }
          let arr = res.data.body.records.map(m=>{
            m.value = m.id;
            m.value = m.name;
            m.label = m.name;
            return m
          })
@@ -356,7 +356,7 @@
                let up = false
                let del = false
                let add = false
        let file = false
                let file = false
                for (var i = 0; i < power.length; i++) {
                    if (power[i].menuMethod == 'upParameter') {
                        up = true

 src/components/view/a5-laboratory-qualifications.vue

@@ -191,23 +191,12 @@
                    v-model="formData.explanation"></el-input>
        </div>
      </div>
      <!-- <div class="search_thing" style="margin-bottom: 16px;">
        <div class="search_label" style="width:120px">首次颁发时间：</div>
        <div class="search_input">
          <el-date-picker style="width:100%" v-model="formData.firstTime"
          type="datetime"
                    size="small"
          format="yyyy-MM-dd HH:mm:ss"
          value-format="yyyy-MM-dd HH:mm:ss"
          clearable
          placeholder="选择日期">
                    </el-date-picker>
        </div>
      </div>
     

      <div class="search_thing" style="margin-bottom: 16px;">
        <div class="search_label" style="width:120px">最近颁发时间：</div>
        <div class="search_label" style="width:120px"><span class="required-span">* </span>颁发时间：</div>
        <div class="search_input">
          <el-date-picker style="width:100%" v-model="formData.recentlyTime"
          <el-date-picker style="width:100%" v-model="formData.dateOfIssuance"
          type="datetime"
                    size="small"
          format="yyyy-MM-dd HH:mm:ss"
@@ -216,7 +205,7 @@
          placeholder="选择日期">
                    </el-date-picker>
        </div>
      </div> -->
      </div> 
      <div class="search_thing" style="margin-bottom: 16px;">
        <div class="search_label" style="width:120px"><span class="required-span">* </span>到期时间：</div>
        <div class="search_input">

 src/components/view/a6-device-management.vue

@@ -185,12 +185,12 @@
              filterable
              clearable></el-cascader>
            </el-form-item>
            <el-form-item label="最近校准日期:">
            <el-form-item label="最近校准日期:" v-if="isUp">
                            <el-date-picker :disabled="isUp" style="width:100%" v-model="formData.latestTraceability" format="yyyy-MM-dd"
                                value-format="yyyy-MM-dd" type="date" size="small" placeholder="选择日期">
                            </el-date-picker>
                        </el-form-item>
            <el-form-item label="下次校准日期:">
            <el-form-item label="下次校准日期:" v-if="isUp">
                            <el-date-picker :disabled="isUp" style="width:100%" v-model="formData.latestTraceability" format="yyyy-MM-dd"
                                value-format="yyyy-MM-dd" type="date" size="small" placeholder="选择日期">
                            </el-date-picker>
@@ -327,7 +327,7 @@
            </el-form-item>
            <el-form-item label="检测项目:">
              <el-cascader
              v-model="formData.insProductIds"
              v-model="formData2.insProductIds"
              :options="options"
              :show-all-levels="false"
              :props="props"
@@ -335,18 +335,9 @@
              style="width:100%"
              collapse-tags
              separator=","
              filterable
              clearable></el-cascader>
            </el-form-item>
            <!-- <el-form-item label="最近校准日期:">
                            <el-date-picker style="width:100%" v-model="formData2.latestTraceability" format="yyyy-MM-dd"
                                value-format="yyyy-MM-dd" type="date" size="small" placeholder="选择日期">
                            </el-date-picker>
                        </el-form-item>
            <el-form-item label="下次校准日期:">
                            <el-date-picker style="width:100%" v-model="formData2.latestTraceability" format="yyyy-MM-dd"
                                value-format="yyyy-MM-dd" type="date" size="small" placeholder="选择日期">
                            </el-date-picker>
                        </el-form-item> -->
            <el-form-item label="设备类型:">
              <el-select v-model="formData2.largeCategory" placeholder="请选择" size="small" style="width:100%">
                <el-option v-for="item in equipmentList" :key="item.value" :label="item.label"
@@ -400,13 +391,14 @@
            return {
                //是否是档案修订  true不是 false是
                isUp: true,
                formData: {},
                formData: {
                },
                formData2: {
                    imageUpload: '',
                    imageName: ''
                },
                value: '',
        props: { multiple: true,emitPath:false,value:'id',label:'name' },
                props: { multiple: true,emitPath:false,value:'id',label:'name' },
                options: [],
                labelPosition: 'right',
                dialogVisible: false,
@@ -439,23 +431,7 @@
                    }],
                    tagField: {
                        deviceStatus: {
                            select: [{
                                value: 0,
                                type: 'success',
                                label: '良好'
                            }, {
                                value: 1,
                                type: 'info',
                                label: '报废'
                            }, {
                                value: 2,
                                type: 'danger',
                                label: '停用'
                            }, {
                                value: 3,
                                type: 'danger',
                                label: '存疑'
                            }]
                            select: []
                        },
                        equipmentManager: {
                            select: []
@@ -523,7 +499,7 @@
            this.selectEnumByCategory()
            this.selectDevicePrincipal()
            this.obtainItemParameterList()
      this.getInsProductIds()
              this.getInsProductIds()
        },
        methods: {
            obtainItemParameterList() {
@@ -576,6 +552,7 @@
                    category: "设备状态"
                }).then(res => {
                    this.deviceStatusList = res.data
                    this.componentData.tagField.deviceStatus.select = res.data
                })
                this.$axios.post(this.$api.enums.selectEnumByCategory, {
                    category: "设备分类"
@@ -617,10 +594,20 @@
                })
      },
            handleClose() {
                this.formData = {}
                this.formData2 = {
                    imageUpload: '',
                    imageName: ''
                }
                this.dialogVisible = false;
                this.upLoad = false;
            },
            handleClose2() {
                this.formData = {}
                this.formData2 = {
                    imageUpload: '',
                    imageName: ''
                }
                this.dialogVisible2 = false;
                this.upLoad = false;
            },
@@ -673,12 +660,10 @@
            },
            submitForm() {
                this.upLoad = true;
                // let authorizedPerson = this.formData.authorizedPerson.length > 0 ? this.formData.authorizedPerson.join(',') : ''
                // delete this.formData.createTime
                // delete this.formData.updateTime
                // delete this.formData.createUser
                // delete this.formData.updateUser
                // this.formData.authorizedPerson = authorizedPerson
                delete this.formData.createTime
                delete this.formData.updateTime
                delete this.formData.createUser
                delete this.formData.updateUser
        this.formData.insProductIds = this.formData.insProductIds.join()
                this.$axios.post(this.$api.deviceScope.upDeviceParameter, this.formData, {
                    headers: {
@@ -701,9 +686,6 @@
            },
            submitForm2() {
                this.upLoad2 = true;
        //         let authorizedPerson = this.formData2.authorizedPerson.length > 0 ? this.formData2.authorizedPerson.join(',') :
        //             ''
        //         this.formData2.authorizedPerson = authorizedPerson
        this.formData.insProductIds = this.formData.insProductIds.join()
                this.$axios.post(this.$api.deviceScope.addDeviceParameter, this.formData2, {
                    headers: {

 src/components/view/a7-standard-method.vue

@@ -223,28 +223,35 @@
        })
      },
      getQualificationList(){
        this.$axios.post(this.$api.certification.getCertificationDetail,{
            page: {
              current: -1,
              size: -1
            },
            entity:{
              name: null,
        }}, {
            headers: {
              'Content-Type': 'application/json'
            }
          }).then(res => {
            if(res.code==200){
              let list = res.data.body.records.map(item => {
                item.label = item.name
                item.value = item.id
                return item
              });
              this.componentData.selectField.qualificationId.select = list
              this.componentData.tagField.qualificationId.select = list
            }
          })
        this.$axios.post(this.$api.enums.selectEnumByCategory, {
                    category: "资质名称"
                }).then(res => {
                    let list = res.data
          this.componentData.selectField.qualificationId.select = list
          this.componentData.tagField.qualificationId.select = list
                })
        // this.$axios.post(this.$api.certification.getCertificationDetail,{
        //     page: {
        //       current: -1,
        //       size: -1
        //     },
        //     entity:{
        //       name: null,
        // }}, {
        //     headers: {
        //       'Content-Type': 'application/json'
        //     }
        //   }).then(res => {
        //     if(res.code==200){
        //       let list = res.data.body.records.map(item => {
        //         item.label = item.name
        //         item.value = item.id
        //         return item
        //       });
        //       this.componentData.selectField.qualificationId.select = list
        //       this.componentData.tagField.qualificationId.select = list
        //     }
        //   })
      }
    }
  }

 src/components/view/notice-detail.vue

@@ -1,7 +1,7 @@
<template>
  <div class="notice-detail-page">
    <div class="notice-detail-head">
      <h4 style="margin-bottom: 16px;">{{ noticeInfo.theme }}</h4>
      <h4 style="margin-bottom: 16px;">{{ noticeInfo.theme }} <el-tag style="margin-left: 10px;" :type="options.find(m=>m.value==noticeInfo.messageType).type" v-if="options.find(m=>m.value==noticeInfo.messageType)">{{ options.find(m=>m.value==noticeInfo.messageType).label }}</el-tag></h4>
      <p style="font-size: 12px;color: #999;margin-bottom: 20px;">
        <!-- <span>消息类型：审批&nbsp; </span> -->
        <span>发送人：{{ noticeInfo.createUser }} </span>
@@ -38,6 +38,7 @@
  data() {
    return{
      noticeInfo:{},
      options:[]
    }
  },
  created(){
@@ -50,7 +51,18 @@
      console.log(this.noticeInfo);
      sessionStorage.setItem("noticeInfo", msg);
    });
    this.getTypeDicts()
  },
  methods:{
    getTypeDicts() {
      this.$axios.post(this.$api.enums.selectEnumByCategory, {
        category: "消息类型"
      }).then(res => {
        let data = res.data
        this.options = data;
      })
    },
  }
}
</script>


 src/main.js

@@ -13,9 +13,9 @@

//本地
Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
const javaApi = 'http://192.168.11.200:8001';//李
// const javaApi = 'http://192.168.11.200:8001';//李
// const javaApi = 'http://192.168.11.249:8001';//张
// const javaApi = 'http://192.168.11.50:8001';//姜
const javaApi = 'http://192.168.11.50:8001';//姜
// const javaApi = 'http://192.168.11.2:8001';//柴
// const javaApi = 'http://114.132.189.42:9006';//测试服
//胜云服务器