mes-ocea-before.git

			@@ -28,12 +28,7 @@
			</el-col>
			<el-col :span="6">
			<el-form-item label="零件号" prop="code">
			<el-input v-model="dataForm.code" :disabled="resultVal!=null && dataForm.id!=null">
			<!-- <el-button
			slot="append"
			icon="el-icon-search"
			:disabled="resultVal!=null && dataForm.id!=null"
			@click="queryCode()"></el-button> -->
			<el-input v-model="dataForm.code" disabled>
			<el-button
			slot="append"
			icon="el-icon-full-screen"
			@@ -44,8 +39,9 @@
			</el-col>
			<el-col :span="6">
			<el-form-item prop="name" label="原材料名称">
			<el-input v-model="dataForm.name" disabled >
			</el-input>
			<el-tooltip class="item" effect="dark" :content="dataForm.name">
			<el-input v-model="dataForm.name" disabled ></el-input>
			</el-tooltip>
			</el-form-item>
			</el-col>
			<el-col :span="6">
			@@ -63,7 +59,9 @@
			<el-row>
			<el-col :span="6">
			<el-form-item label="规格型号" prop="specs">
			<el-input v-model="dataForm.specs" disabled></el-input>
			<el-tooltip class="item" effect="dark" :content="dataForm.specs">
			<el-input v-model="dataForm.specs" disabled></el-input>
			</el-tooltip>
			</el-form-item>
			</el-col>
			<el-col :span="6">
			@@ -76,7 +74,9 @@
			</el-col>
			<el-col :span="6">
			<el-form-item label="供应商名称" prop="supplier">
			<el-tooltip class="item" effect="dark" :content="dataForm.supplier" >
			<el-input v-model="dataForm.supplier" disabled />
			</el-tooltip>
			</el-form-item>
			</el-col>
			<el-col :span="6">
			@@ -342,7 +342,7 @@
			formTime: '',
			message: '',
			name: '',
			code: '88.118.1/A0498220',
			code: '',
			specs: '',
			unit: '',
			number: '',
			@@ -401,12 +401,19 @@
			getDeviceResultInfo(val){
			console.log("扫描后数据",val);
			let id=val.split("id@")[1]
			let filterData=this.deviceList.filter(item=>{
			if(id!=undefined&&id!=''&&id!=null){
			let filterData=this.deviceList.filter(item=>{
			return item.id==id
			})[0]
			console.log(filterData);
			this.row.deviceId=Number(id)
			this.updateDevice(this.row,this.proIndex)
			}else{
			this.$message({
			message: '未识别出二位码计量器具信息！',
			type: 'warning'
			});
			}
			},
			codeDevice(row,index){
			this.row=row
			@@ -417,83 +424,33 @@
			},
			getResultInfo(data){
			console.log("扫描后执行",data);
			if(!data.includes("part_no")){
			this.$message({
			message: '未识别出二位码零件信息！',
			type: 'warning'
			});
			}
			let obj=JSON.parse(data)
			let info={"code":obj["part_no"]}
			console.log("值",info);
			this.paramObj = info
			this.showPart = true
			if(info.code!=undefined&&info.code!=''){
			this.paramObj = info
			this.showPart = true
			}else{
			this.$message({
			message: '未识别出二位码零件信息！',
			type: 'warning'
			});
			}
			},
			cancelCodeDialog(){
			this.qrcode = false
			},
			// 打开相机
			Turnonthecamera() {
			console.log("执行");
			this.qrcode = true
			this.$refs.codeCompont.openCamera()
			// this.camera = 'rear'
			},
			// 扫码结果回调
			// onDecode(result) {
			// console.log(result)
			// this.turnCameraOff()
			// },
			// 相机反转
			// switchCamera() {
			// switch (this.camera) {
			// case 'front':
			// this.camera = 'rear'
			// break
			// case 'rear':
			// this.camera = 'front'
			// break
			// default:
			// this.$toast('错误')
			// }
			// },
			// 关闭相机
			// turnCameraOff() {
			// this.camera = 'off'
			// this.qrcode = false
			// },
			// 打开手电筒
			// ClickFlash() {
			// switch (this.torchActive) {
			// case true:
			// this.torchActive = false
			// break
			// case false:
			// this.torchActive = true
			// break
			// default:
			// this.$toast('错误')
			// }
			// },

			// 检查是否调用摄像头
			// async onInit(promise) {
			// try {
			// await promise
			// } catch (error) {
			// if (error.name === 'StreamApiNotSupportedError') {
			// } else if (error.name === 'NotAllowedError') {
			// this.errorMessage = 'Hey! I need access to your camera'
			// } else if (error.name === 'NotFoundError') {
			// this.errorMessage = 'Do you even have a camera on your device?'
			// } else if (error.name === 'NotSupportedError') {
			// this.errorMessage =
			// 'Seems like this page is served in non-secure context (HTTPS, localhost or file://)'
			// } else if (error.name === 'NotReadableError') {
			// this.errorMessage =
			// "Couldn't access your camera. Is it already in use?"
			// } else if (error.name === 'OverconstrainedError') {
			// this.errorMessage =
			// "Constraints don't match any installed camera. Did you asked for the front camera although there is none?"
			// } else {
			// this.errorMessage = 'UNKNOWN ERROR: ' + error.message
			// }
			// }
			// },
			// 确认回调
			selectPart(param, nodePart, index) {
			if (typeof param !== 'undefined') {
			@@ -759,7 +716,6 @@
			for(var i=0;i<row.testValueList.length;i++){
			let val = row.testValueList[i]
			let reg = /^[0-9][1-9][0-9]$/
			console.log(['是','否'].includes(val));
			if(!reg.test(val) && !['是','否'].includes(val)){
			this.$message.error("请输入数字或选择是否")
			row.testValueList[i] = null