diff --git a/common/http.api.js b/common/http.api.js
index f088b07..5b05a61 100644
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -119,6 +119,8 @@ const install = (Vue, vm) => {
let thirdBltBind = (data={}) => vm.$u.post(`/third/tdevice/blt_bind/`, data); //解绑卡
let tdevice = (data={}) => vm.$u.get(`/third/tdevice/`, data); //设备列表
+ let eventCateList = (data={}) => vm.$u.get(`/ecm/event_cate/`, data); //算法列表
+ let algoCreate = (data={}) => vm.$u.post(`/ecm/algo_vchannel/`, data); //算法列表
vm.$u.api = {
getUserInfo ,
@@ -219,7 +221,10 @@ const install = (Vue, vm) => {
permissions,
thirdBltBind,
- tdevice
+ tdevice,
+
+ eventCateList,
+ algoCreate
};
}
diff --git a/components/multiple-select.vue b/components/multiple-select.vue
new file mode 100644
index 0000000..b650b9a
--- /dev/null
+++ b/components/multiple-select.vue
@@ -0,0 +1,355 @@
+
+
+
+
+
+
+
+
+
+ 暂无数据~
+
+
+ {{ item.name }}
+ ✔
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 91d0923..adef259 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "曲阳金隅EHS",
"appid" : "__UNI__B00D419",
"description" : "曲阳金隅EHS",
- "versionName" : "1.01.44",
- "versionCode" : 101044,
+ "versionName" : "1.01.50",
+ "versionCode" : 10150,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages.json b/pages.json
index a0c7368..00dede6 100644
--- a/pages.json
+++ b/pages.json
@@ -394,6 +394,22 @@
"enablePullDownRefresh": false
}
},
+ {
+ "path": "pages/my/suanfa",
+ "style": {
+ "navigationBarTitleText": "算法布设",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/my/alogadd",
+ "style": {
+ "navigationBarTitleText": "批量布设",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false
+ }
+ },
{
"path": "pages/workSpace/visit/visitor",
"style": {
@@ -428,6 +444,24 @@
}
}
+ ,{
+ "path" : "pages/my/suanfa",
+ "style" :
+ {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
+ }
+ ,{
+ "path" : "pages/my/alogadd",
+ "style" :
+ {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
+ }
],
"globalStyle": {
"navigationBarTextStyle": "black",
diff --git a/pages/my/alogadd.vue b/pages/my/alogadd.vue
new file mode 100644
index 0000000..7c45aee
--- /dev/null
+++ b/pages/my/alogadd.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/my/my.vue b/pages/my/my.vue
index a5a27b7..078f450 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -70,6 +70,12 @@
修改密码
+
@@ -141,6 +147,11 @@
url: '/pages/my/passwordChange'
})
}
+ else if (type == "suanfa") {
+ uni.navigateTo({
+ url: '/pages/my/suanfa'
+ })
+ }
},
getUserInfo() {
var promise;
diff --git a/pages/my/suanfa.vue b/pages/my/suanfa.vue
new file mode 100644
index 0000000..f2c9049
--- /dev/null
+++ b/pages/my/suanfa.vue
@@ -0,0 +1,288 @@
+
+
+
+
+
+
+ 名称:{{row.name}}
+ 标识:{{row.code}}
+
+ 触发:
+ 监控
+ 定位
+
+
+ 喇叭:
+ 已开
+ 未开
+
+
+
+ 喇叭区域:
+ 办公生活区以上
+ 生产一般区以上
+ 生产重点区以上
+
+
+
+
+
+
+
+
+ 新增布设
+
+
+
+
+ 关联算法
+
+
+
+
+
+
+
+
+ 监控相机
+
+
+
+
+
+
+
+
+ 常开
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
+
diff --git a/pages/workSpace/operation/gasList.vue b/pages/workSpace/operation/gasList.vue
index 7dbaed3..d77d209 100644
--- a/pages/workSpace/operation/gasList.vue
+++ b/pages/workSpace/operation/gasList.vue
@@ -88,8 +88,15 @@
检测人:
-
+
+
+
+ {{checker_name}}
+
+
+
@@ -123,10 +130,10 @@
is_ok:true,
checker:'',
},
+ checker_name:'',
initform: {},
oplDetail:{},
gasCheckList: [],
- workerRange: [],
certificateRange: [],
}
},
@@ -137,11 +144,16 @@
onShow() {
this.gasCheckList = [];
this.getOplDetail();
- this.getWorkerRange();
this.getGasCheckList();
this.getInit();
},
methods: {
+ showCheckerPicker() {
+ let params='?type=checker&typeName=checker_name'
+ uni.navigateTo({
+ url:"../../comm/userSelect/index"+params
+ })
+ },
remove(row){
this.$u.api.oplGasDelete(row.id).then(res => {
this.getGasCheckList()
@@ -170,23 +182,6 @@
console.log(res);
});
},
- //工
- getWorkerRange() {
- let that = this;
- that.$u.api.userList({
- page: 0
- }).then(res => {
- let workerRange = [];
- let obj = {};
- res.forEach(item => {
- obj = item;
- obj.value = item.id;
- obj.text = item.name;
- workerRange.push(obj);
- })
- that.workerRange = workerRange
- })
- },
//获取该工作的气体检测记录
getGasCheckList() {
let that = this;
diff --git a/pages/workSpace/opls/soil.vue b/pages/workSpace/opls/soil.vue
index 734460f..0216c1e 100644
--- a/pages/workSpace/opls/soil.vue
+++ b/pages/workSpace/opls/soil.vue
@@ -473,7 +473,7 @@
if (that.oplId !== null) {
that.$u.api.oplUpdate(that.oplId, that.formData).then(res => {
uni.hideLoading();
- params = `?oplId=${that.oplId}`;
+ params = `?oplId=${that.oplId}&oplCateCode=${that.oplCateCode}`;
uni.navigateTo({
url: '/pages/workSpace/operation/workerList' + params
})
@@ -482,7 +482,7 @@
} else {
that.$u.api.oplCreate(that.formData).then(res => {
uni.hideLoading();
- params = `?oplId=${res.id}`;
+ params = `?oplId=${res.id}&oplCateCode=${that.oplCateCode}`;
uni.navigateTo({
url: '/pages/workSpace/operation/workerList' + params
})
diff --git a/pages/workSpace/opls/space.vue b/pages/workSpace/opls/space.vue
index ba66262..d0e0104 100644
--- a/pages/workSpace/opls/space.vue
+++ b/pages/workSpace/opls/space.vue
@@ -477,7 +477,7 @@
if (that.oplId !== null) {
that.$u.api.oplUpdate(that.oplId, that.formData).then(res => {
uni.hideLoading();
- params = `?oplId=${that.oplId}`;
+ params = `?oplId=${that.oplId}&oplCateCode=${that.oplCateCode}`;
uni.navigateTo({
url: '/pages/workSpace/operation/workerList' + params
})
@@ -486,7 +486,7 @@
} else {
that.$u.api.oplCreate(that.formData).then(res => {
uni.hideLoading();
- params = `?oplId=${res.id}`;
+ params = `?oplId=${res.id}&oplCateCode=${that.oplCateCode}`;
uni.navigateTo({
url: '/pages/workSpace/operation/workerList' + params
})
diff --git a/pages/workSpace/opls/usecl.vue b/pages/workSpace/opls/usecl.vue
index e6bc86b..419378c 100644
--- a/pages/workSpace/opls/usecl.vue
+++ b/pages/workSpace/opls/usecl.vue
@@ -590,7 +590,7 @@
if (that.oplId !== null) {
that.$u.api.oplUpdate(that.oplId, that.formData).then(res => {
uni.hideLoading();
- params = `?oplId=${that.oplId}`;
+ params = `?oplId=${that.oplId}&oplCateCode=${that.oplCateCode}`;
uni.navigateTo({
url: '/pages/workSpace/operation/workerList' + params
})
@@ -599,7 +599,7 @@
} else {
that.$u.api.oplCreate(that.formData).then(res => {
uni.hideLoading();
- params = `?oplId=${res.id}`;
+ params = `?oplId=${res.id}&oplCateCode=${that.oplCateCode}`;
uni.navigateTo({
url: '/pages/workSpace/operation/workerList' + params
})
diff --git a/pages/workSpace/workSpace.vue b/pages/workSpace/workSpace.vue
index a42aef3..a4bbe55 100644
--- a/pages/workSpace/workSpace.vue
+++ b/pages/workSpace/workSpace.vue
@@ -71,7 +71,7 @@
-
+