diff --git a/app.js b/app.js
index 00ed519..4a016d6 100644
--- a/app.js
+++ b/app.js
@@ -2,7 +2,7 @@
App({
onLaunch: function () {
var that = this
- that.mplogin()
+ //that.mplogin()
setInterval(that.reflesh,10*60*1000)
},
mplogin: function () {
@@ -69,15 +69,16 @@ App({
url: '/pages/main/main',
})
} else {
+ wx.hideLoading()
wx.showToast({
title: '未绑定账号,请手动登录',
icon:'none'
})
- wx.hideLoading()
+
that.globalData.userInfo.mpopenid = res.data.mpopenid
- wx.reLaunch({
- url: '/pages/bind/binduser?mpopenid=' + res.data.mpopenid,
- })
+ // wx.reLaunch({
+ // url: '/pages/bind/binduser?mpopenid=' + res.data.mpopenid,
+ // })
}
},
})
@@ -93,9 +94,9 @@ App({
'Cookie': getApp().globalData.sessionId,
},
success: res => {
- if(res.data.code!=1){
- that.mplogin()
- }
+ // if(res.data.code!=1){
+ // that.mplogin()
+ // }
}
})
},
diff --git a/app.json b/app.json
index a474985..b73b90a 100644
--- a/app.json
+++ b/app.json
@@ -91,7 +91,11 @@
"pages/troublefollow/detail",
"pages/offence/index",
"pages/offence/add",
- "pages/offence/detail"
+ "pages/offence/detail",
+ "pages/user/chose",
+ "pages/safelist/index",
+ "pages/safefeedback/index",
+ "pages/safefeedback/add"
],
"window": {
"backgroundTextStyle": "light",
diff --git a/pages/bind/binduser.js b/pages/bind/binduser.js
index 94dd2a6..2c481ff 100644
--- a/pages/bind/binduser.js
+++ b/pages/bind/binduser.js
@@ -19,14 +19,18 @@ Page({
},
denglu: function(){
var that=this
- console.log(that.data)
+ var postdata = {
+ username: that.data.username,
+ password: that.data.password,
+ mpopenid: getApp().globalData.userInfo.mpopenid
+ }
wx.request({
url: getApp().globalData.serverUrl + 'bindmp',
header: {
'content-type': 'application/json', //
},
method: 'POST',
- data:that.data,
+ data: postdata,
success: res => {
if (res.statusCode === 200) {
if (res.data.code == 1) {
@@ -40,7 +44,8 @@ Page({
companyid: '',
perms: [],
openid:null
- } //重置globaldata和session
+ }
+ //重置globaldata和session
getApp().mplogin()
// wx.switchTab({
// url: '/pages/main/main',
@@ -136,9 +141,7 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
- this.setData({
- mpopenid:getApp().globalData.userInfo.mpopenid
- })
+ getApp().mplogin()
},
/**
diff --git a/pages/images/safelist.svg b/pages/images/safelist.svg
new file mode 100644
index 0000000..e6ef12b
--- /dev/null
+++ b/pages/images/safelist.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 8ded766..a2da864 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -19,6 +19,19 @@
资料管理
+
+
+
+
+
+
+
+ 我的安全清单
+
+
+
+
+
diff --git a/pages/inspect/add.js b/pages/inspect/add.js
index 6bc59b2..ac6a32e 100644
--- a/pages/inspect/add.js
+++ b/pages/inspect/add.js
@@ -14,6 +14,8 @@ Page({
selected:false,
selected1:true,
csry:"",
+ todouser:"",
+ todouser_name:"请选择",
isok:true
},
selected:function(e){
diff --git a/pages/inspect/add.wxml b/pages/inspect/add.wxml
index 8455af7..a4c28fa 100644
--- a/pages/inspect/add.wxml
+++ b/pages/inspect/add.wxml
@@ -4,7 +4,8 @@
设备编号
{{equipment.num}}
-
+
设备名称
{{equipment.name}}
@@ -34,16 +35,16 @@
-
-
- 巡检类型
-
-
-
- {{jclxArray[jclxIndex].text}}
-
-
+
+
+ 巡检类型
+
+
+ {{jclxArray[jclxIndex].text}}
+
+
+
@@ -54,7 +55,8 @@
-
+
{{item.value}}
@@ -62,33 +64,45 @@
-
+
-
-
+
+
-
+
-
- 抄送给
-
-
-
- 请选择
-
-
+
+ 提交给
-
- {{csryname}}
+
+
+ {{todouser_name}}
+
+
+
+
+ 抄送给
+
+
+
+ 请选择
+
+
+
+
+ {{csryname}}
+
+
+
+
-
-
-
+
+
+ 错误提示
+
+
+ 清单条目信息
+
+
+
+ 条目类型
+
+
+ 责任清单
+ 履职清单
+
+
+
+
+ 条目内容
+
+
+ {{item.name}}
+
+
+
+ 反馈描述
+
+
+
+ 完成情况
+
+
+
+ {{typeArray[typeIndex]}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/safefeedback/add.wxss b/pages/safefeedback/add.wxss
new file mode 100644
index 0000000..48edeaa
--- /dev/null
+++ b/pages/safefeedback/add.wxss
@@ -0,0 +1,4 @@
+/* pages/safefeedback/add.wxss */
+.btn-area{
+ margin:5px
+}
\ No newline at end of file
diff --git a/pages/safefeedback/index.js b/pages/safefeedback/index.js
new file mode 100644
index 0000000..b29e0db
--- /dev/null
+++ b/pages/safefeedback/index.js
@@ -0,0 +1,107 @@
+const api = require("../../utils/request.js");
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ page:1,
+ serverUrl: getApp().globalData.serverUrl,
+ feedbacklist:[]
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+ this.data.itemid = options.item
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+ var that = this;
+ that.onPullDownRefresh();
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ },
+ onPullDownRefresh: function () {
+ var that = this;
+ that.getfeedbacklist(1);
+ wx.stopPullDownRefresh();
+ this.data.page = 1;
+ },
+ onReachBottom: function () {
+ //上拉分页,将页码加1，然后调用分页函数
+ this.data.page = this.data.page + 1;
+ this.getfeedbacklist();
+
+ },
+ getfeedbacklist: function (page) {
+ var that = this;
+ if (page != 1) { page = that.data.page }
+ api.request('api/safefeedback/?a=listall', 'GET', {safeitem: this.data.itemid}).then(res => {
+ if (res.rows.length == 0) {
+ if (page == 1) {
+ this.setData({
+ total: 0,
+ feedbacklist: []
+ })
+ }
+ else {
+ wx.showModal({
+ content: "已经到底啦!",
+ showCancel: false,
+ confirmText: "确定",
+ })
+ }
+ } else {
+ let list
+ if (page == 1) {
+ list = res.rows
+ } else {
+ list = this.data.feedbacklist.concat(res.rows)
+ }
+ this.setData({
+ total: res.total,
+ feedbacklist: list
+ })
+ }
+ })
+ },
+})
\ No newline at end of file
diff --git a/pages/safefeedback/index.json b/pages/safefeedback/index.json
new file mode 100644
index 0000000..b579c78
--- /dev/null
+++ b/pages/safefeedback/index.json
@@ -0,0 +1,5 @@
+{
+ "navigationBarTitleText": "安全清单反馈记录",
+ "enablePullDownRefresh": true,
+ "onReachBottomDistance": 50
+}
\ No newline at end of file
diff --git a/pages/safefeedback/index.wxml b/pages/safefeedback/index.wxml
new file mode 100644
index 0000000..3d7dbd4
--- /dev/null
+++ b/pages/safefeedback/index.wxml
@@ -0,0 +1,21 @@
+
+
+
+ 该项目有{{total}}条反馈
+
+
+
+
+ {{tools.sub(item.content)}}
+ {{item.content}}
+ 提交时间:{{item.createtime}}
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/safefeedback/index.wxss b/pages/safefeedback/index.wxss
new file mode 100644
index 0000000..0783216
--- /dev/null
+++ b/pages/safefeedback/index.wxss
@@ -0,0 +1,14 @@
+/* pages/safefeedback/index.wxss */
+.weui-btn{
+ width:auto;
+ margin: 5px;
+}
+.container {
+ background-color: #fff;
+ color: #939393;
+}
+.head{
+ color:#fff;
+ background-color: cornflowerblue;
+ text-align: center;
+}
\ No newline at end of file
diff --git a/pages/safelist/index.js b/pages/safelist/index.js
new file mode 100644
index 0000000..96d6896
--- /dev/null
+++ b/pages/safelist/index.js
@@ -0,0 +1,111 @@
+// pages/safelist/index.js
+const api = require("../../utils/request.js");
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+ var url = 'api/safelist/?a=my'
+ if(options.id){
+ url = 'api/safelist/?a=detail&id='+options.id
+ }
+ api.request(url, 'GET').then(res => {
+ if(res.code==1){
+ this.setData(res)
+ }else{
+ wx.showToast({
+ title: res.msg,
+ icon:"none"
+ })
+ }
+
+ }).catch(res=>{
+ })
+
+ },
+ gofeedback: function (e){
+ var item = e.currentTarget.dataset.item;
+ this.data.selectedItem = item;
+ wx.navigateTo({
+ url: '/pages/safefeedback/index?item='+item.id,
+ })
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ },
+ scan: function () {
+ wx.scanCode({
+ onlyFromCamera: true,
+ success(res) {
+ if (res.result.indexOf("safelist") != -1) {
+ let id = res.result.split('=')[1]
+ wx.redirectTo({
+ url: 'index?id=' + id,
+ })
+ } else {
+ wx.showModal({
+ title: "系统提示",
+ content: '请扫清单二维码!',
+ showCancel: false,
+ confirmText: "确定"
+ })
+ }
+
+ }
+ })
+ },
+})
\ No newline at end of file
diff --git a/pages/safelist/index.json b/pages/safelist/index.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/safelist/index.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/safelist/index.wxml b/pages/safelist/index.wxml
new file mode 100644
index 0000000..96e06c9
--- /dev/null
+++ b/pages/safelist/index.wxml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+ {{name}}
+
+
+ 责任人:{{user__name}}
+
+
+ 创建日期:{{createtime}}--修改日期:{{updatetime}}
+
+
+
+
+
+
+ 清单项目
+
+
+
+ {{item.name}}
+
+
+ 责任清单
+ 履职清单
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/safelist/index.wxss b/pages/safelist/index.wxss
new file mode 100644
index 0000000..fa79274
--- /dev/null
+++ b/pages/safelist/index.wxss
@@ -0,0 +1 @@
+/* pages/safelist/index.wxss */
\ No newline at end of file
diff --git a/pages/user/chose.js b/pages/user/chose.js
new file mode 100644
index 0000000..49b1f88
--- /dev/null
+++ b/pages/user/chose.js
@@ -0,0 +1,66 @@
+// pages/user/chose.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/user/chose.json b/pages/user/chose.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/user/chose.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/user/chose.wxml b/pages/user/chose.wxml
new file mode 100644
index 0000000..7d7fa3f
--- /dev/null
+++ b/pages/user/chose.wxml
@@ -0,0 +1,2 @@
+
+pages/user/chose.wxml
diff --git a/pages/user/chose.wxss b/pages/user/chose.wxss
new file mode 100644
index 0000000..327e921
--- /dev/null
+++ b/pages/user/chose.wxss
@@ -0,0 +1 @@
+/* pages/user/chose.wxss */
\ No newline at end of file
diff --git a/pages/user/userdetail.js b/pages/user/userdetail.js
index 38ba02e..15f354c 100644
--- a/pages/user/userdetail.js
+++ b/pages/user/userdetail.js
@@ -129,7 +129,7 @@ Page({
if (res.statusCode === 200) {
if (res.data.code == 1) {
-
+ getApp().globalData.sessionId = null;
wx.showToast({})
wx.reLaunch({
url: '../bind/binduser',
diff --git a/pages/userSelect/userSelect.js b/pages/userSelect/userSelect.js
index 212bed7..7abb46c 100644
--- a/pages/userSelect/userSelect.js
+++ b/pages/userSelect/userSelect.js
@@ -11,9 +11,16 @@ Page({
selectList: [], //已选择的元素列表
originalList: [], //最原始的数据列表
indexList: [], //存储目录层级的数组，用于准确的返回上一层
+ type:'multiple'
},
onLoad: function (options) {
+ console.log(options)
+ if(options.type){
+ this.setData({
+ type:options.type
+ })
+ }
wx.setNavigationBarTitle({
title: '选择人员'
})
@@ -79,6 +86,16 @@ Page({
this.setLastTimeSelectList();
+ }else{
+ if(this.data.type=='radio'){
+ var pages = getCurrentPages();
+ var prevPage = pages[pages.length - 2];
+ prevPage.setData({
+ todouser: item.id,
+ todouser_name:item.name
+ })
+ wx.navigateBack()
+ }
}
},
diff --git a/pages/userSelect/userSelect.wxml b/pages/userSelect/userSelect.wxml
index f4340e3..6e99198 100644
--- a/pages/userSelect/userSelect.wxml
+++ b/pages/userSelect/userSelect.wxml
@@ -5,9 +5,9 @@
-
-
-
+
+
+
{{item.name}}
@@ -16,7 +16,7 @@
暂无数据
-
\ No newline at end of file