提交代码

miniprogram/api/projectFiles.js

@@ -0,0 +1,19 @@
+import {request} from '../utils/request'
+
+// 项目文件传达列表
+export function fileList(data){
+	return request({
+		url: '/wechat/projectFiles/list',
+		method: 'get',
+		data: data
+	})
+}
+
+// 根据条件统计项目文件传达
+export function findCountByType(data){
+	return request({
+		url: '/wechat/projectFiles/findCountByType',
+		method: 'get',
+		data: data
+	})
+}

miniprogram/app.js

@@ -29,10 +29,10 @@ App({
     userProjectId:'',
     appId: "wx9997d071b4996f23",    
     // 智慧工地后台接口访问域名
-    reqUrl:'https://szgcwx.jhncidg.com',
+    //reqUrl:'https://szgcwx.jhncidg.com',
-    //reqUrl:'http://127.0.0.1:8091',
+    reqUrl:'http://127.0.0.1:8091',
-    uploadUrl:"https://szgcwx.jhncidg.com/wechat",
+    //uploadUrl:"https://szgcwx.jhncidg.com/wechat",
-    //uploadUrl:'http://127.0.0.1:8091/wechat',
+    uploadUrl:'http://127.0.0.1:8091/wechat',
 
     //御景路数字化集成管控平台接口访问域名
     szhUrl:'https://szh.makalu.cc',

miniprogram/app.json

@@ -107,7 +107,8 @@
                 "project_deptWorks/list/index",
                 "project_standard/list/index",
                 "project_standard/add/index",
-                "project_standard/info/index"
+                "project_standard/info/index",
+                "project_files/index"
             ],
             "independent": false
         }

miniprogram/config.js

@@ -3,6 +3,6 @@ module.exports = {
 	timeout: 60000,
 	appId: "wx9997d071b4996f23", 
 	baseUrl: 'https://szgcwx.jhncidg.com',
-	//baseUrl: 'http://127.0.0.1:8091',
+	baseUrl: 'http://127.0.0.1:8091',
 	noSecuritys:['/wechat/captchaImage','/wxApi/login']
 };

miniprogram/pageage/project_files/index.js

@@ -0,0 +1,222 @@
+import {
+    fileList,
+    findCountByType,
+} from '../../api/projectFiles'
+
+const app = getApp();
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        initData: {},
+        listData: [],
+        qbCount: 0,
+        sjbmCount: 0,
+        jtgsCount: 0,
+        zgsCount: 0,
+        activeState: "1",
+        pageNum: 1,
+        pageSize: 10,
+        lastDataSize: 10,
+        list: [],
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        this.setData({
+            initData: {
+                text: app.globalData.projectName,
+                id: app.globalData.projectId
+            },
+            pageNum: 1,
+            pageSize: 10,
+            lastDataSize: 10,
+            listData: []
+        })
+        this.getListData();
+    },
+
+    /**
+     * 查询文件列表
+     */
+    getListData() {
+        //进入这里说明数据加载完毕
+        if (this.data.lastDataSize < this.data.pageSize) {
+            //app.toast("已经到底了，暂无可继续加载数据!")
+            return;
+        }
+        let that = this;
+        this.queryCount();
+        fileList({
+            fileBelong: this.data.activeState,
+            pageNum: this.data.pageNum,
+            pageSize: this.data.pageSize
+        }).then(res => {
+            //这里处理this.data.lastDataSize=this.data.pageSize
+            if (that.data.list.length > 0 && res.rows.length > 0 && that.data.list[0].id == res.rows[0].id) {
+                that.setData({
+                    lastDataSize: 0,
+                })
+            } else {
+                that.setData({
+                    pageNum: that.data.pageNum + 1,
+                    lastDataSize: res.rows.length,
+                    list: res.rows,
+                    listData: that.data.listData.concat(res.rows)
+                })
+            }
+        });
+    },
+
+        /**
+     * 统计文件传达
+     */
+    queryCount() {
+        let that = this;
+        findCountByType({}).then(res => {
+            if (res.data.length > 0) {
+                let sjbm = 0,
+                    jtgs = 0,
+                    zgs = 0;
+                res.data.forEach(item => {
+                    if (item.fileBelong == "1") {
+                        sjbm += item.total;
+                    } else if (item.fileBelong == "2") {
+                        jtgs += item.total;
+                    } else {
+                        zgs += item.total;
+                    }
+                });
+                that.setData({
+                    sjbmCount: sjbm,
+                    jtgsCount: jtgs,
+                    zgsCount: zgs
+                })
+            }
+        });
+    },
+
+    /**
+     * 加载新数据
+     */
+    onScrollToLower() {
+        console.log("滚动条到底了，开始加载新数据");
+        this.getListData();
+    },
+
+    /**
+     * 下载并打开文档
+     * @param {*} e 
+     */
+    openFile: function (e) {
+        let {
+            filePath
+        } = e.currentTarget.dataset.set
+        wx.downloadFile({
+            // 示例 url，并非真实存在
+            url: app.globalData.uploadUrl + '/common/download/resource?resource=' + filePath,
+            success: function (res) {
+                const _path = res.tempFilePath
+                let fpt = _path.split(".");
+                wx.openDocument({
+                    filePath: _path,
+                    fileType: fpt[fpt.length - 1],
+                    success: function (res) {
+                        console.log('打开文档成功')
+                    },
+                    fail: function (res) {
+                        console.log(res)
+                    }
+                })
+            }
+        })
+        //app.toast("暂不支持下载！如需下载请前往后台管理系统！！")
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    },
+    /**
+     * 标签切换
+     */
+    trainingTypeJump(e) {
+        let index = e.currentTarget.dataset.index;
+        this.setData({
+            activeState: index + '',
+            pageNum: 1,
+            pageSize: 10,
+            lastDataSize: 10,
+            list: [],
+            listData: [],
+        });
+
+        this.getListData();
+    },
+
+    /**
+     * 项目切换
+     * @param {*} e 
+     */
+    onProjectSelect(e) {
+        let projectId = e.detail.id;
+        let projectName = e.detail.text;
+        app.globalData.projectId = projectId;
+        app.globalData.projectName = projectName;
+        this.onLoad();
+    },
+
+    returnToPage: function () {
+        wx.redirectTo({
+            url: '../../pages/safety_manage/index',
+        })
+    }
+})

miniprogram/pageage/project_files/index.json

@@ -0,0 +1,7 @@
+{
+    "usingComponents": {
+        "van-row": "@vant/weapp/row",
+        "van-col": "@vant/weapp/col"
+      },
+    "navigationStyle":"custom"
+}

miniprogram/pageage/project_files/index.wxml

@@ -0,0 +1,65 @@
+<view class="header_title">
+	<view class="header_title_row">
+		<van-row>
+			<van-col span="4">
+				<view class="header_img" bindtap="returnToPage">
+					<image src="/images/left.png"></image>
+				</view>
+			</van-col>
+			<van-col span="15">
+				<view class="header_name">文件传达查看</view>
+			</van-col>
+		</van-row>
+	</view>
+</view>
+<scroll-view class="max_content_scroll" type="list" scroll-y bindscrolltolower="onScrollToLower">
+	<project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
+	<view class="modify_video_nav" style="margin-top: 5rpx;">
+		<view class="{{activeState=='1'?'active':''}}" bindtap="trainingTypeJump" data-index="1"><text>上级部门（{{sjbmCount}}）</text></view>
+		<view class="{{activeState=='2'?'active':''}}" bindtap="trainingTypeJump" data-index="2"><text>集团公司（{{jtgsCount}}）</text></view>
+		<view class="{{activeState=='3'?'active':''}}" bindtap="trainingTypeJump" data-index="3"><text>子公司（{{zgsCount}}）</text></view>
+	</view>
+	<view class="inspect_max_scroll">
+		<!--专项检查样式zxjc-->
+		<view class="inspect_for_scroll" v-if="{{ listData.length>0 }}" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="openFile">
+			<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">{{index < 9 ?'0'+(index+1):(index+1)}}</view>
+								<view class="module_title module_title_flex inspect_list_title_text" wx:if="{{item.fileBelong=='1'}}">上级部门</view>
+								<view class="module_title module_title_flex inspect_list_title_text" wx:if="{{item.fileBelong=='2'}}">集团公司</view>
+								<view class="module_title module_title_flex inspect_list_title_text" wx:if="{{item.fileBelong=='3'}}">子公司</view>
+						</view>
+					</view>
+					<view class="inspect_list_info">
+						<view class="inspect_list_info_details">
+							<view class="inspect_list_info_img">
+								<van-image wx:if="{{item.fileType=='PDF'}}" width="120rpx" height="120rpx" fit="cover" src="https://szgcwx.jhncidg.com/staticFiles/icon/pdf.png" />
+								<van-image wx:if="{{item.fileType=='XLS' || item.fileType=='XLSX'}}" width="120rpx" height="120rpx" fit="cover" src="https://szgcwx.jhncidg.com/staticFiles/img/base/XLSX.png" />
+								<van-image wx:if="{{item.fileType=='DOC' || item.fileType=='DOCX'}}" width="120rpx" height="120rpx" fit="cover" src="https://szgcwx.jhncidg.com/staticFiles/img/base/doc.png" />
+							</view>
+							<view class="inspect_list_info_data">
+								<view class="inspect_list_info_data_prop color_blue">{{item.fileName}}</view>
+								<view class="inspect_list_info_data_prop">
+									<van-row>
+										<van-col span="18">
+											{{item.createTime}}
+										</van-col>
+										<van-col span="6" class="module_see_info_ear">
+											<van-icon name="eye-o" class="ss"></van-icon> {{item.readNum}}
+										</van-col>
+									</van-row>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</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>
+					<view style="color: #a5abbb;">暂无数据</view>
+				</view>
+			</view>
+		</view>
+</scroll-view>

miniprogram/pageage/project_files/index.wxss

@@ -0,0 +1,6 @@
+.module_see_info_ear {
+	color: #00a3ff;
+  }
+.ss{
+	top: 1rpx;
+}  

miniprogram/pages/login/index.wxss

@@ -56,12 +56,12 @@ page{
 }
 .login_logo{
   width: 100%;
-  height:80rpx;
+  height:100rpx;
-  margin-top: 100rpx;
   text-align: center;
 }
 .login_logo image{
-  height: 65rpx;
+  height: 70rpx;
+  margin-top: 30rpx;
 }
 
 .login_input .pass {

miniprogram/pages/project_flowable/detailTask/index.js

@@ -43,7 +43,19 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
-        let {deployId,procInsId,procDefName,deptName,nickName,taskId,taskName,projectName,userId,finishTime,ret} = options
+        let {
+            deployId,
+            procInsId,
+            procDefName,
+            deptName,
+            nickName,
+            taskId,
+            taskName,
+            projectName,
+            userId,
+            finishTime,
+            ret
+        } = options
         //获取缓存数据
         wx.getStorage({
             key: 'userinfo',
@@ -78,15 +90,27 @@ Page({
                 let list = this.data.flowNodes;
                 if (this.data.passState) {
                     if (flowNodeList[i].name == this.data.taskName) {
-                        list.push({id:flowNodeList[i].id,name:flowNodeList[i].name,state:'transact'});
+                        list.push({
+                            id: flowNodeList[i].id,
+                            name: flowNodeList[i].name,
+                            state: 'transact'
+                        });
                         this.setData({
                             passState: false
                         })
                     } else {
-                        list.push({id:flowNodeList[i].id,name:flowNodeList[i].name,state:'pass'});
+                        list.push({
+                            id: flowNodeList[i].id,
+                            name: flowNodeList[i].name,
+                            state: 'pass'
+                        });
                     }
                 } else {
-                    list.push({id:flowNodeList[i].id,name:flowNodeList[i].name,state:'none'});
+                    list.push({
+                        id: flowNodeList[i].id,
+                        name: flowNodeList[i].name,
+                        state: 'none'
+                    });
                 }
                 this.setData({
                     flowNodes: list
@@ -116,7 +140,11 @@ Page({
                     })
                     if (res.data.length > 0) {
                         let list = that.data.flowNodes;
-                        list.push({id:res.data[0].id,name:res.data[0].name,state:'pass'});
+                        list.push({
+                            id: res.data[0].id,
+                            name: res.data[0].name,
+                            state: 'pass'
+                        });
                         that.setData({
                             flowNodes: list
                         })
@@ -192,10 +220,16 @@ Page({
                         res.data.files.split(',').forEach(element => {
                             let ft = element.split('.');
                             if (that.data.imageType.indexOf(ft[ft.length - 1].toLowerCase()) > -1) {
-                            imageList.push({minPath:config.baseUrl+element,path:element});
+                                imageList.push({
+                                    minPath: config.baseUrl + element,
+                                    path: element
+                                });
                             } else {
                                 let it = element.split('/');
-                            filesData.push({name:it[it.length-1],path:element});
+                                filesData.push({
+                                    name: it[it.length - 1],
+                                    path: element
+                                });
                             }
                         });
                     }
@@ -482,7 +516,9 @@ Page({
 
     //展示图片详细
     showImg: function (e) {
-            let {path} = e.currentTarget.dataset.set
+        let {
+            path
+        } = e.currentTarget.dataset.set
         wx.previewImage({
             urls: this.data.imageList,
             current: path
@@ -494,7 +530,9 @@ Page({
      * @param {*} e 
      */
     downFile: function (e) {
-        let {path} = e.currentTarget.dataset.set
+        let {
+            path
+        } = e.currentTarget.dataset.set
         wx.downloadFile({
             // 示例 url，并非真实存在
             url: app.globalData.uploadUrl + '/common/download/resource?resource=' + path,

miniprogram/pages/project_flowable/initTask/index.js

@@ -26,6 +26,7 @@ Page({
         flowNodes: [],
         isFiles: false,
         imageInfoData: [],
+        active: "",
     },
 
     /**
@@ -73,7 +74,8 @@ Page({
                 let list = this.data.flowNodes;
                 list.push({
                     id: flowNodeList[i].id,
-                    name: flowNodeList[i].name
+                    name: flowNodeList[i].name,
+                    text: flowNodeList[i].name.length > 4 ? flowNodeList[i].name.substring(0, 4) : flowNodeList[i].name
                 });
                 this.setData({
                     flowNodes: list
@@ -105,7 +107,8 @@ Page({
                         let list = that.data.flowNodes;
                         list.push({
                             id: res.data[0].id,
-                            name: res.data[0].name
+                            name: res.data[0].name,
+                            text: res.data[0].name
                         });
                         that.setData({
                             flowNodes: list

miniprogram/pages/project_flowable/initTask/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/pages/project_flowable/initTask/index.wxml

@@ -14,11 +14,12 @@
     </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>
         </view>
-        <view class="gk_open" style="margin-top: 20rpx;border: 1px solid transparent;">
+        <!-- <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">
@@ -26,7 +27,7 @@
                     </view>
                 </van-collapse-item>
             </van-collapse>
-        </view>
+        </view> -->
         <view class="inspect_info_list">
             <view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">发起单位</view>
             <view class="inspect_info_content">
@@ -66,8 +67,11 @@
                 <file-uploader-all id="myImage" bindfiles="fileUpload" limit="{{limit}}" fileUrlArray="{{filesData}}"></file-uploader-all>
             </view>
         </view>
+        <view class="safety_inspect_title module_title_flex" wx:if="{{imageInfoData.length==0 || filesData.length==0}}">
+            <text class="color_orange">新版本默认上传图片，PDF文件从上方右侧切换上传。</text>
+        </view>
         <view class="safety_inspect_title module_title_flex" wx:if="{{imageInfoData.length>0 && filesData.length>0}}">
-            <text class="color_orange">已同时选择PDF文件和图片，将上传已选择的文件和图片。</text>
+            <text class="color_blue">已同时选择PDF文件和图片，将上传已选择的文件和图片。</text>
         </view>
         <view class="inspect_info_list">
             <view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">申请说明</view>

miniprogram/pages/project_flowable/initTask/index.wxss

@@ -70,3 +70,12 @@
     color:#8ca4ec ;
     border-width: 0px 0;
   }
+  .van-steps{
+    background-color: transparent !important;
+  }
+  .van-step--horizontal .van-step__circle-container{
+    background-color: transparent !important;
+  }
+  .van-steps--horizontal{
+    padding: 10px 20px !important;
+  }