system-clients 3.1.94-aode → 3.1.94

package/src/components/server/ImageViewer.vue

@@ -0,0 +1,350 @@
+<!--父组件调用时需要写一个按钮和两个方法  一个方法用来显示组件和传图片  另一个方法用来关闭此组件
+  具体用法参照 ImageVieweTest.vue
+-->
+<template>
+  <div class="full-img" v-show="show">
+    <div class="bor">
+      <div class="magnify">
+      <!-- 左边产品图片区域 -->
+      <div class="left_contaner">
+        <div class="middle_img" @mouseover="boxMouseOver" @mouseleave="boxMouseLeave">
+          <!-- 产品图片 -->
+          <img :src="middleImg" alt="">
+          <!-- 阴影盒子 -->
+          <div class="shade" @mouseover="shadeMouseOver" @mousemove="shadeMouseMove" ref="shade" v-show="isShade"></div>
+        </div>
+        <div>
+          <!-- 缩略图容器 -->
+          <div class="carousel">
+            <!-- 缩略图展示盒子 -->
+            <div class="show_box">
+              <ul class="picture_container" ref="middlePicture">
+                <li class="picture_item" @mouseover="tabPicture(item)" v-for="(index , item) in src" :key="index">
+                  <img :src="item.url" class="small_ima" alt="">
+                </li>
+              </ul>
+            </div>
+          </div>
+          <button class="btn_" @click="clone">关闭</button>
+        </div>
+      </div>
+      <!-- 右边放大区域 -->
+        <div class="right_contanier" v-show="isBig">
+          <img :src="middleImg" ref="bigImg" class="big_img" alt="">
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import $ from 'jquery'
+  export default {
+    title: '图片查看器',
+    props: {
+      src: {
+        type: Array
+      },
+      show: {
+        type: Boolean,
+        default: false,
+      },
+      middleImgWidth: {
+        default: 400,
+        type: Number
+      }, // 产品图片宽
+      middleImgHeight: {
+        default: 300,
+        type: Number
+      }, // 产品图片高
+      thumbnailHeight: {
+        default: 80,
+        type: Number
+      }, // 缩略图容器高度
+      zoom: {
+        default: 2, // 缩略比例,放大比例
+        type: Number
+      },
+      width: {
+        default: 80
+      },
+      height: {
+        default: 60
+      },
+      alt: {
+        default: '图片加载失败'
+      },
+      attach: {
+        type: String,
+        default: 'name'
+      }
+    },
+    data () {
+      return {
+        middleImg: '', // 中图图片地址
+        bigImg: '', // 大图图片地址
+        isShade: false, // 控制阴影显示与否
+        isBig: false, // 控制放大图显示与否
+        initX: 0, // 初始clientX值
+        initY: 0, // 初始clientY值
+        leftX: 0, // 初始定位left
+        topY: 0, // 初始定位top
+        middleLeft: 0, // 当前放置小图盒子的定位left值,
+        itemWidth: 80 // 缩略图每张的宽度
+      }
+    },
+    ready () {
+      this.$nextTick(() => {
+        // 容器的高
+        const imgWidth = this.middleImgHeight + this.thumbnailHeight + 120
+        // const imgWidth = 400
+        // 设置容器宽高
+        $('.magnify').css({
+          width: this.middleImgWidth,
+          height: imgWidth
+        })
+        // 设置产品图宽高
+        $('.middle_img').css({
+          width: this.middleImgWidth,
+          height: this.middleImgHeight
+        })
+        // 设置移动阴影图宽高
+        $('.middle_img .shade').css({
+          width: this.middleImgWidth/this.zoom,
+          height: this.middleImgHeight/this.zoom
+        })
+        // 设置缩略图容器高
+        $('.carousel').css({
+          height: this.thumbnailHeight
+        })
+        // 设置每个缩略图宽
+        $('.picture_item').css({
+          width: this.itemWidth
+        })
+        // 设置放大后图片容器的宽高,left
+        $('.right_contanier').css({
+          left: this.middleImgWidth,
+          width: imgWidth,
+          height: imgWidth
+        })
+        // 设置放大图片的宽高(图片的放大倍数)
+        $('.right_contanier .big_img').css({
+          width: imgWidth * this.zoom,
+          height: imgWidth * this.zoom
+        })
+      })
+    },
+    methods: {
+      clone () {
+        console.log('关闭')
+        this.$emit('clone_f')
+      },
+      // 产品图片鼠标移入事件,显示阴影,显示大图
+      boxMouseOver (e) {
+        console.log(9999, e)
+        e.preventDefault();
+        e.stopPropagation();
+        this.isShade = true
+        this.isBig = true
+        // 计算阴影的位置
+        let x = e.offsetX - $('.shade').width()/2
+        let y = e.offsetY - $('.shade').height()/2
+        let maxLeft = $('.middle_img').width() - $('.shade').width()
+        let maxTop = $('.middle_img').height() - $('.shade').height()
+        x = x <= 0 ? 0 : x
+        x = x >= maxLeft ? maxLeft : x
+        y = y <= 0 ? 0 : y
+        y = y >= maxTop ? maxTop : y
+
+        $('.shade').css({
+          left: x,
+          top: y
+        })
+
+      },
+      // 鼠标在阴影移动
+      shadeMouseMove (e) {
+        e.preventDefault();
+        e.stopPropagation();
+        // console.log($('.middle_img')[0].offsetParent.clientLeft)
+        // console.log($('.middle_img')[0].offsetParent.offsetLeft)
+        // 用页面x - 父盒子的offsetLeft - 父盒子的左边框宽度
+        var x = this.getEventPage(e).pageX - $('.middle_img')[0].offsetParent.offsetLeft - $('.middle_img')[0].offsetParent.clientLeft;
+        // var x = this.getEventPage(e).pageX - 312;
+        // 用页面y - 父盒子的offsetTop - 父盒子的上边框宽度
+        // console.log($('.middle_img')[0].offsetParent.offsetTop)
+        var y = this.getEventPage(e).pageY - $('.middle_img')[0].offsetParent.offsetTop - $('.middle_img')[0].offsetParent.clientTop;
+        // var y = this.getEventPage(e).pageY - 109 ;
+
+        // 让阴影的坐标居中
+        x -= $('.shade').width() / 2;
+        y -= $('.shade').height() / 2;
+
+        // 移动边界限制
+        let maxLeft = $('.middle_img').width() - $('.shade').width()
+        let maxTop = $('.middle_img').height() - $('.shade').height()
+        x = x <= 0 ? 0 : x
+        x = x >= maxLeft ? maxLeft : x
+        y = y <= 0 ? 0 : y
+        y = y >= maxTop ? maxTop : y
+        // 重新赋值当前的定位值
+        $('.shade').css({
+          left: x,
+          top: y
+        })
+        // 计算出实时的大图的定位,首先计算出比例
+        // 比例为x:大图宽度/小图宽度 y: 大图高度/小图高度,将小图的定位乘以比例就是大图的定位
+        const xRate = $('.big_img').width() / $('.middle_img').width()
+        const yRate = $('.big_img').height() / $('.middle_img').height()
+        $('.big_img').css({
+          left: -x*xRate,
+          top: -y*yRate
+        })
+        // console.log(e, x, y, xRate, yRate, 66677)
+      },
+      // 鼠标移入阴影,去除自定义事件
+      shadeMouseOver (e) {
+        e.preventDefault();
+        e.stopPropagation();
+        // console.log(88888, e)
+      },
+      // 图片移出隐藏阴影和大图
+      boxMouseLeave (e) {
+        this.isShade = false
+        this.isBig = false
+      },
+      // 切换图片
+      tabPicture (item) {
+        this.middleImg = item.url
+      },
+      /**
+       * 获取网页滚出去的距离（包括上面滚出去的部分和左边滚出去的部分）
+       * @returns {{scrollTop: (Number|number), scrollLeft: (Number|number)}}
+       */
+      getPageScroll() {
+        return {
+          scrollTop: window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || 0,
+          scrollLeft: window.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft || 0
+        }
+      },
+      /**
+       * 获取事件对象点击的点，相对于文档左上角的坐标
+       * @param e
+       * @returns {{pageX: *, pageY: *}}
+       */
+      getEventPage(e) {
+        return {
+          pageX: e.clientX + this.getPageScroll().scrollLeft,
+          pageY: e.clientY + this.getPageScroll().scrollTop
+        }
+      }
+    },
+    // 监听图片查看器是否打开 给产品图设默认值
+    watch: {
+      'show'(val) {
+        if (val) {
+          this.middleImg = this.src[0].url
+        }
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .full-img {
+    position: fixed;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    z-index: 20;
+    background: rgba(0,0,0,0.6);
+    display: flex;
+    overflow: auto;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    color: #fff;
+  }
+  .bor {
+    /*border: 2px solid #18D797;*/
+    width: 904px;
+    height: 504px;
+  }
+  .magnify {
+    position: relative;
+  }
+  .small_ima {
+    width: 100px;
+    height: 80px;
+    display: inline-block;
+  }
+  .left_contaner {
+    width: 100%;
+    height: 100%;
+  }
+  .left_contaner .middle_img {
+    border: 1px solid #ccc;
+    box-sizing: border-box;
+    position: relative;
+  }
+  .left_contaner .shade {
+    background-color: rgba(    135,206,235, .5);
+    position: absolute;
+    top: 0;
+    left: 0;　cursor: move;}
+  .left_contaner .middle_img img {
+    width: 100%;
+    height: 100%;
+  }
+  .left_contaner .carousel {
+    width: 100%;
+    margin-top: 20px;
+    display: -webkit-flex;
+  }
+  .left_contaner .carousel .show_box {
+    flex: 1;
+    overflow: hidden;
+    position: relative;
+  }
+  .left_contaner .carousel .arrow {
+    flex-basis: 25px;
+    cursor: pointer;
+  }
+  .left_contaner .carousel .picture_container {
+    position: absolute;
+    overflow: hidden;
+    top: 0;
+  }
+  .left_contaner .picture_container .picture_item {
+    height: 100%;
+    float: left;
+    padding: 5px;
+    box-sizing: border-box;
+  }
+  .left_contaner .picture_container .picture_item:hover {
+    border: 2px solid #f2019f;
+  }
+  .right_contanier {
+    overflow: hidden;
+    position: absolute;
+    top: 0;
+    border: 1px solid #ccc;
+  }
+  .right_contanier .big_img {
+    position: absolute;
+    top: 0px;
+    left: 0px;
+  }
+  .btn_ {
+    background-color: #6aa6e2;
+    position: absolute;
+    bottom: 11px;
+    left: 13px;
+    width: 55px;
+    height: 35px;
+    border-radius: 5px;
+    border: none;
+  }
+
+</style>

package/src/components/server/Login.vue

@@ -1,16 +1,26 @@
 <template>
   <div class="syslogin">
     <div class="login-title" >
-      <div class="login-title-chi" style="white-space: nowrap">
-        <img src="../../../static/newStyle/login-info.png"/>
-        <span>关于我们</span>
-        <img src="../../../static/newStyle/login-con.png"/>
-        <span>联系我们</span>
+      <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%">
+          <img src="../../../static/newStyle/login-info.png"/>
+          <span @click="showus=true">关于我们</span>
+<!--          <img src="../../../static/newStyle/login-con.png"/>-->
+<!--          <span>联系我们</span>-->
+        </div>
       </div>
     </div>
-    <div class="logopic"  >
-      <div  class="aodelogo"></div>
-    </div>
+
+    <modal :show.sync="showus"  backdrop="true" width="50%" style="width:auto;">
+      <article slot="modal-body" class="modal-body" >
+        <img style="height:100%;width:100%" src="../../../static/newStyle/about-us.png"/>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+
+
     <div class="logoew" v-if="logoandroid" >
       <div v-if="logoandroid" class="imglogo"></div>
       <p class="logocontent">燃气客服系统Android版</p>
@@ -22,9 +32,9 @@
       <div class="loginmain-left">
         <img  class="loginmain-left-img" src="../../../static/newStyle/login-left.png">
       </div>
-      <div class="loginmain-right" style="width:45%">
+      <div class="loginmain-right">
 
-        <p @click="theme()" style="white-space: nowrap">燃气客服系统</p>
+        <p @click="theme()" style="white-space: nowrap">{{config.title}}</p>
 
         <form v-show="!login">
           <!--                    <input type="text" placeholder="用户名" v-model="model.ename" class="usericon">-->
@@ -81,12 +91,6 @@
                 <p class="form-control-static">{{$login.f.name}}</p>
               </div>
             </div>
-            <div class="col-sm-12 form-group">
-              <label class="col-sm-5 control-label">组&nbsp;织&nbsp;编&nbsp;码</label>
-              <div class="col-sm-7">
-                <p class="form-control-static">{{$login.f.number}}</p>
-              </div>
-            </div>
             <div class="col-sm-12 form-group">
               <label class="col-sm-5 control-label">所在销售点</label>
               <div class="col-sm-7">
@@ -112,6 +116,7 @@
   import co from 'co'
   import $ from 'jquery'
   import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
 
   let saveGen = function *(self) {
     try {
@@ -199,7 +204,19 @@
   }
   export default {
     title: '登录',
-    ready () {
+    async ready () {
+      let http = new HttpResetClass()
+      let res = await http.load('POST', 'rs/sql/singleTable',
+        {data:{
+            tablename: 't_changedeclare',
+            condition: ` f_type ='变更通知' `
+          }
+        }, {resolveMsg: null, rejectMsg: '获取通知出错！！'})
+      if(res.data.length>0){
+        console.log("---------------获取通知",res.data[0].f_change_message)
+        this.notice=res.data[0].f_change_message
+      }
+
       if (this.$login && this.$login.getUrlCompileParames('name') && this.$login.getUrlCompileParames('password')) {
         this.model.ename = this.$login.getUrlCompileParames('name')
         this.model.password = this.$login.getUrlCompileParames('password')
@@ -225,7 +242,8 @@
         config: {
           isMac: false,
           depPrompt: false,
-          weakPassword: true
+          weakPassword: false,
+          title: '燃气客服系统'
         },
         login: false,
         depPromptShow: false,
@@ -236,7 +254,9 @@
         picLyanzhengma: '',
         // 修改密码弹框展示
         modifyPwShow: false,
-        logoandroid:true
+        logoandroid:false,
+        showus:false,
+        notice:''
       }
     },
     methods: {
@@ -331,20 +351,21 @@
     box-sizing: border-box;
     margin: 0;
     padding: 0;
-    font-weight: 300;
+    font-weight: 400;
+    outline: none;
   }
 
   body {
     font-family: 'Source Sans Pro', sans-serif;
     color: white;
-    font-weight: 300;
+    font-weight: 400;
   }
 
   body ::-webkit-input-placeholder {
     /* WebKit browsers */
     font-family: 'Source Sans Pro', sans-serif;
     color: white;
-    font-weight: 300;
+    font-weight: 400;
   }
 
   body :-moz-placeholder {
@@ -352,7 +373,7 @@
     font-family: 'Source Sans Pro', sans-serif;
     color: white;
     opacity: 1;
-    font-weight: 300;
+    font-weight: 400;
   }
 
   body ::-moz-placeholder {
@@ -360,14 +381,14 @@
     font-family: 'Source Sans Pro', sans-serif;
     color: white;
     opacity: 1;
-    font-weight: 300;
+    font-weight: 400;
   }
 
   body :-ms-input-placeholder {
     /* Internet Explorer 10+ */
     font-family: 'Source Sans Pro', sans-serif;
     color: white;
-    font-weight: 300;
+    font-weight: 400;
   }
 
   .wrapper {
@@ -436,7 +457,7 @@
     color: white;
     -webkit-transition-duration: 0.25s;
     transition-duration: 0.25s;
-    font-weight: 300;
+    font-weight: 400;
   }
 
   .form input:hover {
@@ -660,17 +681,10 @@
     width:150px;
     margin: 3px -15px;
   }
-  .aodelogo {
-    background:url(../../../static/aodelogo.png);
-    background-size:100%;
-    background-repeat: no-repeat;
-  }
   .imglogo {
-    background:url(../../../static/ewmlogo.png);
+    background:url(../../../static/logo.png);
     background-size:100%;
-    background-repeat: no-repeat;
   }
-
   .logoew {
     width:120px;
     height:120px;
@@ -679,14 +693,6 @@
     margin-top:10px;
   }
 
-  .logopic{
-    width: 23%;
-    height: 100px;
-    float:left;
-    margin-left:3.5%;
-    margin-top:10px;
-  }
-
   @-webkit-keyframes square {
     0% {
       -webkit-transform: translateY(0);