巡查记录跳转隐患详情

app.json

@@ -20,8 +20,10 @@
     "pages/xqzggzs2/xqzggzs2",
     "pages/xunjian/xunjian",
     "pages/xunjiancz/xunjiancz",
-    "pages/qianming/qianming"
+    "pages/qianming/qianming",
+    "pages/xunjianmore/xunjianmore"
   ],
+
   "requiredPrivateInfos": [
     "getLocation"
   ],

base/httputil.js

@@ -5,7 +5,7 @@
 
 
 
-// let BASE_Server = "https://192.168.1.100:18080"
+ //let BASE_Server = "https://192.168.1.100:18080"
 let BASE_Server = "https://sookajs.top:18080"
 
 let app = getApp()

pages/index/index.wxss

@@ -130,12 +130,12 @@ justify-content:space-around;
 background: none;
 }
 .top_banner .xszn{
-      left:5% ;
-      top:38%;
+      left:10% ;
+      top:43%;
 }
 .top_banner .sygl{
-    right:5% ;
-    top:39%;
+    right:10% ;
+    top:44%;
 }
 .top_banner .xszn span{
   background-image:-webkit-linear-gradient(right,#ff2e56,#d260a8); 

pages/me/me.wxss

@@ -45,4 +45,4 @@
   height: 100rpx;
   line-height: 100rpx;
   padding-left: 20rpx;
-}
+}

pages/menu/menu.wxss

@@ -51,7 +51,8 @@ height: 50rpx;
   font-size: 50rpx;
 
   color: #fff;
-  margin: auto;
+  /* margin: auto; */
+  position: absolute;top:50%;left:50%;transform:translate(-50%,-50%);
 }
 .menu_bg{
   background: rgb(236, 235, 235);

pages/xuncha/xuncha.js

@@ -16,7 +16,7 @@ Page({
     menulist: [{
         "id": "1",
         "url": "icon-anquanxuncha",
-        "title": "巡查",
+        "title": "巡更",
       },
       {
         "id": "2",
@@ -69,8 +69,13 @@ Page({
         title: '没有发现安全隐患,请放心!!',
         icon: "none" 
       })
+    }else{
+      console.log(isrisk,"####",buslogid)
+      wx.navigateTo({
+        url: '../xunjianmore/xunjianmore?buslogid='+buslogid
+      })
     }
-    console.log(isrisk,"####",buslogid)
+   
   },
 
   menuItemClick: function (res) {

pages/xunjianimg/xunjianimg.js

@@ -7,7 +7,9 @@ Page({
    */
 
   getXunjianimgList() {
-    http.post("/system/AppXunjianimgController/getXunjianimgList",null,this.getXunjianimgListSuccess)
+    let obj = new Object()
+    obj.isPass = 'N' 
+    http.post("/system/AppXunjianimgController/getXunjianimgList",obj,this.getXunjianimgListSuccess)
   },
   getXunjianimgListSuccess(res){
     console.log("@@@@@",res)

pages/xunjianmore/xunjianmore.js

@@ -0,0 +1,43 @@
+// pages/xunjianmore/xunjianmore.js
+import http from '../../base/httputil'
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+
+   
+  data: {
+    host: app.globalData.host,
+    buslogid: null,
+    mapdata : null,
+    pictureBasePath : null
+  },
+  onLoad(e) {
+    this.initData(e)
+  },
+  initData(e){
+     let buslogid = e.buslogid
+     this.data.buslogid = buslogid
+    console.log("####",this.data.buslogid)
+
+    let obj = new Object()
+    obj.busLogId = this.data.buslogid 
+    http.post("/system/AppXunjianimgController/getXunjianimgList",obj,this.getXunjianMoreListSuccess)
+  },
+  getXunjianMoreListSuccess(res){
+    console.log("@@@@@",res)
+    this.setData({
+      pictureBasePath : res.data.pictureBasePath+"/",
+      mapdata : res.data.xunjianimgMap
+    })
+  },
+  bindViewZhengGaiJinDu(e){
+    let businspectionid = e.currentTarget.dataset.businspectionid
+   
+    wx.navigateTo({
+      url: '../zhenggaijindu/zhenggaijindu?busInspectionId='+businspectionid,
+    })
+  },
+})

pages/xunjianmore/xunjianmore.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {},
+  "navigationBarBackgroundColor": "#f94b0e",
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "巡检"
+}

pages/xunjianmore/xunjianmore.wxml

@@ -0,0 +1,23 @@
+<!--pages/xunjianmore/xunjianmore.wxml-->
+<view class="container">
+  <view style="display: flex; flex-direction: column;" wx:for="{{mapdata}}" wx:for-index="key" wx:for-item="value">
+    <view class="xj_nav">
+      <text class="nav_text1">{{value[0][0]}}</text>
+      <text class="iconfont icon-dian"></text>
+      <text class="nav_text2">{{value[0][1]}}</text>
+    </view>
+    <view class="txt_vi" bindtap="bindViewZhengGaiJinDu" wx:for="{{value[1]}}" data-businspectionid="{{item.busInspectionId}}">
+      <view class="txt flex_row">
+       <!-- <image src="{{pictureBasePath+item.attachUrl}}" />  -->
+        <view class="txt_wz">
+          <text class="">{{index+1}}、{{item.busItemName}}</text>
+          <view class="span_vi">
+            <span class="yellow">{{item.itemsTypeValue}}</span>
+            <span class="yellow">{{item.riskStatusValue}}</span>
+          </view>
+          <!-- <view class="qy_txt">{{item.busEnterpriseName}}</view> -->
+        </view>
+      </view>
+    </view>
+  </view>
+</view>

pages/xunjianmore/xunjianmore.wxss

@@ -0,0 +1,123 @@
+/* pages/xunjianimg/xunjianimg.wxss */
+.xj_nav{
+  height: 90rpx;
+  line-height: 90rpx;
+  display: flex;
+  flex-wrap: wrap;
+  background: rgb(252, 239, 236);
+  padding-left: 30rpx;
+}
+.xj_nav .nav_text1{
+  font-size: 40rpx;
+  color:#f94b0e ;
+  font-weight: bolder;
+}
+.xj_nav .iconfont{
+  font-size: 40rpx;
+  color: #999;
+}
+.xj_nav .nav_text2{
+  font-size: 30rpx;
+  color:#999 ;
+}
+.txt_vi{
+  margin: 20rpx 30rpx;
+  display: flex;
+  flex-direction: column;
+}
+.txt_vi .txt{
+  display: flex;
+  flex-direction: column;
+  border-bottom: 1px solid #eee;
+  font-size: 32rpx;
+}
+.txt_vi text{
+  margin: 20rpx 0rpx;
+  display: inline-flex;
+  text-align: justify;
+  color: #333;
+}
+.txt_vi form{
+  margin-left: auto;
+  display: inline-flex;
+}
+.page-section{
+  display: inline-table;
+}
+.span_vi{
+  display: flex;
+  flex-direction: row;
+  margin-bottom: 20rpx;
+}
+.span_vi span{
+  margin-right: 30rpx;
+  padding: 8rpx 20rpx;
+  line-height:normal!important;
+  border-radius: 10rpx;
+  font-size: 28rpx;
+}
+.red{
+  border: 1px solid #f00;
+  color:#f00 ;
+}
+.yellow{
+  border: 1px solid rgb(238, 167, 15);
+  color:rgb(238, 167, 15) ;
+}
+.green{
+  border: 1px solid rgb(12, 207, 45);
+  color:rgb(12, 207, 45) ;
+}
+.icon-wenjianjia{
+  font-size: 54rpx;
+}
+.tab_nav{
+  position: fixed;
+  bottom: 270rpx;
+  right: 30rpx;
+  display: flex;
+  flex-direction: column-reverse;
+  text-align: right;
+}
+.tab_nav text{
+ padding: 14rpx 30rpx;
+ background: rgba(212, 212, 212, 0.9);
+ border-radius: 50rpx;
+ margin-top: 25rpx;
+ width: auto;
+ display: inline;
+ font-size: 28rpx;
+ color: #333;
+}
+.tab_nav .icon-zengjiashuzi{
+  font-size: 60rpx;
+  color: rgb(153, 153, 153);
+  margin-right: 20rpx;
+}
+ .flex_row{
+   display: flex;
+   flex-direction: row!important;
+   padding-top: 20rpx;
+ }
+ .flex_row image{
+  width: 200rpx;
+  height: 160rpx;
+  background: #ccc;
+  display: inline-table;
+}
+.txt_wz{
+  /* width: 50%; */
+  display: flex;
+  flex-direction: column;
+  margin-left: 30rpx;
+}
+.txt_wz text{
+  margin-top: 0rpx!important;
+}
+.qy_txt{
+  font-size: 28rpx;
+  color: #333;
+  background-color: #f5f5f5;
+  margin-bottom: 20rpx;
+  padding: 10rpx 0rpx 10rpx 20rpx;
+}

project.config.json

@@ -1,12 +1,8 @@
 {
   "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "packOptions": {
-    "ignore": [],
-    "include": []
-  },
   "setting": {
     "urlCheck": false,
-    "es6": true,
+    "es6": false,
     "enhance": true,
     "postcss": true,
     "preloadBackgroundData": false,
@@ -24,8 +20,6 @@
     "compileHotReLoad": false,
     "lazyloadPlaceholderEnable": false,
     "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],
@@ -44,12 +38,14 @@
     "useStaticServer": true
   },
   "compileType": "miniprogram",
-  "libVersion": "2.27.1",
-  "appid": "wx29240c3e95eeed24",
-  "projectname": "edyj_minapp",
   "condition": {},
   "editorSetting": {
     "tabIndent": "insertSpaces",
     "tabSize": 2
-  }
+  },
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "appid": "wx29240c3e95eeed24"
 }

project.private.config.json

@@ -1,8 +1,8 @@
 {
-  "projectname": "edyj_minapp",
+  "projectname": "sooka_edyj_minapp",
   "setting": {
-    "compileHotReLoad": true,
-    "urlCheck": false
+    "compileHotReLoad": false,
+    "urlCheck": true
   },
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "libVersion": "2.16.0"