From f535c9c0e5d5488f3d4f6309163a4b75b9e88fba Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Tue, 14 Apr 2020 17:50:27 +0800
Subject: [PATCH] renwuxiugai
---
app.js | 4 +-
app.json | 5 +-
pages/checkjob/index.json | 2 +-
pages/inspect/add.js | 18 +++-
pages/inspect/add.wxml | 9 +-
pages/inspect/add.wxss | 8 +-
pages/main/main.wxml | 212 +++++++++++++++++++-------------------
7 files changed, 144 insertions(+), 114 deletions(-)
diff --git a/app.js b/app.js
index c05cb5f..cfbf7c9 100644
--- a/app.js
+++ b/app.js
@@ -97,8 +97,8 @@ App({
perms:[],
openid: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://10.21.28.148:8000/',
//serverUrl: 'http://192.168.0.103:8000/',
//serverUrl:'http://10.0.11.195:8000/',
diff --git a/app.json b/app.json
index e12fc27..93b8de8 100644
--- a/app.json
+++ b/app.json
@@ -77,7 +77,10 @@
"pages/data/detail",
"pages/totalrate/index",
"pages/checkjob/yanshou",
- "pages/checkjob/job"
+ "pages/checkjob/job",
+
+ "pages/checkjob/detail",
+ "pages/checkjob/index"
],
"window": {
"backgroundTextStyle": "light",
diff --git a/pages/checkjob/index.json b/pages/checkjob/index.json
index 7bdce1d..b11b844 100644
--- a/pages/checkjob/index.json
+++ b/pages/checkjob/index.json
@@ -1,5 +1,5 @@
{
- "navigationBarTitleText": "排查任务",
+ "navigationBarTitleText": "检查任务",
"enablePullDownRefresh": true,
"onReachBottomDistance": 20
}
\ No newline at end of file
diff --git a/pages/inspect/add.js b/pages/inspect/add.js
index c531657..7f14aa7 100644
--- a/pages/inspect/add.js
+++ b/pages/inspect/add.js
@@ -7,8 +7,22 @@ Page({
data: {
serverUrl: getApp().globalData.serverUrl,
state:1,
- },
-
+ selected:true,
+ selected1:false
+ },
+ selected:function(e){
+ this.setData({
+ selected1:false,
+ selected:true
+ })
+ },
+ selected1:function(e){
+ this.setData({
+ selected:false,
+ selected1:true
+ })
+ },
+
/**
* 生命周期函数--监听页面加载
*/
diff --git a/pages/inspect/add.wxml b/pages/inspect/add.wxml
index fae5d25..a7236e5 100644
--- a/pages/inspect/add.wxml
+++ b/pages/inspect/add.wxml
@@ -13,7 +13,12 @@
{{equipment.area__name}}
-检查项目
+
+
+ 风险点项目
+ 检查表项目
+
+
@@ -22,6 +27,8 @@
+
+ for activity
巡检记录
diff --git a/pages/inspect/add.wxss b/pages/inspect/add.wxss
index 43d11a3..14b9f71 100644
--- a/pages/inspect/add.wxss
+++ b/pages/inspect/add.wxss
@@ -1,3 +1,9 @@
.btn-area{
margin:5px
-}
\ No newline at end of file
+}
+page{background-color:#edf0f3;}
+.nav{width:100%;height:30rpx;display:flex;flex-direction:row;}
+.default{line-height:100rpx;text-align:center;flex:1;border-right:1px solid gainsboro;color:#000;font-weight:bold;font-size:28rpx;}
+.red{line-height:100rpx;text-align:center;color:#fc5558;flex:1;border-right:1px solid gainsboro;font-weight:bold;font-size:28rpx;}
+.show{display:block;text-align:center;line-height:200rpx;}
+.hidden{display:none;text-align:center;line-height:200px;}
diff --git a/pages/main/main.wxml b/pages/main/main.wxml
index 9433bd5..ea2258e 100644
--- a/pages/main/main.wxml
+++ b/pages/main/main.wxml
@@ -1,112 +1,112 @@
-
+
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
-
-{{item.title}}
-
-
-
- 数据采集
-
-
-
- 检查任务
- {{checknum}}
-
-
-
-
- 事故隐患
- {{yhtodonum}}
-
-
-
- 行为观察
- {{gcnoread}}
-
-
-
- 未遂事件
- {{wsnoread}}
-
-
-
- {{jytodonum}}
- 合理化建议
-
-
-
- 作业许可
- {{zytodonum}}
-
-
-
- 风险管控
-
-
-
- 风险任务
- {{tasknum}}
-
-
-
- 设备巡检
-
-
-
-
- 学习园地
-
- {{user__name}}
- ,进入在线考试答题吧！
-
-
-
-
-
-
- 学习资料
-
-
-
- 在线考试
- {{dknum}}
-
-
-
- 实时总排名
-
-
-
- 线下培训
- {{dqdnum}}
-
-
-
- 公告
-
-
-
- 通知
- {{noread}}
-
-
-
- 模拟练习
-
-
-
-
+
\ No newline at end of file