diff --git a/app.json b/app.json
index 3d9a873..ffe9845 100644
--- a/app.json
+++ b/app.json
@@ -46,7 +46,8 @@
"pages/workBenchNew/components/recharge/index",
"pages/workBenchNew/components/installMeter/index",
"pages/workBenchNew/components/uninstallMeter/index",
- "pages/workBenchTodoList/index"
+ "pages/workBenchTodoList/index",
+ "pages/workBenchNew/components/kaihu/index"
],
"subPackages": [
{
diff --git a/components/searchSelect/index.js b/components/searchSelect/index.js
index 88d9507..3cadbc3 100644
--- a/components/searchSelect/index.js
+++ b/components/searchSelect/index.js
@@ -152,7 +152,7 @@ Component({
},
async onSearchCollection() {
const { searchText = "" } = this.data;
- const { code, message, data: parks = [] } = await getCollectionList({keyword: searchText, page: 1});
+ const { code, message, data: parks = [] } = await getCollectionList({keyword: searchText, page: 1, status: 1});
if (code !== OK) {
alertInfo(message)
return
diff --git a/pages/workBenchNew/components/installMeter/index.js b/pages/workBenchNew/components/installMeter/index.js
index 8fa9355..72b9ae9 100644
--- a/pages/workBenchNew/components/installMeter/index.js
+++ b/pages/workBenchNew/components/installMeter/index.js
@@ -113,7 +113,7 @@ Page({
}
this.setData({
show: true,
- title: "采集器A",
+ title: "互感器A",
type: 'collection',
collection: "A"
})
@@ -126,7 +126,7 @@ Page({
}
this.setData({
show: true,
- title: "采集器B",
+ title: "互感器B",
type: 'collection',
collection: "B"
})
@@ -139,7 +139,7 @@ Page({
}
this.setData({
show: true,
- title: "采集器C",
+ title: "互感器C",
type: 'collection',
collection: "C"
})
@@ -360,7 +360,7 @@ Page({
tenement, sharp, peak, flat, valley, overall, url, sn,
collectionARatio, collectionBRatio, collectionCRatio
} = this.data;
- if (!park || !(meter || sn) || !address || meterType == null) {
+ if (!park || !(meter || sn) || !address || meterType == null || !building || !meterBox) {
alertInfo("请填写必填项后保存")
return;
}
@@ -369,7 +369,7 @@ Page({
(collectionA == collectionC&& collectionA != null && collectionC != null) ||
(collectionC == collectionB && collectionB != null && collectionC != null)
) {
- alertInfo("采集器不能重复选择")
+ alertInfo("互感器不能重复选择")
return;
}
if (
@@ -377,7 +377,7 @@ Page({
(collectionARatio != collectionCRatio&& collectionARatio != null && collectionCRatio != null) ||
(collectionCRatio != collectionBRatio && collectionBRatio != null && collectionCRatio != null)
) {
- alertInfo("采集器倍率不一致")
+ alertInfo("互感器倍率不一致")
return;
}
const { code, data, message } = await installMeter({
diff --git a/pages/workBenchNew/components/installMeter/index.wxml b/pages/workBenchNew/components/installMeter/index.wxml
index f01674a..39fc91d 100644
--- a/pages/workBenchNew/components/installMeter/index.wxml
+++ b/pages/workBenchNew/components/installMeter/index.wxml
@@ -41,6 +41,7 @@
placeholder="请选择建筑"
text="{{buildingName}}"
bind:search="onBuildingFocus"
+ required="{{true}}"
/>
diff --git a/pages/workBenchNew/components/kaihu/index.js b/pages/workBenchNew/components/kaihu/index.js
new file mode 100644
index 0000000..6c01e64
--- /dev/null
+++ b/pages/workBenchNew/components/kaihu/index.js
@@ -0,0 +1,66 @@
+// pages/workBenchNew/components/kaihu/index.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/workBenchNew/components/kaihu/index.json b/pages/workBenchNew/components/kaihu/index.json
new file mode 100644
index 0000000..b46458f
--- /dev/null
+++ b/pages/workBenchNew/components/kaihu/index.json
@@ -0,0 +1,10 @@
+{
+ "usingComponents": {
+ "search-select": "/components/searchSelect/index",
+ "van-field": "@vant/weapp/field/index",
+ "van-button": "@vant/weapp/button/index",
+ "navigator": "/components/navigator/index",
+ "van-dialog": "@vant/weapp/dialog/index"
+ },
+ "navigationStyle": "custom"
+}
\ No newline at end of file
diff --git a/pages/workBenchNew/components/kaihu/index.wxml b/pages/workBenchNew/components/kaihu/index.wxml
new file mode 100644
index 0000000..71f2ddd
--- /dev/null
+++ b/pages/workBenchNew/components/kaihu/index.wxml
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+
+
+
+
+ 选择
+
+
+
+
+ 选择
+
+
+
\ No newline at end of file
diff --git a/pages/workBenchNew/components/kaihu/index.wxss b/pages/workBenchNew/components/kaihu/index.wxss
new file mode 100644
index 0000000..a604f74
--- /dev/null
+++ b/pages/workBenchNew/components/kaihu/index.wxss
@@ -0,0 +1 @@
+/* pages/workBenchNew/components/kaihu/index.wxss */
\ No newline at end of file
diff --git a/pages/workBenchNew/index.js b/pages/workBenchNew/index.js
index 12c5b47..aa4fd6b 100644
--- a/pages/workBenchNew/index.js
+++ b/pages/workBenchNew/index.js
@@ -76,6 +76,11 @@ Page({
url: '/pages/workBenchNew/components/uninstallMeter/index',
})
},
+ jumpToKaihu() {
+ wx.navigateTo({
+ url: 'pages/workBenchNew/components/kaihu/index',
+ })
+ },
/**
* 生命周期函数--监听页面初次渲染完成
*/
diff --git a/pages/workBenchNew/index.wxml b/pages/workBenchNew/index.wxml
index 8b8c62a..e237b49 100644
--- a/pages/workBenchNew/index.wxml
+++ b/pages/workBenchNew/index.wxml
@@ -111,7 +111,7 @@
-
+