From 9508c11a63737b4b9e80e1223792f07d3151c2e8 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 11 四月 2025 14:26:01 +0800
Subject: [PATCH] 条件改成 试验条件 电缆配置修改
---
src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue | 2
src/views/business/materialOrder/copperOrder.vue | 2
src/views/statisticalCharts/itemInspectionAnalysis/index.vue | 2
src/views/business/productOrder/components/cable-config.vue | 10 +-
src/views/business/productOrder/index.vue | 2
src/views/business/productOrder/components/auxiliaryWireCore.vue | 10 +-
src/views/business/inspectionTask/components/EditInspectionItem.vue | 2
src/views/business/inspectionTask/index.vue | 37 ++++++------
src/views/business/productOrder/components/addInspectionDia.vue | 96 ++++++++++++++-----------------
9 files changed, 77 insertions(+), 86 deletions(-)
diff --git a/src/views/business/inspectionTask/components/EditInspectionItem.vue b/src/views/business/inspectionTask/components/EditInspectionItem.vue
index f2e9a21..4d6768f 100644
--- a/src/views/business/inspectionTask/components/EditInspectionItem.vue
+++ b/src/views/business/inspectionTask/components/EditInspectionItem.vue
@@ -84,7 +84,7 @@
prop: "inspectionItemSubclass",
},
{
- label: "鏉′欢",
+ label: "璇曢獙鏉′欢",
minWidth: "120px",
prop: "radius",
},
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index 9c622a9..96a4352 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/src/views/business/inspectionTask/index.vue
@@ -46,17 +46,17 @@
:disabled="(scope.row.userName == null || scope.row.insState == 3 || scope.row.insState == 5) && checkPermi(['update:product:onPlan'])"
@click="editInspection(scope.row)">淇敼妫�楠屽��</el-button>
<el-button type="text" size="small" :disabled="(
- scope.row.userName == null ||
- scope.row.insState == 3 ||
- scope.row.insState == 5 ||
- (scope.row.userName && !scope.row.userName.includes(nickName))
- )" @click="handleInspection(scope.row)">妫�楠�</el-button>
+ scope.row.userName == null ||
+ scope.row.insState == 3 ||
+ scope.row.insState == 5 ||
+ (scope.row.userName && !scope.row.userName.includes(nickName))
+ )" @click="handleInspection(scope.row)">妫�楠�</el-button>
<el-button type="text" size="small" :disabled="(
- scope.row.userName == null ||
- scope.row.insState == 5 ||
- scope.row.insState == 3 ||
- (scope.row.userName && !scope.row.userName.includes(nickName))
- )" @click="handleConnect(scope.row)" v-if="tabIndex != 0">浜ゆ帴</el-button>
+ scope.row.userName == null ||
+ scope.row.insState == 5 ||
+ scope.row.insState == 3 ||
+ (scope.row.userName && !scope.row.userName.includes(nickName))
+ )" @click="handleConnect(scope.row)" v-if="tabIndex != 0">浜ゆ帴</el-button>
<el-button type="text" size="small" @click="viewInspectInfo(scope.row)">鍘熷璁板綍</el-button>
<el-popover placement="bottom" trigger="hover" style="margin-left: 6px">
<template #reference>
@@ -64,21 +64,20 @@
</template>
<div>
<el-button :disabled="(scope.row.insState != 3 || scope.row.userName == null ||
- (scope.row.userName && !scope.row.userName.includes(nickName)))" style="margin-left: 10px"
- type="text" size="small" @click="download(scope.row)">涓嬭浇鎶ュ憡</el-button>
+ (scope.row.userName && !scope.row.userName.includes(nickName)))" style="margin-left: 10px" type="text"
+ size="small" @click="download(scope.row)">涓嬭浇鎶ュ憡</el-button>
<el-upload ref='upload' :action="javaApi + '/insReport/inReport'" :before-upload="beforeUpload"
:data="{ id: scope.row.insReportId }" :headers="uploadHeader" :on-error="onError"
:on-success="handleSuccessUp" :show-file-list="false" style="display: inline;margin: 0 6px"
accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar'>
<el-button :disabled="(scope.row.insState != 3 || scope.row.userName == null ||
- (scope.row.userName && !scope.row.userName.includes(nickName)))" size="small"
- type="text">涓婁紶</el-button>
+ (scope.row.userName && !scope.row.userName.includes(nickName)))" size="small" type="text">涓婁紶</el-button>
</el-upload>
<el-button :disabled="(scope.row.insState != 3 || scope.row.userName == null ||
- (scope.row.userName && !scope.row.userName.includes(nickName)))" type="text" size="small"
+ (scope.row.userName && !scope.row.userName.includes(nickName)))" type="text" size="small"
@click="handleRestore(scope.row)">杩樺師</el-button>
<el-button :disabled="(scope.row.insState != 3 || scope.row.userName == null ||
- (scope.row.userName && !scope.row.userName.includes(nickName)))" type="text" size="small"
+ (scope.row.userName && !scope.row.userName.includes(nickName)))" type="text" size="small"
@click="handleIssued(scope.row)">鏌ョ湅鎶ュ憡</el-button>
</div>
</el-popover>
@@ -88,8 +87,8 @@
</div>
<el-dialog :visible.sync="claimVisible" title="鎻愮ず" width="400px">
鏄惁璁ら濮旀墭缂栧彿<span style="color: #33c130">{{
- sampleUserForm.entrustCode
- }}</span>鐨勪换鍔�
+ sampleUserForm.entrustCode
+ }}</span>鐨勪换鍔�
<span slot="footer" class="dialog-footer">
<el-button @click="claimVisible = false">鍙� 娑�</el-button>
<el-button :loading="loading" type="primary" @click="confirmClaim">纭� 瀹�</el-button>
@@ -472,7 +471,7 @@
{ label: "妫�楠屽瓙椤�", prop: "inspectionItemSubclass" },
{ label: "鍗曚綅", prop: "unit" },
{ label: "鏍峰搧鍨嬪彿", prop: "model", mergeCol: true },
- { label: "鏉′欢", prop: "radius" },
+ { label: "璇曢獙鏉′欢", prop: "radius" },
{ label: "鐢电紗鏍囪瘑", prop: "cableTag" },
{ label: "璇曢獙瑕佹眰", prop: "tell" },
{ label: "妫�楠岀粨鏋�", prop: "lastValue" },
diff --git a/src/views/business/materialOrder/copperOrder.vue b/src/views/business/materialOrder/copperOrder.vue
index 472155c..0c7abb2 100644
--- a/src/views/business/materialOrder/copperOrder.vue
+++ b/src/views/business/materialOrder/copperOrder.vue
@@ -242,7 +242,7 @@
</span>
</template>
</el-table-column>
- <el-table-column label="鏉′欢" min-width="140" prop="radius" show-overflow-tooltip></el-table-column>
+ <el-table-column label="璇曢獙鏉′欢" min-width="140" prop="radius" show-overflow-tooltip></el-table-column>
<el-table-column label="璇曢獙鏂规硶" min-width="120" prop="methodS" show-overflow-tooltip>
<template slot="header" slot-scope="scope">
<div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
diff --git a/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue b/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
index ee84eda..840f5d9 100644
--- a/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
+++ b/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
@@ -47,7 +47,7 @@
{ label: '妫�楠屽瓙椤�', prop: 'inspectionItemSubclass' },
{ label: '鍗曚綅', prop: 'unit' },
{ label: '鏍峰搧鍨嬪彿', prop: 'model' },
- { label: '鏉′欢', prop: 'radius' },
+ { label: '璇曢獙鏉′欢', prop: 'radius' },
{ label: '鐢电紗鏍囪瘑', prop: 'cableTag' },
{ label: '璇曢獙瑕佹眰', prop: 'tell' },
{ label: '妫�楠岀粨鏋�', prop: 'lastValue' },
diff --git a/src/views/business/productOrder/components/addInspectionDia.vue b/src/views/business/productOrder/components/addInspectionDia.vue
index ae76551..4119d60 100644
--- a/src/views/business/productOrder/components/addInspectionDia.vue
+++ b/src/views/business/productOrder/components/addInspectionDia.vue
@@ -1,14 +1,9 @@
<template>
<div>
- <el-dialog
- :close-on-click-modal="false"
- :close-on-press-escape="false"
- :visible.sync="dialogVisible"
- title="娣诲姞妫�楠岄」"
+ <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="dialogVisible" title="娣诲姞妫�楠岄」"
width="80%">
<el-table ref="sampleTable" :data="sampleList" border class="el-table sampleTable" highlight-current-row
- :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
- max-height="400px" tooltip-effect="dark">
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" max-height="400px" tooltip-effect="dark">
<el-table-column align="center" label="搴忓彿" type="index" width="65"></el-table-column>
<el-table-column align="center" label="鏍峰搧鍚嶇О" min-width="100" prop="sample">
<template slot-scope="scope">
@@ -18,19 +13,18 @@
<el-table-column align="center" label="鏍峰搧缂栧彿" min-width="100" prop="sampleCode">
<template slot-scope="scope">
<el-input v-model="scope.row.sampleCode" clearable disabled placeholder="涓嶅～鍐欏垯绯荤粺鑷姩鐢熸垚"
- size="small"></el-input>
+ size="small"></el-input>
</template>
</el-table-column>
<el-table-column align="center" label="鏍峰搧鍨嬪彿" min-width="60" prop="model">
<template slot-scope="scope">
- <el-input v-model="scope.row.model" clearable disabled placeholder="涓嶅～鍐欏垯绯荤粺鑷姩鐢熸垚"
- size="small"></el-input>
+ <el-input v-model="scope.row.model" clearable disabled placeholder="涓嶅～鍐欏垯绯荤粺鑷姩鐢熸垚" size="small"></el-input>
</template>
</el-table-column>
<el-table-column align="center" label="妫�楠屾爣鍑�" min-width="100" prop="standardMethodListId">
<template slot-scope="scope">
<el-input v-model="scope.row.standardMethodListId" clearable disabled placeholder="涓嶅～鍐欏垯绯荤粺鑷姩鐢熸垚"
- size="small"></el-input>
+ size="small"></el-input>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" min-width="120">
@@ -40,65 +34,63 @@
</el-table-column>
</el-table>
</el-dialog>
- <el-dialog
- :close-on-click-modal="false"
- :close-on-press-escape="false"
- :visible.sync="itemDialogVisible"
- title="娣诲姞妫�楠岄」"
- width="90%">
- <el-table ref="productTable" v-loading="getProductLoad" :data="productList" :row-class-name="tableRowClassName" border class="el-table"
- :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
- max-height="580px" tooltip-effect="dark" @selection-change="selectProduct">
+ <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="itemDialogVisible"
+ title="娣诲姞妫�楠岄」" width="90%">
+ <el-table ref="productTable" v-loading="getProductLoad" :data="productList" :row-class-name="tableRowClassName"
+ border class="el-table" :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" max-height="580px"
+ tooltip-effect="dark" @selection-change="selectProduct">
<el-table-column type="selection" width="65"></el-table-column>
- <el-table-column label="妫�楠岄」鍒嗙被" min-width="140" prop="inspectionItemClass" show-overflow-tooltip></el-table-column>
+ <el-table-column label="妫�楠岄」鍒嗙被" min-width="140" prop="inspectionItemClass"
+ show-overflow-tooltip></el-table-column>
<el-table-column label="妫�楠岄」" min-width="140" prop="inspectionItem" show-overflow-tooltip></el-table-column>
- <el-table-column label="妫�楠岄」瀛愰」" min-width="140" prop="inspectionItemSubclass" show-overflow-tooltip></el-table-column>
+ <el-table-column label="妫�楠岄」瀛愰」" min-width="140" prop="inspectionItemSubclass"
+ show-overflow-tooltip></el-table-column>
<el-table-column label="瑕佹眰鍊�" min-width="220px" prop="ask">
<template slot-scope="scope">
- <el-input v-if="active==1&&scope.row.inspectionValueType!='5'" v-model="scope.row.ask" :autosize="{ minRows: 1, maxRows: 3}" clearable placeholder="瑕佹眰鍊�"
- size="small" type="textarea"></el-input>
+ <el-input v-if="active == 1 && scope.row.inspectionValueType != '5'" v-model="scope.row.ask"
+ :autosize="{ minRows: 1, maxRows: 3 }" clearable placeholder="瑕佹眰鍊�" size="small"
+ type="textarea"></el-input>
<span v-else>
- <template >{{ scope.row.ask }}</template>
- </span>
+ <template>{{ scope.row.ask }}</template>
+ </span>
</template>
</el-table-column>
<el-table-column label="瑕佹眰鎻忚堪" min-width="220px" prop="tell">
<template slot-scope="scope">
- <el-input v-if="active==1" v-model="scope.row.tell" :autosize="{ minRows: 1, maxRows: 3}" clearable placeholder="瑕佹眰鎻忚堪"
- size="small" type="textarea"></el-input>
+ <el-input v-if="active == 1" v-model="scope.row.tell" :autosize="{ minRows: 1, maxRows: 3 }" clearable
+ placeholder="瑕佹眰鎻忚堪" size="small" type="textarea"></el-input>
<span v-else>
- <template >{{ scope.row.tell }}</template>
- </span>
+ <template>{{ scope.row.tell }}</template>
+ </span>
</template>
</el-table-column>
<el-table-column label="鏉′欢" min-width="140" prop="radius" show-overflow-tooltip>
<template slot-scope="scope">
- <el-input v-if="active==1&&!scope.row.inspectionItem.includes('楂樻俯鍘嬪姏璇曢獙')" v-model="scope.row.radius" :autosize="{ minRows: 1, maxRows: 3}" clearable placeholder="鏉′欢"
- size="small" type="textarea">
+ <el-input v-if="active == 1 && !scope.row.inspectionItem.includes('楂樻俯鍘嬪姏璇曢獙')" v-model="scope.row.radius"
+ :autosize="{ minRows: 1, maxRows: 3 }" clearable placeholder="璇曢獙鏉′欢" size="small" type="textarea">
</el-input>
- <el-select v-else-if="scope.row.inspectionItem.includes('楂樻俯鍘嬪姏璇曢獙') && active==1" v-model="scope.row.radius" clearable
- placeholder="鏉′欢"
- size="small">
- <el-option v-for="(a,i) in JSON.parse(scope.row.radiusList)" :key="i" :label="a" :value="a"></el-option>
+ <el-select v-else-if="scope.row.inspectionItem.includes('楂樻俯鍘嬪姏璇曢獙') && active == 1" v-model="scope.row.radius"
+ clearable placeholder="鏉′欢" size="small">
+ <el-option v-for="(a, i) in JSON.parse(scope.row.radiusList)" :key="i" :label="a" :value="a"></el-option>
</el-select>
- <span v-else>{{scope.row.radius}}</span>
+ <span v-else>{{ scope.row.radius }}</span>
</template>
</el-table-column>
<el-table-column label="绾胯姱" min-width="120" prop="cableTag" show-overflow-tooltip>
<template slot-scope="scope">
- <el-input v-if="active==1" v-model="scope.row.cableTag" :autosize="{ minRows: 1, maxRows: 3}" clearable placeholder="绾胯姱"
- size="small" type="textarea"></el-input>
+ <el-input v-if="active == 1" v-model="scope.row.cableTag" :autosize="{ minRows: 1, maxRows: 3 }" clearable
+ placeholder="绾胯姱" size="small" type="textarea"></el-input>
</template>
</el-table-column>
<el-table-column label="璇曢獙鏂规硶" min-width="120" prop="methodS" show-overflow-tooltip></el-table-column>
<el-table-column label="璁￠噺鍗曚綅" prop="unit" show-overflow-tooltip width="100"></el-table-column>
<el-table-column label="鍗曚环" prop="price" show-overflow-tooltip width="100"></el-table-column>
<el-table-column label="鍖洪棿" min-width="120" prop="section" show-overflow-tooltip></el-table-column>
- <el-table-column :filter-method="filterHandler" :filters="filters" label="瀛愬疄楠屽" min-width="130" prop="sonLaboratory"
- show-overflow-tooltip></el-table-column>
+ <el-table-column :filter-method="filterHandler" :filters="filters" label="瀛愬疄楠屽" min-width="130"
+ prop="sonLaboratory" show-overflow-tooltip></el-table-column>
</el-table>
<span slot="footer" class="dialog-footer">
- <el-button @click="itemDialogVisible = false">鍙� 娑�</el-button>
+ <el-button @click="itemDialogVisible = false">鍙� 娑�</el-button>
<el-button :loading="upLoad" type="primary" @click="submitList">纭� 瀹�</el-button>
</span>
</el-dialog>
@@ -106,7 +98,7 @@
</template>
<script>
-import {addOmitOrderProduct, getProductTreeBySampleId, getSampleByOrderId} from "@/api/business/productOrder";
+import { addOmitOrderProduct, getProductTreeBySampleId, getSampleByOrderId } from "@/api/business/productOrder";
export default {
name: "addInspectionDia",
@@ -122,8 +114,8 @@
productList: [], // 妫�楠岄」琛ㄦ牸鏁版嵁
productListSelected: [], // 閫夋嫨鐨勬楠岄」琛ㄦ牸
active: 1,
- methodS:null,
- id:null,
+ methodS: null,
+ id: null,
filters: [],
upLoad: false,
}
@@ -135,15 +127,15 @@
methods: {
getDataList(row) {
this.dialogVisible = true
- getSampleByOrderId({insOrderId: row.id}).then(res => {
+ getSampleByOrderId({ insOrderId: row.id }).then(res => {
this.sampleList = res.data
})
},
- openAddItemDia (row) {
+ openAddItemDia(row) {
this.itemDialogVisible = true
this.getProductLoad = true
- this.id=row.id
- getProductTreeBySampleId({insSampleId: row.id}).then(res => {
+ this.id = row.id
+ getProductTreeBySampleId({ insSampleId: row.id }).then(res => {
this.getProductLoad = false
this.productList = res.data
}).catch(err => {
@@ -160,14 +152,14 @@
}
this.productListSelected = val
},
- submitList () {
+ submitList() {
this.$confirm('纭娣诲姞姝ゆ楠岄」?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
this.upLoad = true
- addOmitOrderProduct({insProductBindingList:this.productListSelected,insSampleId:this.id}).then(res => {
+ addOmitOrderProduct({ insProductBindingList: this.productListSelected, insSampleId: this.id }).then(res => {
this.upLoad = false
this.$message.success('娣诲姞鎴愬姛锛�')
this.itemDialogVisible = false
@@ -181,7 +173,7 @@
});
});
},
- tableRowClassName({row, rowIndex}) {
+ tableRowClassName({ row, rowIndex }) {
if (row.state === 0) {
return '';
}
diff --git a/src/views/business/productOrder/components/auxiliaryWireCore.vue b/src/views/business/productOrder/components/auxiliaryWireCore.vue
index 7dfe787..d65625f 100644
--- a/src/views/business/productOrder/components/auxiliaryWireCore.vue
+++ b/src/views/business/productOrder/components/auxiliaryWireCore.vue
@@ -13,8 +13,8 @@
:value="item.value"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="妫�楠屾爣鍑�" prop="standardMethodListId">
- <el-select v-model="auxiliaryWireCore.standardMethodListId" disabled placeholder="璇烽�夋嫨妫�楠屾爣鍑�" size="small"
+ <el-form-item label="妫�楠屾爣鍑�" prop="standardMethodListIds">
+ <el-select v-model="auxiliaryWireCore.standardMethodListIds" disabled placeholder="璇烽�夋嫨妫�楠屾爣鍑�" size="small"
@change="(value) => methodChange(value)" multiple>
<el-option v-for="item in standards" :key="item.id" :label="item.code" :value="item.id">
</el-option>
@@ -65,7 +65,7 @@
size="small" type="textarea"></el-input>
</template>
</el-table-column>
- <el-table-column label="鏉′欢" min-width="140" prop="radius" show-overflow-tooltip>
+ <el-table-column label="璇曢獙鏉′欢" min-width="140" prop="radius" show-overflow-tooltip>
<template slot-scope="scope">
<el-input v-if="!scope.row.inspectionItem.includes('楂樻俯鍘嬪姏璇曢獙')" v-model="scope.row.radius"
:autosize="{ minRows: 1, maxRows: 3 }" clearable placeholder="瑕佹眰鎻忚堪" size="small" type="textarea">
@@ -124,7 +124,7 @@
tree: '',
standards: [],
auxiliaryWireCore: {
- standardMethodListId: [],
+ standardMethodListIds: [],
insProduct: [],
num: [],
modelNum: ''
@@ -266,7 +266,7 @@
} catch (e) {
}
})
- this.auxiliaryWireCore.standardMethodListId = this.sampleSelectionList[0].standardMethodListId
+ this.auxiliaryWireCore.standardMethodListIds = this.sampleSelectionList[0].standardMethodListId
// 鏌ヨ妫�娴嬫爣鍑嗕笅鎷夋閫夐」
if (this.auxiliaryWireCore.insProduct.length > 0) {
this.productList = this.auxiliaryWireCore.insProduct
diff --git a/src/views/business/productOrder/components/cable-config.vue b/src/views/business/productOrder/components/cable-config.vue
index 36fb994..63afd96 100644
--- a/src/views/business/productOrder/components/cable-config.vue
+++ b/src/views/business/productOrder/components/cable-config.vue
@@ -13,8 +13,8 @@
:value="item.value"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="妫�楠屾爣鍑�" prop="standardMethodListId">
- <el-select v-model="insulating.standardMethodListId" disabled placeholder="璇烽�夋嫨妫�楠屾爣鍑�" size="small"
+ <el-form-item label="妫�楠屾爣鍑�" prop="standardMethodListIds">
+ <el-select v-model="insulating.standardMethodListIds" disabled placeholder="璇烽�夋嫨妫�楠屾爣鍑�" size="small"
@change="(value) => methodChange(value)" multiple>
<el-option v-for="item in standards" :key="item.id" :label="item.code" :value="item.id">
</el-option>
@@ -71,7 +71,7 @@
<span v-else>{{ scope.row.ask }}</span>
</template>
</el-table-column>
- <el-table-column label="鏉′欢" min-width="140" prop="radius" show-overflow-tooltip>
+ <el-table-column label="璇曢獙鏉′欢" min-width="140" prop="radius" show-overflow-tooltip>
<template slot-scope="scope">
<el-input v-if="active == 1 && (isAskOnlyRead || isSpecial) && !scope.row.inspectionItem.includes('楂樻俯鍘嬪姏璇曢獙')"
v-model="scope.row.radius" :autosize="{ minRows: 1, maxRows: 3 }" clearable placeholder="瑕佹眰鎻忚堪"
@@ -141,7 +141,7 @@
tree: '',
standards: [],
insulating: {
- standardMethodListId: [],
+ standardMethodListIds: [],
insProduct: [],
num: []
},
@@ -252,7 +252,7 @@
}
} catch (e) { }
})
- this.insulating.standardMethodListId = this.sampleSelectionList[0].standardMethodListId
+ this.insulating.standardMethodListIds = this.sampleSelectionList[0].standardMethodListId
// 鏌ヨ妫�娴嬫爣鍑嗕笅鎷夋閫夐」
if (this.insulating.insProduct.length > 0) {
this.productList = this.insulating.insProduct
diff --git a/src/views/business/productOrder/index.vue b/src/views/business/productOrder/index.vue
index 80e631e..066a7a3 100644
--- a/src/views/business/productOrder/index.vue
+++ b/src/views/business/productOrder/index.vue
@@ -579,7 +579,7 @@
{ label: '妫�楠屽瓙椤�', prop: 'inspectionItemSubclass' },
{ label: '鍗曚綅', prop: 'unit' },
{ label: '鏍峰搧鍨嬪彿', prop: 'model' },
- { label: '鏉′欢', prop: 'radius' },
+ { label: '璇曢獙鏉′欢', prop: 'radius' },
{ label: '鐢电紗鏍囪瘑', prop: 'cableTag' },
{ label: '璇曢獙瑕佹眰', prop: 'tell' },
{ label: '妫�楠岀粨鏋�', prop: 'lastValue' },
diff --git a/src/views/statisticalCharts/itemInspectionAnalysis/index.vue b/src/views/statisticalCharts/itemInspectionAnalysis/index.vue
index 39c9d7d..0f642f5 100644
--- a/src/views/statisticalCharts/itemInspectionAnalysis/index.vue
+++ b/src/views/statisticalCharts/itemInspectionAnalysis/index.vue
@@ -248,7 +248,7 @@
{ label: '妫�楠屽瓙椤�', prop: 'inspectionItemSubclass' },
{ label: '鍗曚綅', prop: 'unit' },
{ label: '鏍峰搧鍨嬪彿', prop: 'model' },
- { label: '鏉′欢', prop: 'radius' },
+ { label: '璇曢獙鏉′欢', prop: 'radius' },
{ label: '鐢电紗鏍囪瘑', prop: 'cableTag' },
{ label: '璇曢獙瑕佹眰', prop: 'tell' },
{ label: '妫�楠岀粨鏋�', prop: 'lastValue' },
--
Gitblit v1.9.3