BUG优化 风险管控清单 隐患排查清单 二维码功能

pages/application/hidden-danger-check-standard/custom/list-item.vue

@@ -3,9 +3,9 @@
 		<cu-custom bgColor="bg-gradual-blueness" :isBack="true" :isRingt="true">
 			<block slot="backText">返回</block>
 			<block slot="content">检查项目列表</block>
-			<block slot="right">
+<!--			<block slot="right">
 				<view @tap.stop="openAuth('CAMERA')">扫描</view>
-			</block>
+			</block>-->
 		</cu-custom>
 		<scroll-view scroll-y>
 			<view class="spot-list">

pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-uncheck.vue

@@ -245,10 +245,12 @@
 
               var content = res.data.varList;
               for(var i=0;i<content.length;i++){
-                if(content[i].checkCount==0){
+                /*if(content[i].checkCount==0){
                   this.list.push(content[i]);
                   this.totalList.push(content[i]);
-                }
+                }*/
+                this.list.push(content[i]);
+                this.totalList.push(content[i]);
                 /*else{
                   this.list1.push(content[i]);
                   this.totalList.push(content[i]);

pages/basics/basic-info/confirm.vue

@@ -88,7 +88,7 @@ import {
             if (res.data.pd) {
               uni.hideLoading();
               _this.form = res.data.pd;
-              console.log(_this.form)
+              console.log("111",_this.form)
               _this.$set(_this.form, 'REVIEW_RESULT', '');
             }
           }

pages/basics/home.vue

@@ -628,6 +628,7 @@ import {
 				triggered: false,
 				count: {},
 				totalList: [],
+        hiddenList: [],
 				SURVEY_ID: '',
 				IS_PUBLISH: '',
 				isGoodsEdit: false, // 是否加载编辑后的数据
@@ -1283,6 +1284,52 @@ import {
           }, 2000);
         }
       })
+
+      uni.request({
+
+        url: basePath + '/app/hiddenDangerCheckStandardCustom/checkList',
+        method: 'POST',
+        dataType: 'json',
+        header: {
+          'Content-type': 'application/x-www-form-urlencoded'
+        },
+        data: {
+          USER_NAME: loginUser.NAME,
+          CHECK_DEPARTMENT_ID: loginUser.DEPARTMENT_ID,
+          IS_MAIN: loginUser.ISMAIN,
+          CORPINFO_ID: loginUser.CORPINFO_ID,
+          USER_ID: loginUser.USER_ID,
+        },
+        success: (res) => {
+          if ("success" == res.data.result) {
+            uni.hideLoading();
+            var content = res.data.varList;
+            for (var i = 0; i < content.length; i++) {
+              if (content[i].checkCount == 0) {
+                this.totalList.push(content[i]);
+              } else {
+                this.totalList.push(content[i]);
+              }
+            }
+          } else {
+            uni.showToast({
+              icon: 'none',
+              title: '系统异常',
+              duration: 2000
+            });
+          }
+        },
+        fail: (res) => {
+          uni.showToast({
+            icon: 'none',
+            title: "服务器正在升级，请稍后再试。",
+            duration: 2000
+          });
+          setTimeout(function () {
+            plus.runtime.quit();
+          }, 2000);
+        }
+      })
     },
     // 获得滚动隐患
     getHiddenRoll() {
@@ -1399,7 +1446,13 @@ import {
             for (var i = 0; i < _this.totalList.length; i++) {
               if (_this.totalList[i].LISTMANAGER_ID == listId) {
                 flag = true;
-                _this.goToList({listId: _this.totalList[i].LISTMANAGER_ID, listName: _this.totalList[i].NAME});
+                if(_this.totalList[i].PERIOD) {
+                  _this.goToList({listId: _this.totalList[i].LISTMANAGER_ID, listName: _this.totalList[i].NAME});
+                  break;
+                }
+              } else if (_this.totalList[i].CUSTOM_ID == listId) {
+                flag = true;
+                _this.goTohidden({listId: _this.totalList[i].CUSTOM_ID, listName: _this.totalList[i].NAME});
                 break;
               }
             }
@@ -1454,40 +1507,45 @@ import {
     // 			});
     // 			// _this.goToList({listId:_this.totalList[i].LISTMANAGER_ID,listName:_this.totalList[i].NAME});
     // 		}
-    // 	});
-    // },
-    //跳转事件
-    goToexclude(e) {
-      this.$emit('setInit', true);
-      uni.navigateTo({
-        url: '/pages/basics/hidden-danger-exclude/exclude-list',
-      });
-    },
-    goToDanger(e) {
-      this.$emit('setInit', true);
-      uni.navigateTo({
-        url: '/pages/basics/danger-exclude/danger-exclude-list',
-      });
-    },
-    toSetinit(e) {
-      this.$emit('setInit', true);
-    },
-    //跳转事件
-    goToList(e) {
-      uni.navigateTo({
-        url: '/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-spot?listId=' + e.listId + '&listName=' + e.listName
-      });
-      // uni.navigateTo({
-      // 	url: '/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-list?listId='+e.listId+'&listName='+e.listName
-      // });
-    },
-    goToFace(userId) {
-      uni.navigateTo({
-        url: '/pages/basics/recognitionFace/index?userId=' + userId
-      });
+      // 	});
+      // },
+      //跳转事件
+      goToexclude(e) {
+        this.$emit('setInit', true);
+        uni.navigateTo({
+          url: '/pages/basics/hidden-danger-exclude/exclude-list',
+        });
+      },
+      goToDanger(e) {
+        this.$emit('setInit', true);
+        uni.navigateTo({
+          url: '/pages/basics/danger-exclude/danger-exclude-list',
+        });
+      },
+      toSetinit(e) {
+        this.$emit('setInit', true);
+      },
+      //跳转事件
+      goToList(e) {
+        uni.navigateTo({
+          url: '/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-spot?listId=' + e.listId + '&listName=' + e.listName
+        });
+        // uni.navigateTo({
+        // 	url: '/pages/application/hidden-trouble-investigation/hidden-trouble-app/check-items-list?listId='+e.listId+'&listName='+e.listName
+        // });
+      },
+      goTohidden(e) {
+        uni.navigateTo({
+          url: '/pages/application/hidden-danger-check-standard/custom/list-item?listId=' + e.listId + '&listName=' + e.listName
+        });
+      },
+      goToFace(userId) {
+        uni.navigateTo({
+          url: '/pages/basics/recognitionFace/index?userId=' + userId
+        });
+      }
     }
   }
-}
 </script>
 <style>
 .status_bar {

pages/news/home.vue

@@ -81,7 +81,6 @@
                     </view>
                     <view>
                       <text>{{item.TITLE}}</text>
-
                     </view>
 
 									</view>
@@ -175,8 +174,8 @@
 				tabCur :0,
 			}
 		},
-		mounted(e){
 
+    mounted(e){
 			this.getData();
 			let that=this;
 			let CustomBar = this.CustomBar;
@@ -237,6 +236,8 @@
 				}
 			  },
 			getData() {
+        this.getPcData();
+        this.getTxData();
 				var _this = this;
 				uni.showLoading({
 					title: '请稍候'
@@ -269,7 +270,6 @@
 					}
 				});
 			},
-
 			getPcData() {
 				var _this = this;
 				uni.showLoading({
@@ -337,16 +337,12 @@
         });
       },
 			//跳转事件
-			goToDetail(e) {
-
-			},
       goToTxDetail(e){
         uni.navigateTo({
           url: '/pages/news/notice-list-detail?id='+e+'&type=1',
         });
       },
 			goToPcDetail(e){
-        console.log(e)
         if(this.TabCur == 0) {
           uni.navigateTo({
             url: '/pages/news/notice-list-detail?id='+e+'&type=0',
@@ -388,6 +384,7 @@
                     duration: 1500
                   });
                   _this.getQuery()
+                  this.getTxData();
                 },
                 fail: (err) => {
                   uni.hideLoading();

pages/news/notice-list-detail.vue

@@ -49,8 +49,10 @@
 			this.type =e.type;
 			this.id=e.id;
 			this.getData();
-			console.log(e)
 		},
+    onShow(){
+      this.getData();
+    },
 		methods: {
 			getData() {
 				var _this = this;
@@ -61,7 +63,6 @@
 				if("1"==_this.type){
 					url =  basePath + '/app/notice/goEditForPc'
 				}
-				console.log("1111",_this.id)
 				uni.request({
 					url:url,
 					method: 'POST',