From d27482cf41fba24805d4ded9ac5cbac56887ce3b Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 09 十一月 2023 17:12:48 +0800
Subject: [PATCH] s
---
src/views/equipment/metering/metering-form.vue | 30 +++++++++++++++---------------
vue.config.js | 4 ++--
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 6 +++---
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/views/equipment/metering/metering-form.vue b/src/views/equipment/metering/metering-form.vue
index 66db943..2fc95b7 100644
--- a/src/views/equipment/metering/metering-form.vue
+++ b/src/views/equipment/metering/metering-form.vue
@@ -24,25 +24,25 @@
</el-col>
<el-col :span="12">
<el-form-item label="鏍″噯鏃堕棿" prop="createTime">
- <el-date-picker
- v-model="dataForm.createTime"
- align="right"
- type="date"
- placeholder="鏍″噯鏃堕棿"
- :picker-options="pickerOptions">
- </el-date-picker>
+ <el-date-picker
+ v-model="dataForm.createTime"
+ align="right"
+ type="date"
+ placeholder="鏍″噯鏃堕棿"
+ :picker-options="pickerOptions">
+ </el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鏍″噯鍒版湡鏃堕棿" prop="updateTime">
- <el-date-picker
- v-model="dataForm.updateTime"
- align="right"
- type="date"
- placeholder="鏍″噯鍒版湡鏃堕棿"
- :picker-options="pickerOptions">
- </el-date-picker>
- </el-form-item>
+ <el-date-picker
+ v-model="dataForm.updateTime"
+ align="right"
+ type="date"
+ placeholder="鏍″噯鍒版湡鏃堕棿"
+ :picker-options="pickerOptions">
+ </el-date-picker>
+ </el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="绫诲瀷" prop="type">
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index da0e42b..e806b33 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -154,7 +154,7 @@
class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
<el-input :disabled="scope.row.eId == null"
v-model="scope.row.inote"
- @blur="changeState(scope.row, index)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
+ @blur="changeState(scope.row, index)" placeholder="璇疯緭鍏ユ楠屾弿杩�"></el-input>
<!-- <el-select style="width: 100%;" @change="changeState(scope.row, index)" :disabled="scope.row.eId == null" v-model="scope.row.inote" placeholder="璇烽�夋嫨">
<el-option v-for="item in dataVal" :key="item.value" :label="item.label"
:value="item.value">
@@ -390,7 +390,7 @@
})
},
updateDevice(row,index){
- updateDeviceById({equiomentId:row.eId,fpid:row.iId}).then(res=>{
+ updateDeviceById({deviceId:row.eId,fpid:row.iId}).then(res=>{
this.inspectionItems.forEach(obj=>{
if(obj.children){
obj.children[index-1].inspectionValue = ''
@@ -425,7 +425,7 @@
return
}
let obj = {
- equiomentId: row.eId,
+ deviceId: row.eId,
fpid: row.iid,
inspectionValue: str,
note : row.inote
diff --git a/vue.config.js b/vue.config.js
index 2072109..f55c91d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,9 +2,9 @@
* 閰嶇疆鍙傝��:
* https://cli.vuejs.org/zh/config/
*/
-// const url = 'http://192.168.0.23:9999'
+const url = 'http://192.168.0.23:9999'
// const url = 'http://192.168.0.51:9999'
-const url = 'http://ztt-gateway:9999'
+// const url = 'http://ztt-gateway:9999'
const localUrl = 'http://localhost:8089'
//const localUrl = 'http://10.88.15.95:8089'
const CompressionWebpackPlugin = require('compression-webpack-plugin')
--
Gitblit v1.9.3