风险点下拉刷新 回弹处理

api/dangerApi.js

@@ -22,7 +22,7 @@ export function getDangerByPage(data) {
   return request({
     url: '/goaf/goafhdanger/page',
     method: 'GET',
-    params: data
+    data
   })
 }
 

api/task.js

@@ -109,4 +109,12 @@ export function goaftaskstatis(data) {
     method: 'GET',
 	data
   })
-}
+}
+// 任务统计
+export function goafhdangerstatis(data) {
+  return request({
+    url: "/goaf/goafhdangerstatis",
+    method: 'GET',
+	data
+  })
+}

config/index.js

@@ -1,12 +1,12 @@
 export default {
     base: {
-      dev: 'http://113.141.93.143:1688',
-      pro: 'http://113.141.93.143:1688'
+      dev: 'http://39.104.63.156:1688',
+      pro: 'http://39.104.63.156:1688'
     },
 	appID: '10001',
 	appKey: '82a8bf439373e305',
 	appSecret: '82a8bf439373e305',
 	permitTplId: 7,
 	TokenKey:"Authorization",
-	uploadFile:'http://113.141.93.143:1688'
+	uploadFile:'http://39.104.63.156:1688'
 }

libs/tool.js

@@ -39,6 +39,7 @@ export function toTreeText(data) {
 
 // 只能转换 4000 以下的正整数阿拉伯数字
 export function NumConvertLM(num) {
+	if(!num) return ''
   var Roman = [['', 'I', 'Ⅱ', 'Ⅲ', 'Ⅳ', 'Ⅴ', 'Ⅵ', 'Ⅶ', 'Ⅷ', 'Ⅸ'],
     ['', 'X', 'XX', 'XXX', 'XL', 'L', 'LX', 'LXX', 'LXXX', 'XC'],
     ['', 'C', 'CC', 'CCC', 'CD', 'D', 'DC', 'DCC', 'DCCC', 'CM'],

pages.json

@@ -10,14 +10,16 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "任务",
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true
 			}
 		},
 	    {
 			"path": "pages/risk/risk",
 			"style": {
 				"navigationBarTitleText": "风险",
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true
 			}
 	    }, 
 		{

pages/index/index.vue

@@ -43,7 +43,7 @@
 </template>
 
 <script>
-	import {getCheckTaskByList,goaftaskstatis} from '@/api/task.js'
+	import {getCheckTaskByList,goaftaskstatis,goafhdangerstatis} from '@/api/task.js'
 	import { NumConvertLM } from '@/libs/tool'
 	export default {
 		data() {

pages/risk/rectify/form/form.vue

@@ -191,7 +191,7 @@
 					this.groupList=items
 				})
 			},
-			getUser(groupId){
+			getUser(groupId=""){
 				getUserByPage({
 					page: 1,
 					limit: 999999,

pages/risk/rectify/history/index.vue

@@ -1,8 +1,7 @@
 <template>
 	<view class="reviewHistory">
 		<template v-if="items.length>0">
-			<uni-section title="历史记录" type="line" >
-			</uni-section>
+			<uni-section title="历史记录" type="line" ></uni-section>
 			<uni-group :title="item.activityInsTitle" mode="card" v-for="(item,index) in items" :key="index">
 				<uni-list >
 					<uni-list-item  title="处理时间" :right-text="item.actionTime"></uni-list-item>

pages/risk/review/form/form.vue

@@ -216,7 +216,7 @@
 					this.groupList=items
 				})
 			},
-			getUser(groupId){
+			getUser(groupId=""){
 				getUserByPage({
 					page: 1,
 					limit: 999999,

pages/risk/risk.vue

@@ -76,6 +76,8 @@
 					status:1,
 					accountId:undefined
 				},
+				page:1,
+				limit:10,
 				items:[]
 			}
 		},
@@ -86,7 +88,7 @@
 			this.accountId=accountId
 			this.groupId=groupId
 			this.init()
-			this.getData()
+			this.getDangerByPage()
 		},
 		methods: {
 			formateGoafName({
@@ -105,6 +107,7 @@
 					tab_type=this.groupId
 				}
 				getDangerByList().then((res)=>{
+					console.log(res.data.filter(item=>item.status==4&&item['submit'+type]===tab_type).length)
 					this.statistics.review=res.data.filter(item=>item.status==1&&item['review'+type]===tab_type).length
 					this.statistics.rectify=res.data.filter(item=>item.status==2&&item['rectify'+type]===tab_type).length
 					this.statistics.accept=res.data.filter(item=>item.status==3&&item['accept'+type]===tab_type).length
@@ -112,9 +115,6 @@
 					this.statistics.revocation=res.data.filter(item=>item.status==-1&&item['submit'+type]===tab_type).length
 				})			
 			},
-			onPullDownRefresh (){
-				this.getData()
-			},
 			getData(){
 				let conditions={status:this.conditions.status}
 				let statusName="submit"
@@ -136,6 +136,7 @@
 			},
 			changeTab(type){
 				this.type=type
+				this.init()
 				this.getData()
 			},
 			changeStuas(status,name){
@@ -169,7 +170,38 @@
 				uni.navigateTo({
 					url
 				})
+			},
+			getDangerByPage(){
+				let page=this.page;
+				let conditions={status:this.conditions.status,page,limit:this.limit}
+				let statusName="submit"
+				if(this.conditions.status==1){
+					statusName="review"
+				}else if(this.conditions.status==2){
+					statusName="rectify"
+				}else if(this.conditions.status==3){
+					statusName="accept"
+				}
+				if(this.type==='user'){
+					conditions[statusName+"AccountId"]=this.accountId
+				}else{
+					conditions[statusName+"GroupId"]=this.groupId
+				}			
+				getDangerByPage(conditions).then((res)=>{
+					this.items=this.items.concat(this.items)
+					this.page++
+				})					
 			}
+		},
+		onPullDownRefresh() {
+			this.page=1;
+			this.getDangerByPage()
+			setTimeout(()=>{
+				uni.stopPullDownRefresh()
+			})
+		},
+		onReachBottom(){
+			this.getDangerByPage()
 		}
 	}
 </script>

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/766960c0-fae7-11ed-894e-099c41c3d457
+https://app.liuyingyong.cn/build/download/3b773730-19ad-11ef-a724-5bae5e4c0ab0

unpackage/cache/cloudcertificate/certini

@@ -0,0 +1,4 @@
+[General]
+andrCertfile=package.keystore
+andrCertAlias=__UNI__ED9AEA5
+andrCertPass="KAOu2VNBKFhfhJIQz/y+2w=="

unpackage/dist/dev/mp-weixin/pages/index/index.json

@@ -1,5 +1,6 @@
 {
   "navigationBarTitleText": "任务",
   "navigationStyle": "custom",
+  "enablePullDownRefresh": true,
   "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/mine/mine.js

@@ -224,7 +224,7 @@ var _default = {
           if (res.confirm) {
             (0, _user.logout)().then(function () {
               uni.clearStorageSync();
-              uni.navigateTo({
+              uni.reLaunch({
                 url: '/pages/login/login'
               });
             });

unpackage/dist/dev/mp-weixin/pages/risk/check/check.js

@@ -393,7 +393,7 @@ var _default = {
     return {
       formData: {
         'hdangerId': undefined,
-        'formCode': 'submit',
+        'formCode': 'accept',
         'hdangerTitle': '',
         // 隐患标题
         'dangerCatId': undefined,
@@ -403,7 +403,7 @@ var _default = {
         'hdangerDesc': '',
         // 描述
         'acceptRemark': "",
-        'submitTime': (0, _libs.parseTime)(new Date()),
+        'acceptTime': (0, _libs.parseTime)(new Date()),
         'dangerDeadline': '',
         // 截止时间
         'goafId': undefined,
@@ -477,7 +477,7 @@ var _default = {
       }).then(function () {
         //renshengkuduan !
         _this2.formData.status = 4;
-        _this2.formData.submitTime = (0, _libs.parseTime)(_this2.formData.submitTime);
+        _this2.formData.acceptTime = (0, _libs.parseTime)(_this2.formData.acceptTime);
         _this2.formData.dangerDeadline = (0, _libs.parseTime)(_this2.formData.dangerDeadline);
         (0, _dangerApi.updateDanger)(_this2.formData).then(function (resp) {
           uni.switchTab({

unpackage/dist/dev/mp-weixin/pages/risk/check/form/form.js

@@ -174,7 +174,7 @@ var _default = {
     return {
       formData: {
         'hdangerId': undefined,
-        'formCode': 'submit',
+        'formCode': 'accept',
         'hdangerTitle': '',
         // 隐患标题
         'dangerCatId': undefined,
@@ -184,7 +184,7 @@ var _default = {
         'hdangerDesc': '',
         // 描述
         'acceptRemark': "",
-        'submitTime': (0, _libs.parseTime)(new Date()),
+        'acceptTime': (0, _libs.parseTime)(new Date()),
         'dangerDeadline': '',
         // 截止时间
         'goafId': undefined,
@@ -258,7 +258,7 @@ var _default = {
       }).then(function () {
         //renshengkuduan !
         _this2.formData.status = 4;
-        _this2.formData.submitTime = (0, _libs.parseTime)(_this2.formData.submitTime);
+        _this2.formData.acceptTime = (0, _libs.parseTime)(_this2.formData.acceptTime);
         _this2.formData.dangerDeadline = (0, _libs.parseTime)(_this2.formData.dangerDeadline);
         (0, _dangerApi.updateDanger)(_this2.formData).then(function (resp) {
           uni.switchTab({

unpackage/dist/dev/mp-weixin/pages/risk/rectify/form/form.js

@@ -184,7 +184,7 @@ var _default = {
     return {
       formData: {
         'hdangerId': undefined,
-        'formCode': 'submit',
+        'formCode': 'rectify',
         'hdangerTitle': '',
         // 预警标题
         'dangerCatId': undefined,
@@ -193,7 +193,7 @@ var _default = {
         // 预警等级
         'rectifyRemark': '',
         // 描述
-        'submitTime': (0, _libs.parseTime)(new Date()),
+        'rectifyTime': (0, _libs.parseTime)(new Date()),
         'dangerDeadline': '',
         // 截止时间
         'goafId': undefined,
@@ -318,7 +318,7 @@ var _default = {
                   if (flow.curActivityCode === 'accept') {
                     _this2.formData.status = 3;
                   }
-                  _this2.formData.submitTime = (0, _libs.parseTime)(_this2.formData.submitTime);
+                  _this2.formData.rectifyTime = (0, _libs.parseTime)(_this2.formData.rectifyTime);
                   _this2.formData.dangerDeadline = (0, _libs.parseTime)(_this2.formData.dangerDeadline);
                   (0, _dangerApi.updateDanger)(_this2.formData).then(function (resp) {
                     uni.switchTab({
@@ -356,8 +356,9 @@ var _default = {
         _this3.groupList = items;
       });
     },
-    getUser: function getUser(groupId) {
+    getUser: function getUser() {
       var _this4 = this;
+      var groupId = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "";
       (0, _user.getUserByPage)({
         page: 1,
         limit: 999999,

unpackage/dist/dev/mp-weixin/pages/risk/rectify/history/index.js

@@ -218,7 +218,6 @@ exports.default = void 0;
 //
 //
 //
-//
 var _default = {
   name: "reviewHistory",
   data: function data() {

unpackage/dist/dev/mp-weixin/pages/risk/rectify/rectify.js

@@ -404,7 +404,7 @@ var _default = {
     return {
       formData: {
         'hdangerId': undefined,
-        'formCode': 'submit',
+        'formCode': 'rectify',
         'hdangerTitle': '',
         // 预警标题
         'dangerCatId': undefined,
@@ -413,7 +413,7 @@ var _default = {
         // 预警等级
         'rectifyRemark': '',
         // 描述
-        'submitTime': (0, _libs.parseTime)(new Date()),
+        'rectifyTime': (0, _libs.parseTime)(new Date()),
         'dangerDeadline': '',
         // 截止时间
         'goafId': undefined,
@@ -538,7 +538,7 @@ var _default = {
                   if (flow.curActivityCode === 'accept') {
                     _this2.formData.status = 3;
                   }
-                  _this2.formData.submitTime = (0, _libs.parseTime)(_this2.formData.submitTime);
+                  _this2.formData.rectifyTime = (0, _libs.parseTime)(_this2.formData.rectifyTime);
                   _this2.formData.dangerDeadline = (0, _libs.parseTime)(_this2.formData.dangerDeadline);
                   (0, _dangerApi.updateDanger)(_this2.formData).then(function (resp) {
                     uni.switchTab({
@@ -576,8 +576,9 @@ var _default = {
         _this3.groupList = items;
       });
     },
-    getUser: function getUser(groupId) {
+    getUser: function getUser() {
       var _this4 = this;
+      var groupId = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "";
       (0, _user.getUserByPage)({
         page: 1,
         limit: 999999,

unpackage/dist/dev/mp-weixin/pages/risk/review/form/form.js

@@ -190,7 +190,7 @@ var _default = {
     return {
       formData: {
         'hdangerId': undefined,
-        'formCode': 'submit',
+        'formCode': 'review',
         'hdangerTitle': '',
         // 预警标题
         'dangerCatId': undefined,
@@ -200,7 +200,7 @@ var _default = {
         'reviewRemark': '',
         // 描述
         'hdangerDesc': "",
-        'submitTime': (0, _libs.parseTime)(new Date()),
+        'reviewTime': (0, _libs.parseTime)(new Date()),
         'dangerDeadline': '',
         // 截止时间
         'goafId': undefined,
@@ -365,7 +365,7 @@ var _default = {
                   if (flow.curActivityCode === 'accept') {
                     _this3.formData.status = 3;
                   }
-                  _this3.formData.submitTime = (0, _libs.parseTime)(_this3.formData.submitTime);
+                  _this3.formData.reviewTime = (0, _libs.parseTime)(_this3.formData.reviewTime);
                   _this3.formData.dangerDeadline = (0, _libs.parseTime)(_this3.formData.dangerDeadline);
                   (0, _dangerApi.updateDanger)(_this3.formData).then(function (resp) {
                     uni.switchTab({
@@ -403,8 +403,9 @@ var _default = {
         _this4.groupList = items;
       });
     },
-    getUser: function getUser(groupId) {
+    getUser: function getUser() {
       var _this5 = this;
+      var groupId = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "";
       (0, _user.getUserByPage)({
         page: 1,
         limit: 999999,

unpackage/dist/dev/mp-weixin/pages/risk/review/review.js

@@ -410,7 +410,7 @@ var _default = {
     return {
       formData: {
         'hdangerId': undefined,
-        'formCode': 'submit',
+        'formCode': 'review',
         'hdangerTitle': '',
         // 预警标题
         'dangerCatId': undefined,
@@ -420,7 +420,7 @@ var _default = {
         'reviewRemark': '',
         // 描述
         'hdangerDesc': "",
-        'submitTime': (0, _libs.parseTime)(new Date()),
+        'reviewTime': (0, _libs.parseTime)(new Date()),
         'dangerDeadline': '',
         // 截止时间
         'goafId': undefined,
@@ -585,7 +585,7 @@ var _default = {
                   if (flow.curActivityCode === 'accept') {
                     _this3.formData.status = 3;
                   }
-                  _this3.formData.submitTime = (0, _libs.parseTime)(_this3.formData.submitTime);
+                  _this3.formData.reviewTime = (0, _libs.parseTime)(_this3.formData.reviewTime);
                   _this3.formData.dangerDeadline = (0, _libs.parseTime)(_this3.formData.dangerDeadline);
                   (0, _dangerApi.updateDanger)(_this3.formData).then(function (resp) {
                     uni.switchTab({
@@ -623,8 +623,9 @@ var _default = {
         _this4.groupList = items;
       });
     },
-    getUser: function getUser(groupId) {
+    getUser: function getUser() {
       var _this5 = this;
+      var groupId = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "";
       (0, _user.getUserByPage)({
         page: 1,
         limit: 999999,

unpackage/dist/dev/mp-weixin/pages/risk/risk.js

@@ -239,6 +239,8 @@ var _default = {
         status: 1,
         accountId: undefined
       },
+      page: 1,
+      limit: 10,
       items: []
     };
   },
@@ -249,7 +251,7 @@ var _default = {
     this.accountId = accountId;
     this.groupId = groupId;
     this.init();
-    this.getData();
+    this.getDangerByPage();
   },
   methods: {
     formateGoafName: function formateGoafName(_ref) {
@@ -285,9 +287,6 @@ var _default = {
         }).length;
       });
     },
-    onPullDownRefresh: function onPullDownRefresh() {
-      this.getData();
-    },
     getData: function getData() {
       var _this2 = this;
       var conditions = {
@@ -349,7 +348,40 @@ var _default = {
       uni.navigateTo({
         url: url
       });
+    },
+    getDangerByPage: function getDangerByPage() {
+      var _this3 = this;
+      var page = this.page;
+      var conditions = {
+        status: this.conditions.status,
+        page: page,
+        limit: this.limit
+      };
+      var statusName = "submit";
+      if (this.conditions.status == 1) {
+        statusName = "review";
+      } else if (this.conditions.status == 2) {
+        statusName = "rectify";
+      } else if (this.conditions.status == 3) {
+        statusName = "accept";
+      }
+      if (this.type === 'user') {
+        conditions[statusName + "AccountId"] = this.accountId;
+      } else {
+        conditions[statusName + "GroupId"] = this.groupId;
+      }
+      (0, _dangerApi.getDangerByPage)(conditions).then(function (res) {
+        _this3.items = _this3.items.concat(_this3.items);
+        _this3.page++;
+      });
     }
+  },
+  onPullDownRefresh: function onPullDownRefresh() {
+    this.page = 1;
+    this.getDangerByPage();
+  },
+  onReachBottom: function onReachBottom() {
+    this.getDangerByPage();
   }
 };
 exports.default = _default;

unpackage/dist/dev/mp-weixin/pages/risk/risk.json

@@ -1,5 +1,6 @@
 {
   "navigationBarTitleText": "风险",
   "navigationStyle": "custom",
+  "enablePullDownRefresh": true,
   "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -13,6 +13,13 @@
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "首页",
+          "pathName": "pages/index/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }