safecheck-client 3.0.34-34 → 3.0.34-35

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "safecheck-client",
   "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "3.0.34-34",
+  "version": "3.0.34-35",
   "description": "安检模块 前端组件",
   "author": "丁新 <417755458@qq.com>",
   "license": "ISC",

package/src/components/android/QRCode/QRCodePage.vue

@@ -1,199 +1,208 @@
-<template>
-  <div class="auto">
-    <criteria-paged :model="model"  v-ref:paged>
-      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
-        <div partial>
-          <form>
-            <div class="row app-row">
-              <div class="col-xs-4">
-                <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <label class="font text-left">二维码编号：</label>
-              </div>
-              <div class="col-xs-8" >
-                <input class="search_input input-font" style="width: 70%" placeholder="请输入或扫码" v-model="model.id"/>
-                <button type="button" name="button" class="btn btn-primary" style="width: 25%" @click="$parent.$parent.scan">扫码</button>
-              </div>
-            </div>
-            <div class="row app-row">
-              <div class="col-xs-4">
-                <img src="../../../assets/用户类型.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <label class="font text-left">负责人：</label>
-              </div>
-              <div class="col-xs-8">
-                <v-select :value.sync="model.f_head_name" class="input-font"
-                          :options='$parent.$parent.head_names' placeholder='请选择负责人' :value-single="true"
-                          v-model="model.f_head_name" close-on-select clear-button></v-select>
-              </div>
-            </div>
-            <div class="row app-row">
-              <div class="col-xs-4">
-                <img src="../../../assets/用户姓名.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <label class="font text-left">小区名称/用户名称：</label>
-              </div>
-              <div class="col-xs-8" >
-                <input class="search_input input-font" v-model="model.f_user_name" placeholder="请输入小区名称/用户名称（可模糊查询）">
-              </div>
-            </div>
-            <div class="row text-center" style="margin-top: 20px;">
-              <button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="$parent.$parent.search">查询</button>
-            </div>
-            <div style="height:30px;"></div>
-          </form>
-        </div>
-      </criteria>
-
-      <list :model="model" partial='list'>
-        <div partial>
-          <div class="auto app-text" style="margin-top: 5px;">
-            <div class="panel" style="padding: 10px 10px 5px 10px;">
-              <div class="panel-body panel-self">
-                <div class="row">
-                  <p class="panel-title col-xs-4 text-left font">二维码编号</p>
-                  <p class="panel-title col-xs-8 text-left input-font">{{ row.id  }}</p>
-                </div>
-                <div class="row">
-                  <p class="panel-title col-xs-4 text-left font">负责人二维码编号</p>
-                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_head_code  }}</p>
-                </div>
-                <div class="row">
-                  <p class="panel-title col-xs-4 text-left font">安检情况二维码编号</p>
-                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_safecheck_code }}</p>
-                </div>
-                <div class="row">
-                  <p class="panel-title col-xs-4 text-left font">负责人姓名</p>
-                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_head_name }}</p>
-                </div>
-                <div class="row">
-                  <p class="panel-title col-xs-4 text-left font">小区/用户名称</p>
-                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_user_name}}</p>
-                </div>
-                <div class="row">
-                  <button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="$parent.$parent.$parent.handle(row)">处理</button>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </list>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-import {HttpResetClass, PagedList} from 'vue-client'
-export default {
-  title: '二维码绑定',
-  data () {
-    return {
-      model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, 50, {
-        items: '"id,f_head_code,f_safecheck_code,f_head_name,f_user_name,f_head_post,f_head_phone,f_type"',
-        tablename: '"t_qr_code"',
-        orderitem: '"1"'
-      }),
-      QRCode:{},
-      head_names:[{ label: '请选择', value: '' }]
-    }
-  },
-  ready () {
-    new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`,{data: {
-        items: 'f_head_name',
-        tablename: 't_qr_code',
-        condition: `1=1 and f_head_name is not null`,
-        orderitem: '1'
-      }}).then(res=>{
-      res.data.forEach(item=>{
-        this.head_names.push({label:item.f_head_name,value:item.f_head_name})
-      })
-    })
-  },
-  computed: {
-    reload(){
-      this.$refs.paged.loadPage(this.$refs.paged.model.pageIndex)
-    },
-    selected () {
-      return this.$refs.paged.$refs.grid.selected
-    }
-  },
-  methods:{
-    scan(){
-      HostApp.__this__=this,
-        HostApp.scanCode({callback:"javascript:HostApp.__this__.getCode();"})
-    },
-    getCode(){
-      let datapa = HostApp.getCode().data;
-      this.this.$refs.paged.$refs.cri.model.id=datapa
-    },
-    handle(row){
-      var pardate = {
-        _this:this,
-        tittle:'二维码绑定',
-        safe:true
-      }
-      this.$dispatch('gotoson',pardate)
-      this.$goto('qr-code-binding', {row: row}, 'self')
-    },
-    search(){
-      let condition = `1=1`
-      if (this.$refs.paged.$refs.cri.model.id) {
-        condition += ` and (qr.f_head_code = '${this.$refs.paged.$refs.cri.model.id}' or qr.f_safecheck_code= '${this.$refs.paged.$refs.cri.model.id}')`
-      }
-      if (this.$refs.paged.$refs.cri.model.f_head_name) {
-        condition += ` and qr.f_head_name = ${this.$refs.paged.$refs.cri.model.f_head_name}`
-      }
-      if (this.$refs.paged.$refs.cri.model.f_user_name) {
-        condition += ` and ui.f_user_name = ${this.$refs.paged.$refs.cri.model.f_user_name}`
-      }
-      if (this.$refs.paged.$refs.cri.model.f_residential_area) {
-        condition += ` and ua.f_residential_area = ${this.$refs.paged.$refs.cri.model.f_residential_area}`
-      }
-      this.model.search(condition)
-    }
-
-  }
-}
-</script>
-<style scoped>
-.app-row {
-  background-color: white;
-  padding: 10px 10px 0 10px;
-  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
-}
-.search_input {
-  border: 0;
-  outline: none;
-}
-.font{
-  font: 15px PingFang-SC-Medium;
-  color: #666666;
-}
-.input-font{
-  font: 15px PingFang-SC-Medium;
-  color: #333333;
-}
-.btn-font{
-  font:600 16px PingFang-SC-Bold;
-  color: #499EDF;
-}
-.btn-color{
-  background-color: #FFFFFF;
-  border-radius: 10px ;
-  border: 1px solid #499EDF;
-}
-.app-text {
-  font-size: 12px;
-}
-.panel-self{
-  border-radius: 10px;
-  border:1px solid #499EDF;
-  background-color: #F8F8F8;
-}
-.yybtn-color{
-  border-radius: 4px ;
-  border: 1px solid #499EDF;
-}
-.qxbtn-color{
-  background-color: #FFFFFF;
-  border-radius: 4px ;
-  border: 1px solid #499EDF;
-}
-</style>
+<template>
+  <div class="auto">
+    <criteria-paged :model="model"  v-ref:paged>
+      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+        <div partial>
+          <form>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">二维码编号：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input class="search_input input-font" style="width: 70%" placeholder="请输入或扫码" v-model="model.id"/>
+                <button type="button" name="button" class="btn btn-primary" style="width: 25%" @click="$parent.$parent.scan">扫码</button>
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/用户类型.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">负责人：</label>
+              </div>
+              <div class="col-xs-8">
+                <v-select :value.sync="model.f_head_name" class="input-font"
+                          :options='$parent.$parent.head_names' placeholder='请选择负责人' :value-single="true"
+                          v-model="model.f_head_name" close-on-select clear-button></v-select>
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/用户姓名.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">用户名称：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input class="search_input input-font" v-model="model.f_user_name" placeholder="请输入用户名称（可模糊查询）">
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/用户姓名.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">小区名称：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input class="search_input input-font" v-model="model.f_user_name" placeholder="请输入小区名称（可模糊查询）">
+              </div>
+            </div>
+            <div class="row text-center" style="margin-top: 20px;">
+              <button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="$parent.$parent.search">查询</button>
+            </div>
+            <div style="height:30px;"></div>
+          </form>
+        </div>
+      </criteria>
+
+      <list :model="model" partial='list'>
+        <div partial>
+          <div class="auto app-text" style="margin-top: 5px;">
+            <div class="panel" style="padding: 10px 10px 5px 10px;">
+              <div class="panel-body panel-self">
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">二维码编号</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.id  }}</p>
+                </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">负责人二维码编号</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_head_code  }}</p>
+                </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">安检情况二维码编号</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_safecheck_code }}</p>
+                </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">负责人姓名</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_head_name }}</p>
+                </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">小区/用户名称</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_user_name}}</p>
+                </div>
+                <div class="row">
+                  <button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="$parent.$parent.$parent.handle(row)">处理</button>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+export default {
+  title: '二维码绑定',
+  data () {
+    return {
+      model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, 50, {
+        items: '"id,f_head_code,f_safecheck_code,f_head_name,f_user_name,f_head_post,f_head_phone,f_type"',
+        tablename: '"t_qr_code"',
+        orderitem: '"1"'
+      }),
+      QRCode:{},
+      head_names:[{ label: '请选择', value: '' }]
+    }
+  },
+  ready () {
+    new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`,{data: {
+        items: 'f_head_name',
+        tablename: 't_qr_code',
+        condition: `1=1 and f_head_name is not null`,
+        orderitem: '1'
+      }}).then(res=>{
+      res.data.forEach(item=>{
+        this.head_names.push({label:item.f_head_name,value:item.f_head_name})
+      })
+    })
+  },
+  computed: {
+    reload(){
+      this.$refs.paged.loadPage(this.$refs.paged.model.pageIndex)
+    },
+    selected () {
+      return this.$refs.paged.$refs.grid.selected
+    }
+  },
+  methods:{
+    scan(){
+      HostApp.__this__=this,
+        HostApp.scanCode({callback:"javascript:HostApp.__this__.getCode();"})
+    },
+    getCode(){
+      let datapa = HostApp.getCode().data;
+      this.this.$refs.paged.$refs.cri.model.id=datapa
+    },
+    handle(row){
+      var pardate = {
+        _this:this,
+        tittle:'二维码绑定',
+        safe:true
+      }
+      this.$dispatch('gotoson',pardate)
+      this.$goto('qr-code-binding', {row: row}, 'self')
+    },
+    search(){
+      let condition = `1=1`
+      if (this.$refs.paged.$refs.cri.model.id) {
+        condition += ` and (qr.f_head_code = '${this.$refs.paged.$refs.cri.model.id}' or qr.f_safecheck_code= '${this.$refs.paged.$refs.cri.model.id}')`
+      }
+      if (this.$refs.paged.$refs.cri.model.f_head_name) {
+        condition += ` and qr.f_head_name = ${this.$refs.paged.$refs.cri.model.f_head_name}`
+      }
+      if (this.$refs.paged.$refs.cri.model.f_user_name) {
+        condition += ` and ui.f_user_name = ${this.$refs.paged.$refs.cri.model.f_user_name}`
+      }
+      if (this.$refs.paged.$refs.cri.model.f_residential_area) {
+        condition += ` and ua.f_residential_area = ${this.$refs.paged.$refs.cri.model.f_residential_area}`
+      }
+      this.model.search(condition)
+    }
+
+  }
+}
+</script>
+<style scoped>
+.app-row {
+  background-color: white;
+  padding: 10px 10px 0 10px;
+  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+}
+.search_input {
+  border: 0;
+  outline: none;
+}
+.font{
+  font: 15px PingFang-SC-Medium;
+  color: #666666;
+}
+.input-font{
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
+}
+.btn-font{
+  font:600 16px PingFang-SC-Bold;
+  color: #499EDF;
+}
+.btn-color{
+  background-color: #FFFFFF;
+  border-radius: 10px ;
+  border: 1px solid #499EDF;
+}
+.app-text {
+  font-size: 12px;
+}
+.panel-self{
+  border-radius: 10px;
+  border:1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+.yybtn-color{
+  border-radius: 4px ;
+  border: 1px solid #499EDF;
+}
+.qxbtn-color{
+  background-color: #FFFFFF;
+  border-radius: 4px ;
+  border: 1px solid #499EDF;
+}
+</style>

package/src/components/android/examples/SafeListExamples.vue

@@ -1,95 +1,96 @@
-<template>
-  <div class="panel panel-default auto repair-info-content">
-    <div class="panel-body">
-      <div class="panel panel-default well" v-if="model.length>0">
-        <div class="bg-info">
-          <div class="row form-group">
-            <div class="col-xs-12 col-sm-12 col-md-12">
-              <div class="row">
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  用户名称: {{ model[0].f_user_name }}
-                </div>
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  用户编号: {{ model[0].f_userinfo_code }}
-                </div>
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  用户电话: {{ model[0].f_user_phone }}
-                </div>
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  用户地址: {{ model[0].f_address }}
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="panel panel-default well" v-for="row in model">
-        <div class="bg-info">
-          <div class="row form-group">
-            <div class="col-xs-12 col-sm-12 col-md-12">
-              <div class="row">
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  安检时间: {{ row.f_offsite_time }}
-                </div>
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  安检员: {{ row.f_checker_name }}
-                </div>
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  安检状态: {{ row.f_entry_status }}
-                </div>
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  安检结果: {{ row.f_defect_content.include('正常') ? '正常' : '有隐患' }}
-                </div>
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  整改内容: {{ row.f_defect_text }}
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import {HttpResetClass} from 'vue-client'
-
-export default {
-  title: '查询用户',
-  data() {
-    return {
-      model: [],
-      f_safecheck_code: ''
-    }
-  },
-  methods: {
-    getmodel() {
-      let http = new HttpResetClass()
-      http.load('POST', `rs/sql/tel_singleTable_OrderBy`, {
-        data: {
-          items: "tcp.*,CASE WHEN CHARINDEX( '\"result\":\"正常\"', f_defect_content ) > 0 THEN '无隐患' ELSE replace(replace(replace( replace( RIGHT ( f_defect_content, len( f_defect_content ) - 26 ), substring('{}',2,1), '' ), substring('{}',1,1), '' ),']',''),'\"','') END as f_defect_text",
-          tablename: 't_check_paper tcp left join t_qr_code tqr on tcp.f_userinfoid = tqr.f_userinfo_id',
-          condition: `tqr.f_safecheck_code  = '${this.f_safecheck_code}'`,
-          orderitem: 'tcp.f_offsite_time desc'
-        }
-      }).then((res) => {
-        this.model = res.data
-      })
-    },
-  },
-  ready() {
-    let url = window.location.href
-    if (url.includes('id')){
-      const urlObj = new URL(url);
-      this.f_safecheck_code = urlObj.searchParams.get('id')
-      this.getmodel()
-    }else {
-      console.log(window.location.href)
-      console.log('非法数据')
-    }
-  }
-}
-</script>
-<style>
-</style>
+<template>
+  <div class="panel panel-default auto repair-info-content">
+    <div class="panel-body">
+      <div class="panel panel-default well" v-if="model.length>0">
+        <div class="bg-info">
+          <div class="row form-group">
+            <div class="col-xs-12 col-sm-12 col-md-12">
+              <div class="row">
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  用户名称: {{ model[0].f_user_name }}
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  用户编号: {{ model[0].f_userinfo_code }}
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  用户电话: {{ model[0].f_user_phone }}
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  用户地址: {{ model[0].f_address }}
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="panel panel-default well" v-for="row in model">
+        <div class="bg-info">
+          <div class="row form-group">
+            <div class="col-xs-12 col-sm-12 col-md-12">
+              <div class="row">
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  安检时间: {{ row.f_offsite_time }}
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  安检员: {{ row.f_checker_name }}
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  安检状态: {{ row.f_entry_status }}
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  安检结果: {{ row.f_defect_content.include('正常') ? '正常' : '有隐患' }}
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  整改内容: {{ row.f_defect_text }}
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+
+export default {
+  title: '查询用户',
+  data() {
+    return {
+      model: [],
+      f_safecheck_code: ''
+    }
+  },
+  methods: {
+    getmodel() {
+      let http = new HttpResetClass()
+      http.load('POST', `rs/sql/tel_singleTable_OrderBy`, {
+        data: {
+          items: "tcp.*,CASE WHEN CHARINDEX( '\"result\":\"正常\"', f_defect_content ) > 0 THEN '无隐患' ELSE replace(replace(replace( replace( RIGHT ( f_defect_content, len( f_defect_content ) - 26 ), substring('{}',2,1), '' ), substring('{}',1,1), '' ),']',''),'\"','') END as f_defect_text",
+          tablename: 't_check_paper tcp left join t_qr_code tqr on tcp.f_userinfoid = tqr.f_userinfo_id',
+          condition: `tqr.f_safecheck_code  = '${this.f_safecheck_code}'`,
+          orderitem: 'tcp.f_offsite_time desc'
+        }
+      }).then((res) => {
+        this.model = res.data
+      })
+    },
+  },
+  ready() {
+    console.log(window.location.href)
+    let url = window.location.href
+    if (url.includes('id')){
+      const urlObj = new URL(url);
+      this.f_safecheck_code = urlObj.searchParams.get('id')
+      this.getmodel()
+    }else {
+      console.log(window.location.href)
+      console.log('非法数据')
+    }
+  }
+}
+</script>
+<style>
+</style>