检验任务设备名称不显示bug

licp

2024-07-29 c3ade0a3cf0ced1066ff463f27696b741283facc

检验任务设备名称不显示bug

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

@@ -238,12 +238,12 @@
        <el-button size="small" type="primary" @click="bushingVisible=true" v-if="bushing.length>0">套管切换</el-button> -->
        <el-button size="small" type="primary" @click="sampleVisible=true">样品切换</el-button>
        <el-button size="small" type="primary" @click="taskVisible=true">任务切换</el-button>
        <el-button size="small" type="primary" @click="addVerifyDia = true" v-show="state==1"
        <el-button size="small" type="primary" @click="addVerifyDia = true" v-if="state==1"
          :loading="submitLoading">提交</el-button>
        <!-- 复核 -->
        <el-button size="medium" type="primary" @click="upInsReview(1)" :loading="reviewLoading"
          v-show="state>1">通过</el-button>
        <el-button size="medium" @click="upInsReview(0)" v-show="state>1">不通过</el-button>
          v-if="state>1">通过</el-button>
        <el-button size="medium" @click="upInsReview(0)" v-if="state>1">不通过</el-button>
        <el-button size="small" @click="$emit('goback')">返回</el-button>
      </el-col>
    </el-row>
@@ -271,22 +271,22 @@
          <el-input clearable v-model="insOrder.appointed" disabled size="small" placeholder="请输入"></el-input>
        </el-form-item>
        <el-form-item label="当前样品位数:">
          <el-tag v-show="currentKey">{{ `NO.${currentKey}` }}</el-tag>
          <el-tag v-if="currentKey">{{ `NO.${currentKey}` }}</el-tag>
        </el-form-item>
      </el-form>
    </div>
    <div class="center">
      <div class="search" style="text-align: left;display: flex;align-items: center;justify-content: space-between;">
        <div style="display: flex;align-items: center;">
          <span v-show="tableList.length>0">检验模板：</span>
          <span v-if="tableList.length>0">检验模板：</span>
          <el-radio-group v-model="currentTable" size="small">
            <el-radio-button :label="item.templateId" v-for="(item,index) in tableLists" :key="index"
              size="small">{{ item.templateName }}</el-radio-button>
          </el-radio-group>
        </div>
        <div style="display: flex;align-items: center;">
          <span v-show="fibers.length>0">&nbsp;&nbsp;光纤带：</span>
          <el-select v-model="currentTab" placeholder="请选择" @change="m=>handleChange(m,1)" v-show="fibers.length>0" size="small">
          <span v-if="fibers.length>0">&nbsp;&nbsp;光纤带：</span>
          <el-select v-model="currentTab" placeholder="请选择" @change="m=>handleChange(m,1)" v-if="fibers.length>0" size="small">
            <el-option
              v-for="item in fibers"
              :key="item.value"
@@ -296,8 +296,8 @@
              <el-tag :type="item.state==1?'success':'danger'" style="float: right;margin-top: 5px;" size="small">{{ item.state==1?'已检':'未检' }}</el-tag>
            </el-option>
          </el-select>
          <span v-show="fiber.length>0">&nbsp;&nbsp;光纤：</span>
          <el-select v-model="currentTab" placeholder="请选择" @change="m=>handleChange(m,2)" v-show="fiber.length>0" size="small">
          <span v-if="fiber.length>0">&nbsp;&nbsp;光纤：</span>
          <el-select v-model="currentTab" placeholder="请选择" @change="m=>handleChange(m,2)" v-if="fiber.length>0" size="small">
            <el-option
              v-for="item in fiber"
              :label="item.bushColor+'-'+item.color"
@@ -307,7 +307,7 @@
              <el-tag :type="item.state==1?'success':'danger'" style="float: right;margin-top: 5px;" size="small">{{ item.state==1?'已检':'未检' }}</el-tag>
            </el-option>
          </el-select>
          <el-form :inline="true" :model="otherForm" class="form-inline" label-width="50px" style="padding-top: 0;padding-left: 10px;" v-show="PROJECT=='检测中心'">
          <el-form :inline="true" :model="otherForm" class="form-inline" label-width="50px" style="padding-top: 0;padding-left: 10px;" v-if="PROJECT=='检测中心'">
            <el-form-item label="温度:" style="margin-bottom: 0;">
              <el-input v-model="otherForm.temperature" :disabled="state>1" size="small" placeholder="" style="width: 90px;" @change="m=>subOtherForm(m,'temperature')" ></el-input>
              <span style="margin-left: 4px;">℃</span>
@@ -317,8 +317,8 @@
              <span style="margin-left: 4px;">%</span>
            </el-form-item>
          </el-form>
          <el-button type="primary" size="small" v-show="dataAcquisitionEidt>0&&PROJECT=='检测中心'&&state==1" @click="getDataAcquisitionDevice" :loading="dataAcquisitionLoading">数据采集</el-button>
          <el-button :type="dataAcquisitionEidtAble?'':'primary'" size="small" v-show="dataAcquisitionEidt>0&&PROJECT=='检测中心'&&collected&&state==1" @click="dataAcquisitionEidtAble=!dataAcquisitionEidtAble">{{dataAcquisitionEidtAble?'关闭编辑':'编辑数采'}}</el-button>
          <el-button type="primary" size="small" v-if="dataAcquisitionEidt>0&&PROJECT=='检测中心'&&state==1" @click="getDataAcquisitionDevice" :loading="dataAcquisitionLoading">数据采集</el-button>
          <el-button :type="dataAcquisitionEidtAble?'':'primary'" size="small" v-if="dataAcquisitionEidt>0&&PROJECT=='检测中心'&&collected&&state==1" @click="dataAcquisitionEidtAble=!dataAcquisitionEidtAble">{{dataAcquisitionEidtAble?'关闭编辑':'编辑数采'}}</el-button>
        </div>
      </div>
      <div class="center-box" id="nav" v-loading="tableLoading" v-if="!tableLists.find(m=>m.templateId==currentTable)||(tableLists.find(m=>m.templateId==currentTable).templateName!='温度循环检验原始记录'&&!tableLists.find(m=>m.templateId==currentTable).templateName.includes('热循环')&&!tableLists.find(m=>m.templateId==currentTable).templateName.includes('温升试验'))">
@@ -326,7 +326,7 @@
          <tbody>
            <tr v-for="(m,i) in item.arr" :key="i">
              <td :id='item.templateId+"-"+n.i+"-"+n.r+"-"+n.c' v-for="(n,j) in m" :key="j"
              v-show="n.v.mc==undefined || Object.keys(n.v.mc).length === 4" :colspan="n.v.mc&&n.v.mc.cs?n.v.mc.cs:1"
              v-if="n.v.mc==undefined || Object.keys(n.v.mc).length === 4" :colspan="n.v.mc&&n.v.mc.cs?n.v.mc.cs:1"
                :rowspan="n.v.mc&&n.v.mc.rs?n.v.mc.rs:1"
                :style="`background:${n.v.bg?n.v.bg:''};color:${n.v.fc};font-size:${n.v.fs}px;width:${handleWidth(n)}px !important;height:${item.style.rowlen[n.r]}px;font-wight:${n.v.bl?'bold':''};`">
                <div class="content" :class="`content-h-${n.v.ht} content-v-${n.v.vt}`"
@@ -352,12 +352,12 @@
                      v-else-if="getInspectionValueType(n.i) == 4">/</span>
                  </template>
                  <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='结论'">
                    <el-select v-show="(getInspectionValueType(n.i) == 2 || getInspectionValueType(n.i) == 5) && state==1&&PROJECT=='装备电缆'"
                    <el-select v-if="(getInspectionValueType(n.i) == 2 || getInspectionValueType(n.i) == 5) && state==1&&PROJECT=='装备电缆'"
                      class="table_input" v-model="n.v.v" @change="saveInsContext()">
                      <el-option label="合格" :value="1"></el-option>
                      <el-option label="不合格" :value="0"></el-option>
                    </el-select>
                    <template v-show="PROJECT=='检测中心'||PROJECT=='装备电缆'&&getInspectionValueType(n.i) != 2 ">
                    <template v-if="PROJECT=='检测中心'||PROJECT=='装备电缆'&&getInspectionValueType(n.i) != 2 ">
                      <span v-if="n.v.v===1" :style="`font-family:${n.v.ff} !important;color: green;`">合格</span>
                      <span v-else-if="n.v.v===0" :style="`font-family:${n.v.ff} !important;color: red;`">不合格</span>
                      <span v-else :style="`font-family:${n.v.ff} !important;`">待定</span>
@@ -369,6 +369,9 @@
                      <el-option v-for="item in equipOptions" :key="item.value" :label="item.value" :value="item.value">
                      </el-option>
                    </el-select>
                  </template>
                  <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='设备名称' && state==1">
                  <span>{{ n.v.v }}</span>
                  </template>
                  <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='要求值' && state==1">
                    <span :style="`font-family:${n.v.ff} !important;`">{{getTell(n.i)}}</span>
@@ -385,10 +388,10 @@
                  </template>
                  <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='样品编号'">
                    <div style="display: flex;flex-wrap: nowrap;align-items: center;width: 100%" :title="currentSample.sampleCode">
                      <i class="el-icon-caret-left table_caret" style="width: 16px;" @click="caretSample(-1)" v-show="!currentFiberOpticTape&&!currentFiberOptic"></i>
                      <i class="el-icon-caret-left table_caret" style="width: 16px;" @click="caretSample(-1)" v-if="!currentFiberOpticTape&&!currentFiberOptic"></i>
                      <div :style="`font-family:${n.v.ff} !important;overflow: hidden;white-space: nowrap;width: calc(100% - 32px);`">{{currentSample.sampleCode}}</div>
                      <i class="el-icon-caret-right table_caret" style="width: 16px;"
                      v-show="!currentFiberOpticTape&&!currentFiberOptic"@click="caretSample(1)"></i>
                      v-if="!currentFiberOpticTape&&!currentFiberOptic"@click="caretSample(1)"></i>
                    </div>
                  </template>
                  <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='样品型号'">
@@ -404,21 +407,21 @@
                  <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='光纤带'">
                    <div style="display: flex;flex-wrap: nowrap;align-items: center;">
                      <i class="el-icon-caret-left table_caret" @click="caretTape(-1)
                      " v-show="currentFiberOpticTape"></i>
                      " v-if="currentFiberOpticTape"></i>
                      <div :style="`font-family:${n.v.ff} !important;`">{{currentFiberOpticTape?currentFiberOpticTape.code:''}}</div>
                      <i class="el-icon-caret-right table_caret"
                      v-show="currentFiberOpticTape"
                      v-if="currentFiberOpticTape"
                      @click="caretTape(1)"></i>
                    </div>
                  </template>
                  <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='光纤'">
                    <div style="display: flex;flex-wrap: nowrap;align-items: center;">
                      <i class="el-icon-caret-left table_caret" @click="caretOptic(-1)"
                      v-show="currentFiberOptic"></i>
                      v-if="currentFiberOptic"></i>
                      <div :style="`font-family:${n.v.ff} !important;`">{{currentFiberOptic?currentFiberOptic.color:''}}
                      </div>
                      <i
                      v-show="currentFiberOptic" class="el-icon-caret-right table_caret" @click="caretOptic(1)"></i>
                      v-if="currentFiberOptic" class="el-icon-caret-right table_caret" @click="caretOptic(1)"></i>
                    </div>
                  </template>
                  <span v-else :style="`font-family:${n.v.ff} !important;`" v-html="getValue(n.v)" v-once></span>
@@ -497,7 +500,7 @@
          ref="wareTableData"
          border
          v-loading="wareTableDataLoading"
          style="width: 100%;margin-bottom: 30px;" align="center" v-show="wareForm.inspectionItemSubclass!='20(常温)'&&wareForm.inspectionItemSubclass!='20'||(wareForm.inspectionItemSubclass=='20(常温)'&&wareForm.inspectionItem==1)||(wareForm.inspectionItemSubclass=='20'&&wareForm.inspectionItem==numOptions.length)">
          style="width: 100%;margin-bottom: 30px;" align="center" v-if="wareForm.inspectionItemSubclass!='20(常温)'&&wareForm.inspectionItemSubclass!='20'||(wareForm.inspectionItemSubclass=='20(常温)'&&wareForm.inspectionItem==1)||(wareForm.inspectionItemSubclass=='20'&&wareForm.inspectionItem==numOptions.length)">
          <el-table-column
            label="序号"
            type="index"
@@ -563,7 +566,7 @@
              prop="resValue"
              label="衰减差"
              align="center"
              v-show="wareForm.inspectionItemSubclass!='20(常温)'"
              v-if="wareForm.inspectionItemSubclass!='20(常温)'"
              min-width="90" :key="(new Date())+'4'">
              <template slot="header">
                {{ '衰减差'+(index+1) }}
@@ -576,7 +579,7 @@
              prop="insResult"
              label="结论"
              align="center"
              min-width="70" v-show="wareForm.inspectionItemSubclass!='20(常温)'" :key="(new Date())+'5'">
              min-width="70" v-if="wareForm.inspectionItemSubclass!='20(常温)'" :key="(new Date())+'5'">
              <template slot="header">
                {{ '结论'+(index+1) }}
              </template>
@@ -628,11 +631,11 @@
              </el-option>
            </el-select>
          </el-form-item>
          <el-form-item label="循环次数:" v-show="thermalCyclingInfo.inspectionItemClass=='直流电阻'">
          <el-form-item label="循环次数:" v-if="thermalCyclingInfo.inspectionItemClass=='直流电阻'">
            <el-input-number v-model="thermalCyclingInfo.inspectionItem" :min="1" :max="thermalCyclingInfo.max" label="" style="margin-top:4px;width: 190px;" size="small" @change="thermalCyclingChange"></el-input-number>
          </el-form-item>
          <el-button type="primary" size="small" style="margin-bottom: 22px;margin-left: 30px;" @click="handleAddThermal" v-show="state==1">新增</el-button>
          <el-button size="small" style="margin-bottom: 22px;" @click="handleDeleteThermal" v-show="state==1">删除</el-button>
          <el-button type="primary" size="small" style="margin-bottom: 22px;margin-left: 30px;" @click="handleAddThermal" v-if="state==1">新增</el-button>
          <el-button size="small" style="margin-bottom: 22px;" @click="handleDeleteThermal" v-if="state==1">删除</el-button>
        </el-form>
        <div class="table-container" v-loading="thermalCyclingLoading">
          <table border="1" cellpadding="10" class="thermal-table">
@@ -673,12 +676,12 @@
      :data="{
        orderId:id
      }"
      v-show="state==1&&fileAdd"
      v-if="state==1&&fileAdd"
      :on-success="handleSuccessUp" :show-file-list="false"
        accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar' :headers="headers" :on-change="beforeUpload"
        style="width: 80px !important;"
        :on-error="onError" ref='upload'>
        <el-button size="small" type="primary" v-show="state==1">附件上传</el-button></el-upload>
        <el-button size="small" type="primary" v-if="state==1">附件上传</el-button></el-upload>
      <ValueTable class="value-table" ref="fileList" :url="$api.insOrderPlan.getFileList"
        :componentData="componentData0"
        :delUrl="$api.insOrderPlan.delfile"
@@ -687,7 +690,7 @@
    <el-drawer title="光纤切换" :visible.sync="fiberOpticVisible" :size="500">
      <el-table class="el-table" ref="fiberOpticTable" :data="fiberOptic" height="100%" tooltip-effect="dark" border
        highlight-current-row @row-click="handleChangeOptic" :row-class-name="tableRowClassName"
        :current-row-key="currentKey2" :row-key="record=>record.index" v-show="fiberOpticVisible">
        :current-row-key="currentKey2" :row-key="record=>record.index" v-if="fiberOpticVisible">
        <el-table-column type="index" align="center" label="序号" width="70px" :key="Math.random()">
        </el-table-column>
        <el-table-column prop="bushColor" label="管套色标" min-width="100px" show-overflow-tooltip></el-table-column>
@@ -700,7 +703,7 @@
    <el-drawer title="光纤带切换" :visible.sync="fiberOpticTapeVisible" :size="500">
      <el-table class="el-table" ref="fiberOpticTapeTable" :data="fiberOpticTape" height="100%" tooltip-effect="dark" border
        highlight-current-row @row-click="handleChangeTape" :row-class-name="tableRowClassName"
        :current-row-key="currentKey1" :row-key="record=>record.index" v-show="fiberOpticTapeVisible">
        :current-row-key="currentKey1" :row-key="record=>record.index" v-if="fiberOpticTapeVisible">
        <el-table-column type="index" align="center" label="序号" width="70px" :key="Math.random()">
        </el-table-column>
        <el-table-column prop="code" label="光纤带编号" min-width="110px" show-overflow-tooltip></el-table-column>
@@ -713,7 +716,7 @@
    <el-drawer title="套管切换" :visible.sync="bushingVisible" :size="500">
      <el-table class="el-table" ref="bushingTable" :data="bushing" height="100%" tooltip-effect="dark" border
        highlight-current-row @row-click="handleChangeBushing" :row-class-name="tableRowClassName"
        :current-row-key="currentKey0" :row-key="record=>record.index" v-show="bushingVisible">
        :current-row-key="currentKey0" :row-key="record=>record.index" v-if="bushingVisible">
        <el-table-column type="index" align="center" label="序号" width="70px" :key="Math.random()">
        </el-table-column>
        <el-table-column prop="color" label="管色标" min-width="100px" show-overflow-tooltip></el-table-column>
@@ -724,14 +727,14 @@
    <el-drawer title="样品切换" :visible.sync="sampleVisible" :size="500">
      <el-table class="el-table" ref="productTable" :data="sampleProduct" height="100%" tooltip-effect="dark" border
        highlight-current-row @row-click="handleChangeSample" :row-class-name="tableRowClassName"
        :current-row-key="currentKey" :row-key="record=>record.index" v-show="sampleVisible">
        :current-row-key="currentKey" :row-key="record=>record.index" v-if="sampleVisible">
        <el-table-column type="index" align="center" label="序号" width="70px" :key="Math.random()">
        </el-table-column>
        <el-table-column prop="sampleCode" label="样品编号" min-width="100px" show-overflow-tooltip></el-table-column>
        <el-table-column prop="model" label="样品型号" min-width="100px" show-overflow-tooltip></el-table-column>
        <el-table-column prop="insState" label="检测状态" width="100px" show-overflow-tooltip>
          <template slot-scope="scope">
            <el-tag v-for="(item, i) in typeList" :key="i" v-show="item.value == scope.row.insState" :type="item.type"
            <el-tag v-for="(item, i) in typeList" :key="i" v-if="item.value == scope.row.insState" :type="item.type"
              size="medium" style="margin-right: 5px;">{{item.label}}</el-tag>
          </template>
        </el-table-column>
@@ -742,11 +745,11 @@
        </el-table-column>
        <!-- 检验单会有一个是否有配套样品字段控制显示 -->
        <el-table-column prop="joinModel" label="配套样品型号" min-width="130px" show-overflow-tooltip
        v-show="insOrder.mating>0"></el-table-column>
        v-if="insOrder.mating>0"></el-table-column>
        <el-table-column prop="joinName" label="配套样品名称" min-width="130px" show-overflow-tooltip
        v-show="insOrder.mating>0"></el-table-column>
        v-if="insOrder.mating>0"></el-table-column>
        <el-table-column prop="joinNum" label="配套样品数量" min-width="130px" show-overflow-tooltip
        v-show="insOrder.mating>0"></el-table-column>
        v-if="insOrder.mating>0"></el-table-column>
      </el-table>
    </el-drawer>
    <el-drawer title="任务切换" :visible.sync="taskVisible" :size="500">
@@ -754,7 +757,7 @@
        :componentData="componentData" :key="upIndex" style="height: 100%;"/>
    </el-drawer>
    <el-dialog title="检验复核" :visible.sync="reviewDia" width="500px">
      <div class="body" style="display: flex;padding: 10px;" v-show="reviewDia">
      <div class="body" style="display: flex;padding: 10px;" v-if="reviewDia">
        <div class="search_label" style="width: 150px;"><span class="required-span">* </span>不通过的理由：</div>
        <div class="search_input" style="width: 100%;">
          <el-input size="small" clearable v-model="noReason" type="textarea" :autosize="{ minRows: 4}"></el-input>

 src/main.js

@@ -15,17 +15,16 @@
Vue.prototype.$Big = Big;

// 项目切换
Vue.prototype.PROJECT = '检测中心'
// Vue.prototype.PROJECT = '装备电缆'
// Vue.prototype.PROJECT = '检测中心'
Vue.prototype.PROJECT = '装备电缆'
//本地
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
// 张：192.168.45.249
// const javaApi = 'http://192.168.45.249:8001';
const javaApi = 'http://192.168.92.2:8001';

//云
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
const javaApi = 'http://114.132.189.42:1234';
// const javaApi = 'http://114.132.189.42:1234';

// //检测中心正式库
// Vue.prototype.LOCATIONVUE = "http://10.1.200.86:8080";
@@ -34,7 +33,7 @@
//装备电缆测试库
// Vue.prototype.LOCATIONVUE = "http://10.16.173.59";
// const javaApi = 'http://10.16.173.59:8001';
// const javaApi = 'http://192.168.47.2:8001';
// const javaApi = 'http://192.168.92.249:8001';

Vue.prototype.HaveJson = (val) => {
    return JSON.parse(JSON.stringify(val))