From 8a1027f1e8b29acd001c6319884e68aaef207b8a Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Fri, 10 Apr 2020 10:46:16 +0800
Subject: [PATCH] xiaochenxuxiugai

---
 pages/checkjob/index.wxml |  2 +-
 pages/inspect/add.js      | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/pages/checkjob/index.wxml b/pages/checkjob/index.wxml
index f0f0ab7..5a1f158 100644
--- a/pages/checkjob/index.wxml
+++ b/pages/checkjob/index.wxml
@@ -49,7 +49,7 @@
                 
               </view>
               <view class="weui-media-box__desc">
-                 <span style="background-color:green;color:white">{{item.checkname__username}} </span>
+                 <span style="background-color:green;color:white">{{item.checkname__name}} </span>
                   <view class="weui-media-box__title" wx:if="{{item.jobstate == 1}}" style="font-size:12px;color:green">可执行</view>
                  <view class="weui-media-box__title" wx:if="{{item.jobstate == 2}}" style="font-size:12px;color:red">已过期</view>
               </view>
diff --git a/pages/inspect/add.js b/pages/inspect/add.js
index 315891a..695c7cd 100644
--- a/pages/inspect/add.js
+++ b/pages/inspect/add.js
@@ -35,6 +35,23 @@ Page({
           this.setData({
             equipment:res.data
           })
+          wx.request({
+            url: this.data.serverUrl + 'api/equipmentcheckform/'+id,
+            header: {
+              'content-type': 'application/json', // 默认值
+              'Cookie': getApp().globalData.sessionId,
+            },
+            success: res => {
+              if (res.statusCode === 200) {
+              
+                  this.setData({
+                    itemscheck:res.items
+                  })
+                console.log(itemscheck)
+              }
+              wx.hideLoading();
+            }
+          });
           wx.request({
             url: this.data.serverUrl + 'api/risk?a=steps&type=equipment',
             header: {