提交代码

miniprogram/api/flowable.js

@@ -21,7 +21,7 @@ export function startProcessInstance(data) {
 // 查询流程节点
 export function readDeployNotes(deployId) {
 	return request({
-		url: '/wxApi/flowTask/readNotes/'+deployId,
+		url: '/wechat/flowTask/readDeployNotes/'+deployId,
 		method: 'get'
 	})
 }
@@ -136,7 +136,7 @@ export function myFinishedFlowTaskList(data) {
 // 根据条件查询所有流申请
 export function allInstanceList(data) {
 	return request({
-		url: '/wxApi/flowTask/allList',
+		url: '/wechat/flowTask/allList',
 		method: 'get',
 		data: data
 	})

miniprogram/api/login.js

@@ -33,3 +33,19 @@ export function loginOut() {
 		'method': 'get'
 	})
 }
+
+// 查询公众号消息授权
+export function findOpenUserMsgId(openId) {
+	return request({
+		'url': '/wechat/findOpenUserMsgId/'+openId,
+		'method': 'get'
+	})
+}
+
+// 删除公众号消息授权
+export function delOpenUserMsgId(openId) {
+	return request({
+		'url': '/wechat/delOpenUserMsgId/'+openId,
+		'method': 'get'
+	})
+}

miniprogram/app.wxss

@@ -1380,6 +1380,7 @@ swiper-item video {
 
 .color_green {
   color: #1ab400;
+  font-weight: 800;
 }
 
 .color_blue {
@@ -1841,3 +1842,12 @@ swiper-item video {
 .inspect_list_info_data_2 {
   width: 100%;
 }
+.van-steps{
+  background-color: transparent !important;
+}
+.van-step--horizontal .van-step__circle-container{
+  background-color: transparent !important;
+}
+.van-steps--horizontal{
+  padding: 10px 20px !important;
+}

miniprogram/miniprogram_npm/@vant/weapp/steps/index.js

@@ -8,6 +8,10 @@ component_1.VantComponent({
     icon: String,
     steps: Array,
     active: Number,
+    rejectNode:{
+      type: Number,
+      value: 100,
+    },
     direction: {
       type: String,
       value: 'horizontal',

miniprogram/miniprogram_npm/@vant/weapp/steps/index.wxml

@@ -2,39 +2,25 @@
 
 <view class="custom-class {{ utils.bem('steps', [direction]) }}">
   <view class="van-step__wrapper">
-    <view
+    <view wx:for="{{ steps }}" wx:key="index" bindtap="onClick" data-index="{{ index }}" class="{{ utils.bem('step', [direction, status(index, active)]) }} van-hairline" style="{{ status(index, active) === 'inactive' ? 'color: ' + inactiveColor: '' }}">
-      wx:for="{{ steps }}"
+      <view class="van-step__title" style="{{ index === active ? 'color: #45affb': (index === rejectNode? 'color: #fd6060;font-weight:800':'')}}">
-      wx:key="index"
+        <view style="{{ index < active ? 'color: ' + activeColor : '' }}">{{ item.text }}</view>
-      bindtap="onClick"
-      data-index="{{ index }}"
-      class="{{ utils.bem('step', [direction, status(index, active)]) }} van-hairline"
-      style="{{ status(index, active) === 'inactive' ? 'color: ' + inactiveColor: '' }}"
-    >
-      <view class="van-step__title" style="{{ index === active ? 'color: ' + activeColor : '' }}">
-        <view>{{ item.text }}</view>
         <view class="desc-class">{{ item.desc }}</view>
       </view>
       <view class="van-step__circle-container">
-        <block wx:if="{{ index !== active }}">
+        <block wx:if="{{ index > active }}">
-          <van-icon
+          <block wx:if="{{ index === rejectNode }}">
-            wx:if="{{ item.inactiveIcon || inactiveIcon }}"
+            <van-icon color="#fd6060" name="clear" custom-class="van-step__icon" />
-            color="{{ status(index, active) === 'inactive' ? inactiveColor: activeColor }}"
-            name="{{ item.inactiveIcon || inactiveIcon }}"
-            custom-class="van-step__icon"
-          />
-          <view
-            wx:else
-            class="van-step__circle"
-            style="{{ 'background-color: ' + (index < active ? activeColor : inactiveColor) }}"
-          />
           </block>
-
+          <block wx:if="{{ index != rejectNode }}">
-        <van-icon wx:else name="{{ item.activeIcon || activeIcon }}" color="{{ activeColor }}" custom-class="van-step__icon" />
+            <van-icon wx:if="{{ item.inactiveIcon || inactiveIcon }}" color="{{ status(index, active) === 'inactive' ? inactiveColor: activeColor }}" name="{{ item.inactiveIcon || inactiveIcon }}" custom-class="van-step__icon" />
+            <view wx:else class="van-step__circle" style="{{ 'background-color: ' + (index < active ? activeColor : inactiveColor) }}" />
+          </block>
+        </block>
+        <van-icon wx:else name="{{ index < active ? 'checked': 'checked' }}" style="{{index < active ? 'color:#07c160':'color:#45affb;font-size:30rpx !important;'}}" custom-class="van-step__icon" />
       </view>
-      <view
+      <view wx:if="{{ index === rejectNode -1 }}" class="van-step__line" style="background-color:#fd6060" />
-        wx:if="{{ index !== steps.length - 1 }}"
+      <view wx:if="{{ (index !== steps.length - 1) && index != rejectNode -1 }}" class="van-step__line" style="{{ 'background-color: ' + (index < active ? activeColor : inactiveColor) }}" />
-        class="van-step__line" style="{{ 'background-color: ' + (index < active ? activeColor : inactiveColor) }}"
-      />
     </view>
   </view>
 </view>

miniprogram/miniprogram_npm/@vant/weapp/steps/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.van-steps{overflow:hidden;background-color:#fff;background-color:var(--steps-background-color,#fff)}.van-steps--horizontal{padding:10px}.van-steps--horizontal .van-step__wrapper{position:relative;display:-webkit-flex;display:flex;overflow:hidden}.van-steps--vertical{padding-left:10px}.van-steps--vertical .van-step__wrapper{padding:0 0 0 20px}.van-step{position:relative;-webkit-flex:1;flex:1;font-size:14px;font-size:var(--step-font-size,14px);color:#969799;color:var(--step-text-color,#969799)}.van-step--finish{color:#323233;color:var(--step-finish-text-color,#323233)}.van-step__circle{border-radius:50%;width:5px;width:var(--step-circle-size,5px);height:5px;height:var(--step-circle-size,5px);background-color:#969799;background-color:var(--step-circle-color,#969799)}.van-step--horizontal{padding-bottom:14px}.van-step--horizontal:first-child .van-step__title{-webkit-transform:none;transform:none}.van-step--horizontal:first-child .van-step__circle-container{padding:0 8px 0 0;-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0)}.van-step--horizontal:last-child{position:absolute;right:0;width:auto}.van-step--horizontal:last-child .van-step__title{text-align:right;-webkit-transform:none;transform:none}.van-step--horizontal:last-child .van-step__circle-container{right:0;padding:0 0 0 8px;-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0)}.van-step--horizontal .van-step__circle-container{position:absolute;bottom:6px;z-index:1;-webkit-transform:translate3d(-50%,50%,0);transform:translate3d(-50%,50%,0);background-color:#fff;background-color:var(--white,#fff);padding:0 8px;padding:0 var(--padding-xs,8px)}.van-step--horizontal .van-step__title{display:inline-block;-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0);font-size:12px;font-size:var(--step-horizontal-title-font-size,12px)}.van-step--horizontal .van-step__line{position:absolute;right:0;bottom:6px;left:0;height:1px;-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0);background-color:#ebedf0;background-color:var(--step-line-color,#ebedf0)}.van-step--horizontal.van-step--process{color:#323233;color:var(--step-process-text-color,#323233)}.van-step--horizontal.van-step--process .van-step__icon{display:block;line-height:1;font-size:12px;font-size:var(--step-icon-size,12px)}.van-step--vertical{padding:10px 10px 10px 0;line-height:18px}.van-step--vertical:after{border-bottom-width:1px}.van-step--vertical:last-child:after{border-bottom-width:none}.van-step--vertical:first-child:before{position:absolute;top:0;left:-15px;z-index:1;width:1px;height:20px;content:"";background-color:#fff;background-color:var(--white,#fff)}.van-step--vertical .van-step__circle,.van-step--vertical .van-step__icon,.van-step--vertical .van-step__line{position:absolute;top:19px;left:-14px;z-index:2;-webkit-transform:translate3d(-50%,-50%,0);transform:translate3d(-50%,-50%,0)}.van-step--vertical .van-step__icon{line-height:1;font-size:12px;font-size:var(--step-icon-size,12px)}.van-step--vertical .van-step__line{z-index:1;width:1px;height:100%;-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0);background-color:#ebedf0;background-color:var(--step-line-color,#ebedf0)}
+@import '../common/index.wxss';.van-steps{overflow:hidden;background-color:#fff;background-color:var(--steps-background-color,#fff)}.van-steps--horizontal{padding:10px}.van-steps--horizontal .van-step__wrapper{position:relative;display:-webkit-flex;display:flex;overflow:hidden}.van-steps--vertical{padding-left:10px}.van-steps--vertical .van-step__wrapper{padding:0 0 0 20px}.van-step{position:relative;-webkit-flex:1;flex:1;font-size:14px;font-size:var(--step-font-size,14px);color:#969799;color:var(--step-text-color,#969799)}.van-step--finish{color:#323233;color:var(--step-finish-text-color,#323233)}.van-step__circle{border-radius:50%;width:5px;width:var(--step-circle-size,5px);height:5px;height:var(--step-circle-size,5px);background-color:#969799;background-color:var(--step-circle-color,#969799)}.van-step--horizontal{padding-bottom:14px}.van-step--horizontal:first-child .van-step__title{-webkit-transform:none;transform:none}.van-step--horizontal:first-child .van-step__circle-container{padding:0 8px 0 0;-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0)}.van-step--horizontal:last-child{position:absolute;right:0;width:auto}.van-step--horizontal:last-child .van-step__title{text-align:right;-webkit-transform:none;transform:none}.van-step--horizontal:last-child .van-step__circle-container{right:0;padding:0 0 0 8px;-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0)}.van-step--horizontal .van-step__circle-container{position:absolute;bottom:6px;z-index:1;-webkit-transform:translate3d(-50%,50%,0);transform:translate3d(-50%,50%,0);background-color:#fff;background-color:var(--white,#fff);padding:0 8px;padding:0 var(--padding-xs,8px)}.van-step--horizontal .van-step__title{display:inline-block;-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0);font-size:12px;font-size:var(--step-horizontal-title-font-size,12px)}.van-step--horizontal .van-step__line{position:absolute;right:0;bottom:6px;left:0;height:2px;-webkit-transform:translate3d(0,50%,0);transform:translate3d(0,50%,0);background-color:#ebedf0;background-color:var(--step-line-color,#ebedf0)}.van-step--horizontal.van-step--process{color:#323233;color:var(--step-process-text-color,#323233)}.van-step--horizontal.van-step--process .van-step__icon{display:block;line-height:1;}.van-step--vertical{padding:10px 10px 10px 0;line-height:18px}.van-step--vertical:after{border-bottom-width:1px}.van-step--vertical:last-child:after{border-bottom-width:none}.van-step--vertical:first-child:before{position:absolute;top:0;left:-15px;z-index:1;width:1px;height:20px;content:"";background-color:#fff;background-color:var(--white,#fff)}.van-step--vertical .van-step__circle,.van-step--vertical .van-step__icon,.van-step--vertical .van-step__line{position:absolute;top:19px;left:-14px;z-index:2;-webkit-transform:translate3d(-50%,-50%,0);transform:translate3d(-50%,-50%,0)}.van-step--vertical .van-step__icon{line-height:1;font-size:12px;font-size:var(--step-icon-size,12px)}.van-step--vertical .van-step__line{z-index:1;width:1px;height:100%;-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0);background-color:#ebedf0;background-color:var(--step-line-color,#ebedf0)}.van-step__title{padding-bottom: 10rpx;}

miniprogram/pageage/project_checkDetection/add/index.js

@@ -24,7 +24,9 @@ Page({
         witnessUserName:"",
         checkTime:"",
         laboratoryName:"",
-        qualifiedFlagList:[{id:'Y',text:"是"},{id:'N',text:"否"}]
+        qualifiedFlagList:[{id:'Y',text:"是"},{id:'N',text:"否"}],
+        flowNodes:[{text:'开始'},{text:'提交申请'},{text:'检测报告'},{text:'监理审批'},{text:'结束'}],
+        active: 0
     },
 
     /**

miniprogram/pageage/project_checkDetection/add/index.json

@@ -1,5 +1,6 @@
 {
   "usingComponents": {
+    "van-steps": "@vant/weapp/steps/index",
       "van-overlay": "@vant/weapp/overlay/index"
   },
   "navigationStyle":"custom"

miniprogram/pageage/project_checkDetection/add/index.wxml

@@ -12,6 +12,7 @@
   </view>
 </view>
 <view class="max_content">
+    <van-steps steps="{{ flowNodes }}" active="{{ active }}" />
     <view class="inspect_info ">
     <view class="module_title module_title_flex">
         <view>{{projectName}}</view>

miniprogram/pageage/project_checkDetection/check/index.js

@@ -18,7 +18,9 @@ Page({
         detectionResult:"1",
         detectionFileData:[],
         fileType:["pdf","png","jpg","jpeg"],
-        request:app.globalData.reqUrl
+        request:app.globalData.reqUrl,
+        flowNodes:[{text:'开始'},{text:'提交申请'},{text:'检测报告'},{text:'监理审批'},{text:'结束'}],
+        active: 2
     },
 
     /**

miniprogram/pageage/project_checkDetection/check/index.json

@@ -1,4 +1,6 @@
 {
-    "usingComponents": {"van-overlay": "@vant/weapp/overlay/index"},
+    "usingComponents": {
+        "van-steps": "@vant/weapp/steps/index",
+        "van-overlay": "@vant/weapp/overlay/index"},
     "navigationStyle":"custom"
 }

miniprogram/pageage/project_checkDetection/check/index.wxml

@@ -12,6 +12,7 @@
   </view>
 </view>
 <view class="max_content">
+	<van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.approveStatus=='3' ? active+1:0 }}" />
 	<view class="inspect_overview_max">
 	  <view class="inspect_overview">
 		  <view class="module_title module_title_padding">

miniprogram/pageage/project_checkDetection/edit/index.js

@@ -34,7 +34,9 @@ Page({
         qualifiedFlagList:[{id:'Y',text:"是"},{id:'N',text:"否"}],
         detectionFileData:[],
         fileType:["pdf","png","jpg","jpeg"],
-        request:app.globalData.reqUrl
+        request:app.globalData.reqUrl,
+        flowNodes:[{text:'开始'},{text:'提交申请'},{text:'检测报告'},{text:'监理审批'},{text:'结束'}],
+        active: 1
     },
 
     /**

miniprogram/pageage/project_checkDetection/edit/index.json

@@ -1,5 +1,6 @@
 {
   "usingComponents": {
+    "van-steps": "@vant/weapp/steps/index",
       "van-overlay": "@vant/weapp/overlay/index",
       "van-collapse": "@vant/weapp/collapse",
       "van-collapse-item": "@vant/weapp/collapse-item"

miniprogram/pageage/project_checkDetection/edit/index.wxml

@@ -12,6 +12,7 @@
   </view>
 </view>
 <view class="max_content">
+    <van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.approveStatus=='3' ? active+1:0 }}" />
     <view class="inspect_info ">
     <view class="module_title module_title_flex">
         <view>{{projectName}}</view>

miniprogram/pageage/project_checkDetection/edit/index.wxss

@@ -28,7 +28,8 @@
   }
   .van-cell.van-cell--clickable{
     background-color: #2b345b;
-    margin-top: 30rpx;
+    margin-top: 5rpx;
+    margin-bottom: 5rpx;
     color: #fff;
     border-radius: 15rpx;
   

miniprogram/pageage/project_checkDetection/info/index.js

@@ -17,14 +17,28 @@ Page({
     fileUrls: [],
     activeName: "",
     flowRecordList: [],
-        request:app.globalData.reqUrl
+    request: app.globalData.reqUrl,
+    flowNodes: [{
+      text: '开始'
+    }, {
+      text: '提交申请'
+    }, {
+      text: '检测报告'
+    }, {
+      text: '监理审批'
+    }, {
+      text: '结束'
+    }],
+    active: 100
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-        let {id} = options
+    let {
+      id
+    } = options
     //获取缓存数据
     wx.getStorage({
       key: 'userinfo',
@@ -44,7 +58,9 @@ Page({
    * 
    */
   getInfo() {
-        let {id} = this.data
+    let {
+      id
+    } = this.data
     let that = this
     wx.request({
       url: app.globalData.reqUrl + '/wechat/projectDetection/info',
@@ -55,6 +71,17 @@ Page({
       success(res) {
         res = res.data
         if (res.code == 200) {
+          let state = that.data.active;
+          if (res.data.approveStatus == null) {
+            state = 2;
+          }else if (res.data.approveStatus == "1") {
+            state = 3;
+          } else if (res.data.approveStatus == "3") {
+            state = 2;
+          }
+          that.setData({
+            active: state
+          })
           let imageUrls = [];
           let minImageUrls = [];
           let fileUrls = [];
@@ -141,7 +168,9 @@ Page({
     })
   },
   deleteData() {
-        let {id} = this.data
+    let {
+      id
+    } = this.data
     wx.request({
       url: app.globalData.reqUrl + '/wechat/projectDetection/remove',
       header: {

miniprogram/pageage/project_checkDetection/info/index.json

@@ -1,5 +1,6 @@
 {
     "usingComponents": {
+      "van-steps": "@vant/weapp/steps/index",
       "van-collapse": "@vant/weapp/collapse",
       "van-collapse-item": "@vant/weapp/collapse-item"
     },

miniprogram/pageage/project_checkDetection/info/index.wxml

@@ -12,6 +12,7 @@
   </view>
 </view>
 <view class="max_content">
+	<van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.approveStatus=='3' ? active+1:0 }}" />
 	<view class="inspect_overview_max">
 	  <view class="inspect_overview">
 		<view class="gk_open" style="margin-top: 20rpx;border: 1px solid transparent;">

miniprogram/pageage/project_checkDetection/info/index.wxss

@@ -44,7 +44,8 @@
   }
   .van-cell.van-cell--clickable{
     background-color: #2b345b;
-    margin-top: 30rpx;
+    margin-top: 5rpx;
+    margin-bottom: 5rpx;
     color: #fff;
     border-radius: 15rpx;
   

miniprogram/pageage/project_checkDetection/list/index.wxml

@@ -43,7 +43,7 @@
        </view>
        <view wx:if="{{listData.length==0}}">
             <view style="padding-top: 70px;text-align: -webkit-center;">
-                <image src="https://szgcwx.jhncidg.com/staticFiles/images/nodata.png" style="width: 130px;height: 105px;"></image>
+                <image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
                 <view style="color: #a5abbb;">暂无数据</view>
             </view>
        </view>

miniprogram/pageage/project_checking/add/index.js

@@ -31,7 +31,9 @@ Page({
         dataTypeLvl1List:[],
         dataTypeLvl2List:[],
         dataTypeLvl2AllList:[],
-        list:[{id:1,text:"合格"},{id:2,text:"不合格"}]
+        list:[{id:1,text:"合格"},{id:2,text:"不合格"}],
+        flowNodes:[{text:'开始'},{text:'提交申请'},{text:'监理审批'},{text:'结束'}],
+        active: 0
     },
 
     /**

miniprogram/pageage/project_checking/add/index.json

@@ -1,5 +1,6 @@
 {
   "usingComponents": {
+    "van-steps": "@vant/weapp/steps/index",
       "van-overlay": "@vant/weapp/overlay/index"
   },
   "navigationStyle":"custom",

miniprogram/pageage/project_checking/add/index.wxml

@@ -12,6 +12,7 @@
   </view>
 </view>
 <view class="max_content">
+    <van-steps steps="{{ flowNodes }}" active="{{ active }}" />
     <view class="inspect_info">
     <view class="module_title module_title_flex">
         <view>{{projectName}}</view>

miniprogram/pageage/project_checking/edit/index.js

@@ -36,7 +36,9 @@ Page({
         dataTypeLvl2List:[],
         dataTypeLvl2AllList:[],
         list:[{id:1,text:"合格"},{id:2,text:"不合格"}],
-        request:app.globalData.reqUrl
+        request:app.globalData.reqUrl,
+        flowNodes:[{text:'开始'},{text:'提交申请'},{text:'监理审批'},{text:'结束'}],
+        active: 1
     },
 
     /**

miniprogram/pageage/project_checking/edit/index.json

@@ -2,6 +2,7 @@
   "usingComponents": {
       "van-overlay": "@vant/weapp/overlay/index",
       "van-collapse": "@vant/weapp/collapse",
+      "van-steps": "@vant/weapp/steps/index",
       "van-collapse-item": "@vant/weapp/collapse-item"
   },
   "navigationStyle":"custom",

miniprogram/pageage/project_checking/edit/index.wxml

@@ -12,6 +12,7 @@
   </view>
 </view>
 <view class="max_content">
+    <van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.approveStatus=='3' ? active+1:0 }}" />
     <view class="inspect_info">
     <view class="module_title module_title_flex">
         <view>{{projectName}}</view>

miniprogram/pageage/project_checking/edit/index.wxss

@@ -34,7 +34,8 @@
   }
   .van-cell.van-cell--clickable{
     background-color: #2b345b;
-    margin-top: 30rpx;
+    margin-top: 5rpx;
+    margin-bottom: 5rpx;
     color: #fff;
     border-radius: 15rpx;
   

miniprogram/pageage/project_checking/info/index.js

@@ -15,14 +15,26 @@ Page({
     showDel: false,
     activeName: "",
     flowRecordList: [],
-        request:app.globalData.reqUrl
+    request: app.globalData.reqUrl,
+    flowNodes: [{
+      text: '开始'
+    }, {
+      text: '提交申请'
+    }, {
+      text: '监理审批'
+    }, {
+      text: '结束'
+    }],
+    active: 100
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-        let {id} = options
+    let {
+      id
+    } = options
     //获取缓存数据
     wx.getStorage({
       key: 'userinfo',
@@ -42,7 +54,9 @@ Page({
    * 
    */
   getInfo() {
-        let {id} = this.data
+    let {
+      id
+    } = this.data
     let that = this
     wx.request({
       url: app.globalData.reqUrl + '/wechat/projectchecking/info',
@@ -53,6 +67,15 @@ Page({
       success(res) {
         res = res.data
         if (res.code == 200) {
+          let state = that.data.active;
+          if (res.data.approveStatus == "1") {
+            state = 2;
+          } else if (res.data.approveStatus == "3") {
+            state = 1;
+          }
+          that.setData({
+            active: state
+          })
           let urls = [];
           let minUrls = [];
           if (res.data.imageUrls) {
@@ -95,7 +118,9 @@ Page({
     })
   },
   deleteData() {
-      let {id} = this.data
+    let {
+      id
+    } = this.data
     wx.request({
       url: app.globalData.reqUrl + '/wechat/projectchecking/remove',
       header: {

miniprogram/pageage/project_checking/info/index.json

@@ -2,6 +2,7 @@
     "usingComponents": {
         "van-popup": "@vant/weapp/popup/index",
         "van-collapse": "@vant/weapp/collapse",
+        "van-steps": "@vant/weapp/steps/index",
         "van-collapse-item": "@vant/weapp/collapse-item"
     },
     "navigationStyle":"custom",

miniprogram/pageage/project_checking/info/index.wxml

@@ -3,7 +3,9 @@
 	<view class="header_title_row">
 		<van-row>
 			<van-col span="4">
-        <view class="header_img" bindtap="returnToPage"><image src="/images/left.png"></image></view>
+				<view class="header_img" bindtap="returnToPage">
+					<image src="/images/left.png"></image>
+				</view>
 			</van-col>
 			<van-col span="15">
 				<view class="header_name">举牌验收详情</view>
@@ -12,6 +14,7 @@
 	</view>
 </view>
 <view class="max_content">
+	<van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.approveStatus=='3' ? active+1:0 }}" />
 	<view class="inspect_overview_max">
 		<view class="inspect_overview">
 			<view class="gk_open" style="margin-top: 20rpx;border: 1px solid transparent;">
@@ -32,10 +35,18 @@
 											</view>
 										</view>
 										<view class="inspect_list_info gk_open_con">
-									<view wx:if="{{item.userName}}"><image src="/images/lw_3.png"></image>办理用户：<text>{{item.userName}}</text></view>
+											<view wx:if="{{item.userName}}">
-									<view wx:if="{{item.deptName}}"><image src="/images/s_1.png"></image>办理单位：<text class="color_blue">{{item.deptName}}</text></view>
+												<image src="/images/lw_3.png"></image>办理用户：<text>{{item.userName}}</text>
-									<view><image src="/images/s_6.png"></image>办理时间：<text>{{item.createTime}}</text></view>
+											</view>
-									<view wx:if="{{item.comment}}"><image src="/images/s_7.png"></image>审批意见：<text>{{item.comment}}</text></view>
+											<view wx:if="{{item.deptName}}">
+												<image src="/images/s_1.png"></image>办理单位：<text class="color_blue">{{item.deptName}}</text>
+											</view>
+											<view>
+												<image src="/images/s_6.png"></image>办理时间：<text>{{item.createTime}}</text>
+											</view>
+											<view wx:if="{{item.comment}}">
+												<image src="/images/s_7.png"></image>审批意见：<text>{{item.comment}}</text>
+											</view>
 										</view>
 									</view>
 								</view>
@@ -135,4 +146,3 @@
 		<view class="problem_submit_to_btn problem_submit_to_save" bindtap="onUpdate">修改</view>
 	</view>
 </view>
-

miniprogram/pageage/project_checking/info/index.wxss

@@ -44,7 +44,8 @@
   }
   .van-cell.van-cell--clickable{
     background-color: #2b345b;
-    margin-top: 30rpx;
+    margin-top: 5rpx;
+    margin-bottom: 5rpx;
     color: #fff;
     border-radius: 15rpx;
   

miniprogram/pageage/project_checking/list/index.wxml

@@ -50,7 +50,7 @@
    </view>
    <view wx:if="{{listData.length==0}}">
         <view style="padding-top: 70px;text-align: -webkit-center;">
-            <image src="https://szgcwx.jhncidg.com/staticFiles/images/nodata.png" style="width: 130px;height: 105px;"></image>
+            <image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
             <view style="color: #a5abbb;">暂无数据</view>
         </view>
     </view>

miniprogram/pageage/project_deptWorks/list/index.wxml

@@ -41,7 +41,7 @@
    </view>
    <view wx:if="{{listData.length==0}}">
         <view style="padding-top: 70px;text-align: -webkit-center;">
-            <image src="https://szgcwx.jhncidg.com/staticFiles/images/nodata.png" style="width: 130px;height: 105px;"></image>
+            <image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
             <view style="color: #a5abbb;">暂无数据</view>
         </view>
     </view>

miniprogram/pageage/project_files/index.js

@@ -46,7 +46,7 @@ Page({
             let fileDepts = "";
             if(res.data.minRoleId>3){
                 if(res.data.minRoleId==4){
-                    fileDepts += app.globalData.projectInfoList[0].projectInfoList[0].deptId;
+                    fileDepts += app.globalData.projectInfoList[0].deptId;
                 }else{
                     app.globalData.projectInfoList.forEach(pro =>{
                         fileDepts += pro.projectInfoList[0].deptId;

miniprogram/pageage/project_files/index.wxml

@@ -57,7 +57,7 @@
 			</view>
 			<view wx:if="{{listData.length==0}}">
 				<view style="padding-top: 70px;text-align: -webkit-center;">
-					<image src="https://szgcwx.jhncidg.com/staticFiles/images/nodata.png" style="width: 130px;height: 105px;"></image>
+					<image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
 					<view style="color: #a5abbb;">暂无数据</view>
 				</view>
 			</view>

miniprogram/pageage/project_insurance/list/index.wxml

@@ -39,7 +39,7 @@
    </view>
    <view wx:if="{{listData.length==0}}">
         <view style="padding-top: 70px;text-align: -webkit-center;">
-            <image src="https://szgcwx.jhncidg.com/staticFiles/images/nodata.png" style="width: 130px;height: 105px;"></image>
+            <image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
             <view style="color: #a5abbb;">暂无数据</view>
         </view>
     </view>

miniprogram/pageage/project_materialSeal/add/index.js

@@ -24,7 +24,9 @@ Page({
         showBgd:false,
         rectifierData:[],
         witnessUser:"",
-        witnessUserName:""
+        witnessUserName:"",
+        flowNodes:[{text:'开始'},{text:'提交申请'},{text:'监理审批'},{text:'结束'}],
+        active: 0
     },
 
     /**

miniprogram/pageage/project_materialSeal/add/index.json

@@ -6,6 +6,7 @@
     "van-picker": "@vant/weapp/picker/index",
     "van-area": "@vant/weapp/area/index",
     "mkl-multi-select": "/components/@mkl/multi-select/index",
+    "van-steps": "@vant/weapp/steps/index",
       "van-overlay": "@vant/weapp/overlay/index"
   },
   "navigationStyle":"custom"

miniprogram/pageage/project_materialSeal/add/index.wxml

@@ -12,6 +12,7 @@
   </view>
 </view>
 <view class="max_content">
+    <van-steps steps="{{ flowNodes }}" active="{{ active }}" />
     <view class="inspect_info">
     <view class="module_title module_title_flex">
         <view>{{projectName}}</view>

miniprogram/pageage/project_materialSeal/edit/index.js

@@ -28,7 +28,9 @@ Page({
         activeName:"",
         flowRecordList:[],
         infoData:{},
-        request:app.globalData.reqUrl
+        request:app.globalData.reqUrl,
+        flowNodes:[{text:'开始'},{text:'提交申请'},{text:'监理审批'},{text:'结束'}],
+        active: 1
     },
 
     /**

miniprogram/pageage/project_materialSeal/edit/index.json

@@ -8,6 +8,7 @@
     "mkl-multi-select": "/components/@mkl/multi-select/index",
       "van-overlay": "@vant/weapp/overlay/index",
       "van-collapse": "@vant/weapp/collapse",
+      "van-steps": "@vant/weapp/steps/index",
       "van-collapse-item": "@vant/weapp/collapse-item"
   },
   "navigationStyle":"custom"

miniprogram/pageage/project_materialSeal/edit/index.wxml

@@ -12,6 +12,7 @@
   </view>
 </view>
 <view class="max_content">
+    <van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.approveStatus=='3' ? active+1:0 }}" />
     <view class="inspect_info">
     <view class="module_title module_title_flex">
         <view>{{projectName}}</view>

miniprogram/pageage/project_materialSeal/edit/index.wxss

@@ -67,7 +67,8 @@
   }
   .van-cell.van-cell--clickable{
     background-color: #2b345b;
-    margin-top: 30rpx;
+    margin-top: 5rpx;
+    margin-bottom: 5rpx;
     color: #fff;
     border-radius: 15rpx;
   

miniprogram/pageage/project_materialSeal/info/index.js

@@ -23,14 +23,26 @@ Page({
     fileUrls2: [],
     activeName: "",
     flowRecordList: [],
-        request:app.globalData.reqUrl
+    request: app.globalData.reqUrl,
+    flowNodes: [{
+      text: '开始'
+    }, {
+      text: '提交申请'
+    }, {
+      text: '监理审批'
+    }, {
+      text: '结束'
+    }],
+    active: 100
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-        let {id} = options
+    let {
+      id
+    } = options
     //获取缓存数据
     wx.getStorage({
       key: 'userinfo',
@@ -50,7 +62,9 @@ Page({
    * 
    */
   getInfo() {
-        let {id} = this.data
+    let {
+      id
+    } = this.data
     let that = this
     wx.request({
       url: app.globalData.reqUrl + '/wechat/projectMaterialSeal/info',
@@ -61,6 +75,15 @@ Page({
       success(res) {
         res = res.data
         if (res.code == 200) {
+          let state = that.data.active;
+          if (res.data.approveStatus == "1") {
+            state = 2;
+          } else if (res.data.approveStatus == "3") {
+            state = 1;
+          }
+          that.setData({
+            active: state
+          })
           let urls = [];
           let minUrls = [];
           if (res.data.imageUrls) {
@@ -151,7 +174,9 @@ Page({
     })
   },
   deleteData() {
-      let {id} = this.data
+    let {
+      id
+    } = this.data
     let that = this;
     wx.request({
       url: app.globalData.reqUrl + "/wechat/projectMaterialSeal/remove",

miniprogram/pageage/project_materialSeal/info/index.json

@@ -2,6 +2,7 @@
     "usingComponents": {
         "van-popup": "@vant/weapp/popup/index",
         "van-collapse": "@vant/weapp/collapse",
+        "van-steps": "@vant/weapp/steps/index",
         "van-collapse-item": "@vant/weapp/collapse-item"
     },
     "navigationStyle":"custom",

miniprogram/pageage/project_materialSeal/info/index.wxml

@@ -12,6 +12,7 @@
   </view>
 </view>
 <view class="max_content">
+	<van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.approveStatus=='3' ? active+1:0 }}" />
   <view class="inspect_overview_max">
 	  <view class="inspect_overview">
 		<view class="gk_open" style="margin-top: 20rpx;border: 1px solid transparent;">

miniprogram/pageage/project_materialSeal/info/index.wxss

@@ -44,7 +44,8 @@
   }
   .van-cell.van-cell--clickable{
     background-color: #2b345b;
-    margin-top: 30rpx;
+    margin-top: 5rpx;
+    margin-bottom: 5rpx;
     color: #fff;
     border-radius: 15rpx;
   

miniprogram/pageage/project_materialSeal/list/index.wxml

@@ -46,7 +46,7 @@
    </view>
    <view wx:if="{{listData.length==0}}">
         <view style="padding-top: 70px;text-align: -webkit-center;">
-            <image src="https://szgcwx.jhncidg.com/staticFiles/images/nodata.png" style="width: 130px;height: 105px;"></image>
+            <image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
             <view style="color: #a5abbb;">暂无数据</view>
         </view>
     </view>

miniprogram/pageage/project_measure/add/index.js

@@ -39,7 +39,9 @@ Page({
             id: 2,
             text: "不合格"
         }],
-        fileType: ["doc", "docx", "xls", "xlsx", "ppt", "pptx", "pdf", "png", "jpg", "jpeg"]
+        fileType: ["doc", "docx", "xls", "xlsx", "ppt", "pptx", "pdf", "png", "jpg", "jpeg"],
+        flowNodes:[{text:'开始'},{text:'提交申请'},{text:'监理审批'},{text:'结束'}],
+        active: 0
     },
 
     /**

miniprogram/pageage/project_measure/add/index.json

@@ -1,5 +1,6 @@
 {
   "usingComponents": {
+      "van-steps": "@vant/weapp/steps/index",
       "van-overlay": "@vant/weapp/overlay/index"
   },
   "navigationStyle":"custom"

miniprogram/pageage/project_measure/add/index.wxml

@@ -12,6 +12,7 @@
   </view>
 </view>
 <view class="max_content">
+    <van-steps steps="{{ flowNodes }}" active="{{ active }}" />
     <view class="inspect_info ">
     <view class="module_title module_title_flex">
         <view>{{projectName}}</view>

miniprogram/pageage/project_measure/edit/index.js

@@ -27,6 +27,8 @@ Page({
         type: "",
         info: "",
         filesData: [],
+        flowNodes:[{text:'开始'},{text:'提交申请'},{text:'监理审批'},{text:'结束'}],
+        active: 1
     },
 
     /**

miniprogram/pageage/project_measure/edit/index.json

@@ -2,6 +2,7 @@
   "usingComponents": {
       "van-overlay": "@vant/weapp/overlay/index",
       "van-collapse": "@vant/weapp/collapse",
+      "van-steps": "@vant/weapp/steps/index",
       "van-collapse-item": "@vant/weapp/collapse-item"
   },
   "navigationStyle":"custom"

miniprogram/pageage/project_measure/edit/index.wxml

@@ -12,6 +12,7 @@
   </view>
 </view>
 <view class="max_content">
+    <van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.approveStatus=='3' ? active+1:0 }}" />
     <view class="inspect_info ">
     <view class="module_title module_title_flex">
         <view>{{projectName}}</view>

miniprogram/pageage/project_measure/edit/index.wxss

@@ -28,7 +28,8 @@
   }
   .van-cell.van-cell--clickable{
     background-color: #2b345b;
-    margin-top: 30rpx;
+    margin-top: 5rpx;
+    margin-bottom: 5rpx;
     color: #fff;
     border-radius: 15rpx;
   

miniprogram/pageage/project_measure/info/index.js

@@ -15,14 +15,26 @@ Page({
     minImageList: [],
     activeName: "",
     flowRecordList: [],
-        request:app.globalData.reqUrl
+    request: app.globalData.reqUrl,
+    flowNodes: [{
+      text: '开始'
+    }, {
+      text: '提交申请'
+    }, {
+      text: '监理审批'
+    }, {
+      text: '结束'
+    }],
+    active: 100
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-        let {id} = options
+    let {
+      id
+    } = options
     //获取缓存数据
     wx.getStorage({
       key: 'userinfo',
@@ -43,7 +55,9 @@ Page({
    * 
    */
   getInfo() {
-        let {id} = this.data
+    let {
+      id
+    } = this.data
     let that = this
     wx.request({
       url: app.globalData.reqUrl + '/wechat/projectMeasure/info',
@@ -54,6 +68,15 @@ Page({
       success(res) {
         res = res.data
         if (res.code == 200) {
+          let state = that.data.active;
+          if (res.data.approveStatus == "1") {
+            state = 2;
+          } else if (res.data.approveStatus == "3") {
+            state = 1;
+          }
+          that.setData({
+            active: state
+          })
           let urls = [];
           let minUrls = [];
           if (res.data.imageUrls) {
@@ -96,7 +119,9 @@ Page({
     })
   },
   deleteData() {
-        let {id} = this.data
+    let {
+      id
+    } = this.data
     let that = this;
     wx.request({
       url: app.globalData.reqUrl + '/wechat/projectMeasure/remove',

miniprogram/pageage/project_measure/info/index.json

@@ -1,5 +1,6 @@
 {
     "usingComponents": {
+      "van-steps": "@vant/weapp/steps/index",
         "van-collapse": "@vant/weapp/collapse",
       "van-collapse-item": "@vant/weapp/collapse-item"
     },

miniprogram/pageage/project_measure/info/index.wxml

@@ -12,6 +12,7 @@
   </view>
 </view>
 <view class="max_content">
+    <van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.approveStatus=='3' ? active+1:0 }}" />
 	<view class="inspect_overview_max">
 	  <view class="inspect_overview">
 		<view class="gk_open" style="margin-top: 20rpx;border: 1px solid transparent;">

miniprogram/pageage/project_measure/info/index.wxss

@@ -44,7 +44,8 @@
   }
   .van-cell.van-cell--clickable{
     background-color: #2b345b;
-    margin-top: 30rpx;
+    margin-top: 5rpx;
+    margin-bottom: 5rpx;
     color: #fff;
     border-radius: 15rpx;
   

miniprogram/pageage/project_measure/list/index.wxml

@@ -46,7 +46,7 @@
        </view>
        <view wx:if="{{listData.length==0}}">
             <view style="padding-top: 70px;text-align: -webkit-center;">
-                <image src="https://szgcwx.jhncidg.com/staticFiles/images/nodata.png" style="width: 130px;height: 105px;"></image>
+                <image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
                 <view style="color: #a5abbb;">暂无数据</view>
             </view>
        </view>

miniprogram/pageage/project_problemmodify/quality/add/index.js

@@ -33,14 +33,25 @@ Page({
         selectIndex: "",
         problemType: "1",
         showHis: false,
-        problemTypeList:[{id:"1",text:"常规检查"},{id:"2",text:"专项检查"}]
+        problemTypeList: [{
+            id: "1",
+            text: "常规检查"
+        }, {
+            id: "2",
+            text: "专项检查"
+        }],
+        flowNodes:[{text:'开始'},{text:'提交隐患'},{text:'隐患整改'},{text:'隐患复检'},{text:'结束'}],
+        active: 0 
     },
 
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
-        let {projectId,projectName} = options
+        let {
+            projectId,
+            projectName
+        } = options
         //获取缓存数据
         wx.getStorage({
             key: 'userinfo',
@@ -96,8 +107,21 @@ Page({
                 'content-type': 'application/x-www-form-urlencoded'
             },
             success(res) {
-                res = res.data
+                res = res.data;
                 if (res.code == 200) {
+                    let findMy = false;
+                    res.data.forEach(it => {
+                        if (it.userinfoList.length > 0) {
+                            it.userinfoList.forEach(u => {
+                                if (that.data.loginName == u.phonenumber) {
+                                    findMy = true;
+                                }
+                            });
+                        }
+                    });
+                    if(!findMy){
+                        res.data[0].userinfoList.push({state:false,nickName:that.data.userName,jobTypeName:'集团公司',phonenumber:that.data.loginName});
+                    }
                     that.setData({
                         rectifierData2: res.data,
                     })
@@ -153,7 +177,10 @@ Page({
                 if (res.code == 200) {
                     let list = [];
                     res.data.forEach(it => {
-                        list.push({"id":it.dictValue,"text":it.dictLabel});
+                        list.push({
+                            "id": it.dictValue,
+                            "text": it.dictLabel
+                        });
                     })
                     that.setData({
                         dangerTypeList: list
@@ -248,7 +275,24 @@ Page({
             loadShow: true
         })
         let that = this
-        let {projectId,projectName,dangerType,lordSent,lordSentUser,copySend,copySendUser,workParts,changeInfo,nickedTime,recheckSend,recheckSendUser,imageInfoData,loginName,problemType,userName} =  that.data;
+        let {
+            projectId,
+            projectName,
+            dangerType,
+            lordSent,
+            lordSentUser,
+            copySend,
+            copySendUser,
+            workParts,
+            changeInfo,
+            nickedTime,
+            recheckSend,
+            recheckSendUser,
+            imageInfoData,
+            loginName,
+            problemType,
+            userName
+        } = that.data;
         //数据效验
         if (projectId == "" || loginName == "") {
             app.toast("数据异常，请刷新页面重试!")
@@ -397,7 +441,9 @@ Page({
                     "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
                 },
                 name, //上传的所需字段，后端提供
-            formData: { user: 'test' },
+                formData: {
+                    user: 'test'
+                },
                 success: (res) => {
                     // 上传完成操作
                     const data = JSON.parse(res.data)

miniprogram/pageage/project_problemmodify/quality/add/index.json

@@ -1,5 +1,6 @@
 {
   "usingComponents": {
+    "van-steps": "@vant/weapp/steps/index",
       "van-overlay": "@vant/weapp/overlay/index"
   },
   "navigationStyle":"custom",

miniprogram/pageage/project_problemmodify/quality/add/index.wxml

@@ -12,6 +12,7 @@
   </view>
 </view>
 <view class="max_content">
+    <van-steps steps="{{ flowNodes }}" active="{{ active }}" />
     <view class="inspect_info ">
     <view class="module_title module_title_flex">
         <view>{{projectName}}</view>

miniprogram/pageage/project_problemmodify/quality/check/index.js

@@ -18,7 +18,9 @@ Page({
         minImageList:[],
         auditImageList:[],
         auditMinImageList:[],
-        request:app.globalData.reqUrl
+        request:app.globalData.reqUrl,
+        flowNodes:[{text:'开始'},{text:'提交隐患'},{text:'隐患整改'},{text:'隐患复检'},{text:'结束'}],
+        active: 3 
     },
 
     /**

miniprogram/pageage/project_problemmodify/quality/check/index.json

@@ -1,6 +1,9 @@
 {
     "usingComponents": {
         "van-popup": "@vant/weapp/popup/index",
+        "van-collapse": "@vant/weapp/collapse",
+      "van-steps": "@vant/weapp/steps/index",
+      "van-collapse-item": "@vant/weapp/collapse-item",
         "van-overlay": "@vant/weapp/overlay/index"
     },
     "navigationStyle":"custom",

miniprogram/pageage/project_problemmodify/quality/check/index.wxml

@@ -3,7 +3,9 @@
     <view class="header_title_row">
         <van-row>
             <van-col span="4">
-        <view class="header_img" bindtap="returnToPage"><image src="/images/left.png"></image></view>
+                <view class="header_img" bindtap="returnToPage">
+                    <image src="/images/left.png"></image>
+                </view>
             </van-col>
             <van-col span="15">
                 <view class="header_name">质量隐患复检</view>
@@ -12,13 +14,66 @@
     </view>
 </view>
 <view class="max_content">
+	<van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.checkState=='3' ? active+1:0 }}" />
     <view class="inspect_overview_max">
         <view class="inspect_overview">
             <view class="module_title module_title_padding">
                 <view>{{infoData.problemArea}}</view>
             </view>
+            <view class="gk_open" style="margin-top: 20rpx;border: 1px solid transparent;">
+                <van-collapse value="{{activeName}}" bind:change="onChange">
+                    <!-- <van-collapse-item title="申请流程" name="1">
+                    <view class="left_manage2" wx:for="{{flowNodes}}" wx:key="index">
+                        <text class="safety_issue_number {{item.state}}">{{item.name}}</text>
+                    </view>
+                </van-collapse-item> -->
+                    <van-collapse-item title="审批日志" name="2">
+                        <view class="inspect_list">
+                            <view class="inspect_for" wx:for="{{flowRecordList}}" wx:key="index">
+                                <view class="inspect_for_bgd">
+                                    <view class="inspect_list_title">
+                                        <view class="inspect_list_title_label inspect_list_title_width">
+                                            <view class="inspect_list_title_number">{{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}}</view>
+                                                    <view class="module_title module_title_flex inspect_list_title_text">{{item.taskName}}{{item.commentResult}}
+                                                        <text wx:if="{{item.commentResult=='通过'}}" class="timeline_for_state_1 color_green">{{item.commentResult}}</text>
+                                                        <text wx:if="{{item.commentResult=='驳回'}}" class="timeline_for_state_2 color_purple">{{item.commentResult}}</text>
+                                                        <text wx:if="{{item.commentResult=='退回'}}" class="timeline_for_state_2 color_purple">{{item.commentResult}}</text>
+                                                    </view>
+                                            </view>
+                                        </view>
+                                        <view class="inspect_list_info gk_open_con">
+                                            <view wx:if="{{item.assigneeName}}">
+                                                <image src="/images/lw_3.png"></image>办理用户：<text>{{item.assigneeName}}</text>
+                                            </view>
+                                            <view wx:if="{{item.assigneeName}}">
+                                                <image src="/images/s_1.png"></image>办理单位：<text class="color_blue">{{item.deptName}}</text>
+                                            </view>
+                                            <view wx:if="{{item.candidate}}">
+                                                <image src="/images/s_2.png"></image>候选办理：<text>{{item.candidate}}</text>
+                                            </view>
+                                            <view wx:if="{{item.deleteReason}}">
+                                                <image src="/images/s_18.png"></image>驳回节点：<text>{{item.deleteReason}}</text>
+                                            </view>
+                                            <view>
+                                                <image src="/images/s_6.png"></image>接收时间：<text>{{item.startTime}}</text>
+                                            </view>
+                                            <view wx:if="{{item.endTime}}">
+                                                <image src="/images/lw_8.png"></image>处理时间：<text>{{item.endTime}}</text>
+                                            </view>
+                                            <view wx:if="{{item.duration}}">
+                                                <image src="/images/img_11.png"></image>处理耗时：<text>{{item.duration}}</text>
+                                            </view>
+                                            <view wx:if="{{item.message}}">
+                                                <image src="/images/s_7.png"></image>处理意见：<text>{{item.message}}</text>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </view>
+                            </view>
+                    </van-collapse-item>
+                </van-collapse>
+            </view>
             <view class="inspect_overview_list_max">
-              
                 <view class="inspect_overview_list">
                     <van-row>
                         <van-col span="6"><text class="color_purple">隐患图片</text></van-col>
@@ -138,8 +193,7 @@
         <view class="inspect_overview_list_max">
             <view class="inspect_info_list">
                 <view class="inspect_info_content">
-                  <textarea  class="add_textarea" placeholder="请填写整改复检意见"
+                    <textarea class="add_textarea" placeholder="请填写整改复检意见" placeholder-style="color:#6777aa;" bindinput="onInputOpinion" maxlength="200" />
-                  placeholder-style="color:#6777aa;" bindinput="onInputOpinion" maxlength="200"/>
                 </view>
             </view>
         </view>

miniprogram/pageage/project_problemmodify/quality/draft/index.js

@@ -22,6 +22,8 @@ Page({
         ],
         lordSent:"",
         lordSentUser:"",
+        flowNodes:[{text:'开始'},{text:'提交隐患'},{text:'隐患整改'},{text:'隐患复检'},{text:'结束'}],
+        active: 0 
     },
 
     /**

miniprogram/pageage/project_problemmodify/quality/draft/index.json

@@ -1,5 +1,6 @@
 {
   "usingComponents": {
+    "van-steps": "@vant/weapp/steps/index",
       "van-overlay": "@vant/weapp/overlay/index"
   },
   "navigationStyle":"custom",

miniprogram/pageage/project_problemmodify/quality/draft/index.wxml

@@ -12,6 +12,7 @@
   </view>
 </view>
 <view class="max_content">
+    <van-steps steps="{{ flowNodes }}" active="{{ active }}" />
     <view class="inspect_info ">
     <view class="module_title_2 module_title_flex">
         <view>{{projectName}}</view>
@@ -47,7 +48,7 @@
 </view>
 <view class="problem_submit_to">
     <view class="problem_submit_to_btn" bindtap="cancelSaveView">取消</view>
-    <view class="problem_submit_to_btn problem_submit_to_save"  bindtap="onProblemSubmitSave">提交隐患</view>
+    <view class="problem_submit_to_btn problem_submit_to_save"  bindtap="onProblemSubmitSave">保存草稿</view>
 </view> 
 </view>
 

miniprogram/pageage/project_problemmodify/quality/info/index.js

@@ -16,14 +16,28 @@ Page({
     minImageList: [],
     auditImageList: [],
     auditMinImageList: [],
-        request:app.globalData.reqUrl
+    request: app.globalData.reqUrl,
+    flowNodes: [{
+      text: '开始'
+    }, {
+      text: '提交隐患'
+    }, {
+      text: '隐患整改'
+    }, {
+      text: '隐患复检'
+    }, {
+      text: '结束'
+    }],
+    active: 100
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-        let {id} = options
+    let {
+      id
+    } = options
     //获取缓存数据
     wx.getStorage({
       key: 'userinfo',
@@ -44,7 +58,9 @@ Page({
    * 
    */
   getInfo() {
-        let {id} = this.data
+    let {
+      id
+    } = this.data
     let that = this
     wx.request({
       url: app.globalData.reqUrl + '/wechat/projectProblemmodify/info',
@@ -55,6 +71,17 @@ Page({
       success(res) {
         res = res.data
         if (res.code == 200) {
+          let state = that.data.active;
+          if (res.data.checkState == "0") {
+            state = 2;
+          } else if (res.data.checkState == "1") {
+            state = 3;
+          } else if (res.data.checkState == "3") {
+            state = 1;
+          }
+          that.setData({
+            active: state
+          })
           let urls = [];
           let minUrls = [];
           if (res.data.smarkUrl) {
@@ -81,7 +108,9 @@ Page({
   },
 
   getAuditinfo() {
-      let {id} = this.data
+    let {
+      id
+    } = this.data
     let that = this
     wx.request({
       url: app.globalData.reqUrl + '/wechat/projectProblemmodify/queryAuditInfo',
@@ -127,7 +156,9 @@ Page({
     })
   },
   deleteData() {
-        let {id} = this.data
+    let {
+      id
+    } = this.data
     wx.request({
       url: app.globalData.reqUrl + '/wechat/projectProblemmodify/removeQuality',
       header: {

miniprogram/pageage/project_problemmodify/quality/info/index.json

@@ -1,5 +1,9 @@
 {
-    "usingComponents": {},
+    "usingComponents": {
+        "van-collapse": "@vant/weapp/collapse",
+        "van-steps": "@vant/weapp/steps/index",
+        "van-collapse-item": "@vant/weapp/collapse-item"
+    },
     "navigationStyle":"custom",
     "navigationBarTitleText": "质量隐患详情"
 }

miniprogram/pageage/project_problemmodify/quality/info/index.wxml

@@ -12,6 +12,7 @@
   </view>
 </view>
 <view class="max_content">
+	<van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.checkState=='3' ? active+1:0 }}" />
 	<view class="inspect_overview_max">
 	  <view class="inspect_overview">
 		  <view class="module_title module_title_padding">

miniprogram/pageage/project_problemmodify/quality/list/index.js

@@ -64,6 +64,76 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
+      if (options && options.barProId) {
+        //数据未加载完毕，从文件读取数据
+        if (app.globalData.projectInfoList.length == 0) {
+          wx.getStorage({
+            key: 'projectInfoList',
+            success: res => {
+              app.globalData.projectInfoList = res.data;
+              app.globalData.projectInfoList.forEach(item => {
+                if (item.projectId == options.barProId) {
+                  app.globalData.projectId = item.projectId;
+                  app.globalData.projectName = item.projectName;
+                }
+              });
+              //未查询到项目信息
+              if (!app.globalData.projectId) {
+                app.globalData.projectInfoList.push({
+                  projectId: options.barProId,
+                  projectId: options.barProName
+                });
+                app.globalData.projectId = options.barProId;
+                app.globalData.projectName = options.barProName;
+              }
+              //从缓存读取项目信息
+              this.setData({
+                initData: {
+                  text: app.globalData.projectName,
+                  id: app.globalData.projectId
+                }
+              })
+            },
+            fail: err => {
+              //未获取用户信息时，重新登录
+              wx.redirectTo({
+                url: '../pages/login/index',
+              })
+            }
+          })
+        } else {
+          app.globalData.projectInfoList.forEach(item => {
+            if (item.projectId == options.barProId) {
+              app.globalData.projectId = item.projectId;
+              app.globalData.projectName = item.projectName;
+            }
+          });
+          //未查询到项目信息
+          if (!app.globalData.projectId) {
+            app.globalData.projectInfoList.push({
+              projectId: options.barProId,
+              projectId: options.barProName
+            });
+            app.globalData.projectId = options.barProId;
+            app.globalData.projectName = options.barProName;
+          }
+          //从缓存读取项目信息
+          this.setData({
+            initData: {
+              text: app.globalData.projectName,
+              id: app.globalData.projectId
+            }
+          })
+        }
+      } else {
+        //从缓存读取项目信息
+        this.setData({
+          initData: {
+            text: app.globalData.projectName,
+            id: app.globalData.projectId
+          }
+        })
+      }
      //获取缓存数据
       wx.getStorage({
         key: 'userinfo',

miniprogram/pageage/project_problemmodify/quality/list/index.wxml

@@ -57,19 +57,19 @@
       </view>
       <view wx:if="{{listData.length==0}}">
         <view style="padding-top: 70px;text-align: -webkit-center;">
-          <image src="../https://szgcwx.jhncidg.com/staticFiles/images/nodata.png" style="width: 130px;height: 105px;"></image>
+          <image src="../https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
           <view style="color: #a5abbb;">暂无数据</view>
         </view>
       </view>
       <view class="inspect_add_to_darft" bindtap="skipAddDarft">
         <view style="padding-top: 22rpx;">
-          <image src="/../images/new_add.png"></image>
+          <image src="/images/new_add.png"></image>
           <view>草稿</view>
         </view>
       </view>
       <view class="inspect_add_to" bindtap="skipAdd">
         <view style="padding-top: 22rpx;">
-          <image src="/../images/new_add.png"></image>
+          <image src="/images/new_add.png"></image>
           <view>新增</view>
         </view>
       </view>

miniprogram/pageage/project_problemmodify/quality/modify/index.js

@@ -17,7 +17,9 @@ Page({
         status:"0",
         imageList:[],
         minImageList:[],
-        request:app.globalData.reqUrl
+        request:app.globalData.reqUrl,
+        flowNodes:[{text:'开始'},{text:'提交隐患'},{text:'隐患整改'},{text:'隐患复检'},{text:'结束'}],
+        active: 2 
     },
 
     /**

miniprogram/pageage/project_problemmodify/quality/modify/index.json

@@ -1,6 +1,9 @@
 {
     "usingComponents": {
         "van-popup": "@vant/weapp/popup/index",
+        "van-collapse": "@vant/weapp/collapse",
+        "van-steps": "@vant/weapp/steps/index",
+        "van-collapse-item": "@vant/weapp/collapse-item",
         "van-overlay": "@vant/weapp/overlay/index"
     },
     "navigationStyle":"custom",

miniprogram/pageage/project_problemmodify/quality/modify/index.wxml

@@ -12,6 +12,7 @@
   </view>
 </view>
 <view class="max_content">
+	<van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.checkState=='3' ? active+1:0 }}" />
 	<view class="inspect_overview_max">
 	  <view class="inspect_overview">
 		  <view class="module_title module_title_padding">

miniprogram/pageage/project_problemmodify/security/add/index.js

@@ -34,7 +34,9 @@ Page({
         selectIndex:"",
         problemType:"1",
         showHis:false,
-        problemTypeList:[{id:"1",text:"常规检查"},{id:"2",text:"专项检查"}]
+        problemTypeList:[{id:"1",text:"常规检查"},{id:"2",text:"专项检查"}],
+        flowNodes:[{text:'开始'},{text:'提交隐患'},{text:'隐患整改'},{text:'隐患复检'},{text:'结束'}],
+        active: 0 
     },
 
     /**
@@ -100,6 +102,19 @@ Page({
             success(res){
                 res = res.data
                 if(res.code == 200){
+                    let findMy = false;
+                    res.data.forEach(it => {
+                        if (it.userinfoList.length > 0) {
+                            it.userinfoList.forEach(u => {
+                                if (that.data.loginName == u.phonenumber) {
+                                    findMy = true;
+                                }
+                            });
+                        }
+                    });
+                    if(!findMy){
+                        res.data[0].userinfoList.push({state:false,nickName:that.data.userName,jobTypeName:'集团公司',phonenumber:that.data.loginName});
+                    }
                     that.setData({
                         rectifierData2:res.data,
                     });

miniprogram/pageage/project_problemmodify/security/add/index.json

@@ -1,5 +1,6 @@
 {
   "usingComponents": {
+    "van-steps": "@vant/weapp/steps/index",
       "van-overlay": "@vant/weapp/overlay/index"
   },
   "navigationStyle":"custom",

miniprogram/pageage/project_problemmodify/security/add/index.wxml

@@ -12,6 +12,7 @@
   </view>
 </view>
 <view class="max_content">
+    <van-steps steps="{{ flowNodes }}" active="{{ active }}" />
     <view class="inspect_info">
     <view class="module_title module_title_flex">
         <view>{{projectName}}</view>

miniprogram/pageage/project_problemmodify/security/check/index.js

@@ -18,7 +18,9 @@ Page({
         minImageList:[],
         auditImageList:[],
         auditMinImageList:[],
-        request:app.globalData.reqUrl
+        request:app.globalData.reqUrl,
+        flowNodes:[{text:'开始'},{text:'提交隐患'},{text:'隐患整改'},{text:'隐患复检'},{text:'结束'}],
+        active: 3 
     },
 
     /**

miniprogram/pageage/project_problemmodify/security/check/index.json

@@ -1,6 +1,9 @@
 {
     "usingComponents": {
         "van-popup": "@vant/weapp/popup/index",
+        "van-collapse": "@vant/weapp/collapse",
+        "van-steps": "@vant/weapp/steps/index",
+        "van-collapse-item": "@vant/weapp/collapse-item",
         "van-overlay": "@vant/weapp/overlay/index"
     },
     "navigationStyle":"custom",

miniprogram/pageage/project_problemmodify/security/check/index.wxml

@@ -12,6 +12,7 @@
   </view>
 </view>
 <view class="max_content">
+    <van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.checkState=='3' ? active+1:0 }}" />
     <view class="inspect_overview_max">
         <view class="inspect_overview">
             <view class="module_title module_title_padding">

miniprogram/pageage/project_problemmodify/security/draft/index.js

@@ -22,6 +22,8 @@ Page({
         ],
         lordSent:"",
         lordSentUser:"",
+        flowNodes:[{text:'开始'},{text:'提交隐患'},{text:'隐患整改'},{text:'隐患复检'},{text:'结束'}],
+        active: 0 
     },
 
     /**

miniprogram/pageage/project_problemmodify/security/draft/index.json

@@ -1,5 +1,6 @@
 {
   "usingComponents": {
+    "van-steps": "@vant/weapp/steps/index",
       "van-overlay": "@vant/weapp/overlay/index"
   },
   "navigationStyle":"custom",

miniprogram/pageage/project_problemmodify/security/draft/index.wxml

@@ -12,6 +12,7 @@
   </view>
 </view>
 <view class="max_content">
+    <van-steps steps="{{ flowNodes }}" active="{{ active }}" />
     <view class="inspect_info ">
     <view class="module_title_2 module_title_flex">
         <view>{{projectName}}</view>
@@ -47,7 +48,7 @@
 </view>
 <view class="problem_submit_to">
     <view class="problem_submit_to_btn" bindtap="cancelSaveView">取消</view>
-    <view class="problem_submit_to_btn problem_submit_to_save"  bindtap="onProblemSubmitSave">提交隐患</view>
+    <view class="problem_submit_to_btn problem_submit_to_save"  bindtap="onProblemSubmitSave">保存草稿</view>
 </view> 
 </view>
 

miniprogram/pageage/project_problemmodify/security/info/index.js

@@ -15,7 +15,9 @@ Page({
         minImageList:[],
         auditImageList:[],
         auditMinImageList:[],
-        request:app.globalData.reqUrl 
+        request:app.globalData.reqUrl,
+        flowNodes:[{text:'开始'},{text:'提交隐患'},{text:'隐患整改'},{text:'隐患复检'},{text:'结束'}],
+        active: 100  
     },
 
     /**
@@ -54,6 +56,17 @@ Page({
           success(res){
             res = res.data
             if(res.code == 200){
+              let state = that.data.active;
+          if (res.data.checkState == "0") {
+            state = 2;
+          } else if (res.data.checkState == "1") {
+            state = 3;
+          } else if (res.data.checkState == "3") {
+            state = 1;
+          }
+          that.setData({
+            active: state
+          })
               let urls = [];
               let minUrls = [];
               if(res.data.smarkUrl){

miniprogram/pageage/project_problemmodify/security/info/index.json

@@ -1,5 +1,9 @@
 {
-    "usingComponents": {},
+    "usingComponents": {
+        "van-collapse": "@vant/weapp/collapse",
+        "van-steps": "@vant/weapp/steps/index",
+        "van-collapse-item": "@vant/weapp/collapse-item"
+    },
     "navigationStyle":"custom",
     "navigationBarTitleText": "安全隐患详情"
 }

miniprogram/pageage/project_problemmodify/security/info/index.wxml

@@ -12,6 +12,7 @@
   </view>
 </view>
 <view class="max_content">
+	<van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.checkState=='3' ? active+1:0 }}" />
 	<view class="inspect_overview_max">
 	  <view class="inspect_overview">
 		  <view class="module_title module_title_padding">

miniprogram/pageage/project_problemmodify/security/list/index.js

@@ -57,6 +57,76 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
+      if (options && options.barProId) {
+        //数据未加载完毕，从文件读取数据
+        if (app.globalData.projectInfoList.length == 0) {
+          wx.getStorage({
+            key: 'projectInfoList',
+            success: res => {
+              app.globalData.projectInfoList = res.data;
+              app.globalData.projectInfoList.forEach(item => {
+                if (item.projectId == options.barProId) {
+                  app.globalData.projectId = item.projectId;
+                  app.globalData.projectName = item.projectName;
+                }
+              });
+              //未查询到项目信息
+              if (!app.globalData.projectId) {
+                app.globalData.projectInfoList.push({
+                  projectId: options.barProId,
+                  projectId: options.barProName
+                });
+                app.globalData.projectId = options.barProId;
+                app.globalData.projectName = options.barProName;
+              }
+              //从缓存读取项目信息
+              this.setData({
+                initData: {
+                  text: app.globalData.projectName,
+                  id: app.globalData.projectId
+                }
+              })
+            },
+            fail: err => {
+              //未获取用户信息时，重新登录
+              wx.redirectTo({
+                url: '../pages/login/index',
+              })
+            }
+          })
+        } else {
+          app.globalData.projectInfoList.forEach(item => {
+            if (item.projectId == options.barProId) {
+              app.globalData.projectId = item.projectId;
+              app.globalData.projectName = item.projectName;
+            }
+          });
+          //未查询到项目信息
+          if (!app.globalData.projectId) {
+            app.globalData.projectInfoList.push({
+              projectId: options.barProId,
+              projectId: options.barProName
+            });
+            app.globalData.projectId = options.barProId;
+            app.globalData.projectName = options.barProName;
+          }
+          //从缓存读取项目信息
+          this.setData({
+            initData: {
+              text: app.globalData.projectName,
+              id: app.globalData.projectId
+            }
+          })
+        }
+      } else {
+        //从缓存读取项目信息
+        this.setData({
+          initData: {
+            text: app.globalData.projectName,
+            id: app.globalData.projectId
+          }
+        })
+      }
      //获取缓存数据
       wx.getStorage({
         key: 'userinfo',

miniprogram/pageage/project_problemmodify/security/list/index.wxml

@@ -56,19 +56,19 @@
        </view>
        <view wx:if="{{listData.length==0}}">
             <view style="padding-top: 70px;text-align: -webkit-center;">
-                <image src="../https://szgcwx.jhncidg.com/staticFiles/images/nodata.png" style="width: 130px;height: 105px;"></image>
+                <image src="../https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
                 <view style="color: #a5abbb;">暂无数据</view>
             </view>
        </view>
        <view class="inspect_add_to_darft"  bindtap="skipAddDarft">
         <view style="padding-top: 22rpx;">
-          <image src="/../images/new_add.png"></image>
+          <image src="/images/new_add.png"></image>
           <view>草稿</view>
         </view>
 </view>
        <view class="inspect_add_to"  bindtap="skipAdd">
         <view style="padding-top: 22rpx;">
-          <image src="/../images/new_add.png"></image>
+          <image src="/images/new_add.png"></image>
           <view>新增</view>
         </view>
         </view>

miniprogram/pageage/project_problemmodify/security/modify/index.js

@@ -17,7 +17,9 @@ Page({
         status:"0",
         imageList:[],
         minImageList:[],
-        request:app.globalData.reqUrl 
+        request:app.globalData.reqUrl,
+        flowNodes:[{text:'开始'},{text:'提交隐患'},{text:'隐患整改'},{text:'隐患复检'},{text:'结束'}],
+        active: 2 
     },
 
     /**

miniprogram/pageage/project_problemmodify/security/modify/index.json

@@ -1,6 +1,9 @@
 {
     "usingComponents": {
         "van-popup": "@vant/weapp/popup/index",
+        "van-collapse": "@vant/weapp/collapse",
+        "van-steps": "@vant/weapp/steps/index",
+        "van-collapse-item": "@vant/weapp/collapse-item",
         "van-overlay": "@vant/weapp/overlay/index"
     },
     "navigationStyle":"custom",

miniprogram/pageage/project_problemmodify/security/modify/index.wxml

@@ -12,6 +12,7 @@
   </view>
 </view>
 <view class="max_content">
+	<van-steps steps="{{ flowNodes }}" active="{{ active }}" rejectNode="{{ active<100 && infoData.checkState=='3' ? active+1:0 }}" />
 	<view class="inspect_overview_max">
 	  <view class="inspect_overview">
 		  <view class="module_title module_title_padding">

miniprogram/pageage/project_schedule/list/index.wxml

@@ -39,7 +39,7 @@
    </view>
    <view wx:if="{{listData.length==0}}">
         <view style="padding-top: 70px;text-align: -webkit-center;">
-            <image src="https://szgcwx.jhncidg.com/staticFiles/images/nodata.png" style="width: 130px;height: 105px;"></image>
+            <image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
             <view style="color: #a5abbb;">暂无数据</view>
         </view>
     </view>

miniprogram/pageage/project_special/list/index.wxml

@@ -40,7 +40,7 @@
    </view>
    <view wx:if="{{listData.length==0}}">
         <view style="padding-top: 70px;text-align: -webkit-center;">
-            <image src="https://szgcwx.jhncidg.com/staticFiles/images/nodata.png" style="width: 130px;height: 105px;"></image>
+            <image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
             <view style="color: #a5abbb;">暂无数据</view>
         </view>
     </view>

miniprogram/pageage/project_standard/info/index.wxss

@@ -44,7 +44,8 @@
   }
   .van-cell.van-cell--clickable{
     background-color: #2b345b;
-    margin-top: 30rpx;
+    margin-top: 5rpx;
+    margin-bottom: 5rpx;
     color: #fff;
     border-radius: 15rpx;
   

miniprogram/pageage/project_standard/list/index.wxml

@@ -43,7 +43,7 @@
        </view>
        <view wx:if="{{listData.length==0}}">
             <view style="padding-top: 70px;text-align: -webkit-center;">
-                <image src="https://szgcwx.jhncidg.com/staticFiles/images/nodata.png" style="width: 130px;height: 105px;"></image>
+                <image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
                 <view style="color: #a5abbb;">暂无数据</view>
             </view>
        </view>

miniprogram/pageage/project_train/list/index.wxml

@@ -41,7 +41,7 @@
    </view>
    <view wx:if="{{listData.length==0}}">
         <view style="padding-top: 70px;text-align: -webkit-center;">
-            <image src="https://szgcwx.jhncidg.com/staticFiles/images/nodata.png" style="width: 130px;height: 105px;"></image>
+            <image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
             <view style="color: #a5abbb;">暂无数据</view>
         </view>
     </view>