（*）登录页顶部图片文字修改+开始巡检提交结构暂交

weapp/package/polling/polling.js

@@ -3,7 +3,6 @@ import { getPatrolPlan } from "../../utils/getApiUrl";
 import { Request } from "../../common";
 const moment = require("../../utils/moment");
 
-
 Page({
 
   /**

weapp/package/startInspection/startInspection.js

@@ -1,4 +1,8 @@
 // package/startInspection/startInspection.js
+import { addPatrolRecord, getPatrolRecord } from "../../utils/getApiUrl";
+import { Request } from "../../common";
+const moment = require("../../utils/moment");
+
 Page({
 
   /**
@@ -7,12 +11,25 @@ Page({
   data: {
     dataList: '',
     imgs: [], //上传图片
+    imgUrl: getApp().globalData.imgUrl,
+    msgInp: '', //巡查详情
+    itemData: '', //单条数据
+    changeTwo: '', //是否异常
+    changeThree: '', //严重等级
   },
 
   handleChangeTwo(e) {
     this.setData({
       changeTwo: e.detail.value
     })
+    if (e.detail.value == 'normal') {
+      this.setData({
+        msgInp: '', //巡查详情
+        changeThree: '', //严重等级
+        imgs: []
+      })
+      return;
+    }
   },
 
   handleChangeThree(e) {
@@ -21,15 +38,21 @@ Page({
     })
   },
 
-  showModal() {
+  showModal(e) {
     this.setData({
-      showModal: true
+      showModal: true,
+      itemData: e.currentTarget.dataset.itemdata
     })
   },
 
   bindCancel() {
     this.setData({
-      showModal: false
+      showModal: false,
+      itemData: '',
+      msgInp: '', //巡查详情
+      changeTwo: '', //是否异常
+      changeThree: '', //严重等级
+      imgs: []
     })
   },
 
@@ -39,7 +62,10 @@ Page({
     var pics = [];
     var detailPics = that.data.imgs;
     if (detailPics.length >= 20) {
-      commonJs.showToast('最多选择20张图片上传');
+      wx.showToast({
+        title: '最多选择20张图片上传',
+        icon: 'none'
+      });
       return;
     }
     wx.chooseMedia({
@@ -48,14 +74,13 @@ Page({
       sizeType: ['original', 'compressed'], // original 原图，compressed 压缩图，默认二者都有
       sourceType: ['album', 'camera'], // album 从相册选图，camera 使用相机，默认二者都有
       success: function (res) {
-        console.log(res);
         var imgs = res.tempFiles;
         for (var i = 0; i < imgs.length; i++) {
           if (res.tempFiles[i].size > 15728640) {
             commonJs.showToast('图片大于15M，不可上传');
             return;
           }
-          pics.push(imgs[i])
+          pics.push(imgs[i].tempFilePath)
         }
         that.uploadimg({
           url: getApp().globalData.webUrl + '_upload/attachments/project', //这里是你图片上传的接口
@@ -82,7 +107,8 @@ Page({
       success: (resp) => {
         wx.hideLoading();
         success++;
-        var str = resp.data //返回的结果，可能不同项目结果不一样
+        var str = JSON.parse(resp.data) //返回的结果，可能不同项目结果不一样
+        str = str.uploaded
         console.log(str);
         if (imgs.length >= 20) {
           that.setData({
@@ -90,7 +116,7 @@ Page({
           });
           return false;
         } else {
-          imgs.push(str);
+          imgs.push(that.data.imgUrl + str);
           that.setData({
             imgs: imgs
           })
@@ -138,6 +164,93 @@ Page({
     })
   },
 
+  // 巡查详情
+  bindInput: function (e) {
+    this.setData({
+      msgInp: e.detail.value
+    })
+  },
+
+  // 开始巡检录入
+  addPatrolRecord: function () {
+    let that = this;
+    let { itemData, imgs, msgInp, changeTwo, changeThree, dataList, imgUrl } = that.data;
+    let newImgs = imgs.map(i => {
+      i = i.replace(imgUrl, '');
+      return i;
+    })
+    if (changeTwo == 'abnormal') {
+      if (msgInp == '') {
+        wx.showToast({
+          title: '请填写巡查详情',
+          icon: 'none'
+        })
+        return;
+      }
+      if (changeThree == '') {
+        wx.showToast({
+          title: '请选择严重等级',
+          icon: 'none'
+        })
+        return;
+      }
+      let data = {
+        patrolPlanId: dataList.id,
+        lastInspectionTime: moment().format('YYYY-MM-DD'),
+        inspectionTime: moment().format('YYYY-MM-DD'),
+        points: {
+          user: dataList.user,
+          project: dataList.project,
+          frequency: dataList.frequency,
+          itemData: itemData,
+          msgInp: msgInp,
+          changeThree: changeThree == 'slight' ? '轻微' : changeThree == 'moderate' ? '中度' : '严重',
+          imgs: newImgs,
+        },
+        alarm: true
+      }
+      Request.post(addPatrolRecord(), data).then(res => {
+        wx.showToast({
+          title: '提交成功',
+        })
+        that.bindCancel();
+      })
+    } else {
+      if (changeTwo == 'normal') {
+        let data = {
+          patrolPlanId: dataList.id,
+          lastInspectionTime: moment().format('YYYY-MM-DD'),
+          inspectionTime: moment().format('YYYY-MM-DD'),
+          points: {
+            user: dataList.user,
+            project: dataList.project,
+            frequency: dataList.frequency,
+            itemData: itemData,
+          },
+          alarm: false
+        }
+        Request.post(addPatrolRecord(), data).then(res => {
+          wx.showToast({
+            title: '提交成功',
+          })
+          that.bindCancel();
+        })
+        return;
+      }
+      wx.showToast({
+        title: '提交信息不全，请检查',
+        icon: 'none'
+      })
+    }
+  },
+
+  // 获取巡检记录
+  getPatrolRecord: function () {
+    Request.get(getPatrolRecord(this.data.dataList.id)).then(res => {
+      console.log(res);
+    })
+  },
+
   // selfLocation() {
   //   const self = this
   //   wx.showLoading({
@@ -199,6 +312,7 @@ Page({
       dataList: data,
       points
     })
+    // that.getPatrolRecord()
   },
 
   /**

weapp/package/startInspection/startInspection.wxml

@@ -3,7 +3,7 @@
   <view class="titleFirst">巡检要求</view>
   <view class="txt">
     <view style="float: left;font-weight: bold;">结构物名称</view>
-    <view style="float:left;width:70%;margin-left:40rpx;">{{dataList.name}}</view>
+    <view style="float:left;width:70%;margin-left:40rpx;">{{dataList.project.name}}</view>
   </view>
   <view class="txt">
     <view style="float: left;font-weight: bold;">开始时间</view>
@@ -40,7 +40,7 @@
       <view class="txt" style="margin-bottom: 20rpx;">
         <view style="float: left;font-weight: bold;">巡检点位</view>
         <view style="float:left;width:55%;margin-left:40rpx;">{{item.name}}</view>
-        <view class="startBtn" bindtap="showModal">开始巡检</view>
+        <view class="startBtn" data-itemData="{{item}}" bindtap="showModal">开始巡检</view>
       </view>
       <view class="txt" style="margin-bottom: 20rpx;">
         <view style="float: left;font-weight: bold;">上次巡检日期</view>
@@ -62,24 +62,24 @@
     <view class="popBox">
       <view style="padding:20rpx 30rpx;overflow: hidden;">
         <view style="float: left;">当前点位：</view>
-        <view style="float:left;width: 75%;">点位A</view>
+        <view style="float:left;width:480rpx;text-align: justify;">{{itemData.name}}</view>
       </view>
       <view style="padding:20rpx 30rpx;overflow: hidden;">
         <view style="float: left;">当前位置：</view>
-        <view style="float:left;width: 75%;">点位A</view>
+        <view style="float:left;width:480rpx;text-align: justify;">点位A</view>
       </view>
       <radio-group style="padding:10px 15px;display:flex;justify-content: space-evenly;" bindchange="handleChangeTwo">
         <radio style="color:#1979ff;" color="#1979ff" value="normal">正常</radio>
         <radio style="color:#CC0000;" color="#CC0000" value="abnormal">异常</radio>
       </radio-group>
-      <textarea style="width: 84%;margin:0 auto;border:2rpx solid #ccc;padding:20rpx;height: 120rpx;border-radius: 10rpx;" placeholder="请输入巡查详情" maxlength="-1" wx:if="{{changeTwo == 'abnormal'}}"></textarea>
+      <textarea style="width: 84%;margin:0 auto;border:2rpx solid #ccc;padding:20rpx;height: 120rpx;border-radius: 10rpx;" placeholder="请输入巡查详情" maxlength="-1" wx:if="{{changeTwo == 'abnormal'}}" bindinput="bindInput"></textarea>
       <radio-group style="padding:10px 15px;display:flex;justify-content: space-evenly;" bindchange="handleChangeThree" wx:if="{{changeTwo == 'abnormal'}}">
         <radio style="color:#FF9900;" color="#FF9900" value="slight">轻微</radio>
         <radio style="color:#FF3300;" color="#FF3300" value="moderate">中度</radio>
         <radio style="color:#990000;" color="#990000" value="severity">严重</radio>
       </radio-group>
 
-      <view class="weui-uploader">
+      <view class="weui-uploader" style="padding: 20rpx 30rpx;height:350rpx;overflow-y:scroll;" wx:if="{{changeTwo == 'abnormal'}}">
         <view class="img-v weui-uploader__bd" style="overflow:hidden;">
           <view class='pic' wx:for="{{imgs}}" wx:for-item="item" wx:key="*this">
             <image class='weui-uploader__img showImg' src="{{item}}" data-index="{{index}}" mode="aspectFill" bindtap="previewImg">
@@ -95,7 +95,7 @@
 
       <view class="btnBox">
         <view class="cancel" bindtap="bindCancel">取消</view>
-        <view class="submit">提交</view>
+        <view class="submit" bindtap="addPatrolRecord">提交</view>
       </view>
     </view>
   </view>

weapp/pages/login/login.wxml

@@ -1,6 +1,9 @@
 <!--pages/login/login.wxml-->
 <view class='logo-container'>
-  <image class='logo' src='/images/logo.png' />
+  <image class='logo' src='/images/logo.png'>
+    <view style="font-size:32rpx;color:#2675F5;position:absolute;top:180rpx;left:48rpx;">您好，欢迎使用</view>
+    <view style="font-size:40rpx;color:#2675F5;position:absolute;top:244rpx;left:48rpx;font-weight:bold;">运维巡检平台～</view>
+  </image>
 </view>
 
 <view class="body-container" wx:if='{{!isAutoLogin}}'>

weapp/utils/getApiUrl.js

@@ -17,3 +17,13 @@ exports.getProjectList = () => {
 exports.getPatrolPlan = () => {
   return `/patrolPlan`
 }
+
+// 开始巡检录入
+exports.addPatrolRecord = () => {
+  return `/patrolRecord/add`
+}
+
+// 获取巡检记录
+exports.getPatrolRecord = (patrolPlanId, startTime, endTime, alarm) => {
+  return `/patrolRecord/${patrolPlanId}/${startTime}/${endTime}/${alarm}`
+}