system-phone 3.1.35 → 3.1.37

package/src/bootstrap/less/wells.less

@@ -1,29 +1,29 @@
-//
-// Wells
-// --------------------------------------------------
-
-
-// Base class
-.well {
-  min-height: 20px;
-  padding: 19px;
-  margin-bottom: 20px;
-  background-color: @well-bg;
-  border: 1px solid @well-border;
-  border-radius: @border-radius-base;
-  .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
-  blockquote {
-    border-color: #ddd;
-    border-color: rgba(0,0,0,.15);
-  }
-}
-
-// Sizes
-.well-lg {
-  padding: 24px;
-  border-radius: @border-radius-large;
-}
-.well-sm {
-  padding: 9px;
-  border-radius: @border-radius-small;
-}
+//
+// Wells
+// --------------------------------------------------
+
+
+// Base class
+.well {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: @well-bg;
+  border: 1px solid @well-border;
+  border-radius: @border-radius-base;
+  .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
+  blockquote {
+    border-color: #ddd;
+    border-color: rgba(0,0,0,.15);
+  }
+}
+
+// Sizes
+.well-lg {
+  padding: 24px;
+  border-radius: @border-radius-large;
+}
+.well-sm {
+  padding: 9px;
+  border-radius: @border-radius-small;
+}

package/src/components/AloneLoadParams.vue

@@ -1,26 +1,26 @@
-<template>
-  <div>
-     <p>获取参数中，请保持网络畅通</p>
-  </div>
-</template>
-
-<script>
-import co from 'co'
-import Vue from 'vue'
-import LoadParams from '../plugins/LoadParams'
-
-export default {
-  title: '加载参数',
-  props: {
-    componentName: {
-      type: String
-    }
-  },
-  ready () {
-    LoadParams.load().then(() => {
-      // this.$resetpost(Vue.dataUrl + 'rs/logic/androidLog', {data: {name: 'path', msg: '加载参数成功'}}, {resolveMsg: null, rejectMsg: null})
-      this.$goto(this.componentName)
-    })
-  }
-}
-</script>
+<template>
+  <div>
+     <p>获取参数中，请保持网络畅通</p>
+  </div>
+</template>
+
+<script>
+import co from 'co'
+import Vue from 'vue'
+import LoadParams from '../plugins/LoadParams'
+
+export default {
+  title: '加载参数',
+  props: {
+    componentName: {
+      type: String
+    }
+  },
+  ready () {
+    LoadParams.load().then(() => {
+      // this.$resetpost(Vue.dataUrl + 'rs/logic/androidLog', {data: {name: 'path', msg: '加载参数成功'}}, {resolveMsg: null, rejectMsg: null})
+      this.$goto(this.componentName)
+    })
+  }
+}
+</script>

package/src/components/AlreadyService.vue

@@ -49,7 +49,7 @@
         let criteria = {
           items: 'id',
           tablename: 't_check_plan_item',
-          condition: `f_no_checkplan = '有计划安检' and f_approved = '打回'`,
+          condition: `f_no_checkplan = '有计划安检' and f_approved = '不通过'`,
           groupitem: 'id'
         }
         let result = HostApp._executeTask({'type':'sql', 'data':{'alias': 'safe_singleTable_GroupBy', 'criteria': criteria}})

package/src/components/LoadAppdata.vue

@@ -1,38 +1,38 @@
-<template>
-  <div class="loadingdata" :class="{'loaderror': show, 'loadsuccess': !show}">
-    <!-- <h2 style="margin: 0" v-if="show">{{msg}}</h2> -->
-    <h2 style="margin: 0" v-if="show">参数加载失败，请检查网络状态和服务状态...</h2>
-  </div>
-</template>
-
-<script>
-  export default {
-    title: '加载参数',
-    data () {
-      return {
-        msg: '',
-        show: false
-      }
-    },
-    ready () {
-      this.$appdata.load().then(() => {
-        this.$emit('ready')
-      })
-    }
-  }
-</script>
-<style media="screen">
-  .loadingdata {
-    position: fixed;
-    background: #fff;
-    opacity: 0.6;
-    top: 0;
-    width: 100%;
-  }
-  .loaderror {
-    opacity: 1;
-  }
-  .loadsuccess {
-    display: none;
-  }
-</style>
+<template>
+  <div class="loadingdata" :class="{'loaderror': show, 'loadsuccess': !show}">
+    <!-- <h2 style="margin: 0" v-if="show">{{msg}}</h2> -->
+    <h2 style="margin: 0" v-if="show">参数加载失败，请检查网络状态和服务状态...</h2>
+  </div>
+</template>
+
+<script>
+  export default {
+    title: '加载参数',
+    data () {
+      return {
+        msg: '',
+        show: false
+      }
+    },
+    ready () {
+      this.$appdata.load().then(() => {
+        this.$emit('ready')
+      })
+    }
+  }
+</script>
+<style media="screen">
+  .loadingdata {
+    position: fixed;
+    background: #fff;
+    opacity: 0.6;
+    top: 0;
+    width: 100%;
+  }
+  .loaderror {
+    opacity: 1;
+  }
+  .loadsuccess {
+    display: none;
+  }
+</style>

package/src/components/LoginAppV4.vue

@@ -100,7 +100,9 @@ let asyncReady = async function (self, url) {
     // 判断是否需要弱密码校验
     if (self.config && self.config.telephone && self.config.telephone.LoginApp && 'undefined' != typeof self.config.telephone.LoginApp.weakPassword) {
       self.weakPassword = self.config.telephone.LoginApp.weakPassword
+      Vue.weakPassword = self.config.telephone.LoginApp.weakPassword
     }
+
     console.log('手机端获取.json文件')
     console.log(JSON.stringify(self.config))
     return true
@@ -354,7 +356,7 @@ export default {
         console.log('获取参数结束')
         this.loaderShow = false
         // 弱口令验证
-        if (this.weakPassword && !(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*(123|321|abc|cba))[a-zA-Z\d!@#$%^&*()_+-=<>?]{8,16}$/.test(this.password))) {
+        if (this.weakPassword && !(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*(),.?":{}|<>~`+=_\\-])[A-Za-z\d!@#$%^&*(),.?":{}|<>~`+=_\\-]{8,}$/.test(this.password))) {
           await this.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm'])
           this.modifyPassword = true
           return

package/src/components/ModifyPassWord.vue

@@ -1,216 +1,216 @@
-<template>
-  <!--<div class="app-botton" @click="back()">-->
-  <!--<span class="glyphicon glyphicon-menu-left">返回</span>-->
-  <!--</div>-->
-  <div class="auto">
-    <div class="row app-row">
-      <div class="col-xs-4">
-        <img src="../assets/姓名.png" style="width: 20px;margin-bottom: 5px" alt="">
-        <span class="text-left font">账号</span>
-      </div>
-      <div class="col-xs-8 input-font">
-        <input type="text" class="search_input input-font" v-model="model.ename" readonly/>
-      </div>
-    </div>
-    <div class="row app-row">
-      <div class="col-xs-4" style="margin-top: 8px">
-        <img src="../assets/原始密码.png" style="width: 20px;margin-bottom: 5px" alt="">
-        <span class="text-left font">原始密码</span>
-      </div>
-      <div class="col-xs-8">
-        <input type="password" id="oldpassword" class="search_input input-font" v-model="model.oldpassword"
-               placeholder="请输入原始密码"/>
-      </div>
-    </div>
-    <div class="row app-row">
-      <div class="col-xs-4" style="margin-top: 8px">
-        <img src="../assets/密码.png" style="width: 20px;margin-bottom: 5px">
-        <span class="text-left font">新密码</span>
-      </div>
-      <div class="col-xs-8">
-        <input type="password" id="newpassword1" class="search_input input-font" v-model="model.password"
-               :placeholder="weakPassword?'需要包含大小写字母符号数字':'请输入新密码'"/>
-      </div>
-    </div>
-    <div class="row app-row">
-      <div class="col-xs-4" style="margin-top: 8px">
-        <img src="../assets/密码.png" style="width: 20px;margin-bottom: 5px" alt="">
-        <span class="text-left font">确认密码</span>
-      </div>
-      <div class="col-xs-8">
-        <input type="password" id="newpassword2" class="search_input input-font" v-model="model.newpassword"
-               placeholder="请重新输入新密码"/>
-      </div>
-    </div>
-    <div class="row app-row">
-      <div class="col-xs-4" style="margin-top: 8px">
-        <img src="../assets/选中.png" style="width: 20px;margin-bottom: 5px" alt="" v-if="showpass" @click="showoff()">
-        <img src="../assets/未选.png" style="width: 20px;margin-bottom: 5px" alt="" v-if="!showpass" @click="showon()">
-        <span class="text-left font">显示密码</span>
-      </div>
-    </div>
-    <div class="row app-row text-center">
-      <button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="save()">提交</button>
-    </div>
-  </div>
-</template>
-<script>
-import Vue from 'vue'
-
-let asyncCheck = async function (self, url) {
-  try {
-    let that = self
-    let user = {
-      ename: that.model.ename,
-      newpassword: that.model.password,
-      affirmpassword: that.model.newpassword,
-      password: that.model.oldpassword
-    }
-    let res = await Vue.resetpost(`${url}/${Vue.isv4 ?'api/af-system':'rs'}/user/modifypwd`, {data: user}, {resolveMsg: null, rejectMsg: null})
-    console.log("手机端验证登陆原始密码")
-    console.log(res.data)
-    if ((JSON.stringify(res.data).startsWith("{") || JSON.stringify(res.data).startsWith("[")) && res.data.code && res.data.msg) {
-      if (res.data.code === 200) {
-        that.$showMessage('修改密码成功！')
-        if (that.sourse == 'login') {
-          that.$emit('success', that.model.password)
-          return
-        }
-        that.$back()
-      } else {
-        that.$showMessage('修改密码失败，请重新输入！' + res.data.msg)
-        console.log(res.data)
-        return
-      }
-    } else {
-      if(res.data){
-        that.$showMessage('修改密码成功！')
-        if(that.sourse == 'login'){
-          that.$emit('success',that.model.password)
-          return
-        }
-        that.$back()
-      }else {
-        that.$showMessage('修改密码失败，请重新输入！')
-        console.log(res.data)
-        return
-      }
-    }
-  } catch (error) {
-    if (error.status == 500) {
-      that.$showMessage('网络异常，请检查手机网络！')
-    } else {
-      throw error
-    }
-  }
-}
-
-export default {
-  title: '修改密码',
-  data() {
-    return {
-      model: {
-        user: Vue.user.name,
-        userid: Vue.user.id,
-        ename: Vue.user.ename,
-        oldpassword: '',
-        password: '',
-        newpassword: ''
-      },
-      showpass: false
-    }
-  },
-  props: {
-    sourse: '',
-    weakPassword: false
-  },
-  ready() {
-
-  },
-  methods: {
-    back() {
-      let _this = this
-      this.$showMessage('所填写内容将不可恢复！', ['confirm', 'cancel']).then((res) => {
-        if (res === 'confirm') {
-          _this.$back()
-        }
-      })
-    },
-    // showpass(){
-    //   console.log('1')
-    //   document.getElementById("oldpassword").type = "text"
-    // },
-    showon() {
-      this.showpass = true
-      document.getElementById("oldpassword").type = "text"
-      document.getElementById("newpassword1").type = "text"
-      document.getElementById("newpassword2").type = "text"
-    },
-    showoff() {
-      this.showpass = false
-      document.getElementById("oldpassword").type = "password"
-      document.getElementById("newpassword1").type = "password"
-      document.getElementById("newpassword2").type = "password"
-    },
-    save() {
-      // 先对新密码和确认密码是否一致
-      if (this.model.password != this.model.newpassword) {
-        this.$showMessage('两次输入密码不一致！')
-        return
-      }
-      if (this.weakPassword && this.model.password && !(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*(123|321|abc|cba))[a-zA-Z\d!@#$%^&*()_+-=<>?]{8,16}$/.test(this.model.password))) {
-        this.$showMessage("密码必须是8~16位数字与大小字母外加特殊字符的组合，并且不能出现类似'123','abc'等连贯数字或者字母")
-        return
-      }
-      // 检验原始密码是否符合 并修改密码
-      asyncCheck(this, this.$androidUtil.getProxyUrl())
-    }
-  }
-}
-</script>
-<style>
-.search_input {
-  border: 0;
-  outline: none;
-}
-
-.app-row {
-  background-color: white;
-  padding: 10px 10px 0 10px;
-  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
-}
-
-.font {
-  font: 15px PingFang-SC-Medium;
-}
-
-.btn-font {
-  font: 600 16px PingFang-SC-Bold;
-  color: #499EDF;
-}
-
-.btn-color {
-  background-color: #FFFFFF;
-  border-radius: 10px;
-  border: 1px solid #499EDF;
-}
-
-.input-font {
-  font: 15px PingFang-SC-Medium;
-  color: #333333;
-}
-
-.app-botton {
-  position: fixed;
-  background: #87b2dd;
-  color: #FFF;
-  padding: 8px;
-  text-align: center;
-  font-size: 1.2em;
-  z-index: 10;
-  opacity: 0.5;
-  bottom: 50px;
-  margin-top: -10px;
-  height: 40px;
-}
-</style>
+<template>
+  <!--<div class="app-botton" @click="back()">-->
+  <!--<span class="glyphicon glyphicon-menu-left">返回</span>-->
+  <!--</div>-->
+  <div class="auto">
+    <div class="row app-row">
+      <div class="col-xs-4">
+        <img src="../assets/姓名.png" style="width: 20px;margin-bottom: 5px" alt="">
+        <span class="text-left font">账号</span>
+      </div>
+      <div class="col-xs-8 input-font">
+        <input type="text" class="search_input input-font" v-model="model.ename" readonly/>
+      </div>
+    </div>
+    <div class="row app-row">
+      <div class="col-xs-4" style="margin-top: 8px">
+        <img src="../assets/原始密码.png" style="width: 20px;margin-bottom: 5px" alt="">
+        <span class="text-left font">原始密码</span>
+      </div>
+      <div class="col-xs-8">
+        <input type="password" id="oldpassword" class="search_input input-font" v-model="model.oldpassword"
+               placeholder="请输入原始密码"/>
+      </div>
+    </div>
+    <div class="row app-row">
+      <div class="col-xs-4" style="margin-top: 8px">
+        <img src="../assets/密码.png" style="width: 20px;margin-bottom: 5px">
+        <span class="text-left font">新密码</span>
+      </div>
+      <div class="col-xs-8">
+        <input type="password" id="newpassword1" class="search_input input-font" v-model="model.password"
+               :placeholder="weakPassword?'需要包含大小写字母符号数字':'请输入新密码'"/>
+      </div>
+    </div>
+    <div class="row app-row">
+      <div class="col-xs-4" style="margin-top: 8px">
+        <img src="../assets/密码.png" style="width: 20px;margin-bottom: 5px" alt="">
+        <span class="text-left font">确认密码</span>
+      </div>
+      <div class="col-xs-8">
+        <input type="password" id="newpassword2" class="search_input input-font" v-model="model.newpassword"
+               placeholder="请重新输入新密码"/>
+      </div>
+    </div>
+    <div class="row app-row">
+      <div class="col-xs-4" style="margin-top: 8px">
+        <img src="../assets/选中.png" style="width: 20px;margin-bottom: 5px" alt="" v-if="showpass" @click="showoff()">
+        <img src="../assets/未选.png" style="width: 20px;margin-bottom: 5px" alt="" v-if="!showpass" @click="showon()">
+        <span class="text-left font">显示密码</span>
+      </div>
+    </div>
+    <div class="row app-row text-center">
+      <button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="save()">提交</button>
+    </div>
+  </div>
+</template>
+<script>
+import Vue from 'vue'
+
+let asyncCheck = async function (self, url) {
+  try {
+    let that = self
+    let user = {
+      ename: that.model.ename,
+      newpassword: that.model.password,
+      affirmpassword: that.model.newpassword,
+      password: that.model.oldpassword
+    }
+    let res = await Vue.resetpost(`${url}/${Vue.isv4 ?'api/af-system':'rs'}/user/modifypwd`, {data: user}, {resolveMsg: null, rejectMsg: null})
+    console.log("手机端验证登陆原始密码")
+    console.log(res.data)
+    if ((JSON.stringify(res.data).startsWith("{") || JSON.stringify(res.data).startsWith("[")) && res.data.code && res.data.msg) {
+      if (res.data.code === 200) {
+        that.$showMessage('修改密码成功！')
+        if (that.sourse == 'login') {
+          that.$emit('success', that.model.password)
+          return
+        }
+        that.$back()
+      } else {
+        that.$showMessage('修改密码失败，请重新输入！' + res.data.msg)
+        console.log(res.data)
+        return
+      }
+    } else {
+      if(res.data){
+        that.$showMessage('修改密码成功！')
+        if(that.sourse == 'login'){
+          that.$emit('success',that.model.password)
+          return
+        }
+        that.$back()
+      }else {
+        that.$showMessage('修改密码失败，请重新输入！')
+        console.log(res.data)
+        return
+      }
+    }
+  } catch (error) {
+    if (error.status == 500) {
+      that.$showMessage('网络异常，请检查手机网络！')
+    } else {
+      throw error
+    }
+  }
+}
+
+export default {
+  title: '修改密码',
+  data() {
+    return {
+      model: {
+        user: Vue.user.name,
+        userid: Vue.user.id,
+        ename: Vue.user.ename,
+        oldpassword: '',
+        password: '',
+        newpassword: ''
+      },
+      showpass: false
+    }
+  },
+  props: {
+    sourse: '',
+    weakPassword: false
+  },
+  ready() {
+
+  },
+  methods: {
+    back() {
+      let _this = this
+      this.$showMessage('所填写内容将不可恢复！', ['confirm', 'cancel']).then((res) => {
+        if (res === 'confirm') {
+          _this.$back()
+        }
+      })
+    },
+    // showpass(){
+    //   console.log('1')
+    //   document.getElementById("oldpassword").type = "text"
+    // },
+    showon() {
+      this.showpass = true
+      document.getElementById("oldpassword").type = "text"
+      document.getElementById("newpassword1").type = "text"
+      document.getElementById("newpassword2").type = "text"
+    },
+    showoff() {
+      this.showpass = false
+      document.getElementById("oldpassword").type = "password"
+      document.getElementById("newpassword1").type = "password"
+      document.getElementById("newpassword2").type = "password"
+    },
+    save() {
+      // 先对新密码和确认密码是否一致
+      if (this.model.password != this.model.newpassword) {
+        this.$showMessage('两次输入密码不一致！')
+        return
+      }
+      if (Vue.weakPassword  && !(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*(),.?":{}|<>~`+=_\\-])[A-Za-z\d!@#$%^&*(),.?":{}|<>~`+=_\\-]{8,}$/.test(this.model.password))) {
+        this.$showMessage("密码必须是8~16位数字与大小字母外加特殊字符的组合，并且不能出现类似'123','abc'等连贯数字或者字母")
+        return
+      }
+      // 检验原始密码是否符合 并修改密码
+      asyncCheck(this, this.$androidUtil.getProxyUrl())
+    }
+  }
+}
+</script>
+<style>
+.search_input {
+  border: 0;
+  outline: none;
+}
+
+.app-row {
+  background-color: white;
+  padding: 10px 10px 0 10px;
+  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+}
+
+.font {
+  font: 15px PingFang-SC-Medium;
+}
+
+.btn-font {
+  font: 600 16px PingFang-SC-Bold;
+  color: #499EDF;
+}
+
+.btn-color {
+  background-color: #FFFFFF;
+  border-radius: 10px;
+  border: 1px solid #499EDF;
+}
+
+.input-font {
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
+}
+
+.app-botton {
+  position: fixed;
+  background: #87b2dd;
+  color: #FFF;
+  padding: 8px;
+  text-align: center;
+  font-size: 1.2em;
+  z-index: 10;
+  opacity: 0.5;
+  bottom: 50px;
+  margin-top: -10px;
+  height: 40px;
+}
+</style>