safecheck-client 3.0.33-92 → 3.0.33-95

package/src/components/planmanage/PlanManage.vue

@@ -576,7 +576,7 @@
         //查询安检员selectChanged
         async searchChecker(id){
           let res=await new HttpResetClass().load('POST', '/rs/search', {
-            source: `root.getResourceById($${this.userlogin.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1)`,
+            source: `root.getResourceById($${this.userlogin.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$)!=null ).where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1)`,
             userid: this.$login.f.id
           }, {resolveMsg: null, rejectMsg: null})
           let arr = []

package/src/filiale/tianke/pc/checkScreen.vue

@@ -232,26 +232,20 @@
         }
         let td=Util.toStandardDateString()
         //获取今天上传的所有隐患
-        let arr=await new HttpResetClass().load("POST", `rs/sql/defectDetails`, {data:{condition:` f_filialeid in ('${this.$login.f.orgid}') and f_upload_date>'${Util.toStartDateYearString()} 00:00:00' and f_longitude is not null`}},
+        let arr=await new HttpResetClass().load("POST", `rs/sql/defectDetails`, {data:{condition:` f_filialeid in ('${this.$login.f.orgid}') and f_upload_date>'${Util.toStandardDateString()} 00:00:00'`}},
           {resolveMsg: null, rejectMsg: null})
         //tag)
         if(arr.data){
           this.todayDefectList=[]
           arr.data.forEach((defect)=>{
-            //拿出今天的隐患放到今日隐患列表中
-            console.log("td",td)
-            console.log("defect",defect)
-            console.log("defect",defect)
             if(defect.f_upload_date.indexOf(td)!=-1){
               this.todayDefectList.push(defect)
             }
-            //取出一二三级隐患
-            console.log("二级隐患",defect.f_defect_level=='二级隐患')
-            if(defect.f_defect_level=='一级隐患'){
+            if(defect.f_defect_level.indexOf('一级') >=0){
               this.level1.push(defect)
-            }else if(defect.f_defect_level=='二级隐患'){
+            }else if(defect.f_defect_level.indexOf('二级') >=0){
               this.level2.push(defect)
-            }else if(defect.f_defect_level=='三级隐患'){
+            }else if(defect.f_defect_level.indexOf('三级') >=0){
               this.level3.push(defect)
             }else{
               this.problems.push(defect)