safecheck-client 3.0.34-42 → 3.0.34-43

package/src/filiale/tongchuan/utils/EventListener.js

@@ -1,29 +1,29 @@
-const EventListener = {
-  /**
-   * Listen to DOM events during the bubble phase.
-   *
-   * @param {DOMEventTarget} target DOM element to register listener on.
-   * @param {string} eventType Event type, e.g. 'click' or 'mouseover'.
-   * @param {function} callback Callback function.
-   * @return {object} Object with a `remove` method.
-   */
-  listen(target, eventType, callback) {
-    if (target.addEventListener) {
-      target.addEventListener(eventType, callback, false)
-      return {
-        remove() {
-          target.removeEventListener(eventType, callback, false)
-        }
-      }
-    } else if (target.attachEvent) {
-      target.attachEvent('on' + eventType, callback)
-      return {
-        remove() {
-          target.detachEvent('on' + eventType, callback)
-        }
-      }
-    }
-  }
-}
-
-export default EventListener
+const EventListener = {
+  /**
+   * Listen to DOM events during the bubble phase.
+   *
+   * @param {DOMEventTarget} target DOM element to register listener on.
+   * @param {string} eventType Event type, e.g. 'click' or 'mouseover'.
+   * @param {function} callback Callback function.
+   * @return {object} Object with a `remove` method.
+   */
+  listen(target, eventType, callback) {
+    if (target.addEventListener) {
+      target.addEventListener(eventType, callback, false)
+      return {
+        remove() {
+          target.removeEventListener(eventType, callback, false)
+        }
+      }
+    } else if (target.attachEvent) {
+      target.attachEvent('on' + eventType, callback)
+      return {
+        remove() {
+          target.detachEvent('on' + eventType, callback)
+        }
+      }
+    }
+  }
+}
+
+export default EventListener

package/src/filiale/tongchuan/utils/coerceBoolean.js

@@ -1,7 +1,7 @@
-// Attempt to convert a string value to a Boolean. Otherwise, return the value
-// without modification so Vue can throw a warning.
-export default (val) => (typeof val !== "string" ? val :
-  val === "true" ? true :
-  val === "false" ? false :
-  val === "null" ? false :
-  val === "undefined" ? false : val)
+// Attempt to convert a string value to a Boolean. Otherwise, return the value
+// without modification so Vue can throw a warning.
+export default (val) => (typeof val !== "string" ? val :
+  val === "true" ? true :
+  val === "false" ? false :
+  val === "null" ? false :
+  val === "undefined" ? false : val)

package/src/filiale/weinan/pc/CheckBookSearchUserList.vue

@@ -56,6 +56,10 @@
             </div>
             <div class="form-group col-sm-4" >
               <button class="button_new" style="margin-right: 10px"  @click="$parent.$parent.showUserCondition()">更多条件</button>
+              <export-excel-safe :data="$parent.$parent.searchData"
+                                 :field="$parent.$parent.excelHeaders"
+                                 :choose-col="true"
+                                 sqlurl="rs/logic/SafeExportExcel" sql-name="FetchUserFileByOrgNoRuHuSXQ" template-name='安检筛选用户信息导出'></export-excel-safe>
               <button class="button_search" style="margin-right: 10px"  @click="search()">查询</button>
               <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.createAndSend()">下发</button>
             </div>
@@ -111,7 +115,7 @@
                       placeholder='请选择'
                       style="width:60%;text-align: center"
                       :disabled-days-of-week="[]"
-                      :format="'yyyy-MM-dd'"
+                      :format="'yyyy-MM-dd 00:00:00'"
                       :show-rest-button="reset"
                       :value.sync="model.f_check_start"
                       v-model="model.f_check_start">
@@ -123,7 +127,7 @@
                       placeholder='请选择'
                       :disabled-days-of-week="[]"
                       style="width:60%;text-align: center"
-                      :format="'yyyy-MM-dd'"
+                      :format="'yyyy-MM-dd 23:59:59'"
                       :show-rest-button="reset"
                       :value.sync="model.f_check_end"
                       v-model="model.f_check_end">
@@ -269,7 +273,31 @@ import {toStandardDateString} from "../../../components/Util";
 export default {
   title: '计划管理',
   data() {
+    let model = new PagedList('/rs/sql/FetchUserFileByOrgNoRuHuSXQ', 20, {
+        "orderitem": "'f_residential_area,f_building,f_unit,f_floor,f_room'",
+        "f_usertype": "''",
+        "month": "''",
+        "SafeCheckSX": 'this.SafeCheckSX',
+        "SafeCheckCQ": "''",
+        "startday":"''",
+        "endday":"''"})
+        model.SafeCheckSX = '1 = 1'
     return {
+      searchData: {
+        condition: "1=1",
+        orderitem: "f_residential_area,f_building,f_unit,f_floor,f_room",
+        SafeCheckSX:""
+      },
+      excelHeaders: {
+        'f_userinfo_code': '用户编号',
+        'f_user_name': '用户姓名',
+        'f_user_type': '用户类型',
+        'f_residential_area': '小区名称',
+        'f_last_check_date': '最后一次安检日期',
+        'f_last_check_state': '最后一次安检状态',
+        'f_address': '详细地址'
+      },
+      model: model,
       createPlan:{
         f_safecheck_type:"年度普检",
         checker:"",
@@ -285,14 +313,6 @@ export default {
       yearList:[{label:"2020",value:"2020"},{label:"2021",value:"2021"},{label:"2022",value:"2022"},{label:"2023",value:"2023"},{label:"2024",value:"2024"},{label:"2025",value:"2025"},{label:"2026",value:"2026"},{label:"2027",value:"2027"},{label:"2028",value:"2028"},{label:"2029",value:"2029"},{label:"2030",value:"2030"}],
       monthList:[{label:"1",value:"1"},{label:"2",value:"2"},{label:"3",value:"3"},{label:"4",value:"4"},{label:"5",value:"5"},{label:"6",value:"6"},{label:"7",value:"7"},{label:"8",value:"8"},{label:"9",value:"9"},{label:"10",value:"10"},{label:"11",value:"11"},{label:"12",value:"12"}],
       showCreatePlan:false,
-      model:new PagedList('/rs/sql/FetchUserFileByOrgNoRuHuSXQ', 20, {
-        "orderitem": "'f_residential_area,f_building,f_unit,f_floor,f_room'",
-        "f_usertype": "''",
-        "month": "''",
-        "SafeCheckSX": {"f_check_start": '', "f_check_end": ''},
-        "SafeCheckCQ": "''",
-        "startday":"''",
-        "endday":"''"}),
       a:'1',
       opt:[{label:"测试",value:"测试"}],
       showCondtion:false,
@@ -357,6 +377,7 @@ export default {
           f_filialeid:this.userlogin.orgid,
           f_subscribe_date:'',
           condition:this.model.condition,
+          SafeCheckSX: this.model.SafeCheckSX,
           switchCheckAll:true,
           checkAll:this.checkAll,
           param:this.checkes,
@@ -398,66 +419,42 @@ export default {
       this.excelUserCondtion=true
     },
     selfSearch (args) {
-      console.log(this.bookrow,"6666")
-      //tag)
-      // 判断时间和状态匹配条件
-      let f_last_check_state = ''
-
-      if(args.model.f_last_check_state.length > 0){
+      if(args.model.f_last_check_state.length > 0) {
         let zzcon = ''
-        if( Util.isEmpty(args.model.f_check_start) && Util.isEmpty(args.model.f_check_end)){
+        if (Util.isEmpty(args.model.f_check_start) || Util.isEmpty(args.model.f_check_end)) {
           this.$showMessage("选择安检状态时，需要选择安检时间区间！")
           return
         }
-        for(let i = 0;i<args.model.f_last_check_state.length;i++){
-          if(args.model.f_last_check_state[i] == '未检'){
-            let lscon = args.model.f_check_start ? ` or ui.f_last_check_date <= '${args.model.f_check_start} 00:00:00'` :''
-            lscon += lscon ? (args.model.f_check_end ? ` or ui.f_last_check_date >= '${args.model.f_check_end} 23:59:59'` :''): (args.model.f_check_end ? `ui.f_last_check_date >= '${args.model.f_check_end} 23:59:59'` :'')
-            if(i == args.model.f_last_check_state.length-1){
-              zzcon += `( ui.f_last_check_state is null or ua.f_last_check_state =''   ${lscon} ) `
-            }else{
-              zzcon += `( ui.f_last_check_state is null or ua.f_last_check_state =''  ${lscon} ) or `
+        this.model.SafeCheckSX = ` f_offsite_time > '${args.model.f_check_start}' and f_offsite_time < '${args.model.f_check_end}'`
+        for (let i = 0; i < args.model.f_last_check_state.length; i++) {
+          if (args.model.f_last_check_state[i] == '未检') {
+            zzcon += ' tcp.ruhu is null '
+            if (i != args.model.f_last_check_state.length - 1) {
+              zzcon += ' or'
             }
-          } else{
-            let lscon = args.model.f_check_start ? ` and ui.f_last_check_date >= '${args.model.f_check_start} 00:00:00'` :''
-            lscon += lscon ? (args.model.f_check_end ? ` and ui.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'') : (args.model.f_check_end ? ` ui.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'')
-            if(i == args.model.f_last_check_state.length-1){
-              zzcon += `(ui.f_last_check_state = '${args.model.f_last_check_state[i]}' ${lscon} ) `
-            }else{
-              zzcon += `(ui.f_last_check_state = '${args.model.f_last_check_state[i]}' ${lscon} ) or `
+          } else if (args.model.f_last_check_state[i] == '入户') {
+            zzcon += `tcp.ruhu > 0`
+            if (i != args.model.f_last_check_state.length - 1) {
+              zzcon += ' or'
+            }
+          } else if (args.model.f_last_check_state[i] == '拒检') {
+            zzcon += `(tcp.jujian > 0 and tcp.ruhu = 0 and tcp.daofang = 0) `
+            if (i != args.model.f_last_check_state.length - 1) {
+              zzcon += ' or'
+            }
+          } else if (args.model.f_last_check_state[i] == '到访不遇') {
+            zzcon += `(tcp.daofang > 0 and tcp.ruhu = 0 and tcp.jujian = 0) `
+            if (i != args.model.f_last_check_state.length - 1) {
+              zzcon += ' or'
             }
           }
         }
         args.condition += `and ( ${zzcon} )`
-      }else if(args.model.f_last_check_state.length == 0 && (!Util.isEmpty(args.model.f_check_start) || !Util.isEmpty(args.model.f_check_end) )){
-        let lscon = args.model.f_check_start ? ` and ui.f_last_check_date >= '${args.model.f_check_start} 00:00:00'` :''
-        lscon += lscon ? (args.model.f_check_end ? ` and ui.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'') : (args.model.f_check_end ? ` ui.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'')
-        args.condition += lscon
       }else{
-        console.log('这块无条件')
+        //无条件
+        this.model.SafeCheckSX = ` 1 != 1 `
       }
-
-      // if (!Util.isEmpty(args.model.f_last_check_state) && (!Util.isEmpty(args.model.f_check_start) || !Util.isEmpty(args.model.f_check_end) )){
-      //   if (args.model.f_last_check_state == '未检'){
-      //     var lscon = args.model.f_check_start ? ` or ua.f_last_check_date <= '${args.model.f_check_start} 00:00:00'` :''
-      //     lscon += lscon ? (args.model.f_check_end ? ` or ua.f_last_check_date >= '${args.model.f_check_end} 23:59:59'` :''): (args.model.f_check_end ? `ua.f_last_check_date >= '${args.model.f_check_end} 23:59:59'` :'')
-      //     args.condition +=`and (ua.f_last_check_state is null or ua.f_last_check_state =''  ${lscon} ) `
-      //   }else  {
-      //     var lscon = args.model.f_check_start ? ` and ua.f_last_check_date >= '${args.model.f_check_start} 00:00:00'` :''
-      //     lscon += lscon ? (args.model.f_check_end ? ` and ua.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'') : (args.model.f_check_end ? ` ua.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'')
-      //     args.condition += `and ua.f_last_check_state = '${args.model.f_last_check_state}' ${lscon}`
-      //   }
-      //
-      // }else if (Util.isEmpty(args.model.f_last_check_state) && (!Util.isEmpty(args.model.f_check_start) || !Util.isEmpty(args.model.f_check_end) )) {
-      //   var lscon = args.model.f_check_start ? ` and ua.f_last_check_date >= '${args.model.f_check_start} 00:00:00'` :''
-      //   lscon += lscon ? (args.model.f_check_end ? ` and ua.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'') : (args.model.f_check_end ? ` ua.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'')
-      //   args.condition += lscon
-      // }else if (!Util.isEmpty(args.model.f_last_check_state) && Util.isEmpty(args.model.f_check_start) && Util.isEmpty(args.model.f_check_end)){
-      //   this.$showMessage("选择安检状态时，需要选择安检时间区间！")
-      //   return
-      // }else{
-      //   console.log('这块无条件')
-      // }
+      this.searchData.SafeCheckSX =  this.model.SafeCheckSX
       let condition1=`(ui.f_last_check_date is null or ui.f_last_check_date ='')`
       let arge = args.condition.replace('从未安检',condition1)
       args.condition = arge
@@ -517,6 +514,7 @@ export default {
       this.cancel()
       this.checkes=[]
       this.checkAll=false
+      this.searchData.condition = args.condition
       this.model.search(args.condition, args.model, args.condValue)
     },
     showUserCondition(){

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

@@ -120,51 +120,6 @@
                     <input type="text" class="input_search" v-model="model.f_unit"
                            style="width: 60%" placeholder="请选择" condition="ua.f_unit='{}'">
                   </div>
-<!--                  <div class="form-group col-sm-4" >-->
-<!--                    <label class="font_normal_body">开户起始:</label>-->
-<!--                    <datepicker-->
-<!--                      placeholder='请选择'-->
-<!--                      style="width:60%"-->
-<!--                      :disabled-days-of-week="[]"-->
-<!--                      :format="'yyyy-MM-dd'"-->
-<!--                      :show-rest-button="reset"-->
-<!--                      :value.sync="model.f_startfile_time"-->
-<!--                      v-model="model.f_startfile_time"-->
-<!--                      condition="ui.f_createfile_date >= '{} 00:00:00'">-->
-<!--                    </datepicker>-->
-<!--                  </div>-->
-<!--                  <div class="form-group col-sm-4" >-->
-<!--                    <label class="font_normal_body">开户截止:</label>-->
-<!--                    <datepicker-->
-<!--                      placeholder='请选择'-->
-<!--                      :disabled-days-of-week="[]"-->
-<!--                      style="width:60%"-->
-<!--                      :format="'yyyy-MM-dd'"-->
-<!--                      :show-rest-button="reset"-->
-<!--                      :value.sync="model.f_endfile_time"-->
-<!--                      v-model="model.f_endfile_time"-->
-<!--                      condition="ui.f_createfile_date <= '{} 00:00:00'">-->
-<!--                    </datepicker>-->
-<!--                  </div>-->
-<!--                  <div class="form-group col-sm-4" >-->
-<!--                    <label class="font_normal_body">表&ensp;箱&ensp;号:</label>-->
-<!--                    <input type="text" class="input_search" v-model="model.f_metertitles"-->
-<!--                           style="width: 60%" placeholder="请选择" condition="uf.f_metertitles='{}'">-->
-<!--                  </div>-->
-<!--                  <div class="form-group col-sm-4" >-->
-<!--                    <label class="font_normal_body">抄&ensp;表&ensp;册:</label>-->
-<!--                    <v-select-->
-<!--                      class="select select_list"-->
-<!--                      :value.sync="model.f_meter_book_num"-->
-<!--                      v-model="model.f_meter_book_num"-->
-<!--                      :options='$parent.$parent.cbc'-->
-<!--                      placeholder='请选择'-->
-<!--                      condition="uf.f_meter_book_num='{}'"-->
-<!--                      close-on-select-->
-<!--                      value-single-->
-<!--                    >-->
-<!--                    </v-select>-->
-<!--                  </div>-->
                   <div class="form-group col-sm-4" >
                     <label class="font_normal_body">派发情况:</label>
                     <v-select
@@ -194,21 +149,6 @@
                     >
                     </v-select>
                   </div>
-<!--                  <div class="form-group col-sm-4" >-->
-<!--                    <label class="font_normal_body">安检情况:</label>-->
-<!--                    <v-select-->
-<!--                      class="select select_list"-->
-<!--                      :value.sync="model.checkState"-->
-<!--                      v-model="model.checkState"-->
-<!--                      :options='$parent.$parent.checkStateList'-->
-<!--                      placeholder='请选择'-->
-<!--                      condition="{}"-->
-<!--                      :search="false"-->
-<!--                      close-on-select-->
-<!--                      value-single-->
-<!--                    >-->
-<!--                    </v-select>-->
-<!--                  </div>-->
                   <div class="form-group col-sm-4" >
                     <label class="font_normal_body">安检片区:</label>
                     <v-select
@@ -223,31 +163,16 @@
                     >
                     </v-select>
                   </div>
-                  <!--<div class="form-group col-sm-4" >
-                    <label class="font_normal_body">入户情况:</label>
-                    <v-select
-                      class="select select_list"
-                      :value.sync="model.f_hasHousehold"
-                      v-model="model.f_hasHousehold"
-                      :options='$parent.$parent.hasHousehold'
-                      placeholder='请选择'
-                      close-on-select
-                      :search="false"
-                      value-single
-                    >
-                    </v-select>
-                  </div>-->
                   <div class="form-group col-sm-4" >
                     <label class="font_normal_body">安检起始:</label>
                     <datepicker
                       placeholder='请选择'
                       style="width:60%;text-align: center"
                       :disabled-days-of-week="[]"
-                      :format="'yyyy-MM-dd'"
+                      :format="'yyyy-MM-dd 00:00:00'"
                       :show-rest-button="reset"
                       :value.sync="model.f_check_start"
-                      v-model="model.f_check_start"
-                      condition="ui.f_last_check_date >='{} 00:00:00'">
+                      v-model="model.f_check_start">
                     </datepicker>
                   </div>
                   <div class="form-group col-sm-4" >
@@ -256,11 +181,10 @@
                       placeholder='请选择'
                       :disabled-days-of-week="[]"
                       style="width:60%;text-align: center"
-                      :format="'yyyy-MM-dd'"
+                      :format="'yyyy-MM-dd 23:59:59'"
                       :show-rest-button="reset"
                       :value.sync="model.f_check_end"
-                      v-model="model.f_check_end"
-                      condition="ui.f_last_check_date  <='{} 00:00:00'">
+                      v-model="model.f_check_end">
                     </datepicker>
                   </div>
 
@@ -339,18 +263,20 @@
   import Vue from "vue";
 
     export default {
-        name: "PlanManage",
+        name: "checkUserList",
         title: '计划管理',
         data() {
+          let model = new PagedList('/rs/sql/FetchUserFileByOrgNoRuHuSXQ', 20, {
+            "orderitem": "'f_residential_area,f_building,f_unit,f_floor,f_room'",
+            "f_usertype": "''",
+            "month": "''",
+            "SafeCheckSX": 'this.SafeCheckSX',
+            "SafeCheckCQ": "''",
+            "startday":"''",
+            "endday":"''"})
+          model.SafeCheckSX = '1 = 1'
           return {
-            model:new PagedList('/rs/sql/FetchUserFileByOrgNoRuHuSXQ', 100, {
-              "orderitem": "'f_residential_area,f_building,f_unit,f_floor,f_room'",
-              "f_usertype": "''",
-              "month": "''",
-              "SafeCheckSX": {"f_check_start": '', "f_check_end": ''},
-              "SafeCheckCQ": "''",
-              "startday":"''",
-              "endday":"''"}),
+            model: model,
             a:'1',
             opt:[{label:"测试",value:"测试"}],
             showCondtion:false,
@@ -361,7 +287,6 @@
             meter_gasbrand:[],//气表品牌
             hasHousehold:[{label:"全部",value:""},{label:"已入户",value:"已入户"},{label:"未入户",value:"未入户"}],
             yearCheckList:[{label:"全部",value:""},{label:"已在计划中",value:"ua.f_plan_id is not null"},{label:"未在计划中",value:"ua.f_plan_id is null"}],
-            checkStateList:[{label:"全部",value:""},{label:"两年内已检",value:"DATEDIFF(day,isnull(ui.f_last_check_date,'2010-01-01'),GETDATE())<=730"},{label:"两年内未检",value:"DATEDIFF(day,isnull(ui.f_last_check_date,'2010-01-01'),GETDATE())>730"},{label:"从未安检",value:"从未安检"}],
             hasResidentialArea:[{label:"全部",value:""},{label:"有名称",value:"有名称"},{label:"无名称",value:"无名称"}],
             sliceArea:[],
             meterbooks:[],
@@ -462,38 +387,33 @@
             this.excelUserCondtion=true
           },
           selfSearch (args) {
-            //tag)
-           let condition1="(ui.f_last_check_date is null or ui.f_last_check_date ='')"
-           let arge = args.condition.replace('从未安检',condition1)
-            args.condition = arge
-            args.condition += ` and ui.f_filialeid='${this.userlogin.orgid}'`
-            if (!Util.isEmpty(args.model.f_last_check_state)){
-              if (args.model.f_last_check_state == '未检'){
-                args.condition +=" and (ui.f_last_check_state is null or ui.f_last_check_state ='')"
-              }else  {
-                args.condition += `and ui.f_last_check_state = '${args.model.f_last_check_state}'`
+            if(args.model.f_last_check_state) {
+              if (Util.isEmpty(args.model.f_check_start) || Util.isEmpty(args.model.f_check_end)) {
+                this.$showMessage("选择安检状态时，需要选择安检时间区间！")
+                return
+              }
+              this.model.SafeCheckSX = ` f_offsite_time > '${args.model.f_check_start}' and f_offsite_time < '${args.model.f_check_end}'`
+              if (args.model.f_last_check_state == '未检') {
+                args.condition += ' and  tcp.ruhu is null '
+              } else if (args.model.f_last_check_state == '入户') {
+                args.condition += ` and tcp.ruhu > 0`
+              } else if (args.model.f_last_check_state == '拒检') {
+                args.condition += ` and tcp.jujian > 0 and tcp.ruhu = 0 and tcp.daofang = 0 `
+              } else if (args.model.f_last_check_state == '到访不遇') {
+                args.condition += ` and tcp.daofang > 0 and tcp.ruhu = 0 and tcp.jujian = 0 `
               }
+            }else{
+              //无条件
+              this.model.SafeCheckSX = ` 1 != 1 `
             }
-            //(ua.f_residential_area is not null or ua.f_residential_area !='')
-            // (ua.f_residential_area is null or ua.f_residential_area ='')
+            args.condition += ` and ui.f_filialeid='${this.userlogin.orgid}'`
             if (args.model.f_residential_area == "无名称"){
               args.condition +=" and (ua.f_residential_area is null or ua.f_residential_area ='')"
             }else if (args.model.f_residential_area == "有名称"){
               args.condition +=" and (ua.f_residential_area is not null and ua.f_residential_area !='')"
             }
             console.log('查询条件',args)
-            /*if(args.model.f_hasHousehold=='已入户'){
-              args.condition +=` and Extract(year from TO_DATE(ua.f_last_check_date,'yyyy-mm-dd hh24:mi:ss'))=2021 and ua.F_LAST_CHECK_STATE='入户'`
-            }else if(args.model.f_hasHousehold=='未入户'){
-              args.condition +=` and (Extract(year from nvl(TO_DATE(ua.f_last_check_date,'yyyy-mm-dd hh24:mi:ss'),'1990-01-01 00:00:00'))!=2021 or nvl(ua.F_LAST_CHECK_STATE,'未入户')!='入户')`
-            }*/
             if(args.model.checkBook){
-             /* let arr=args.model.checkBook.split('-')
-              if(arr[1] == '用户'){
-                args.condition +=` and ua.f_check_book_id=${arr[0]}`
-              }else{
-                args.condition +=` and area.f_check_book_id=${arr[0]} and ua.f_check_book_id is null`
-              }*/
               let uas = []
               let areas = []
               for (let item of args.model.checkBook) {
@@ -680,6 +600,7 @@
                       f_filialeid:this.userlogin.orgid,
                       f_subscribe_date:'',
                       condition:this.model.condition,
+                      SafeCheckSX: this.model.SafeCheckSX,
                       switchCheckAll:true,
                       checkAll:this.checkAll,
                       param:this.checkes,

package/src/plugins/LoadData.js

@@ -1,10 +1,10 @@
-import Vue from 'vue'
-// import AppData from '../stores/AppData'
-
-let getSafeCheckParams = {
-  install (Vue, options) {
-    // 给vue增添对话框显示方法
-    Vue.getSafeCheckParams = Vue.prototype.$getSafeCheckParams = getSafeCheckParams
-  }
-}
-export default getSafeCheckParams
+import Vue from 'vue'
+// import AppData from '../stores/AppData'
+
+let getSafeCheckParams = {
+  install (Vue, options) {
+    // 给vue增添对话框显示方法
+    Vue.getSafeCheckParams = Vue.prototype.$getSafeCheckParams = getSafeCheckParams
+  }
+}
+export default getSafeCheckParams

package/src/plugins/LoadParams.js

@@ -1,24 +1,24 @@
-import Vue from 'vue'
-// import AppData from '../stores/AppData'
-
-let LoadParams = {
-    // 开启卡监听
-  load () {
-    return Vue.resetpost('rs/path/getParams', {data: {}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-      res.data.forEach((item) => {
-        let value = []
-        item.f_paramvalues.forEach((item, index) => {
-          value[index] = {}
-          value[index].label = item.name
-          value[index].value = item.name
-        })
-        AppData.params[item.name] = value
-      })
-    }).catch((res) => {
-      this.msg = res.data
-      this.show = true
-    })
-  }
-}
-
-export default LoadParams
+import Vue from 'vue'
+// import AppData from '../stores/AppData'
+
+let LoadParams = {
+    // 开启卡监听
+  load () {
+    return Vue.resetpost('rs/path/getParams', {data: {}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+      res.data.forEach((item) => {
+        let value = []
+        item.f_paramvalues.forEach((item, index) => {
+          value[index] = {}
+          value[index].label = item.name
+          value[index].value = item.name
+        })
+        AppData.params[item.name] = value
+      })
+    }).catch((res) => {
+      this.msg = res.data
+      this.show = true
+    })
+  }
+}
+
+export default LoadParams

package/src/stores/wxconfig.js

@@ -1,10 +1,10 @@
-export default {
-  // 一下为长安呼叫使用云电话地址
-  // tcUrl: 'http://192.169.1.2:9876/Dual'
- /* voiceUrl: 'http://127.0.0.1:9876/Dual',
-  texttUrl: 'http://192.168.2.77:9876/Dual'*/
-  // 一下为咸阳呼叫使用地址
-  // tcUrl: 'http://192.168.2.77:9876/Dual'
-  // tcUrl: 'http://127.0.0.1:9876/Dual'
-  // tcUrl: 'http://192.168.30.28:9876/Dual'
-}
+export default {
+  // 一下为长安呼叫使用云电话地址
+  // tcUrl: 'http://192.169.1.2:9876/Dual'
+ /* voiceUrl: 'http://127.0.0.1:9876/Dual',
+  texttUrl: 'http://192.168.2.77:9876/Dual'*/
+  // 一下为咸阳呼叫使用地址
+  // tcUrl: 'http://192.168.2.77:9876/Dual'
+  // tcUrl: 'http://127.0.0.1:9876/Dual'
+  // tcUrl: 'http://192.168.30.28:9876/Dual'
+}

package/src/utils/getNowDate.js

@@ -1,33 +1,33 @@
-export default () => {
-  // 求取当前时间的工具
-  let myweekday = ''
-  let year = ''
-  let mydate = new Date()
-  myweekday = mydate.getDay()
-  let mymonth = mydate.getMonth() + 1
-  let myday = mydate.getDate()
-  let myyear = mydate.getYear()
-  year = (myyear > 200) ? myyear : 1900 + myyear
-  let weekday = ''
-  if (myweekday === 0) {
-    weekday = '星期日'
-  } else if (myweekday === 1) {
-    weekday = '星期一'
-  } else if (myweekday === 2) {
-    weekday = '星期二'
-  } else if (myweekday === 3) {
-    weekday = '星期三'
-  } else if (myweekday === 4) {
-    weekday = '星期四'
-  } else if (myweekday === 5) {
-    weekday = '星期五'
-  } else if (myweekday === 6) {
-    weekday = '星期日'
-  } else if (myweekday === 7) {
-    weekday = '星期六'
-  }
-
-
-  // document.write("<font color=#ffffff>今天是 "+year+"年"+mymonth+"月"+myday+"日 "+weekday+"</font>");
-  return  year + '年' + mymonth + '月' + myday + '日 ' + weekday
-}
+export default () => {
+  // 求取当前时间的工具
+  let myweekday = ''
+  let year = ''
+  let mydate = new Date()
+  myweekday = mydate.getDay()
+  let mymonth = mydate.getMonth() + 1
+  let myday = mydate.getDate()
+  let myyear = mydate.getYear()
+  year = (myyear > 200) ? myyear : 1900 + myyear
+  let weekday = ''
+  if (myweekday === 0) {
+    weekday = '星期日'
+  } else if (myweekday === 1) {
+    weekday = '星期一'
+  } else if (myweekday === 2) {
+    weekday = '星期二'
+  } else if (myweekday === 3) {
+    weekday = '星期三'
+  } else if (myweekday === 4) {
+    weekday = '星期四'
+  } else if (myweekday === 5) {
+    weekday = '星期五'
+  } else if (myweekday === 6) {
+    weekday = '星期日'
+  } else if (myweekday === 7) {
+    weekday = '星期六'
+  }
+
+
+  // document.write("<font color=#ffffff>今天是 "+year+"年"+mymonth+"月"+myday+"日 "+weekday+"</font>");
+  return  year + '年' + mymonth + '月' + myday + '日 ' + weekday
+}