diff --git a/app.js b/app.js index 2217680..9ae06b8 100644 --- a/app.js +++ b/app.js @@ -73,8 +73,8 @@ App({ }, globalData: { userInfo: null, - serverUrl: 'https://safeyun.ctcshe.com/', - //serverUrl: 'http://127.0.0.1:8000/', + //serverUrl: 'https://safeyun.ctcshe.com/', + serverUrl: 'http://127.0.0.1:8000/', //serverUrl: 'http://192.168.0.102:8000/', //serverUrl:'http://10.7.100.250:8000/', isaqy: 0 diff --git a/app.json b/app.json index c9a2d90..4a6506b 100644 --- a/app.json +++ b/app.json @@ -53,12 +53,20 @@ "pages/safecert/detail", "pages/exercise/index", "pages/questioncat/index", - "pages/exercise/main" + "pages/exercise/main", + "pages/area/tree", + "pages/suggest/update", + "pages/inspect/index", + "pages/inspect/add", + "pages/inspect/detail", + "pages/equipment/detail", + "pages/risk/myindex", + "pages/risk/detail" ], "window": { "backgroundTextStyle": "light", "navigationBarBackgroundColor": "#fff", - "navigationBarTitleText": "安全预警lite", + "navigationBarTitleText": "安全生产管理工具", "navigationBarTextStyle": "black" }, "tabBar": { diff --git a/pages/area/tree.js b/pages/area/tree.js new file mode 100644 index 0000000..c820ad1 --- /dev/null +++ b/pages/area/tree.js @@ -0,0 +1,41 @@ +Page({ + data: { + value: [], + }, + selThis(e) { + //console.log(e.detail); + var pages = getCurrentPages(); + var prevPage = pages[pages.length - 2]; + prevPage.setData({ + yhqy:e.detail.id, + yhqy__name:e.detail.name, + missqy:e.detail.id, + missqy__name:e.detail.name, + zyqy__name:e.detail.name, + zyqy:e.detail.id, + jyqy:e.detail.id, + jyqy__name:e.detail.name + }) + wx.navigateBack() + }, + onLoad: function (option) { + wx.request({ + url: getApp().globalData.serverUrl + 'api/area?a=tree', + header: { + 'content-type': 'application/json', // 默认值 + 'Cookie': wx.getStorageSync("sessionid"), + }, + data: {}, + success: res => { + if (res.statusCode === 200) { + //console.log(res.data) + var data = res.data + console.log(data) + this.setData({ + value: data + }) + } + } + }); + }, +}); diff --git a/pages/area/tree.json b/pages/area/tree.json new file mode 100644 index 0000000..b040efd --- /dev/null +++ b/pages/area/tree.json @@ -0,0 +1,5 @@ +{ + "usingComponents": { + "path-view": "/components/path-view/index" + } +} \ No newline at end of file diff --git a/pages/area/tree.wxml b/pages/area/tree.wxml new file mode 100644 index 0000000..d7e4d45 --- /dev/null +++ b/pages/area/tree.wxml @@ -0,0 +1,8 @@ + + + + 地图区域 + + diff --git a/pages/area/tree.wxss b/pages/area/tree.wxss new file mode 100644 index 0000000..a32f022 --- /dev/null +++ b/pages/area/tree.wxss @@ -0,0 +1,12 @@ +.item { + display: block; + margin: 20px 0 10px; + padding-left: 10px; + font-size: 16px; +} +.ps { + margin-bottom: 10px; + padding: 0 10px; + color: #666; + font-size: 24rpx; +} \ No newline at end of file diff --git a/pages/equipment/detail.js b/pages/equipment/detail.js new file mode 100644 index 0000000..ca25901 --- /dev/null +++ b/pages/equipment/detail.js @@ -0,0 +1,66 @@ +// pages/equipment/detail.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/equipment/detail.json b/pages/equipment/detail.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/equipment/detail.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/equipment/detail.wxml b/pages/equipment/detail.wxml new file mode 100644 index 0000000..97cdd71 --- /dev/null +++ b/pages/equipment/detail.wxml @@ -0,0 +1,2 @@ + +pages/equipment/detail.wxml diff --git a/pages/equipment/detail.wxss b/pages/equipment/detail.wxss new file mode 100644 index 0000000..59a94d0 --- /dev/null +++ b/pages/equipment/detail.wxss @@ -0,0 +1 @@ +/* pages/equipment/detail.wxss */ \ No newline at end of file diff --git a/pages/examtest/index.js b/pages/examtest/index.js index 6e9d245..7f70e92 100644 --- a/pages/examtest/index.js +++ b/pages/examtest/index.js @@ -39,6 +39,7 @@ Page({ }, success: res => { if (res.statusCode === 200) { + console.log(res.data.rows) if (res.data.rows.length == 0) { if (page == 1) { this.setData({ @@ -169,4 +170,24 @@ Page({ this.getyklist(); } }, + testDetail:function(e){ + let data = e.currentTarget.dataset + let examtest__state = data.examtest__state + console.log(examtest__state) + let id = data.id + if (examtest__state==0){ + let url = "detail?detailid="+id.toString() + wx.navigateTo({ + url: url, + }) + }else{ + wx.showModal({ + title: "系统提示", + content: '考试还未关闭,请稍候查看', + showCancel: false, + confirmText: "确定" + }) + } + + } }); \ No newline at end of file diff --git a/pages/examtest/index.wxml b/pages/examtest/index.wxml index e833dac..29b56ce 100644 --- a/pages/examtest/index.wxml +++ b/pages/examtest/index.wxml @@ -28,7 +28,7 @@ 共{{yktotal}}条考试 - + {{item.examtest__name}} @@ -36,14 +36,14 @@ 耗时:{{item.took}}分钟 得分:{{item.score}} - - 通过 - - - 未通过 + + 通过 + 未通过 + 进行中 + 已关闭 - + diff --git a/pages/examtest/result.wxml b/pages/examtest/result.wxml index 75bd39f..ba65fc7 100644 --- a/pages/examtest/result.wxml +++ b/pages/examtest/result.wxml @@ -18,8 +18,8 @@ - - + + diff --git a/pages/exercise/index.js b/pages/exercise/index.js index 0d37e7a..caf453b 100644 --- a/pages/exercise/index.js +++ b/pages/exercise/index.js @@ -6,6 +6,7 @@ Page({ */ data: { catsname:'', + cats:'', start1:true, start2:false }, @@ -48,6 +49,7 @@ wx.getStorage({ */ onShow: function () { var that=this + let oldcats = this.data.cats let lst = getApp().globalData.selectList let nst = [] let nst1 = [] @@ -61,15 +63,24 @@ wx.getStorage({ cats: nst1.join(','), }) } - wx.getStorage({ - key: 'ydtms', - success: function (res) { - that.setData({ - start1: false, - start2: true - }) - }, - }) + if (oldcats == '' || oldcats == this.data.cats){ + wx.getStorage({ + key: 'ydtms', + success: function (res) { + that.setData({ + start1: false, + start2: true + }) + }, + }) + } + else{ + that.setData({ + start1: true, + start2: false + }) + } + }, /** diff --git a/pages/exercise/main.wxml b/pages/exercise/main.wxml index ec0b92c..b03aae6 100644 --- a/pages/exercise/main.wxml +++ b/pages/exercise/main.wxml @@ -51,7 +51,7 @@ - + \ No newline at end of file diff --git a/pages/images/inspect.png b/pages/images/inspect.png new file mode 100644 index 0000000..9a9c4c0 Binary files /dev/null and b/pages/images/inspect.png differ diff --git a/pages/images/riskrole.png b/pages/images/riskrole.png new file mode 100644 index 0000000..7f3efc7 Binary files /dev/null and b/pages/images/riskrole.png differ diff --git a/pages/index/index.wxml b/pages/index/index.wxml index c887053..1b39804 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -10,36 +10,54 @@ 平台账号: {{username}} - 昵称: (点击进入个人信息管理) + 昵称: + (点击进入个人信息管理) - - 资料管理 - - - - - - - 我的特种作业证书 - - - - - - - - - - - 我的安全资格证书 - - - - - + + 资料管理 + + + + + + + + 我的特种作业证书 + + + + + + + + + + + + 我的安全资格证书 + + + + + + + + + + + + + 我的岗位风险 + + + + + + + \ No newline at end of file diff --git a/pages/inspect/add.js b/pages/inspect/add.js new file mode 100644 index 0000000..638ef5b --- /dev/null +++ b/pages/inspect/add.js @@ -0,0 +1,142 @@ +// pages/inspect/check.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + serverUrl: getApp().globalData.serverUrl, + state:1, + }, + + /** + * 生命周期函数--监听页面加载 + */ + radioChange: function (e) { + console.log('radio发生change事件,携带value值为:', e.detail.value); + this.setData({ + state: e.detail.value, + }); + }, + bindcontentInput: function (e) { + this.data.content = e.detail.value + }, + onLoad: function (options) { + let id = options.id + wx.request({ + url: this.data.serverUrl + 'api/equipment?a=detail&id=' + id, + header: { + 'content-type': 'application/json', // 默认值 + 'Cookie': wx.getStorageSync("sessionid"), + }, + success: res => { + if (res.statusCode === 200) { + console.log(res.data) + this.setData({ + equipment:res.data + }) + wx.request({ + url: this.data.serverUrl + 'api/risk?a=steps&type=equipment', + header: { + 'content-type': 'application/json', // 默认值 + 'Cookie': wx.getStorageSync("sessionid"), + }, + method:'post', + data:{'name':res.data.name,'id':res.data.id,'areaid':res.data.area__id}, + success: res => { + if (res.statusCode === 200) { + if(res.data.code==1){ + this.setData({ + steps:res.data.steps + }) + } + } + wx.hideLoading(); + } + }); + } + } + }); + }, +submit:function(){ + let data={ + equipment:this.data.equipment.id, + state:this.data.state, + content:this.data.content + } + wx.showLoading({ + title: '提交中', + }) + wx.request({ + url: this.data.serverUrl + 'api/inspect?a=add', + header: { + 'content-type': 'application/json', // 默认值 + 'Cookie': wx.getStorageSync("sessionid"), + }, + method:'POST', + data:data, + success: res => { + if (res.statusCode === 200) { + console.log(res.data) + wx.navigateBack({ + + }) + } + wx.hideLoading(); + } + }); +}, + submit2: function () { + wx.navigateTo({ + url: '/pages/trouble/addtrouble?type=inspect', + }) + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/inspect/add.json b/pages/inspect/add.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/inspect/add.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/inspect/add.wxml b/pages/inspect/add.wxml new file mode 100644 index 0000000..1c518d9 --- /dev/null +++ b/pages/inspect/add.wxml @@ -0,0 +1,45 @@ +当前设备 + + + 设备编号 + {{equipment.num}} + + + 设备名称 + {{equipment.name}} + + + 区域 + {{equipment.area__name}} + + +检查项目 + + + + {{item.step}}- + {{item.result}}- + {{item.hazard}} + + + +巡检记录 + + + + + + + + + +