safecheck-client 3.0.27-gongyi → 3.0.30-gongyi

package/examples/UserFiles/comp.js

@@ -1,227 +1,227 @@
-import {SearchList, date} from 'vue-client'
-import {all} from 'vue-client'
-import {HttpResetClass} from 'vue-client'
-import Vue from "vue"
-export default class Comp {
-  /*async constructor() {
-    await this.ready()
-  }*/
-  // 用户安检信息列表
-  all = new all()
-  //气表品牌
-  brands=[]
-  user=new SearchList(false)
-  http = new HttpResetClass()
-  isAndNot = ["是", "否"]
-  data=[]
-  userinfo_code=''
-  userinfo={}
-  selectTemplate=''
-  devices=[]
-  userfiles={
-    f_meternumber:"",
-    f_initial_base:"",
-    f_user_type:"",
-    f_meter_brand:"",
-    f_meter_style:"",
-    f_aroundmeter:"",
-    f_gas_person:"",
-    f_gas_date:"",
-    f_userfiles_address:"",
-    f_install_person:"",
-    f_install_date:"",
-  }
-  showUser=true
-  showFiles=false
-  shouDevices=false
-  userfiles_address=["厨房","室外"]
-  filialeid=Vue.user.orgid
-  //filialeid=453
-
-  aroundmeterList=['左表','右表']
-  change(filed,f){
-    this[filed]=this[filed]?false:true
-    f()
-  }
-  changeUserinfo(modelname,key,val){
-    this[modelname][key]=val
-  }
-  changeUserfiles(key,val){
-    this.userfiles[key]=val
-  }
-  changeDevices(index,key,val){
-    this.devices[index][key]=val
-  }
-  gasmodel=[]
-
-  changeBrand(val,f){
-    console.log("-"+"-------"+JSON.stringify(val))
-    this.userfiles.f_gasbrand_id=val.id
-    this.userfiles.f_meter_brand=val.f_meter_brand
-    this.gasmodel=val.gasmodel
-    this.userfiles.f_meter_style='请选择'
-    f()
-  }
-  changeBrandModel(val,f){
-    console.log("当前gasmodel---"+JSON.stringify(val))
-    this.userfiles.f_gasmodel_id=val.id
-    this.userfiles.f_meter_style=val.f_meter_style
-    f()
-  }
-  async ready() {
-   await this.getAllBrands()
-  }
-setField(key,val){
-    this.user.search.setField(key,val)
-}
- async getUserInfo(f){
-
-   //console.log("-----------------")
-     /*console.log("1111111111111111111111111"+JSON.stringify(Vue.$appdata.saleParams))
-   console.log("22222222222222222222222222"+JSON.stringify(Vue.$appdata))*/
-   //Vue.appdata.load()
-   //console.log(Vue.appdata.saleParams)
-    /*if(Vue.android){    ${this.$androidUtil.getProxyUrl()}
-      this.all.$androidUtil.bzLogic(('FetchCheckPaper', {id: "this.item.id"}))
-    }else{*/
-    this.setFiled("f_filialeid",this.filialeid)
-      await this.user.searchList(Vue.androidUtil.getProxyUrl()+"/rs/sql/filemanage_getUserfies",{
-        f_filialeid: "u.f_filialeid={}",
-        name:"u.f_user_name like '%{}%'",
-        code:"u.f_userinfo_code='{}'",
-        address:"a.f_address like '%{}%'"
-      },{orderitem: "f_userinfo_id DESC"})
-
-   f()
-  }
-
-  async getUserfiles(f){
-   /* if(Vue.android){
-      this.all.$androidUtil.bzLogic(('FetchCheckPaper', {id: "this.item.id"}))
-    }else{*/
-      let response=await this.http.load("POST", Vue.androidUtil.getProxyUrl()+'/rs/logic/commonSearchByUser', {
-        data:{
-          f_userinfo_code:this.userinfo_code,
-          f_unit:'fen',
-          info:[]
-        }
-      }, {resolveMsg: null, rejectMsg: null})
-    this.userinfo=response.data.resJson.userinfo
-    if(this.userinfo.userfiles){
-      if(this.userinfo.userfiles.devices){
-        this.devices=this.userinfo.userfiles.devices
-      }else{
-        this.userinfo.userfiles.devices=this.devices
-      }
-      console.log("设备信息")
-      console.log(JSON.stringify(this.devices))
-      console.log("查询到的设备信息")
-      console.log(JSON.stringify(this.userinfo.userfiles.devices))
-    }else{
-      this.userinfo.userfiles=this.userfiles
-    }
-    let arr=[]
-    arr.push(this.userinfo.userfiles)
-    this.userinfo.userfiles=arr
-    this.userfiles=this.userinfo.userfiles[0]
-    console.log("档案信息")
-    console.log(JSON.stringify(this.userinfo))
-    console.log("设备信息")
-    console.log(JSON.stringify(this.devices))
-    //}
-    console.log("---------安装位置"+JSON.stringify(this.userfiles_address))
-    f()
-  }
-  getTemplate(){
-    if(this.userinfo_code){
-      return "component2"
-    }else{
-      return "component1"
-    }
-  }
-  setFiled(key,val){
-    this[key]=val
-  }
-
-  addDevicesItem(f){
-    this.devices.push({
-      f_devices_type:"",
-      f_devices_no:"",
-      f_brand:"",
-      f_devices_model:"",
-      f_input_date:this.getNowFormatDate()
-    })
-    f()
-  }
-
-  del(index,f){
-      console.log(index+"--------")
-      this.devices.splice(index,1)
-    f()
-  }
-
-//获取所有气表品牌getAllBrands
- async getAllBrands(){
-    let response=await this.http.load("POST", Vue.androidUtil.getProxyUrl()+"/rs/logic/getSaleInitData", {
-      f_orgid: this.filialeid
-    }, {resolveMsg: null, rejectMsg: null})
-   this.brands=response.data.gasbrands
-  }
-//保存用户档案信息
-  async saveUserInfo(f){
-    for(let i=0;i<this.devices.length;i++){this.devices[i].img={content:"",filename:""}}
-
-    console.log(this.userinfo)
-    this.userinfo.f_operator_record="文明"
-
-    this.userinfo.userfiles[0].devicesinfo=this.userinfo.userfiles[0].devices
-    let response=await this.http.load("POST", Vue.androidUtil.getProxyUrl()+"/rs/logic/filemanage_fileSave", {
-      data:{
-        userinfo:this.userinfo,
-        address:{id:this.userinfo.userfiles[0].f_useraddress_id}
-      }
-    }, {resolveMsg: "修改成功！", rejectMsg: "失败，请联系管理员"})
-    this.userinfo_code=''
-    f()
-  }
-  back(f){
-    this.userinfo_code=''
-    f()
-  }
-  //获取当前时间
-  getNowFormatDate() {
-    let date = new Date();
-    let seperator1 = "-";
-    let seperator2 = ":";
-    let month = date.getMonth() + 1;
-    let strDate = date.getDate();
-    let hour = date.getHours();
-    let min = date.getMinutes();
-    let second = date.getSeconds();
-    if (month >= 1 && month <= 9) {
-      month = "0" + month;
-    }
-    if (strDate >= 0 && strDate <= 9) {
-      strDate = "0" + strDate;
-    }
-    if (hour >= 0 && hour <= 9) {
-      hour = "0" + hour;
-    }
-    if (min >= 0 && min <= 9) {
-      min = "0" + min;
-    }
-    if (second >= 0 && second <= 9) {
-      second = "0" + second;
-    }
-    let currentdate = date.getFullYear() + seperator1 + month + seperator1 + strDate
-      + " " + hour + seperator2 + min
-      + seperator2 + second;
-    return currentdate;
-  }
-
-  //加载更多数据
-  async loadMore(modelname,f) {
-    await this[modelname].list.loadMore()
-    f()
-  }
-}
+import {SearchList, date} from 'vue-client'
+import {all} from 'vue-client'
+import {HttpResetClass} from 'vue-client'
+import Vue from "vue"
+export default class Comp {
+  /*async constructor() {
+    await this.ready()
+  }*/
+  // 用户安检信息列表
+  all = new all()
+  //气表品牌
+  brands=[]
+  user=new SearchList(false)
+  http = new HttpResetClass()
+  isAndNot = ["是", "否"]
+  data=[]
+  userinfo_code=''
+  userinfo={}
+  selectTemplate=''
+  devices=[]
+  userfiles={
+    f_meternumber:"",
+    f_initial_base:"",
+    f_user_type:"",
+    f_meter_brand:"",
+    f_meter_style:"",
+    f_aroundmeter:"",
+    f_gas_person:"",
+    f_gas_date:"",
+    f_userfiles_address:"",
+    f_install_person:"",
+    f_install_date:"",
+  }
+  showUser=true
+  showFiles=false
+  shouDevices=false
+  userfiles_address=["厨房","室外"]
+  filialeid=Vue.user.orgid
+  //filialeid=453
+
+  aroundmeterList=['左表','右表']
+  change(filed,f){
+    this[filed]=this[filed]?false:true
+    f()
+  }
+  changeUserinfo(modelname,key,val){
+    this[modelname][key]=val
+  }
+  changeUserfiles(key,val){
+    this.userfiles[key]=val
+  }
+  changeDevices(index,key,val){
+    this.devices[index][key]=val
+  }
+  gasmodel=[]
+
+  changeBrand(val,f){
+    console.log("-"+"-------"+JSON.stringify(val))
+    this.userfiles.f_gasbrand_id=val.id
+    this.userfiles.f_meter_brand=val.f_meter_brand
+    this.gasmodel=val.gasmodel
+    this.userfiles.f_meter_style='请选择'
+    f()
+  }
+  changeBrandModel(val,f){
+    console.log("当前gasmodel---"+JSON.stringify(val))
+    this.userfiles.f_gasmodel_id=val.id
+    this.userfiles.f_meter_style=val.f_meter_style
+    f()
+  }
+  async ready() {
+   await this.getAllBrands()
+  }
+setField(key,val){
+    this.user.search.setField(key,val)
+}
+ async getUserInfo(f){
+
+   //console.log("-----------------")
+     /*console.log("1111111111111111111111111"+JSON.stringify(Vue.$appdata.saleParams))
+   console.log("22222222222222222222222222"+JSON.stringify(Vue.$appdata))*/
+   //Vue.appdata.load()
+   //console.log(Vue.appdata.saleParams)
+    /*if(Vue.android){    ${this.$androidUtil.getProxyUrl()}
+      this.all.$androidUtil.bzLogic(('FetchCheckPaper', {id: "this.item.id"}))
+    }else{*/
+    this.setFiled("f_filialeid",this.filialeid)
+      await this.user.searchList(Vue.androidUtil.getProxyUrl()+"/rs/sql/filemanage_getUserfies",{
+        f_filialeid: "u.f_filialeid={}",
+        name:"u.f_user_name like '%{}%'",
+        code:"u.f_userinfo_code='{}'",
+        address:"a.f_address like '%{}%'"
+      },{orderitem: "f_userinfo_id DESC"})
+
+   f()
+  }
+
+  async getUserfiles(f){
+   /* if(Vue.android){
+      this.all.$androidUtil.bzLogic(('FetchCheckPaper', {id: "this.item.id"}))
+    }else{*/
+      let response=await this.http.load("POST", Vue.androidUtil.getProxyUrl()+'/rs/logic/commonSearchByUser', {
+        data:{
+          f_userinfo_code:this.userinfo_code,
+          f_unit:'fen',
+          info:[]
+        }
+      }, {resolveMsg: null, rejectMsg: null})
+    this.userinfo=response.data.resJson.userinfo
+    if(this.userinfo.userfiles){
+      if(this.userinfo.userfiles.devices){
+        this.devices=this.userinfo.userfiles.devices
+      }else{
+        this.userinfo.userfiles.devices=this.devices
+      }
+      console.log("设备信息")
+      console.log(JSON.stringify(this.devices))
+      console.log("查询到的设备信息")
+      console.log(JSON.stringify(this.userinfo.userfiles.devices))
+    }else{
+      this.userinfo.userfiles=this.userfiles
+    }
+    let arr=[]
+    arr.push(this.userinfo.userfiles)
+    this.userinfo.userfiles=arr
+    this.userfiles=this.userinfo.userfiles[0]
+    console.log("档案信息")
+    console.log(JSON.stringify(this.userinfo))
+    console.log("设备信息")
+    console.log(JSON.stringify(this.devices))
+    //}
+    console.log("---------安装位置"+JSON.stringify(this.userfiles_address))
+    f()
+  }
+  getTemplate(){
+    if(this.userinfo_code){
+      return "component2"
+    }else{
+      return "component1"
+    }
+  }
+  setFiled(key,val){
+    this[key]=val
+  }
+
+  addDevicesItem(f){
+    this.devices.push({
+      f_devices_type:"",
+      f_devices_no:"",
+      f_brand:"",
+      f_devices_model:"",
+      f_input_date:this.getNowFormatDate()
+    })
+    f()
+  }
+
+  del(index,f){
+      console.log(index+"--------")
+      this.devices.splice(index,1)
+    f()
+  }
+
+//获取所有气表品牌getAllBrands
+ async getAllBrands(){
+    let response=await this.http.load("POST", Vue.androidUtil.getProxyUrl()+"/rs/logic/getSaleInitData", {
+      f_orgid: this.filialeid
+    }, {resolveMsg: null, rejectMsg: null})
+   this.brands=response.data.gasbrands
+  }
+//保存用户档案信息
+  async saveUserInfo(f){
+    for(let i=0;i<this.devices.length;i++){this.devices[i].img={content:"",filename:""}}
+
+    console.log(this.userinfo)
+    this.userinfo.f_operator_record="文明"
+
+    this.userinfo.userfiles[0].devicesinfo=this.userinfo.userfiles[0].devices
+    let response=await this.http.load("POST", Vue.androidUtil.getProxyUrl()+"/rs/logic/filemanage_fileSave", {
+      data:{
+        userinfo:this.userinfo,
+        address:{id:this.userinfo.userfiles[0].f_useraddress_id}
+      }
+    }, {resolveMsg: "修改成功！", rejectMsg: "失败，请联系管理员"})
+    this.userinfo_code=''
+    f()
+  }
+  back(f){
+    this.userinfo_code=''
+    f()
+  }
+  //获取当前时间
+  getNowFormatDate() {
+    let date = new Date();
+    let seperator1 = "-";
+    let seperator2 = ":";
+    let month = date.getMonth() + 1;
+    let strDate = date.getDate();
+    let hour = date.getHours();
+    let min = date.getMinutes();
+    let second = date.getSeconds();
+    if (month >= 1 && month <= 9) {
+      month = "0" + month;
+    }
+    if (strDate >= 0 && strDate <= 9) {
+      strDate = "0" + strDate;
+    }
+    if (hour >= 0 && hour <= 9) {
+      hour = "0" + hour;
+    }
+    if (min >= 0 && min <= 9) {
+      min = "0" + min;
+    }
+    if (second >= 0 && second <= 9) {
+      second = "0" + second;
+    }
+    let currentdate = date.getFullYear() + seperator1 + month + seperator1 + strDate
+      + " " + hour + seperator2 + min
+      + seperator2 + second;
+    return currentdate;
+  }
+
+  //加载更多数据
+  async loadMore(modelname,f) {
+    await this[modelname].list.loadMore()
+    f()
+  }
+}

package/examples/UserFiles/index.html

@@ -1,19 +1,19 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>安检计划</title>
-    <script src="go_static/wasm_exec.js"></script>
-    <script src="go_static/Functions.js"></script>
-    <script src="go_static/init.js"></script>
-    <script src="go_static/tools.js"></script>
-    <script src="go_static/Jsons.js"></script>
-    <script src="go_static/class.js"></script>
-  </head>
-  <body style="overflow: hidden;">
-    <app></app>
-    <!--<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/eruda"></script>
-    <script>eruda.init();</script>-->
-    <script src="./UserFilesApp.js"></script>
-  </body>
-</html>
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>安检计划</title>
+    <script src="go_static/wasm_exec.js"></script>
+    <script src="go_static/Functions.js"></script>
+    <script src="go_static/init.js"></script>
+    <script src="go_static/tools.js"></script>
+    <script src="go_static/Jsons.js"></script>
+    <script src="go_static/class.js"></script>
+  </head>
+  <body style="overflow: hidden;">
+    <app></app>
+    <!--<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/eruda"></script>
+    <script>eruda.init();</script>-->
+    <script src="./UserFilesApp.js"></script>
+  </body>
+</html>

package/examples/UserFiles/main.js

@@ -1,13 +1,13 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-
-// 调用全局配置
-all()
-require('../../src/bootstrap/less/bootstrap.less')
-
-/* eslint-disable no-new */
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+
+// 调用全局配置
+all()
+require('../../src/bootstrap/less/bootstrap.less')
+
+/* eslint-disable no-new */
+new Vue({
+  el: 'body',
+  components: { App }
+})

package/home.html

@@ -1,16 +1,16 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <title>安检系统</title>
-    <style media="screen">
-      body{width: 100%;background:#7f8eaf url(./static/mainbg.jpg) no-repeat center bottom; background-size: cover;}
-      body .loginbg{ width:100%; height:500px; background:url(./static/login_bg.jpg) no-repeat center top;}
-    </style>
-  </head>
-  <body>
-    <widget></widget>
-    <!-- built files will be auto injected -->
-  </body>
-<ml>
+<!DOCTYPE html>
+<html lang="zh-CN">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+    <title>安检系统</title>
+    <style media="screen">
+      body{width: 100%;background:#7f8eaf url(./static/mainbg.jpg) no-repeat center bottom; background-size: cover;}
+      body .loginbg{ width:100%; height:500px; background:url(./static/login_bg.jpg) no-repeat center top;}
+    </style>
+  </head>
+  <body>
+    <widget></widget>
+    <!-- built files will be auto injected -->
+  </body>
+<ml>

package/index.html

@@ -1,23 +1,23 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <title>安检系统</title>
-    <link rel="stylesheet" href="http://cache.amap.com/lbs/static/main1119.css"/>
-    <!--引入高德地图组件-->
-    <script src="https://webapi.amap.com/maps?v=1.4.2&key=4889f1e58df01cb40415536c8907bf64"></script>
-    <!--引入UI组件库（1.1版本） -->
-    <script src="https://webapi.amap.com/ui/1.1/main.js?v=1.1.1"></script>
-    <script type="text/javascript" src="http://cache.amap.com/lbs/static/addToolbar.js"></script>
-    <style media="screen">
-      /*url(./static/newmainbg.jpg)*/
-      body{width: 100%;background:#7f8eaf  no-repeat center bottom; background-size: cover;}
-      body .loginbg{ width:100%; height:100%; background:url(./static/newStyle/loginbg.gif) no-repeat center top;}
-    </style>
-  </head>
-  <body class="themeOne">
-    <app></app>
-    <!-- built files will be auto injected -->
-  </body>
-</html>
+<!DOCTYPE html>
+<html lang="zh-CN">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+    <title>安检系统</title>
+    <link rel="stylesheet" href="http://cache.amap.com/lbs/static/main1119.css"/>
+    <!--引入高德地图组件-->
+    <script src="https://webapi.amap.com/maps?v=1.4.2&key=4889f1e58df01cb40415536c8907bf64"></script>
+    <!--引入UI组件库（1.1版本） -->
+    <script src="https://webapi.amap.com/ui/1.1/main.js?v=1.1.1"></script>
+    <script type="text/javascript" src="http://cache.amap.com/lbs/static/addToolbar.js"></script>
+    <style media="screen">
+      /*url(./static/newmainbg.jpg)*/
+      body{width: 100%;background:#7f8eaf  no-repeat center bottom; background-size: cover;}
+      body .loginbg{ width:100%; height:100%; background:url(./static/newStyle/loginbg.gif) no-repeat center top;}
+    </style>
+  </head>
+  <body class="themeOne">
+    <app></app>
+    <!-- built files will be auto injected -->
+  </body>
+</html>

package/oa.iml

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/bin" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/bin" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
 </module>

package/package.json

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

package/publish.bat

@@ -1,7 +1,7 @@
-del c:\test\static\*.* /Q
-del c:\test\*.* /Q
-rd c:\test\static /q
-del c:\test\*.* /Q
-xcopy dist-android\*.* c:\test\*.* /S /Y
-del c:\test\static\*.map
-del c:\test\static\.gitkeep
+del c:\test\static\*.* /Q
+del c:\test\*.* /Q
+rd c:\test\static /q
+del c:\test\*.* /Q
+xcopy dist-android\*.* c:\test\*.* /S /Y
+del c:\test\static\*.map
+del c:\test\static\.gitkeep

package/release.bat

@@ -1,5 +1,5 @@
-git add -A
-git commit -m "[build] %1"
-git tag -a V%1 -m "Release version %1"
-git push origin --tags
-git push
+git add -A
+git commit -m "[build] %1"
+git tag -a V%1 -m "Release version %1"
+git push origin --tags
+git push