renwuxiugai

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/',

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",

pages/checkjob/index.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "排查任务",
+  "navigationBarTitleText": "检查任务",
   "enablePullDownRefresh": true,
   "onReachBottomDistance": 20
 }

pages/inspect/add.js

@@ -7,7 +7,21 @@ 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
+            })
+        },
    
   /**
    * 生命周期函数--监听页面加载

pages/inspect/add.wxml

@@ -13,7 +13,12 @@
     <view class="weui-cell__ft">{{equipment.area__name}}</view>
   </view>
 </view>
-<view class="weui-cells__title">检查项目</view>
+
+ <view class="nav bc_white">
+    <view class="{{selected?'red':'default'}}" bindtap="selected">风险点项目</view>
+    <view class="{{selected1?'red':'default'}}" bindtap="selected1">检查表项目</view>
+  </view>
+  <view class="{{selected?'show':'hidden'}}">
 <block wx:for="{{steps}}" wx:key="unique">
 <view class="weui-cells weui-cells_after-title">
   <view class="weui-article__p " style="marigin:5px">
@@ -22,6 +27,8 @@
   </view>
 </view>
 </block>
+</view>
+  <view class="{{selected1?'show':'hidden'}}">for activity</view>
 <view class="weui-cells__title">巡检记录</view>
 
 <radio-group name="radio-group" class="weui-cell" bindchange="radioChange">

pages/inspect/add.wxss

@@ -1,3 +1,9 @@
 .btn-area{
   margin:5px
 }
+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;}

pages/main/main.wxml

@@ -11,12 +11,12 @@
 
 	<view class="page__bd">
 		<swiper class="swiper_container" vertical="true" autoplay="true" circular="true" interval="3000" wx:if="{{isGjjt}}">
-<block wx:for="{{msgList}}" wx:key="title">
-<swiper-item>
-<view class="swiper_item">{{item.title}}</view>
-</swiper-item>
-</block>
-</swiper>
+			<block wx:for="{{msgList}}" wx:key="title">
+				<swiper-item>
+					<view class="swiper_item">{{item.title}}</view>
+				</swiper-item>
+			</block>
+		</swiper>
 		<view class="weui-cells__title" wx:if="{{!isGjjt}}">数据采集</view>
 		<view class="weui-grids" wx:if="{{!isGjjt}}">
 			<navigator url="/pages/checkjob/index" class="weui-grid" hover-class="weui-grid_active">