完成电路试验模板保存记录

licp

2024-11-04 cf6e91b8d81b528d65257fdc4912011873977cad

完成电路试验模板保存记录

 src/assets/api/controller.js

@@ -33,6 +33,7 @@
    auxiliaryOriginalHours,
    evaluate,
    role,
    insProductTemplate,
  }
}

@@ -416,3 +417,11 @@
const role = {
  getRole:"/role/getRole",//获取当前用户角色
}

// 电路试验模板
const insProductTemplate = {
  addInsProductTemplate:'/insProductTemplate/addInsProductTemplate',//保存模版
  chooseInsProductTemplate:'/insProductTemplate/chooseInsProductTemplate',//选择模版
  getInsProductTemplate:'/insProductTemplate/getInsProductTemplate',//选择之后查看详情  传参id
  delInsProductTemplate:'/insProductTemplate/delInsProductTemplate',//删除模版  传参id
}

 src/components/do/b1-inspect-order-plan/Inspection.vue

@@ -259,8 +259,19 @@
    <el-row class="title">
      <el-col :span="12" style="padding-left: 20px;text-align: left;" :class="{noShow:noBack}">检验单详情
      </el-col>
      <el-col :span="12" style="text-align: right;">
        <el-button size="small" type="primary" @click="versionDialogVisible=true" v-if="state==1&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName.includes('电路试验')">检验模板切换</el-button>
      <el-col :span="12" style="text-align: right;display: flex;align-items: center;justify-content: end">
        <el-button size="small" type="primary" @click="versionDialogVisible=true" v-if="state==1&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName.includes('电路试验')">电调/非电调模板切换</el-button>
        <el-select v-model="template" size="medium" placeholder="电路预设模板" style="margin-right: 10px;margin-left: 10px;" v-if="state==1&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName.includes('电路试验')"
          @change="selectInsProductTemplateById">
          <el-option v-for="(a, ai) in templates" :key="ai" :value="a.id" :label="a.name">
            <span style="float: left">{{ a.name }}</span>
            <i class="el-icon-delete" style="float: right; color: #66b1ff; font-size: 16px;line-height: 34px;"
              @click.stop="handleDelete(a)" v-if="addInsProductTemplatePower"></i>
          </el-option>
        </el-select>
        <el-button size="medium" @click="templateDia=true" v-if="state==1&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName.includes('电路试验')&&addInsProductTemplatePower">
            <span style="color: #3A7BFA;">保存模板</span>
          </el-button>
        <el-button size="small" type="primary" @click="sampleVisible=true;uploadSample()">样品切换</el-button>
        <el-button size="small" type="primary" @click="taskVisible=true" v-show="!isLook">任务切换</el-button>
        <el-button size="small" type="primary" @click="handleSubmit" v-if="state==1"
@@ -726,8 +737,8 @@
      <!-- 电路试验 -->
      <div v-else-if="tableLists.find(m=>m.templateId==currentTable).templateName.includes('电路试验')" style="width: 100%;overflow-x: auto;overflow-y: visible;">
        <!-- <Circuit></Circuit> -->
        <CircuitParameters1 v-if="currentTableState==0" :insProduct="currentSample.insProduct" :orderId="id" :sampleId="currentSample.id" :state="state" :num="currentSample.num1" :isLook="isLook" :currentNum="currentNum"></CircuitParameters1>
        <CircuitParameters2 v-if="currentTableState==1" :insProduct="currentSample.insProduct" :orderId="id" :sampleId="currentSample.id" :state="state" :num="currentSample.num1" :isLook="isLook" :currentNum="currentNum"></CircuitParameters2>
        <CircuitParameters1 v-if="currentTableState==0" :insProduct="currentSample.insProduct" :orderId="id" :sampleId="currentSample.id" :state="state" :num="currentSample.num1" :isLook="isLook" :currentNum="currentNum" ref="CircuitParameters"></CircuitParameters1>
        <CircuitParameters2 v-if="currentTableState==1" :insProduct="currentSample.insProduct" :orderId="id" :sampleId="currentSample.id" :state="state" :num="currentSample.num1" :isLook="isLook" :currentNum="currentNum" ref="CircuitParameters"></CircuitParameters2>
      </div>
      <!-- 温湿度试验 -->
      <div v-else-if="tableLists.find(m=>m.templateId==currentTable).templateName.includes('温湿度试验')">
@@ -912,6 +923,18 @@
      width="60%" fullscreen :modal="false">
      <filePreview v-if="lookFileVisible" :fileUrl="currentFile.url"
      :currentFile="currentFile" style="max-height: 87vh;overflow-y: auto;"/>
    </el-dialog>
    <el-dialog title="保存模板" :visible.sync="templateDia" width="400px">
      <div class="body" style="display: flex;align-items: center;" v-if="templateDia">
        <div class="search_label" style="width: 90px;"><span class="required-span">* </span>模板名称：</div>
        <div class="search_input">
          <el-input size="small" clearable v-model="templateName"></el-input>
        </div>
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button @click="templateDia = false">取 消</el-button>
        <el-button type="primary" @click="addTemplateDia" :loading="templateLoading">确 定</el-button>
      </span>
    </el-dialog>
  </div>
</template>
@@ -1127,6 +1150,12 @@
          humidity:''
        },
        currentFile:{},//当前文件
        templates:[],//电路试验模板
        templateDia:false,//电路试验模板保存模板弹框
        template:null,
        templateLoading:false,
        templateName:'',
        addInsProductTemplatePower:false,//配置模板权限
      }
    },
    // 用于上传文件的信息
@@ -1155,6 +1184,7 @@
      this.scrollInit()
      this.getPower()
      this.startWorker()
      this.selectInsProductTemplate()
    },
    watch: {
      // 监听任务id，获取任务信息
@@ -2150,6 +2180,7 @@
        let fileAdd = false
        let collected = false
        let temDataAcquisition = false
        let addInsProductTemplatePower = false;
        for (var i = 0; i < power.length; i++) {
                    if (power[i].menuMethod == 'uploadFile') {
                        fileAdd = true
@@ -2163,6 +2194,9 @@
          if (power[i].menuMethod == 'temDataAcquisition') {
                        temDataAcquisition = true
                    }
          if(power[i].menuMethod == 'addInsProductTemplate'){
            addInsProductTemplatePower = true
          }
                }
        if (!fileDel) {
                    this.componentData0.do.splice(1, 1)
@@ -2170,6 +2204,7 @@
        this.fileAdd = fileAdd
        this.collected = collected
        this.temDataAcquisition = temDataAcquisition
        this.addInsProductTemplatePower = addInsProductTemplatePower
      },
      uploadSample(){
        this.$axios.post(this.$api.insOrderPlan.doInsOrder, {
@@ -3767,6 +3802,96 @@
        } catch (error) {
          this.$emit('goback')
        }
      },
      selectInsProductTemplate(){
        this.$axios.post(this.$api.insProductTemplate.chooseInsProductTemplate).then(res => {
          if (res.code == 201) return
          this.templates = res.data
        })
      },
      selectInsProductTemplateById(e){
        if(e){
          this.$axios.post(this.$api.insProductTemplate.getInsProductTemplate + '?id=' + e).then(res => {
            if (res.code == 201) return
            let obj = JSON.parse(res.data.message)
            if(this.currentTableState!=res.data.version){
              this.$message.error('电调/非电调模板版本不一致，请重新选择')
              this.template = null
              return
            }
            // 当前模板中未包含所有项目
            let state = this.currentSample.insProduct.every(item=>{
              if(obj.allBandList&&obj.allBandList.length>0&&obj.allBandList[0].projectList&&obj.allBandList[0].projectList.length>0&&item.inspectionItemSubclass&&obj.allBandList[0].projectList.find(m=>m.inspectionItemSubclass==item.inspectionItemSubclass)){
                return true
              }else{
                return false
              }
            })
            if(!state){
              this.template = null
              this.$message.error('当前模板中未包含所有项目，请重新选择')
              return
            }
            // 保存版本
            this.saveVersion()
            // 如果模板的检验项多了，则删除多余的
            obj.allBandList.forEach(item=>{
              item.projectList.forEach((m,i)=>{
                if(!this.currentSample.insProduct.find(n=>m.inspectionItemSubclass==n.inspectionItemSubclass)){
                  item.projectList.splice(i,1)
                }
              })
            })
            this.$refs.CircuitParameters.upTemplate(obj)
          })
        }
      },
      addTemplateDia(){
        let obj = {
          allBandList:this.$refs.CircuitParameters.allBandList,
          intermodulationNum:this.$refs.CircuitParameters.intermodulationNum,
          angleList:this.$refs.CircuitParameters.angleList,
        }
        if (this.templateName) {
          this.templateLoading = true;
          this.$axios.post(this.$api.insProductTemplate.addInsProductTemplate, {
            name: this.templateName,
            version:this.currentTableState,
            message:JSON.stringify(obj)
          }, {
            headers: {
              'Content-Type': 'application/json'
            }
          }).then(res => {
            if (res.code == 201) return
            this.templateLoading = false;
            this.templateDia = false;
            this.$message.success('保存成功')
            this.selectInsProductTemplate()
            this.templateName = ''
          })
        } else {
          this.$message.error('请填写模板名称')
        }
      },
      handleDelete(row){
        this.$confirm('是否删除当前数据?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(() => {
          this.$axios.post(this.$api.insProductTemplate.delInsProductTemplate, {
            id: row.id
          }).then(res => {
            if (res.code === 201) {
              return
            }
            this.$message.success('删除成功')
            this.selectInsProductTemplate()
          }).catch(e => {
            this.$message.error('删除失败')
          })
        }).catch(() => {})
      }
    }
  }

 src/components/do/b1-inspect-order-plan/circuit-parameters1.vue

@@ -359,12 +359,14 @@
      isMore:false,
      loading:{},
      intermodulationNum:0,//互调检验项目的数量
      upTemplateState:false,
    };
  },
  watch: {
    // 角度数量变化时，更新所有频段下面的所有项目下的所有端口和角度
    angleList(val) {
      this.allBandList.forEach(item => {
      if(!this.upTemplateState){
        this.allBandList.forEach(item => {
        item.projectList.forEach(m => {
          // 添加角度
          for(let i=0;i<val.length;i++){
@@ -401,6 +403,7 @@
          }
        })
      })
      }
      // console.log(this.allBandList)
    },
    currentNum(val) {
@@ -474,6 +477,7 @@
                    angleList.push({value:m})
                  })
                  this.angleList = angleList
                  this.upTemplateState = false;
                }
                let tell = ''
                if(item.tell.includes(',')){
@@ -574,6 +578,7 @@
    },
    // 删除数组
    deleteList(index,list,type){
      this.upTemplateState = false;
      if(list.length>1){
        if(type=='互调'){
          let index = null;
@@ -629,6 +634,7 @@
    },
    // 添加数组
    addList(list,type){
      this.upTemplateState = false;
      if(type=='互调'){
        let obj = null;
        let index = null;
@@ -790,6 +796,35 @@
      }).catch(err => {
        console.log(err)
      })
    },
    // 更新模板
    upTemplate(obj){
      this.upTemplateState = true;
      // return
      obj.allBandList.forEach((item,index)=>{
        if(!this.allBandList[index]){
          this.allBandList[index] = {
            projectList:this.HaveJson(this.allBandList[0].projectList)
          }
        }
        this.allBandList[index].band = item.band
        let arr = []
        item.projectList.forEach((m,i)=>{
          if(this.allBandList[index].projectList.find(n=>n.inspectionItemSubclass==m.inspectionItemSubclass)){
            let obj0 = {
            angleList:m.angleList,
            portList:m.portList,
            portNum:m.portNum,
              value:m.value,
              valueType:m.valueType
            }
            arr.push({...this.allBandList[index].projectList.find(n=>n.inspectionItemSubclass==m.inspectionItemSubclass),...obj0})
          }
        })
        this.allBandList[index].projectList = arr
      })
      this.angleList = obj.angleList
      this.intermodulationNum = obj.intermodulationNum
    }
  }
}

 src/components/do/b1-inspect-order-plan/circuit-parameters2.vue

@@ -243,13 +243,15 @@
      isMore:false,
      insProductNew:[],
      intermodulationNum:0,//互调检验项目的数量
      loading:{}
      loading:{},
      upTemplateState:false,
    };
  },
  watch: {
    // 角度数量变化时，更新所有频段下面的所有项目下的所有端口和角度
    angleList(val) {
      this.allBandList.forEach(item => {
      if(!this.upTemplateState){
        this.allBandList.forEach(item => {
        item.projectList.forEach(m => {
          if(m.angleList.length!==val.length){
            m.angleList = JSON.parse(JSON.stringify(this.angleList))
@@ -274,6 +276,7 @@
          }
        })
      })
      }
    },
    currentNum(val) {
      this.initData()
@@ -345,6 +348,7 @@
                    angleList.push({value:m})
                  })
                  this.angleList = angleList
                  this.upTemplateState = false
                }
                let tell = ''
                if(item.tell.includes(',')){
@@ -447,6 +451,7 @@
    },
    // 删除数组
    deleteList(index,list,type){
      this.upTemplateState = false
      if(list.length>1){
        if(type=='互调'){
          let index = null;
@@ -502,6 +507,7 @@
    },
    // 添加数组
    addList(list,type){
      this.upTemplateState = false
      if(type=='互调'){
        let obj = null;
        let index = null;
@@ -666,6 +672,35 @@
      }).catch(err => {
        console.log(err)
      })
    },
    // 更新模板
    upTemplate(obj){
      this.upTemplateState = true;
      // return
      obj.allBandList.forEach((item,index)=>{
        if(!this.allBandList[index]){
          this.allBandList[index] = {
            projectList:this.HaveJson(this.allBandList[0].projectList),
            band:item.band
          }
        }
        let arr = []
        item.projectList.forEach((m,i)=>{
          if(this.allBandList[index].projectList.find(n=>n.inspectionItemSubclass==m.inspectionItemSubclass)){
            let obj0 = {
            angleList:m.angleList,
            portList:m.portList,
            portNum:m.portNum,
              value:m.value,
              valueType:m.valueType
            }
            arr.push({...this.allBandList[index].projectList.find(n=>n.inspectionItemSubclass==m.inspectionItemSubclass),...obj0})
          }
        })
        this.allBandList[index].projectList = arr
      })
      this.angleList = obj.angleList
      this.intermodulationNum = obj.intermodulationNum
    }
  }
}

 src/components/view/index-index.vue

@@ -285,6 +285,7 @@
            <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>
            </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}">

 src/main.js

@@ -21,11 +21,11 @@
//本地
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
// const javaApi = 'http://172.20.10.5:8001';
const javaApi = 'http://172.20.10.5:8001';

// //通信测试库
// Vue.prototype.LOCATIONVUE = "http://10.1.13.77:8080";
const javaApi = 'http://10.1.13.77:8001';
// const javaApi = 'http://10.1.13.77:8001';

// 通信正式库
// Vue.prototype.LOCATIONVUE = "https://ztwxlims.ztt.cn:7443";