diff --git a/miniprogram/app.js b/miniprogram/app.js
index e46517c..de2748f 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -18,9 +18,9 @@
// this.globalData = {}
},
globalData: {
- httpsUrl: "https://logapi.smartlog.work/",
- // httpsUrl: "https://38ka911915.picp.vip/", // 柴壮本地
- // httpsUrl: "http://192.168.8.106:8083/",// 柴壮本地
+ httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址
+ // httpsUrl: "https://38ka911915.picp.vip/", // 周甜本地
+ // httpsUrl: "http://192.168.147.39:5905/",// 周甜本地
// httpsUrl: "http://139.198.18.188:8083/",
// url: "http://127.0.0.1:8083/",
//httpsUrl: "http://127.0.0.1:8083/",
diff --git a/miniprogram/app.js b/miniprogram/app.js
index e46517c..de2748f 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -18,9 +18,9 @@
// this.globalData = {}
},
globalData: {
- httpsUrl: "https://logapi.smartlog.work/",
- // httpsUrl: "https://38ka911915.picp.vip/", // 柴壮本地
- // httpsUrl: "http://192.168.8.106:8083/",// 柴壮本地
+ httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址
+ // httpsUrl: "https://38ka911915.picp.vip/", // 周甜本地
+ // httpsUrl: "http://192.168.147.39:5905/",// 周甜本地
// httpsUrl: "http://139.198.18.188:8083/",
// url: "http://127.0.0.1:8083/",
//httpsUrl: "http://127.0.0.1:8083/",
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index 0535dd4..e04855c 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -20,6 +20,32 @@
personoption1: [],
projectoption: [],
devtypeList:[],
+ installTypeList:[
+ {
+ text: '初次安装',
+ value: '1',
+ },
+ {
+ text: '初次拆走',
+ value: '2',
+ },
+ {
+ text: '二次安装',
+ value: '3',
+ },
+ {
+ text: '二次拆走',
+ value: '4',
+ },
+ {
+ text: '正在维护',
+ value: '5',
+ },
+ {
+ text: '其他',
+ value: '6',
+ },
+ ],
show: false,
form: {
devcode: "",
@@ -46,6 +72,7 @@
photopath1: '',
photopath2: '',
photopath3: '',
+ installType: '1', // 设备安装情况
},
fileList: [],
listQuery: {
@@ -726,6 +753,14 @@
[wellType]: value.detail
})
},
+ // 设置设备安装情况
+ selectInstallType(value) {
+ var that = this;
+ var installType = 'form.installType';
+ that.setData({
+ [installType]: value.detail
+ })
+ },
//设置设备类型
selectDevType(event) {
diff --git a/miniprogram/app.js b/miniprogram/app.js
index e46517c..de2748f 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -18,9 +18,9 @@
// this.globalData = {}
},
globalData: {
- httpsUrl: "https://logapi.smartlog.work/",
- // httpsUrl: "https://38ka911915.picp.vip/", // 柴壮本地
- // httpsUrl: "http://192.168.8.106:8083/",// 柴壮本地
+ httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址
+ // httpsUrl: "https://38ka911915.picp.vip/", // 周甜本地
+ // httpsUrl: "http://192.168.147.39:5905/",// 周甜本地
// httpsUrl: "http://139.198.18.188:8083/",
// url: "http://127.0.0.1:8083/",
//httpsUrl: "http://127.0.0.1:8083/",
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index 0535dd4..e04855c 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -20,6 +20,32 @@
personoption1: [],
projectoption: [],
devtypeList:[],
+ installTypeList:[
+ {
+ text: '初次安装',
+ value: '1',
+ },
+ {
+ text: '初次拆走',
+ value: '2',
+ },
+ {
+ text: '二次安装',
+ value: '3',
+ },
+ {
+ text: '二次拆走',
+ value: '4',
+ },
+ {
+ text: '正在维护',
+ value: '5',
+ },
+ {
+ text: '其他',
+ value: '6',
+ },
+ ],
show: false,
form: {
devcode: "",
@@ -46,6 +72,7 @@
photopath1: '',
photopath2: '',
photopath3: '',
+ installType: '1', // 设备安装情况
},
fileList: [],
listQuery: {
@@ -726,6 +753,14 @@
[wellType]: value.detail
})
},
+ // 设置设备安装情况
+ selectInstallType(value) {
+ var that = this;
+ var installType = 'form.installType';
+ that.setData({
+ [installType]: value.detail
+ })
+ },
//设置设备类型
selectDevType(event) {
diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml
index 03cbe1c..e281a5b 100644
--- a/miniprogram/pages/addDevice/addDevice.wxml
+++ b/miniprogram/pages/addDevice/addDevice.wxml
@@ -53,13 +53,23 @@
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/miniprogram/app.js b/miniprogram/app.js
index e46517c..de2748f 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -18,9 +18,9 @@
// this.globalData = {}
},
globalData: {
- httpsUrl: "https://logapi.smartlog.work/",
- // httpsUrl: "https://38ka911915.picp.vip/", // 柴壮本地
- // httpsUrl: "http://192.168.8.106:8083/",// 柴壮本地
+ httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址
+ // httpsUrl: "https://38ka911915.picp.vip/", // 周甜本地
+ // httpsUrl: "http://192.168.147.39:5905/",// 周甜本地
// httpsUrl: "http://139.198.18.188:8083/",
// url: "http://127.0.0.1:8083/",
//httpsUrl: "http://127.0.0.1:8083/",
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index 0535dd4..e04855c 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -20,6 +20,32 @@
personoption1: [],
projectoption: [],
devtypeList:[],
+ installTypeList:[
+ {
+ text: '初次安装',
+ value: '1',
+ },
+ {
+ text: '初次拆走',
+ value: '2',
+ },
+ {
+ text: '二次安装',
+ value: '3',
+ },
+ {
+ text: '二次拆走',
+ value: '4',
+ },
+ {
+ text: '正在维护',
+ value: '5',
+ },
+ {
+ text: '其他',
+ value: '6',
+ },
+ ],
show: false,
form: {
devcode: "",
@@ -46,6 +72,7 @@
photopath1: '',
photopath2: '',
photopath3: '',
+ installType: '1', // 设备安装情况
},
fileList: [],
listQuery: {
@@ -726,6 +753,14 @@
[wellType]: value.detail
})
},
+ // 设置设备安装情况
+ selectInstallType(value) {
+ var that = this;
+ var installType = 'form.installType';
+ that.setData({
+ [installType]: value.detail
+ })
+ },
//设置设备类型
selectDevType(event) {
diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml
index 03cbe1c..e281a5b 100644
--- a/miniprogram/pages/addDevice/addDevice.wxml
+++ b/miniprogram/pages/addDevice/addDevice.wxml
@@ -53,13 +53,23 @@
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.js b/miniprogram/pages/addDevicelog/addDeviceLog.js
index 65a940f..86e4980 100644
--- a/miniprogram/pages/addDevicelog/addDeviceLog.js
+++ b/miniprogram/pages/addDevicelog/addDeviceLog.js
@@ -22,6 +22,32 @@
installtimeFmt: '',
show: false,
devcodeDisabled: false, // 控制设备编号不可编辑
+ installTypeList:[
+ {
+ text: '初次安装',
+ value: '1',
+ },
+ {
+ text: '初次拆走',
+ value: '2',
+ },
+ {
+ text: '二次安装',
+ value: '3',
+ },
+ {
+ text: '二次拆走',
+ value: '4',
+ },
+ {
+ text: '正在维护',
+ value: '5',
+ },
+ {
+ text: '其他',
+ value: '6',
+ },
+ ],
form: {
devcode: "",
wellcode: "",
@@ -46,7 +72,8 @@
wellname: "",
photopath1: '',
photopath2: '',
- photopath3: ''
+ photopath3: '',
+ installType: '', // 设备安装情况
},
fileList: [],
detail: "",
@@ -392,6 +419,13 @@
})
return false
}
+ if (this.data.form.installType == "") {
+ wx.showToast({
+ icon: 'none',
+ title: '设备安装情况不能为空！',
+ })
+ return false
+ }
console.log('---------', this.data.form.longitude);
if (this.data.form.longitude == "" || this.data.form.latitude == "") {
wx.showToast({
@@ -654,6 +688,15 @@
[wellType]: value.detail
})
},
+ // 设置设备安装情况
+ selectInstallType(value) {
+ var that = this;
+ var installType = 'form.installType';
+ that.setData({
+ [installType]: value.detail
+ })
+ },
+
//运维人员默认为登录人
// selectpersonValue(event) {
// var that = this;
diff --git a/miniprogram/app.js b/miniprogram/app.js
index e46517c..de2748f 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -18,9 +18,9 @@
// this.globalData = {}
},
globalData: {
- httpsUrl: "https://logapi.smartlog.work/",
- // httpsUrl: "https://38ka911915.picp.vip/", // 柴壮本地
- // httpsUrl: "http://192.168.8.106:8083/",// 柴壮本地
+ httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址
+ // httpsUrl: "https://38ka911915.picp.vip/", // 周甜本地
+ // httpsUrl: "http://192.168.147.39:5905/",// 周甜本地
// httpsUrl: "http://139.198.18.188:8083/",
// url: "http://127.0.0.1:8083/",
//httpsUrl: "http://127.0.0.1:8083/",
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index 0535dd4..e04855c 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -20,6 +20,32 @@
personoption1: [],
projectoption: [],
devtypeList:[],
+ installTypeList:[
+ {
+ text: '初次安装',
+ value: '1',
+ },
+ {
+ text: '初次拆走',
+ value: '2',
+ },
+ {
+ text: '二次安装',
+ value: '3',
+ },
+ {
+ text: '二次拆走',
+ value: '4',
+ },
+ {
+ text: '正在维护',
+ value: '5',
+ },
+ {
+ text: '其他',
+ value: '6',
+ },
+ ],
show: false,
form: {
devcode: "",
@@ -46,6 +72,7 @@
photopath1: '',
photopath2: '',
photopath3: '',
+ installType: '1', // 设备安装情况
},
fileList: [],
listQuery: {
@@ -726,6 +753,14 @@
[wellType]: value.detail
})
},
+ // 设置设备安装情况
+ selectInstallType(value) {
+ var that = this;
+ var installType = 'form.installType';
+ that.setData({
+ [installType]: value.detail
+ })
+ },
//设置设备类型
selectDevType(event) {
diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml
index 03cbe1c..e281a5b 100644
--- a/miniprogram/pages/addDevice/addDevice.wxml
+++ b/miniprogram/pages/addDevice/addDevice.wxml
@@ -53,13 +53,23 @@
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.js b/miniprogram/pages/addDevicelog/addDeviceLog.js
index 65a940f..86e4980 100644
--- a/miniprogram/pages/addDevicelog/addDeviceLog.js
+++ b/miniprogram/pages/addDevicelog/addDeviceLog.js
@@ -22,6 +22,32 @@
installtimeFmt: '',
show: false,
devcodeDisabled: false, // 控制设备编号不可编辑
+ installTypeList:[
+ {
+ text: '初次安装',
+ value: '1',
+ },
+ {
+ text: '初次拆走',
+ value: '2',
+ },
+ {
+ text: '二次安装',
+ value: '3',
+ },
+ {
+ text: '二次拆走',
+ value: '4',
+ },
+ {
+ text: '正在维护',
+ value: '5',
+ },
+ {
+ text: '其他',
+ value: '6',
+ },
+ ],
form: {
devcode: "",
wellcode: "",
@@ -46,7 +72,8 @@
wellname: "",
photopath1: '',
photopath2: '',
- photopath3: ''
+ photopath3: '',
+ installType: '', // 设备安装情况
},
fileList: [],
detail: "",
@@ -392,6 +419,13 @@
})
return false
}
+ if (this.data.form.installType == "") {
+ wx.showToast({
+ icon: 'none',
+ title: '设备安装情况不能为空！',
+ })
+ return false
+ }
console.log('---------', this.data.form.longitude);
if (this.data.form.longitude == "" || this.data.form.latitude == "") {
wx.showToast({
@@ -654,6 +688,15 @@
[wellType]: value.detail
})
},
+ // 设置设备安装情况
+ selectInstallType(value) {
+ var that = this;
+ var installType = 'form.installType';
+ that.setData({
+ [installType]: value.detail
+ })
+ },
+
//运维人员默认为登录人
// selectpersonValue(event) {
// var that = this;
diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.wxml b/miniprogram/pages/addDevicelog/addDeviceLog.wxml
index 9f616da..3b7ffee 100644
--- a/miniprogram/pages/addDevicelog/addDeviceLog.wxml
+++ b/miniprogram/pages/addDevicelog/addDeviceLog.wxml
@@ -54,6 +54,18 @@
+
+
+
+
+
+
+
+
+
+
+
+