ソースを参照

发布会议信息选择巡检模板,会议巡检结构保存

xyg 3 年 前
コミット
6716f81bfd

+ 9 - 5
light-application-wx/pages/index-admin/index-admin.js

@@ -73,11 +73,15 @@ Page({
                     util.toast(res.data.msg);
                 } else {
                     let datas = res.data.data;
-                    that.setData({
-                        nextTitle: datas.title,
-                        nextTime: util.formatDate(datas.receptionTime),
-                        nextUnit: datas.receptionObject
-                    });
+                    if (datas) {
+                        that.setData({
+                            nextTitle: datas.title,
+                            nextTime: util.formatDate(datas.receptionTime),
+                            nextUnit: datas.receptionObject
+                        });
+                    } else {
+                        util.toast('暂无下一场会议');
+                    }
                 }
             }
         });

+ 1 - 1
light-application-wx/pages/index/index.js

@@ -75,7 +75,7 @@ Page({
                     util.toast(res.data.msg);
                 } else {
                     let datas = res.data.data;
-                    if (datas && datas.length > 0) {
+                    if (datas) {
                         that.setData({
                             nextMeeting: datas,
                             nextTitle: datas.title,

+ 59 - 12
light-application-wx/pages/information-release/information-release.js

@@ -14,26 +14,61 @@ Page({
         dateTime: null,
         dateTime1: null,
         startYear: new Date().getFullYear(),
-        endYear: new Date().getFullYear() + 5
+        endYear: new Date().getFullYear() + 5,
+        ids: [],
+        templetArr: [],
+        inspectionTemplate: '',
+        inspectionTemplateId: null
     },
 
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
+        let that = this;
         // 获取完整的年月日 时分秒,以及默认显示的数组
-        var obj1 = dateTimePicker.dateTimePicker(this.data.startYear, this.data.endYear);
+        var obj1 = dateTimePicker.dateTimePicker(that.data.startYear, that.data.endYear);
         // console.info(obj1)
         // 精确到分的处理,将数组的秒去掉
         var lastArray = obj1.dateTimeArray.pop();
         var lastTime = obj1.dateTime.pop();
-        this.setData({
+        that.setData({
             dateTimeArray: obj1.dateTimeArray,
             dateTimeArray: obj1.dateTimeArray,
             dateTime: obj1.dateTime,
             dateTime1: obj1.dateTime
         });
-        this.setTime();
+        that.setTime();
+
+        //查询巡检模板列表
+        util.get({
+            url: '/api/inspection/template/getByType',
+            header: {
+                'content-type': 'application/x-www-form-urlencoded'
+            },
+            data: {
+                type: 20
+            },
+            success: (res) => {
+                console.info(res);
+                wx.hideLoading();
+                if (res.data.code != 200) {
+                    util.toast(res.data.msg);
+                } else {
+                    let datas = res.data.data;
+                    let ids = [];
+                    let arr = [];
+                    for (let i in datas) {
+                        ids.push(datas[i].id);
+                        arr.push(datas[i].name);
+                    }
+                    that.setData({
+                        ids: ids,
+                        templetArr: arr
+                    });
+                }
+            }
+        });
     },
 
     /**
@@ -122,7 +157,12 @@ Page({
         });
     },
 
+    /**
+     * 提交保存会议信息
+     * @param {*} e 
+     */
     formSubmit: function (e) {
+        let that = this;
         console.info(e);
         let values = e.detail.value;
         if (!values.title) {
@@ -145,6 +185,11 @@ Page({
             util.toast('请输入接待人数');
             return false;
         }
+        values.inspectionTemplateId = that.data.inspectionTemplateId;
+        if (!values.inspectionTemplateId) {
+            util.toast('请选择巡检模板');
+            return false;
+        }
 
         util.post({
             url: '/api/meeting/info/addBean',
@@ -152,22 +197,24 @@ Page({
             success: function (res) {
                 console.info(res);
                 if (res.data.code == 200) {
-                    wx.showToast({
-                        title: '操作成功',
-                        icon: 'success'
-                    });
+                    util.toast(res.data.msg);
                     setTimeout(() => {
                         wx.navigateBack({
                             delta: -1,
                         });
                     }, 1000);
                 } else {
-                    wx.showToast({
-                        title: res.data.msg,
-                        icon: 'success'
-                    });
+                    util.toast(res.data.msg);
                 }
             }
         });
+    },
+
+    bindPickerChange: function (e) {
+        let that = this;
+        that.setData({
+            inspectionTemplate: that.data.templetArr[e.detail.value],
+            inspectionTemplateId: that.data.ids[e.detail.value]
+        });
     }
 })

+ 6 - 0
light-application-wx/pages/information-release/information-release.wxml

@@ -36,6 +36,12 @@
                 <view class="page-section-title">接待要求</view>
                 <textarea class="weui-input" name="receptionRequirement" placeholder="请输入接待要求"></textarea>
             </view>
+            <view class="page-section page-section-gap">
+                <view class="page-section-title">巡检模板</view>
+                <picker mode="selector" value="{{index}}" bindchange="bindPickerChange" range="{{templetArr}}">
+                    <input class="weui-input" name="inspectionTemplate" value="{{inspectionTemplate}}" placeholder="请选择巡检模板" disabled="true" />
+                </picker>
+            </view>
         </scroll-view>
         <view class="btn-area">
             <button class="submit-btn" formType="submit">提交</button>

+ 77 - 12
light-application-wx/pages/meeting-inspection-abnormal/meeting-inspection-abnormal.js

@@ -1,5 +1,6 @@
 // pages/meeting-inspection-abnormal/meeting-inspection-abnormal.js
 const app = getApp();
+const util = require('../../utils/util.js');
 Page({
 
     /**
@@ -8,14 +9,19 @@ Page({
     data: {
         imgPath: app.globalData.imgPath,
         path: app.globalData.path,
-        uploadList: ["https://scpic.chinaz.net/files/pic/pic9/201711/zzpic8396.jpg", "https://uploadfile.huiyi8.com/2016/0224/20160224041528239.jpg"],
+        uploadList: [],
+        ids: [],
+        desc: null,
+        inspectionProjectId: null,
     },
 
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
-
+        this.setData({
+            inspectionProjectId: options.inspectionProjectId
+        });
     },
 
     /**
@@ -72,25 +78,84 @@ Page({
     chooseImage: function () {
         let that = this;
         wx.chooseImage({
-            count: 9,
+            count: 1,
             success: function (res) {
-                let arr = that.data.uploadList;
-                arr.push(res.tempFilePaths);
-                that.setData({
-                    uploadList: arr
-                })
+                wx.uploadFile({
+                    filePath: res.tempFilePaths[0],
+                    name: 'file',
+                    url: that.data.path + '/api/upload/record/upload',
+                    header: {
+                        "Content-Type": "multipart/form-data",
+                        "Authorization": app.globalData.Authorization
+                    },
+                    formData: {
+                        fileType: 20
+                    },
+                    success(re) {
+                        let datas = JSON.parse(re.data);
+                        if (datas.code != 200) {
+                            util.toast(datas.msg);
+                        } else {
+                            let arr = that.data.uploadList;
+                            let ids = that.data.ids;
+                            arr.push(res.tempFilePaths[0]);
+                            ids.push(datas.data.id);
+                            that.setData({
+                                uploadList: arr,
+                                ids: ids
+                            });
+                        }
+                    }
+                });
             }
-        })
+        });
     },
+
     /**
      * 移除上传图片
      * @param {*} e 
      */
     removeImg: function (e) {
-        let arr = this.data.uploadList;
+        let that = this;
+        let arr = that.data.uploadList;
+        let ids = that.data.ids;
         arr.splice(e.target.dataset.index, 1);
+        ids.splice(e.target.dataset.index, 1);
+        that.setData({
+            uploadList: arr,
+            ids: ids
+        });
+    },
+
+    /**
+     * 获取描述内容
+     * @param {*} e 
+     */
+    forDescription: function (e) {
         this.setData({
-            uploadList: arr
-        })
+            desc: e.detail.value
+        });
+    },
+
+    /**
+     * 巡检结果不正常描述提交
+     */
+    submitAbnormal: function () {
+        let that = this;
+        let desc = that.data.desc;
+        if (!desc) {
+            util.toast('请输入结果描述');
+            return;
+        }
+        let obj = {
+            fileIds: that.data.ids,
+            inspectionProjectId: that.data.inspectionProjectId,
+            remark: desc,
+            result: 20,
+        }
+        wx.setStorageSync('inspectionResultItem', JSON.stringify(obj));
+        wx.navigateBack({
+            delta: -1,
+        });
     }
 })

+ 2 - 2
light-application-wx/pages/meeting-inspection-abnormal/meeting-inspection-abnormal.wxml

@@ -13,8 +13,8 @@
 </view>
 <view class="result-desc">
     <view>巡检结果描述</view>
-    <textarea class="desc" placeholder="请输入描述" placeholder-style="color:#999999;"></textarea>
+    <textarea class="desc" placeholder="请输入描述" placeholder-style="color:#999999;" bindinput="forDescription"></textarea>
 </view>
 <view class="bottom-save">
-    <view class="save-btn">提交</view>
+    <view class="save-btn" bindtap="submitAbnormal">提交</view>
 </view>

+ 15 - 30
light-application-wx/pages/meeting-inspection-history-detail/meeting-inspection-history-detail.js

@@ -1,46 +1,31 @@
 // pages/meeting-inspection-history-detail/meeting-inspection-history-detail.js
+const util = require('../../utils/util.js');
 Page({
 
     /**
      * 页面的初始数据
      */
     data: {
-        list: [{
-            name: '数字调音台(HuShan)',
-            status: '正常',
-            color: '#2EC3CD'
-        }, {
-            name: '数字调音台(ITC)',
-            status: '不正常',
-            color: '#E95543'
-        }, {
-            name: '音频处理器(ITC)',
-            status: '正常',
-            color: '#2EC3CD'
-        }, {
-            name: '功率放大器(7台)',
-            status: '正常',
-            color: '#2EC3CD'
-        }, {
-            name: '797电容话筒(2只)',
-            status: '正常',
-            color: '#2EC3CD'
-        }, {
-            name: '797电容话筒(32只)',
-            status: '正常',
-            color: '#2EC3CD'
-        }, {
-            name: '797电容话筒(21只)',
-            status: '正常',
-            color: '#2EC3CD'
-        }]
+        list: []
     },
 
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
-
+        util.post({
+            url: '/api/inspection/record/queryDetails',
+            header: {
+                'content-type': 'application/x-www-form-urlencoded'
+            },
+            data: {
+                id: options.id
+            },
+            success: (res) => {
+                console.info(res)
+                wx.hideLoading();
+            }
+        });
     },
 
     /**

+ 82 - 17
light-application-wx/pages/meeting-inspection-history/meeting-inspection-history.js

@@ -1,28 +1,41 @@
 // pages/meeting-inspection-history/meeting-inspection-history.js
+const util = require('../../utils/util.js');
 Page({
 
     /**
      * 页面的初始数据
      */
     data: {
-        list: [{
-            time: '2022-12-12',
-            username: '李海清',
-            normalNum: 12,
-            abnormalNum: 0
-        }, {
-            time: '2022-12-11',
-            username: '李海清',
-            normalNum: 12,
-            abnormalNum: 0
-        }]
+        current: 1,
+        size: 10,
+        total: 0,
+        list: []
     },
 
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
-
+        let that = this;
+        util.get({
+            url: '/api/inspection/record/list',
+            data: {
+                current: that.data.current,
+                size: that.data.size
+            },
+            success: function (res) {
+                console.info(res)
+                wx.hideLoading();
+                if (res.data.code != 200) {
+                    util.toast(res.data.msg);
+                } else {
+                    that.setData({
+                        total: res.data.data.total,
+                        list: res.data.data.records
+                    });
+                }
+            }
+        });
     },
 
     /**
@@ -57,14 +70,66 @@ Page({
      * 页面相关事件处理函数--监听用户下拉动作
      */
     onPullDownRefresh: function () {
-
+        let that = this;
+        that.setData({
+            current: 1,
+            list: []
+        });
+        util.get({
+            url: '/api/inspection/record/list',
+            data: {
+                current: that.data.current,
+                size: that.data.size
+            },
+            success: (res) => {
+                wx.hideLoading();
+                wx.stopPullDownRefresh();
+                if (res.data.code != 200) {
+                    util.toast(res.data.msg);
+                } else {
+                    that.setData({
+                        total: res.data.data.total,
+                        list: res.data.data.records
+                    });
+                }
+            }
+        });
     },
 
     /**
      * 页面上拉触底事件的处理函数
      */
     onReachBottom: function () {
-
+        let that = this;
+        let arr = that.data.list;
+        let page = that.data.current;
+        if (arr.length >= that.data.total) {
+            util.toast('没有更多数据了');
+            return;
+        }
+        that.setData({
+            current: ++page
+        });
+        util.get({
+            url: '/api/inspection/record/list',
+            data: {
+                current: that.data.current,
+                size: that.data.size
+            },
+            success: (res) => {
+                wx.hideLoading();
+                wx.stopPullDownRefresh();
+                console.info(res);
+                if (res.data.code != 200) {
+                    util.toast(res.data.msg);
+                } else {
+                    let list = res.data.data.records;
+                    that.setData({
+                        list: arr.concat(list)
+                    });
+                }
+            }
+        });
     },
 
     /**
@@ -73,14 +138,14 @@ Page({
     onShareAppMessage: function () {
 
     },
+
     /**
      * 查看详情
      * @param {*} e 
      */
     openDetail: function (e) {
         wx.navigateTo({
-            url: '../meeting-inspection-history-detail/meeting-inspection-history-detail',
-        })
-
+            url: '../meeting-inspection-history-detail/meeting-inspection-history-detail?id='+e.currentTarget.dataset.id,
+        });
     }
 })

+ 3 - 1
light-application-wx/pages/meeting-inspection-history/meeting-inspection-history.json

@@ -1,4 +1,6 @@
 {
   "usingComponents": {},
-  "navigationBarTitleText": "历史记录"
+  "navigationBarTitleText": "历史记录",
+  "enablePullDownRefresh": true,
+  "onReachBottomDistance": 50
 }

+ 4 - 4
light-application-wx/pages/meeting-inspection-history/meeting-inspection-history.wxml

@@ -1,15 +1,15 @@
 <!--pages/meeting-inspection-history/meeting-inspection-history.wxml-->
 <scroll-view class="list" croll-y="true">
-    <view class="item" wx:key="i" wx:for="{{list}}" bindtap="openDetail">
+    <view class="item" wx:key="i" wx:for="{{list}}" data-id="{{item.id}}" bindtap="openDetail">
         <view class="first">
-            <text class="time">{{item.time}}</text>
-            <text class="username">{{item.username}}</text>
+            <text class="time">{{item.createTime}}</text>
+            <text class="username">{{item.inspectionPersonnel}}</text>
         </view>
         <view class="second">
             <text class="normal-text">正常</text>
             <text class="normal-num">({{item.normalNum}})</text>
             <text class="abnormal-text">不正常</text>
-            <text class="abnormal-num">({{item.abnormalNum}})</text>
+            <text class="abnormal-num">({{item.errorNum}})</text>
         </view>
     </view>
 </scroll-view>

+ 71 - 7
light-application-wx/pages/meeting-inspection/meeting-inspection.js

@@ -7,9 +7,10 @@ Page({
      */
     data: {
         inspectionProjectList: [],
-        currentTab: 10,//10:会前 20:会中 30:会后
+        currentTab: 20,//20:会前 30:会中 40:会后
         meetingId: '',
-        inspectionResultList: []
+        inspectionResultList: [],
+        abnormalIndex: null,
     },
 
     /**
@@ -29,7 +30,6 @@ Page({
             },
             success: (res) => {
                 wx.hideLoading();
-                console.info(res);
                 if (res.data.code != 200) {
                     util.toast(res.data.msg);
                 } else {
@@ -53,7 +53,24 @@ Page({
      * 生命周期函数--监听页面显示
      */
     onShow: function () {
-
+        let that = this;
+        let item = wx.getStorageSync('inspectionResultItem');
+        if (item) {
+            let obj = JSON.parse(item);
+            let index = that.data.abnormalIndex;
+
+            that.data.inspectionProjectList[index].result = 20;
+            that.data.inspectionProjectList[index].color = '#E95543';
+            that.data.inspectionProjectList[index].results = '不正常';
+            let list = that.data.inspectionResultList;
+            list.push(obj);
+            that.setData({
+                inspectionProjectList: that.data.inspectionProjectList,
+                inspectionResultList: list,
+                abnormalIndex: null
+            });
+            wx.removeStorageSync('inspectionResultItem');
+        }
     },
 
     /**
@@ -121,8 +138,11 @@ Page({
      * @param {*} e 
      */
     abnormal: function (e) {
+        this.setData({
+            abnormalIndex: e.currentTarget.dataset.index
+        });
         wx.navigateTo({
-            url: '../meeting-inspection-abnormal/meeting-inspection-abnormal',
+            url: '../meeting-inspection-abnormal/meeting-inspection-abnormal?inspectionProjectId=' + e.currentTarget.dataset.id,
         })
     },
 
@@ -136,8 +156,52 @@ Page({
         });
     },
 
+    /**
+     * 提交巡检结果
+     */
     submitInspection: function () {
-        console.info(this.data.inspectionResultList)
-        console.info(this.data.meetingId)
+        let that = this;
+        let inspectionResultList = that.data.inspectionResultList;
+        if (!inspectionResultList || inspectionResultList.length < 1) {
+            util.toast('请选择巡检结果');
+            return;
+        }
+
+        wx.showModal({
+            cancelColor: 'cancelColor',
+            title: '巡检工程师',
+            showCancel: false,
+            editable: true,
+            placeholderText: '请输入姓名',
+            success: (res) => {
+                if (!res.content) {
+                    util.toast('请输入姓名');
+                    return;
+                } else {
+                    util.post({
+                        url: '/api/inspection/record/addBean',
+                        data: {
+                            meetingId: that.data.meetingId,
+                            inspectionType: that.data.currentTab,
+                            inspectionResultList: inspectionResultList,
+                            inspectionPersonnel: res.content
+                        },
+                        success: (res) => {
+                            wx.hideLoading();
+                            if (res.data.code != 200) {
+                                util.toast(res.data.msg);
+                            } else {
+                                util.toast(res.data.msg);
+                                setTimeout(() => {
+                                    wx.navigateBack({
+                                        delta: -1,
+                                    });
+                                }, 1000);
+                            }
+                        }
+                    });
+                }
+            }
+        });
     }
 })

+ 37 - 37
light-application-wx/pages/meeting-inspection/meeting-inspection.wxml

@@ -1,43 +1,43 @@
 <!--pages/meeting-inspection/meeting-inspection.wxml-->
 <view class="container">
-  <view class="head">
-    <view style="margin-left: 40rpx;" data-no="10" bindtap="switchTab">
-      <text class="{{currentTab==10?'select':'no-select'}}">会前</text>
-      <view class="sign-buju">
-        <view wx:if="{{currentTab==10}}" class="sign"></view>
-      </view>
-    </view>
-    <view data-no="20" bindtap="switchTab">
-      <text class="{{currentTab==20?'select':'no-select'}}">会中</text>
-      <view class="sign-buju">
-        <view wx:if="{{currentTab==20}}" class="sign"></view>
-      </view>
+    <view class="head">
+        <view style="margin-left: 40rpx;" data-no="20" bindtap="switchTab">
+            <text class="{{currentTab==20?'select':'no-select'}}">会前</text>
+            <view class="sign-buju">
+                <view wx:if="{{currentTab==20}}" class="sign"></view>
+            </view>
+        </view>
+        <view data-no="30" bindtap="switchTab">
+            <text class="{{currentTab==30?'select':'no-select'}}">会中</text>
+            <view class="sign-buju">
+                <view wx:if="{{currentTab==30}}" class="sign"></view>
+            </view>
+        </view>
+        <view data-no="40" bindtap="switchTab" style="margin-right: 40rpx;">
+            <text class="{{currentTab==40?'select':'no-select'}}">会后</text>
+            <view class="sign-buju">
+                <view wx:if="{{currentTab==40}}" class="sign"></view>
+            </view>
+        </view>
     </view>
-    <view data-no="30" bindtap="switchTab" style="margin-right: 40rpx;">
-      <text class="{{currentTab==30?'select':'no-select'}}">会后</text>
-      <view class="sign-buju">
-        <view wx:if="{{currentTab==30}}" class="sign"></view>
-      </view>
+    <view class="history-record-buju">
+        <view class="history-record" bindtap="history">历史记录</view>
     </view>
-  </view>
-  <view class="history-record-buju">
-    <view class="history-record" bindtap="history">历史记录</view>
-  </view>
-  <scroll-view scroll-y="true" class="body">
-    <view class="inspection-project" wx:for="{{inspectionProjectList}}" wx:key="i" wx:index="index">
-      <view>
-        <text class="project-name">{{item.name}}</text>
-        <view class="divider"></view>
-        <view class="buju">
-          <text class="status-title">设备运行状态</text>
-          <view class="buju1" wx:if="{{!item.result}}">
-            <view class="button" data-index="{{index}}" data-id="{{item.id}}" bindtap="abnormal">不正常</view>
-            <view class="button" data-index="{{index}}" data-id="{{item.id}}" bindtap="normal">正常</view>
-          </view>
-          <view wx:if="{{item.result}}" style="color: {{item.color}};">{{item.results}}</view>
+    <scroll-view scroll-y="true" class="body">
+        <view class="inspection-project" wx:for="{{inspectionProjectList}}" wx:key="i" wx:index="index">
+            <view>
+                <text class="project-name">{{item.name}}</text>
+                <view class="divider"></view>
+                <view class="buju">
+                    <text class="status-title">设备运行状态</text>
+                    <view class="buju1" wx:if="{{!item.result}}">
+                        <view class="button" data-index="{{index}}" data-id="{{item.id}}" bindtap="abnormal">不正常</view>
+                        <view class="button" data-index="{{index}}" data-id="{{item.id}}" bindtap="normal">正常</view>
+                    </view>
+                    <text class="results" wx:if="{{item.result}}" style="color: {{item.color}};">{{item.results}}</text>
+                </view>
+            </view>
         </view>
-      </view>
-    </view>
-  </scroll-view>
-  <button style="width:80%;" class="submit-button" bindtap="submitInspection">提交</button>
+    </scroll-view>
+    <button style="width:80%;" class="submit-button" bindtap="submitInspection">提交</button>
 </view>

+ 27 - 20
light-application-wx/pages/meeting-inspection/meeting-inspection.wxss

@@ -1,12 +1,12 @@
 /* pages/meeting-inspection/meeting-inspection.wxss */
 
-.container{
+.container {
   background-color: #F0F4F7;
   display: block;
   height: 100%;
 }
 
-.head{
+.head {
   background-color: #FFFFFF;
   display: inline-flex;
   justify-content: space-between;
@@ -14,41 +14,41 @@
   line-height: 100rpx;
 }
 
-.head .no-select{
+.head .no-select {
   color: #666666;
   font-size: 38rpx;
 }
 
-.head .select{
+.head .select {
   color: #333333;
   font-size: 40rpx;
 }
 
-.head .sign-buju{
+.head .sign-buju {
   display: flex;
   justify-content: center;
 }
 
-.head .sign{
+.head .sign {
   background-color: #E87126;
   width: 32rpx;
   height: 8rpx;
   border-radius: 6rpx;
 }
 
-.body{
+.body {
   margin-top: 20rpx;
   margin-bottom: 70rpx;
-  overflow-y:scroll;
+  overflow-y: scroll;
   height: calc(100vh - 330rpx);
 }
 
-.history-record-buju{
+.history-record-buju {
   display: flex;
   justify-content: flex-end;
 }
 
-.history-record{
+.history-record {
   margin-top: 20rpx;
   text-align: center;
   border-radius: 40rpx;
@@ -60,7 +60,7 @@
   border: 1rpx solid #CECECE;
 }
 
-.inspection-project{
+.inspection-project {
   margin-left: 40rpx;
   margin-right: 40rpx;
   background-color: #FFFFFF;
@@ -69,12 +69,12 @@
   margin-bottom: 10rpx;
 }
 
-.inspection-project .project-name{
+.inspection-project .project-name {
   line-height: 80rpx;
   margin-left: 30rpx;
 }
 
-.inspection-project .status-title{
+.inspection-project .status-title {
   margin-top: 10rpx;
   font-size: 22rpx;
   color: #999999;
@@ -82,24 +82,26 @@
   margin-left: 30rpx;
 }
 
-.inspection-project .divider{
+.inspection-project .divider {
   margin-top: 10rpx;
   border: 1rpx solid #EBE8E3;
   margin-left: 30rpx;
   margin-right: 30rpx;
 }
 
-.inspection-project .buju{
+.inspection-project .buju {
   display: flex;
-  justify-content:space-between;
+  justify-content: space-between;
+  align-items: center;
 }
 
-.inspection-project .buju1{
+.inspection-project .buju1 {
   display: flex;
-  justify-content:space-between;
+  justify-content: space-between;
+  align-items: center;
 }
 
-.inspection-project .button{
+.inspection-project .button {
   margin-top: 10rpx;
   text-align: center;
   border-radius: 40rpx;
@@ -111,7 +113,12 @@
   margin: 26rpx 30rpx 0 0;
 }
 
-.submit-button{
+.results {
+  line-height: 50rpx;
+  margin-right: 40rpx;
+}
+
+.submit-button {
   border-radius: 45rpx;
   background-color: #3D5C92;
   color: #FFFFFF;

+ 1 - 1
light-application-wx/pages/visit-agenda/visit-agenda.js

@@ -20,7 +20,7 @@ Page({
             item: item,
             title: item.title,
             receptionTime: util.formatDate(item.receptionTime, 'yyyy年MM月dd日 HH:mm'),
-            receptionDirector: item.receptionDirector
+            receptionContent: item.receptionContent
         });
     },
 

+ 1 - 1
light-application-wx/pages/visit-agenda/visit-agenda.wxml

@@ -12,6 +12,6 @@
             <view class="vertical" wx:if="{{item.desc != null && item.desc != ''}}"></view>
             <view class="desc" wx:if="{{item.desc != null && item.desc != ''}}">{{item.desc}}</view>
         </view> -->
-        <view>{{receptionDirector}}</view>
+        <view>{{receptionContent}}</view>
     </view>
 </view>