safecheck-client 3.0.33-1 → 3.0.33-100

package/src/filiale/rongchuang/pc.js

@@ -5,6 +5,7 @@ import Vue from "vue";
 let specialComp = {
   // 计划管理用户
   'check-user-list': (resolve) => { require(['./pc/checkUserList'], resolve) },
+  'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) },
   'new-check-paper': (resolve) => { require(['./pc/NewCheckpaper'], resolve) },
 }
 exports.specialComp = specialComp

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)
@@ -469,10 +463,15 @@
         let that=this
         this.map = new AMap.Map('check_map', {
           zoom: 12,
+          center: [116.80030599999998, 37.65219],
+          showIndoorMap: false,
           viewMode: '2D',  //设置地图模式
           lang: 'zh_cn',  //设置地图语言类型
           zindex: 99
         });
+
+        let bounds = this.map.getBounds();
+        this.map.setLimitBounds(bounds);
         // 异步加载地图插件
         AMap.plugin(
           ['AMap.ToolBar','AMap.Geolocation','AMap.Geocoder'], () => {//异步加载插件

package/src/filiale/tongchuan/pc/checkUserList.vue

@@ -344,8 +344,8 @@
         },
         props:["selectplan","userlogin"],
         ready(){
-          this.$refs.paged.$refs.criteria.model.f_user_state='正常'
-          this.$refs.paged.$refs.criteria.model.f_endfile_time=Util.toStartDateYearString()
+          // this.$refs.paged.$refs.criteria.model.f_user_state='正常'
+          // this.$refs.paged.$refs.criteria.model.f_endfile_time=Util.toStartDateYearString()
           //this.$refs.paged.$refs.criteria.model.f_hasHousehold='未入户'
           this.setConList()
           this.loadpage()

package/src/filiale/weinan/android/PaperFeedback.vue

@@ -103,14 +103,14 @@
       <label>请输入超期原因:</label><br/>
       <textarea style="width: 100%;" v-model="paper.f_exceed_reason"></textarea>
     </div>
-    <div class="form-group col-md-12 col-sm-12 col-xs-12" :class="style__">
-      <div class="col-xs-6 col-sm-6">
-        <input type="checkbox" v-model="backlistisselect" :readonly="enabled"/><label class="text-left font" >限制该用户购气</label>
-      </div>
-      <div class="col-xs-6 col-sm-6">
-        <input type="checkbox" v-model="deletebacklistisselect" :readonly="deleteenabled"/><label class="text-left font" >取消该用户限制</label>
-      </div>
-    </div>
+<!--    <div class="form-group col-md-12 col-sm-12 col-xs-12" :class="style__">-->
+<!--      <div class="col-xs-6 col-sm-6">-->
+<!--        <input type="checkbox" v-model="backlistisselect" :readonly="enabled"/><label class="text-left font" >限制该用户购气</label>-->
+<!--      </div>-->
+<!--      <div class="col-xs-6 col-sm-6">-->
+<!--        <input type="checkbox" v-model="deletebacklistisselect" :readonly="deleteenabled"/><label class="text-left font" >取消该用户限制</label>-->
+<!--      </div>-->
+<!--    </div>-->
     <div class="form-group col-md-12 col-sm-12 col-xs-12" :class="style__" v-if="Vue.$appdata.getParam('安检天然气安全使用须知检查')=='是'">
       <div class="col-xs-12 col-sm-12">
         <input type="checkbox" v-model="paper.f_gas_guidelines" /><label class="text-left font" >天然气安全使用须知</label>