From 2b9cc8c8650cad1f76cd1e3140407c0c5d39df87 Mon Sep 17 00:00:00 2001
From: xiepeng <xiepeng@zcloudchina.com>
Date: Wed, 26 Jun 2024 17:53:35 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96=20=E9=A3=8E=E9=99=A9?=
 =?UTF-8?q?=E7=AE=A1=E6=8E=A7=E6=B8=85=E5=8D=95=20=E9=9A=90=E6=82=A3?=
 =?UTF-8?q?=E6=8E=92=E6=9F=A5=E6=B8=85=E5=8D=95=20=E4=BA=8C=E7=BB=B4?=
 =?UTF-8?q?=E7=A0=81=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom/list-item.vue                      |   4 +-
 .../hidden-trouble-uncheck.vue                |   6 +-
 pages/basics/home.vue                         | 124 +++++++++++++-----
 pages/news/home.vue                           |   1 +
 4 files changed, 98 insertions(+), 37 deletions(-)

diff --git a/pages/application/hidden-danger-check-standard/custom/list-item.vue b/pages/application/hidden-danger-check-standard/custom/list-item.vue
index 31f337f..d418757 100644
--- a/pages/application/hidden-danger-check-standard/custom/list-item.vue
+++ b/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">
diff --git a/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-uncheck.vue b/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-uncheck.vue
index 3a29d43..e86350a 100644
--- a/pages/application/hidden-trouble-investigation/hidden-trouble-app/hidden-trouble-uncheck.vue
+++ b/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]);
diff --git a/pages/basics/home.vue b/pages/basics/home.vue
index 9809289..c440f5e 100644
--- a/pages/basics/home.vue
+++ b/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 {
diff --git a/pages/news/home.vue b/pages/news/home.vue
index 2cfe42e..8f7c92a 100644
--- a/pages/news/home.vue
+++ b/pages/news/home.vue
@@ -384,6 +384,7 @@
                     duration: 1500
                   });
                   _this.getQuery()
+                  this.getTxData();
                 },
                 fail: (err) => {
                   uni.hideLoading();