safecheck-client 3.0.34-1 → 3.0.34-100

package/src/filiale/tongchuan/android/Select.vue

@@ -0,0 +1,421 @@
+<template>
+  <div v-el:group class="btn-group" v-bind:class="{open: show, dropup: direction === 'up'}" :style="{width:width, fontSize: fontSize}">
+    <button v-el:btn type="button" class="btn btn-default dropdown-toggle select-style" :style="{minWidth: '100%', fontSize: fontSize}"
+            :id="'vc-select-button-'+attach"
+            @click="toggleDropdown"
+            @blur="show = (search ? show : false)"
+            v-bind="{disabled: disabled}"
+    >
+      <span class="btn-placeholder" v-show="showPlaceholder">{{placeholder}}</span>
+      <span class="btn-content" :style="{textOverflow:'ellipsis',overflow: 'hidden'}">{{ selectedItems }}</span>
+      <span class="caret"></span>
+    </button>
+    <ul  class="dropdown-menu" v-bind:class="{'menu-align-right': align=== 'right'}" :style="{overflow:'scroll',maxHeight: maxHeight + 'px',width: menuWidth,minWidth:minWidth,left:left+'px', fontSize: fontSize }" v-el:dropdown>
+      <template v-if="options.length">
+        <li v-if="search" class="bs-searchbox" style="white-space: nowrap">
+          <input type="text" placeholder="Search"
+                 style="width: 80%;display: inline"
+                 v-model="searchText"
+                 class="form-control" autocomplete="off"
+                 @keyup.enter="putOptions(searchText)">
+
+          <span  style="width: 20%;display: inline"
+                 v-if="search&&multiple&&show&&!isSelectAll"
+                 @mousedown.prevent="selectAll(options)">全选</span>
+          <span style="width: 20%;display: inline"
+                v-if="search&&multiple&&show&&isSelectAll"
+                @mousedown.prevent="selectAll(options)">取消</span>
+        </li>
+        <li v-for="option in options | findBy searchText " style="position:relative">
+          <a @mousedown.prevent="select(option.value,null)" style="cursor:pointer" :id="'vc-select-a-'+attach+'-'+$index">
+            {{ option.label }}
+            <span class="glyphicon glyphicon-ok check-mark" v-show="isSelected(option.value)"></span>
+          </a>
+        </li>
+      </template>
+      <slot v-else></slot>
+      <div class="notify" v-show="showNotify" transition="fadein">Limit reached ({{limit}} items max).
+      </div>
+    </ul>
+  </div>
+</template>
+
+<script>
+  import EventListener from '../utils/EventListener'
+  import coerceBoolean from '../utils/coerceBoolean.js'
+
+  export default {
+    props: {
+      options: {
+        type: Array,
+        default() { return [] },
+      },
+      value: {
+        twoWay: true
+      },
+      placeholder: {
+        type: String,
+        default: '请选择'
+      },
+      multiple: {
+        type: Boolean,
+        coerce: coerceBoolean,
+        default: false
+      },
+      search: { // Allow searching (only works when options are provided)
+        type: Boolean,
+        coerce: coerceBoolean,
+        default: true
+      },
+      limit: {
+        type: Number,
+        default: 1024
+      },
+      closeOnSelect: { // only works when multiple==false
+        type: Boolean,
+        coerce: coerceBoolean,
+        default: false
+      },
+      disabled: {
+        type: Boolean,
+        coerce: coerceBoolean,
+        default: false
+      },
+      attach: {
+        type: String,
+        default: 'vuestrap'
+      },
+      enterPush: {
+        type: Boolean,
+        dafault: false
+      },
+      maxHeight: {
+        type: [Number,String],
+        default: 300
+      },
+      minWidth:{
+        type:[Number,String],
+        default:'100%'
+      },
+      valueSingle: {
+        type: Boolean,
+        default: false
+      },
+      //全选标志位
+      isSelectAll: {
+        type: Boolean,
+        default: false
+      },
+      filerKey: {
+        default: 'id'
+      },
+      direction: { // 展开方向，默认为向下，可以向上up
+        type: String,
+        default: 'down'
+      },
+      align: {
+        type: String,
+        default: 'left' // 内内容框对齐方式，默认是左对齐，也可以right，右对齐
+      },
+      width:{
+        type:String,
+        default:'60%'
+      },
+      timeout: {
+        type: Number,
+        default: 300
+      },
+      fontSize: {
+        type: String,
+        default: '16px'
+      },
+      menuMode: {
+        type: String
+      }
+    },
+    ready() {
+      if(this.search&&this.multiple){
+        this.minWidth='190px'
+      }
+      // 如果this.value不存在或正length不等于0
+      if ((this.value === false? false :!this.value) || this.value.length === 0) {
+        if (this.valueSingle) {
+          this.value = ''
+        } else {
+          this.value = []
+        }
+      }else {
+        // 如果this.value不是数组
+        if (this.value.constructor !== Array) {
+          if (!this.valueSingle) {
+            this.value = [this.value]
+          }
+        } else {
+          // this.value不是数组并且不是多选
+          if (!this.multiple && this.value.length > 1) {
+            this.value = this.value.slice(0, 1)
+          } else if (this.multiple && this.value.length > this.limit) {
+            this.value = this.value.slice(0, this.limit)
+          }
+        }
+      }
+      let el = this.$els.dropdown
+      let elbtn = this.$els.btn
+      this._closeEvent = EventListener.listen(window, 'mouseup', (e)=> {
+        if (!el.contains(e.target) && this.show && !elbtn.contains(e.target)) {
+          this.show = false
+        }
+      })
+    },
+    data() {
+      return {
+        left:'0',
+
+        searchText: null,
+        show: false,
+        showNotify: false,
+        paramsData: [],
+        // isShowModify: false
+        timer: null,
+        menuwidth: 'auto'
+      }
+    },
+    computed: {
+      // 返回显示的选择内容
+      selectedItems() {
+        // 值为空，返回空串
+        if (this.value === false? false: !this.value) {
+          return ''
+        }
+        // 把单选变成数组
+        let value
+        if (this.valueSingle) {
+          value = [this.value]
+        } else {
+          value = this.value
+        }
+
+        // 根据value值，找到label
+        let foundItems = []
+        if (value === false?true:value && value.length) {
+          for (var item of value) {
+            // 如果没有可选项，直接value内容
+            if (this.options.length === 0)
+            {
+              foundItems = value;
+            }
+            // 有可选项
+            else
+            {
+              // 如果是对象，显示对象给定的列
+              if (typeof item === "object") {
+                for(let o of this.options) {
+                  // 选中对象鱼可选项value值相同，取选项的label
+                  if((o.value === false?true:o.value)&& o.value[this.filerKey] === item[this.filerKey]) {
+                    foundItems.push(o.label)
+                    break
+                  }
+                }
+              } else {
+                // 否则，显示值本身
+                let option
+                this.options.some(o => {
+                  if(o.value === item) {
+                    option = o
+                    return true
+                  }
+                })
+                option && foundItems.push(option.label)
+              }
+            }
+          }
+          if (foundItems.length === 0 || foundItems[0].constructor === Object) {
+            return ''
+          }
+          //选中的
+          let str= foundItems.join(', ')
+          // if(str.length > 4)
+          //   return str.substring(0,4)+'...'
+          // else
+          return str
+        }
+      },
+      showPlaceholder() {
+        if (this.value ===false? true :this.value) {
+          return this.value.length === 0 || this.selectedItems === ''
+        }
+        return true
+      }
+    },
+    watch: {
+      menuMode: {
+        immediate: true,
+        handler() {
+          if (this.menuMode == 'align-button'){
+            this.menuWidth = '100%'
+          }
+        }
+      },
+      value(val) {
+        this.$emit('change', val)
+        this.$emit('selected', this.selected)
+        if (val && val.length > this.limit) {
+          this.showNotify = true
+          this.value.pop()
+          setTimeout(() => this.showNotify = false, 1000)
+        }
+      },
+      show(){
+        this.judgBoundary();
+      },
+      searchText() {
+        // 防抖
+        if (this.timer) {
+          clearTimeout(this.timer)
+        }
+        this.timer = setTimeout(() => {
+          this.$emit('select-search', this.searchText)
+        }, this.timeout)
+      }
+    },
+    methods: {
+      //全选
+      selectAll(v) {
+        this.isSelectAll=!this.isSelectAll
+        if(this.searchText === null){
+          v.forEach((item) => {
+            this.select(item.value, this.isSelectAll)
+          })
+        }else {
+          let result= v.filter((item) => {
+            return item.label.includes(this.searchText)
+          }).forEach((item) => {
+            this.select(item.value, this.isSelectAll)
+          })
+        }
+      },
+      select (v, flag) {
+        if (flag == true) {
+          if (this.multiple) {
+            this.value.$remove(v)
+            this.value.push(v)
+          } else if (this.closeOnSelect) {
+            this.toggleDropdown()
+          }
+        } else if (flag == false) {
+          if (this.multiple) {
+            this.value.$remove(v)
+          } else if (this.closeOnSelect) {
+            this.toggleDropdown()
+          }
+        } else if (flag == null) {
+          if (this.valueSingle || !this.value || this.value.indexOf(v) === -1) {
+            if (this.multiple) {
+              this.value.push(v)
+            } else {
+              if (this.value == v) {
+                this.value = undefined
+              } else if (this.valueSingle) {
+                this.value = v
+              } else {
+                this.value = [v]
+              }
+            }
+          } else {
+            if (this.multiple || this.value) {
+              this.value.$remove(v)
+            }
+          }
+          if (this.closeOnSelect) {
+            this.toggleDropdown()
+          }
+        }
+        this.judgBoundary()
+        this.$emit('select-changed', v)
+      },
+
+      isSelected(v) {
+        if (this.value === false? false: !this.value) {
+          return false
+        }
+        if (this.value.constructor !== Array) {
+          return this.value == v
+        } else {
+          return this.value.indexOf(v) !== -1
+        }
+
+      },
+      toggleDropdown() {
+        this.width = this.$els.group.clientWidth *  this.width +'px'
+        this.show = !this.show
+      },
+      putOptions (val) {
+        if (this.enterPush) {
+          let sign = false
+          this.options.forEach((item) => {
+            if (val === item.label) {
+              sign = true
+            }
+          })
+        }
+        this.judgBoundary();
+      },
+      judgBoundary(){
+        //判断是否超出边界，超出移动
+        if(this.menuMode != 'align-button' && document.documentElement.offsetWidth< this.$els.dropdown.getBoundingClientRect().right){
+          this.left = document.documentElement.offsetWidth - this.$els.dropdown.getBoundingClientRect().right - 25
+        }
+      }
+    },
+    beforeDestroy() {
+      if (this._closeEvent) this._closeEvent.remove()
+    }
+  }
+</script>
+
+<style scoped>
+  .bs-searchbox {
+    padding: 4px 8px;
+  }
+  .menu-align-right {
+    left: unset;
+    right: 0;
+  }
+  .btn-group .dropdown-menu .notify {
+    position: absolute;
+    bottom: 5px;
+    width: 96%;
+    margin: 0 2%;
+    min-height: 26px;
+    padding: 3px 5px;
+    background: #f5f5f5;
+    /*border: 1px solid #e3e3e3;*/
+    box-shadow: inset 0 1px 1px rgba(0,0,0,.05);
+    pointer-events: none;
+    opacity: .9;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  .select-style {
+    border: 0px;
+    /*border-bottom: 2px solid #C9CCCF;*/
+    border: 1px solid #93B2D3;
+    border-radius: 0px;
+    color: #555;
+    overflow:hidden;text-overflow:ellipsis;
+  }
+  /* 为新产品增加修改菜单选项 */
+  .vselect-self-style {
+    text-align: center;
+    border: 2px dashed #ccc;
+    margin: 5px 10px;
+    border-radius: 5px;
+  }
+  /* 当内容超过最大时，显示省略，长度不能超过最大值 */
+  .btn-group > button {
+    max-width: 100%;
+  }
+  .btn-group > button .btn-content {
+    max-width: 100%;
+  }
+</style>

package/src/filiale/tongchuan/android.js

@@ -4,6 +4,7 @@ import Vue from "vue";
 // 手机特殊目录注册到该文件中
 let specialComp = {
   'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
+  'v-select': (resolve) => { require(['./android/Select'], resolve) },
   'paper-feedback' : (resolve) => { require(['./android/PaperFeedback'], resolve) },
   'safecheck-userinfo' : (resolve) => { require(['./android/SafecheckUserInfo'], resolve) },
   'safecheck-devices' : (resolve) => { require(['./android/SafecheckDevices'], resolve) },

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

@@ -6,12 +6,14 @@
           <div class="row">
             <div class="col-sm-4 form-group">
               <role-selector-safe
+                :value-multiple="true"
+                :value-close="false"
                 role-name="安检员"
                 role-lable="安&ensp;检&ensp;员"
                 @re-res="$parent.$parent.getRes"
                 :value.sync="model.f_checker_id"
                 v-model="model.f_checker_id"
-                condition="f_checker_name = '{}'">
+                condition="f_checker_name in {}">
               </role-selector-safe>
             </div>
             <div class="col-sm-2 form-group">

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

@@ -74,12 +74,14 @@
             </div>
             <div :class="$parent.$parent.style2" style="margin: 0">
               <role-selector-safe
+                :value-multiple="true"
+                :value-close="false"
                 role-name="安检员"
                 role-lable="安&nbsp;检&nbsp;员&nbsp;"
                 @re-res="$parent.$parent.getRes"
                 :value.sync="model.f_checker_id"
                 v-model="model.f_checker_id"
-                condition="f_checker_name = '{}'">
+                condition="f_checker_name in {}">
               </role-selector-safe>
             </div>
 
@@ -222,12 +224,14 @@
 
             <div :class="$parent.$parent.style2" style="margin: 0">
               <role-selector-safe
+                :value-multiple="true"
+                :value-close="false"
                 role-name="安检员"
                 role-lable="安&nbsp;检&nbsp;员&nbsp;"
                 @re-res="$parent.$parent.getRes"
                 :value.sync="model.f_checker_id"
                 v-model="model.f_checker_id"
-                condition="f_checker_name = '{}'">
+                condition="f_checker_name in {}">
               </role-selector-safe>
             </div>
           </div>

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

@@ -6,12 +6,14 @@
           <div class="row">
             <div class="col-sm-4 form-group">
               <role-selector-safe
+                :value-multiple="true"
+                :value-close="false"
                 role-name="安检员"
                 role-lable="安&ensp;检&ensp;员"
                 @re-res="$parent.$parent.getRes"
                 :value.sync="model.f_checker_id"
                 v-model="model.f_checker_id"
-                condition="f_checker_name = '{}'">
+                condition="f_checker_name in {}">
               </role-selector-safe>
             </div>
             <div class="col-sm-2 form-group">

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

@@ -549,11 +549,6 @@ export default {
   },
   methods: {
     devicesCollect() {
-      //tag
-      //tag)
-      //tag)
-      //tag
-
       this.deviceCollects = []
       let checkResult = '正常'
       this.result = '正常'
@@ -577,26 +572,22 @@ export default {
               if ((items.type === 'selector' || items.type === 'radio' || items.type === 'checkbox') && items.f_item_value != null && items.f_item_value instanceof Array) {
                 for (let i in items.f_item_value) {
                   let f_item_value = items.f_item_value[i]
-
-                  //tag)
-                  //tag)
-                  //tag)
-                  //tag)
-                  if (!this.config[this.data[device][item].f_device_type].items[items.f_item_name]) {
-                    continue
-                  }
-                  let options = this.config[this.data[device][item].f_device_type].items[items.f_item_name].options
-                  for (let option in options) {
-                    if (options[option].data == f_item_value) {
-                      if (options[option].isdefect == 'true' || options[option].isdefect == true) {
-                        checkResult = '有隐患'
-                        this.result = '有隐患'
-                        defects = `${defects}:${options[option].data}/`
-                        // let level = options[option].level
+                  for (let j = 0; j < this.config[this.data[device][item].f_device_type].items.length; j++) {
+                    if(this.config[this.data[device][item].f_device_type].items[j].lname===items.f_item_name){
+                      if(this.config[this.data[device][item].f_device_type].items[j].options){
+                        let options = this.config[this.data[device][item].f_device_type].items[j].options
+                        for (let option in options) {
+                          if (options[option].data === f_item_value) {
+                            if (options[option].isdefect === 'true' || options[option].isdefect === true) {
+                              checkResult = '有隐患'
+                              this.result = '有隐患'
+                              defects = `${defects}:${options[option].data}/`
+                            }
+                          }
+                        }
                       }
                     }
                   }
-                  //tag)
                 }
                 if (defects != '') {
                   deviceInfos.push(`${items.f_item_name}${defects.substring(0, defects.length - 1)}`)

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

@@ -653,7 +653,7 @@
           }
           defectIdStr = `(${defectIds.join(',')})`
           let http = new HttpResetClass()
-          let sql = `update t_devices_items set f_deal_dispose = '自行整改',f_live_dispose = '是' where id in ${defectIdStr}`
+          let sql = `update t_devices_items set f_deal_dispose = '自行整改' where id in ${defectIdStr}`
           http.load('POST', 'rs/logic/runSQL', { data: { sql: sql } },
             { resolveMsg: null, rejectMsg: null }).then(()=>{
             this.showModal3 = false

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

@@ -6,6 +6,8 @@
           <div class="row">
             <div :class="{'form-group col-sm-6':$parent.$parent.$parent.showItem,'form-group col-sm-4':!$parent.$parent.$parent.showItem}" style="margin: 0">
               <role-selector-safe
+                :value-multiple="true"
+                :value-close="false"
                 role-name="安检员"
                 role-lable="安&ensp;检&ensp;员"
                 @re-res="$parent.$parent.getRes"
@@ -223,8 +225,9 @@
           condition2 += ` AND f_offsite_time <= '${this.f_end_time} 23:59:59'`
         }
         if (this.$refs.paged.$refs.cri.model.f_checker_id){
-          condition3 += ` AND f_checker = '${this.$refs.paged.$refs.cri.model.f_checker_id}' `
-          condition2 += ` AND f_checker_name = '${this.$refs.paged.$refs.cri.model.f_checker_id}' `
+          debugger
+          condition3 += ` AND f_checker in ${this.$refs.paged.$refs.cri.model.f_checker_id} `
+          condition2 += ` AND f_checker_name in ${this.$refs.paged.$refs.cri.model.f_checker_id} `
         }
         this.model.f_start_time=this.f_start_time
         this.model.f_end_time=this.f_end_time

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

@@ -115,6 +115,21 @@
                     >
                     </v-select>
                   </div>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">街&ensp;&ensp;&ensp;&ensp;道:</label>
+                    <v-select
+                      class="select select_list"
+                      :value.sync="model.f_street"
+                      v-model="model.f_street"
+                      :options='$parent.$parent.streets'
+                      placeholder='请选择'
+                      condition="ua.f_street like '%{}%'"
+                      :search="false"
+                      close-on-select
+                      value-single
+                    >
+                    </v-select>
+                  </div>
                   <!--<div class="form-group col-sm-4" >
                     <label class="font_normal_body">小区名称:</label>
                     <input type="text" class="input_search" v-model="model.f_userinfo_code"
@@ -336,6 +351,7 @@
             meterbooks:[],
             cbc:[],
             areaList:[],
+            streets:[],
             checkAll:false,
             checkes:[],
             excelUserCondtion:false,
@@ -355,6 +371,7 @@
             this.select_search()
             this.Mreadibook()
             this.getSliceArea()
+            this.getstreets()
           },
           cancel(){
             this.showCondtion=false
@@ -418,6 +435,19 @@
 
               })
           },
+          getstreets(){
+            new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_street",orderitem:"id",condition:`f_orgid = '${this.userlogin.orgid}' `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
+              ////tag)
+              this.streets=[]
+              if(res.data.length>0){
+                this.streets.push({label:"全部",value:""})
+                res.data.forEach((result)=>{
+                  this.streets.push({label:result.f_street,value:result.f_street})
+                })
+              }
+
+            })
+          },
           //获取抄表册
           async Mreadibook(){
             this.cbc=[]

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

@@ -0,0 +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

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

@@ -0,0 +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)

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

@@ -997,7 +997,7 @@ export default {
         f_repair_department: this.config[this.device.device].items[item].repairDepartment ? this.config[this.device.device].items[item].repairDepartment : '',
         f_deal_dispose: this.config[this.device.device].items[item].dealDispose ? this.config[this.device.device].items[item].dealDispose : '',
         f_handle_date: '',
-        f_block_pitfall: this.config[this.device.device].items[item].blockPitfall ? this.config[this.device.device].items[item].blockPitfall : false,
+        f_block_pitfall: this.config[this.device.device].items[item].blockPitfall ? this.config[this.device.device].items[item].blockPitfall : '否',
         f_lose_efficacy: this.config[this.device.device].items[item].loseEfficacy ? this.config[this.device.device].items[item].loseEfficacy : '',
         isshow: this.config[this.device.device].items[item].isshow == false ? this.config[this.device.device].items[item].isshow : true,
         readonly: this.config[this.device.device].items[item].readonly == true ? true : false,