system-clients 3.2.16 → 3.2.19

package/src/components/server/ModifyPw.vue

@@ -1,111 +1,111 @@
-<template>
-  <div>
-    <validator name="v">
-      <modal :show.sync="show" v-ref:modal  backdrop="false">
-        <header slot="modal-header" class="modal-header">
-          <button type="button" class="close" @click="rest"><span>&times;</span></button>
-          <h4 class="modal-title">修改密码</h4>
-        </header>
-        <article slot="modal-body" class="modal-body modifystyle auto form-horizontal">
-          <div class="has-feedback form-group"
-               :class="{'has-warning':$v.password.required,'has-error': $v.password.required,
-          'has-success':!$v.password.required}">
-            <label for="password" class="col-sm-4 col-sm-offset-1 control-label">原始密码:&nbsp;&nbsp;</label>
-            <div class="col-sm-4">
-              <input type="password" v-model="deliver.password" class="form-control" id="password" v-validate:password="{ required: true}">
-              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.password.required"></span>
-              <span v-if="$v.password.required">不能为空</span>
-            </div>
-          </div>
-          <div class="has-feedback form-group"
-               :class="{'has-warning':$v.newpassword.required,'has-error':($v.newpassword.numbersAndLetter8to16 || $v.newpassword.minlength)&& !$v.newpassword.required && !$v.newpassword.chinesePassword,
-          'has-success': !$v.newpassword.required && !$v.newpassword.numbersAndLetter8to16&&!$v.newpassword.minlength  && !$v.newpassword.chinesePassword}">
-            <label for="newpassword" class="col-sm-4 col-sm-offset-1 control-label">新的密码:&nbsp;&nbsp;</label>
-            <div class="col-sm-4">
-              <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{required:true, numbersAndLetter8to16: true, minlength: 6,chinesePassword: true}'>
-              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required && !$v.newpassword.minlength && !($v.newpassword.numbersAndLetter8to16 && !($v.newpassword.required)) && !($v.newpassword.chinesePassword) "></span>
-              <span v-if="$v.newpassword.required">不能为空</span>
-              <span v-if="($v.newpassword.numbersAndLetter8to16||$v.newpassword.minlength) && !($v.newpassword.required&&$v.newpassword.minlength)">密码必须是8~16位数字与字母组合</span>
-              <span v-if="$v.newpassword.chinesePassword">密码不能包含中文</span>
-            </div>
-          </div>
-          <div class="has-feedback form-group"
-               :class="{'has-warning':$v.affirmpassword.required,'has-error':$v.affirmpassword.equalValid && !($v.affirmpassword.required),
-          'has-success': !$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))}">
-            <label for="affirmpassword" class="col-sm-4 col-sm-offset-1 control-label">确认密码:&nbsp;&nbsp;</label>
-            <div class="col-sm-4">
-              <input type="password" v-model="deliver.affirmpassword" class="form-control" id="affirmpassword" v-validate:affirmpassword="{ required: true, equalValid: deliver.newpassword }">
-              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))"></span>
-              <span v-if="$v.affirmpassword.required">不能为空</span>
-              <span v-if="$v.affirmpassword.equalValid && !($v.affirmpassword.required)">两次密码不一致 !!</span>
-            </div>
-          </div>
-        </article>
-
-        <footer slot="modal-footer" class="modal-footer">
-          <button  type="button" class="btn btn-success" @click='confirm' :disabled="!$v.valid">确认</button>
-          <button  type="button" class="btn btn-default" @click='rest'>取消</button>
-        </footer>
-      </modal>
-    </validator>
-  </div>
-
-
-</template>
-<script>
-  import co from 'co'
-  import validator from '../../plugins/validation';
-
-  let saveGen = function * (self) {
-    self.deliver.ename = self.functions.ename
-    // let res = yield self.$post('rs/user/entity', {data: self.deliver})
-    // let res = yield self.$post('rs/db/modifypassword', {data: self.deliver})
-    // let res = yield self.$resetpost('/rs/db/modifypwd', {data: self.deliver})
-    //  Util.f.password = self.deliver.newpassword
-    let res = yield self.$resetpost('/rs/user/modifypwd', {data: self.deliver }, {resolveMsg: null,rejectMsg: null})
-    self.$login.f.password = self.deliver.newpassword
-    console.log(res.data)
-    if (res.data == true) {
-      self.$showAlert('修改成功!', 'success', 2000)
-      self.deliver.password = ''
-      self.deliver.newpassword = ''
-      self.deliver.affirmpassword = ''
-      self.show = false
-    } else {
-      self.$showMessage(res.data)
-    }
-  }
-  export default {
-    title: '系统管理-密码修改',
-    data () {
-      return {
-        deliver: {
-          password: '',
-          newpassword: '',
-          affirmpassword: ''
-        },
-        functions: this.$login.f
-      }
-    },
-    props: ['show'],
-    methods: {
-      confirm () {
-        let gen = saveGen(this)
-        co(gen)
-      },
-      rest () {
-        this.show = false
-        this.deliver = {password: '', newpassword: '', affirmpassword: ''}
-      }
-    }
-  }
-</script>
-<style>
-  /*修改密码body界面样式*/
-  .modifystyle {
-    background: #FCFEEE;
-  }
-  .modifystyle span{
-    color: red;
-  }
-</style>
+<template>
+  <div>
+    <validator name="v">
+      <modal :show.sync="show" v-ref:modal  backdrop="false">
+        <header slot="modal-header" class="modal-header">
+          <button type="button" class="close" @click="rest"><span>&times;</span></button>
+          <h4 class="modal-title">修改密码</h4>
+        </header>
+        <article slot="modal-body" class="modal-body modifystyle auto form-horizontal">
+          <div class="has-feedback form-group"
+               :class="{'has-warning':$v.password.required,'has-error': $v.password.required,
+          'has-success':!$v.password.required}">
+            <label for="password" class="col-sm-4 col-sm-offset-1 control-label">原始密码:&nbsp;&nbsp;</label>
+            <div class="col-sm-4">
+              <input type="password" v-model="deliver.password" class="form-control" id="password" v-validate:password="{ required: true}">
+              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.password.required"></span>
+              <span v-if="$v.password.required">不能为空</span>
+            </div>
+          </div>
+          <div class="has-feedback form-group"
+               :class="{'has-warning':$v.newpassword.required,'has-error':($v.newpassword.numbersAndLetter8to16 || $v.newpassword.minlength)&& !$v.newpassword.required && !$v.newpassword.chinesePassword,
+          'has-success': !$v.newpassword.required && !$v.newpassword.numbersAndLetter8to16&&!$v.newpassword.minlength  && !$v.newpassword.chinesePassword}">
+            <label for="newpassword" class="col-sm-4 col-sm-offset-1 control-label">新的密码:&nbsp;&nbsp;</label>
+            <div class="col-sm-4">
+              <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{required:true, numbersAndLetter8to16: true, minlength: 6,chinesePassword: true}'>
+              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required && !$v.newpassword.minlength && !($v.newpassword.numbersAndLetter8to16 && !($v.newpassword.required)) && !($v.newpassword.chinesePassword) "></span>
+              <span v-if="$v.newpassword.required">不能为空</span>
+              <span v-if="($v.newpassword.numbersAndLetter8to16||$v.newpassword.minlength) && !($v.newpassword.required&&$v.newpassword.minlength)">密码必须是8~16位数字与字母组合</span>
+              <span v-if="$v.newpassword.chinesePassword">密码不能包含中文</span>
+            </div>
+          </div>
+          <div class="has-feedback form-group"
+               :class="{'has-warning':$v.affirmpassword.required,'has-error':$v.affirmpassword.equalValid && !($v.affirmpassword.required),
+          'has-success': !$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))}">
+            <label for="affirmpassword" class="col-sm-4 col-sm-offset-1 control-label">确认密码:&nbsp;&nbsp;</label>
+            <div class="col-sm-4">
+              <input type="password" v-model="deliver.affirmpassword" class="form-control" id="affirmpassword" v-validate:affirmpassword="{ required: true, equalValid: deliver.newpassword }">
+              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))"></span>
+              <span v-if="$v.affirmpassword.required">不能为空</span>
+              <span v-if="$v.affirmpassword.equalValid && !($v.affirmpassword.required)">两次密码不一致 !!</span>
+            </div>
+          </div>
+        </article>
+
+        <footer slot="modal-footer" class="modal-footer">
+          <button  type="button" class="btn btn-success" @click='confirm' :disabled="!$v.valid">确认</button>
+          <button  type="button" class="btn btn-default" @click='rest'>取消</button>
+        </footer>
+      </modal>
+    </validator>
+  </div>
+
+
+</template>
+<script>
+  import co from 'co'
+  import validator from '../../plugins/validation';
+
+  let saveGen = function * (self) {
+    self.deliver.ename = self.functions.ename
+    // let res = yield self.$post('rs/user/entity', {data: self.deliver})
+    // let res = yield self.$post('rs/db/modifypassword', {data: self.deliver})
+    // let res = yield self.$resetpost('/rs/db/modifypwd', {data: self.deliver})
+    //  Util.f.password = self.deliver.newpassword
+    let res = yield self.$resetpost('/rs/user/modifypwd', {data: self.deliver }, {resolveMsg: null,rejectMsg: null})
+    self.$login.f.password = self.deliver.newpassword
+    console.log(res.data)
+    if (res.data == true) {
+      self.$showAlert('修改成功!', 'success', 2000)
+      self.deliver.password = ''
+      self.deliver.newpassword = ''
+      self.deliver.affirmpassword = ''
+      self.show = false
+    } else {
+      self.$showMessage(res.data)
+    }
+  }
+  export default {
+    title: '系统管理-密码修改',
+    data () {
+      return {
+        deliver: {
+          password: '',
+          newpassword: '',
+          affirmpassword: ''
+        },
+        functions: this.$login.f
+      }
+    },
+    props: ['show'],
+    methods: {
+      confirm () {
+        let gen = saveGen(this)
+        co(gen)
+      },
+      rest () {
+        this.show = false
+        this.deliver = {password: '', newpassword: '', affirmpassword: ''}
+      }
+    }
+  }
+</script>
+<style>
+  /*修改密码body界面样式*/
+  .modifystyle {
+    background: #FCFEEE;
+  }
+  .modifystyle span{
+    color: red;
+  }
+</style>

package/src/filiale/dongguan/Login.vue

@@ -1,12 +1,12 @@
 <template>
-  <div class="syslogin">
+  <div class="syslogin" style="background-image: url(../static/newStyle/dongguan1.png)">
     <div class="login-title" >
       <div class="row auto">
         <marquee style="width:80%;margin-top:25px"><span  style="font-size: 1.8rem;color: white;">{{notice}}</span></marquee>
         <div class="login-title-chi" style="white-space: nowrap;margin-right:-5%">
           <div v-if="titleShow">
           <img src="../../../static/newStyle/login-info.png"/>
-          <span @click="showus=true">关于我们</span>
+          <span style="color:#7D7D7D;font-weight: bold;" @click="showus=true">关于我们</span>
           </div>
           <!--          <img src="../../../static/newStyle/login-con.png"/>-->
           <!--          <span>联系我们</span>-->
@@ -29,16 +29,16 @@
       <p  class="logofooter">(仅浏览器扫描)</p>
     </div>
     <!--输入框-->
-    <div class="loginmain" style="margin: 8% 3% 6% 73%;width: 22%;height: 48%;">
+    <div class="loginmain" style="margin: 8% 3% 6% 73%;width: 22%;height: 48%;background-color: #00A8E9">
       <!-- <img src="../../../static/login_title1.png" alt="图片加载未完成" class="img-responsive" style="margin: 0 auto; padding-top: 150px;" /> -->
 <!--      <div class="loginmain-left">-->
 <!--        <img  class="loginmain-left-img" src="../../../static/newStyle/login-left.png">-->
 <!--      </div>-->
       <div class="loginmain-right" style="float:none;padding:4% 4% 2% 4%;width:80%">
 
-        <p @click="theme()" style="white-space: nowrap;font-weight:bold;text-align: center">{{config.title}}</p>
+        <p @click="theme()" style="white-space: nowrap;font-weight:bold; text-align: center;font-size: 4rem;color:white">{{config.title}}</p>
 
-        <form v-show="!login">
+        <form v-show="!login" class="login-form">
           <!--                    <input type="text" placeholder="用户名" v-model="model.ename" class="usericon">-->
           <div class="login-input" style="opacity: 0;position:absolute;width:0;height:0;">
             <img src="../../../static/newStyle/login-user.png"/>
@@ -85,8 +85,8 @@
         </div>
       </div>
     </div>
-    <div class="login-foot" style="margin-top:10%" v-show="true">
-      技术支持：东莞市伊米斯智能科技有限公司
+    <div class="login-foot" style="margin-top:11%;font-weight: bold;color:#7D7D7D" v-show="true">
+      技术支持：东莞市伊米斯智能科技有限公司  粤ICP备2022095777号-1
     </div>
     <div class="login-foot" v-show="$login.BAinformation">
       {{{ $login.BAinformation }}}
@@ -311,7 +311,7 @@ export default {
         isMac: false,
         depPrompt: false,
         weakPassword: false,
-        title: 'AiGAS CLOUD',
+        title: '伊米斯燃气云',
         distanceLogin: false,
         // 那些角色可以定时获取预约提示
         isTip : false,
@@ -529,4 +529,369 @@ export default {
   display:flex;
   justify-content: center;
 }
+body {
+  font-family: 'Source Sans Pro', sans-serif;
+  color: white;
+  font-weight: 400;
+}
+
+body ::-webkit-input-placeholder {
+  /* WebKit browsers */
+  font-family: 'Source Sans Pro', sans-serif;
+  color: white;
+  font-weight: 400;
+}
+
+body :-moz-placeholder {
+  /* Mozilla Firefox 4 to 18 */
+  font-family: 'Source Sans Pro', sans-serif;
+  color: white;
+  opacity: 1;
+  font-weight: 400;
+}
+
+body ::-moz-placeholder {
+  /* Mozilla Firefox 19+ */
+  font-family: 'Source Sans Pro', sans-serif;
+  color: white;
+  opacity: 1;
+  font-weight: 400;
+}
+
+body :-ms-input-placeholder {
+  /* Internet Explorer 10+ */
+  font-family: 'Source Sans Pro', sans-serif;
+  color: white;
+  font-weight: 400;
+}
+
+.wrapper {
+  /*background: #2D83BA;
+  background: -webkit-linear-gradient(top left, #2D83BA 0%, #2D83BA 100%);
+  background: linear-gradient(to bottom right, #2D83BA 0%, #2D83BA 100%);
+  opacity: 0.8;*/
+  position: absolute;
+  top: 50%;
+  right: -60px;
+  width: 40%;
+  height: 400px;
+  margin-top: -150px;
+  overflow: hidden;
+
+}
+
+.wrapper.form-success .container h3 {
+  -webkit-transform: translateY(85px);
+  -ms-transform: translateY(85px);
+  transform: translateY(85px);
+}
+
+.container {
+  max-width: 350px;
+  margin: 0 auto;
+  padding: 30px 100px 50px 100px;
+  height: 400px;
+  text-align: center;
+  /*以下增加*/
+  background: #2D83BA;
+  background: -webkit-linear-gradient(top left, #2D83BA 0%, #2D83BA 100%);
+  background: linear-gradient(to bottom right, #2D83BA 0%, #2D83BA 100%);
+  opacity: 0.8;
+}
+
+.container h3 {
+  font-size: 40px;
+  -webkit-transition-duration: 1s;
+  transition-duration: 1s;
+  -webkit-transition-timing-function: ease-in-put;
+  transition-timing-function: ease-in-put;
+  font-weight: 200;
+}
+
+.form {
+  padding: 20px 0;
+  position: relative;
+  z-index: 2;
+}
+
+.form input {
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  outline: 0;
+  border: 1px solid #50ABE6;
+  background-color: #50ABE6;
+  width: 250px;
+  border-radius: 3px;
+  padding: 10px 15px;
+  margin: 0 auto 10px auto;
+  display: block;
+  text-align: center;
+  font-size: 18px;
+  color: white;
+  -webkit-transition-duration: 0.25s;
+  transition-duration: 0.25s;
+  font-weight: 400;
+}
+
+.form input:hover {
+  background-color: rgba(255, 255, 255, 0.4);
+}
+
+.form input:focus {
+  background-color: white;
+  width: 300px;
+  color: #53e3a6;
+}
+
+.usericon {
+  background-image: url(../../../static/usericon.png);
+  background-repeat: no-repeat;
+  background-size: 30px;
+  background-position-x: 8px;
+  background-position-y: 8px;
+}
+
+.psicon {
+  background-image: url(../../../static/psicon.png);
+  background-repeat: no-repeat;
+  background-size: 30px;
+  background-position-x: 8px;
+  background-position-y: 8px;
+}
+
+.form button {
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  outline: 0;
+  background-color: white;
+  border: 0;
+  padding: 10px 15px;
+  color: #253830;
+  border-radius: 3px;
+  width: 250px;
+  cursor: pointer;
+  font-size: 18px;
+  -webkit-transition-duration: 0.25s;
+  transition-duration: 0.25s;
+}
+
+.form button:hover {
+  background-color: #f5f7f9;
+}
+
+/*注册字体样式*/
+.form span {
+  color: #fff;
+  display: table-footer-group;
+  position: absolute;
+  right: 10px;
+  margin-top: 10px;
+  cursor: pointer;
+}
+
+.logotitle {
+  color: #fff;
+  position: absolute;
+  top: 50px;
+  left: 50px;
+  font-size: 50px;
+}
+
+/*注册模态框界面样式*/
+.modifystyle {
+  background: #FCFEEE;
+}
+
+.modifystyle div {
+  height: auto;
+  margin-bottom: 15px;
+  /*text-align: center;*/
+  /*margin-left: 20%;*/
+}
+
+/*bootstrap字体图标要手动调整，所以使用字体图标的span必须紧跟在input后面，负责会错位*/
+.modifystyle div input + span {
+  top: 0 !important;
+  right: 32%;
+}
+
+.modifystyle span {
+  color: red;
+}
+
+/* 通告区内容 */
+.notice-board {
+  height: auto;
+  position: absolute;
+  top: 50%;
+  margin-top: -150px;
+  margin-left: 100px;
+  color: #fff;
+}
+
+/*修改密码底部按钮部分样式*/
+.footerbtn {
+  text-align: center;
+  padding: 15px;
+}
+
+.footerbtn button {
+  width: 100px;
+  margin-left: 20px;
+}
+
+.bg-bubbles {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 1;
+}
+
+.bg-bubbles li {
+  position: absolute;
+  list-style: none;
+  display: block;
+  width: 40px;
+  height: 40px;
+  background-color: rgba(255, 255, 255, 0.15);
+  bottom: -160px;
+  -webkit-animation: square 25s infinite;
+  animation: square 25s infinite;
+  -webkit-transition-timing-function: linear;
+  transition-timing-function: linear;
+}
+
+.bg-bubbles li:nth-child(1) {
+  left: 10%;
+}
+
+.bg-bubbles li:nth-child(2) {
+  left: 20%;
+  width: 80px;
+  height: 80px;
+  -webkit-animation-delay: 2s;
+  animation-delay: 2s;
+  -webkit-animation-duration: 17s;
+  animation-duration: 17s;
+}
+
+.bg-bubbles li:nth-child(3) {
+  left: 25%;
+  -webkit-animation-delay: 4s;
+  animation-delay: 4s;
+}
+
+.bg-bubbles li:nth-child(4) {
+  left: 40%;
+  width: 60px;
+  height: 60px;
+  -webkit-animation-duration: 22s;
+  animation-duration: 22s;
+  background-color: rgba(255, 255, 255, 0.25);
+}
+
+.bg-bubbles li:nth-child(5) {
+  left: 70%;
+}
+
+.bg-bubbles li:nth-child(6) {
+  left: 80%;
+  width: 120px;
+  height: 120px;
+  -webkit-animation-delay: 3s;
+  animation-delay: 3s;
+  background-color: rgba(255, 255, 255, 0.2);
+}
+
+.bg-bubbles li:nth-child(7) {
+  left: 32%;
+  width: 160px;
+  height: 160px;
+  -webkit-animation-delay: 7s;
+  animation-delay: 7s;
+}
+
+.bg-bubbles li:nth-child(8) {
+  left: 55%;
+  width: 20px;
+  height: 20px;
+  -webkit-animation-delay: 15s;
+  animation-delay: 15s;
+  -webkit-animation-duration: 40s;
+  animation-duration: 40s;
+}
+
+.bg-bubbles li:nth-child(9) {
+  left: 25%;
+  width: 10px;
+  height: 10px;
+  -webkit-animation-delay: 2s;
+  animation-delay: 2s;
+  -webkit-animation-duration: 40s;
+  animation-duration: 40s;
+  background-color: rgba(255, 255, 255, 0.3);
+}
+
+.bg-bubbles li:nth-child(10) {
+  left: 90%;
+  width: 160px;
+  height: 160px;
+  -webkit-animation-delay: 11s;
+  animation-delay: 11s;
+}
+.logofooter{
+  font-size: 12px;
+  color:#fff;
+  width:150px;
+  margin-left: 17px;
+}
+.logocontent{
+  font-size: 14px;
+  color:#fff;
+  width:150px;
+  margin: 3px -15px;
+}
+.imglogo {
+  background:url(../../../static/logo.png);
+  background-size:100%;
+}
+.login-form{
+  border-radius: 10px;
+  margin: 0 -12%;
+  background: white;
+  padding: 5%;
+}
+.logoew {
+  width:120px;
+  height:120px;
+  float:right;
+  margin-right:8.5%;
+  margin-top:10px;
+}
+
+@-webkit-keyframes square {
+  0% {
+    -webkit-transform: translateY(0);
+    transform: translateY(0);
+  }
+  100% {
+    -webkit-transform: translateY(-700px) rotate(600deg);
+    transform: translateY(-700px) rotate(600deg);
+  }
+}
+
+@keyframes square {
+  0% {
+    -webkit-transform: translateY(0);
+    transform: translateY(0);
+  }
+  100% {
+    -webkit-transform: translateY(-700px) rotate(600deg);
+    transform: translateY(-700px) rotate(600deg);
+  }
+}
 </style>

package/src/filiale/dongguan/system.js

@@ -1,6 +1,6 @@
-// 分公司特殊组件页面注册
-
-exports.specialComp =  {
-  'home-page': (resolve) => require(['./Main'], resolve),
-  'login': (resolve) => require(['./Login'], resolve)
-}
+// 分公司特殊组件页面注册
+
+exports.specialComp =  {
+  'home-page': (resolve) => require(['./Main'], resolve),
+  'login': (resolve) => require(['./Login'], resolve)
+}