system-clients 3.1.95 → 3.1.96-aode

package/src/components/Main.vue

@@ -1,76 +1,25 @@
 <template>
-  <div @click="hindsetting1()" :class="{'with-watermark':showwatermakeflag}">
-    <!--    <div class="system-main" id="box" v-el:box v-if="!isManger">-->
-    <!--      <div class="system-logo" style="height: auto">-->
-    <!--        <img :src="imgs.logoimg" alt=""/>-->
-    <!--        <label>{{systemname}}</label>-->
-    <!--        <div class="system-logo-chi" >-->
-    <!--          <div  v-if="userpane"  class="auto system-logo-prompt" style="float: right">-->
-    <!--            <span>{{orgpathnames}}</span>-->
-    <!--          </div>-->
-    <!--          &lt;!&ndash;<div class="system-logo-chi-img1" style="float: right" @mouseenter="mouseenteruser()"  @mouseleave="mouseleaveuser()"></div>&ndash;&gt;-->
-    <!--          <span  style="float: right; padding-top: 2px"  @mouseenter="mouseenteruser()"  @mouseleave="mouseleaveuser()"  class="system-logo-chi-span-1">{{$login.f.name}}</span>-->
-    <!--          <span style="border-left: 1px solid;float: right;padding-top: 2px" class="system-logo-chi-span-1"> <img src="../../static/newStyle/login-f.png" height="20" width="20"> </span>-->
-    <!--          <a href="index.html" onclick="return confirm('您确定要退出系统吗？');" style="float: right;padding-top: 2px">-->
-    <!--            <img src="../../static/newStyle/system-off.png" alt="" >-->
-    <!--            <span class="system-logo-chi-span-1">退出系统</span>-->
-    <!--          </a>-->
-    <!--          <div style="float: right"  :class="{'dropstyle':setting,'dropstyle-1':!setting}">-->
-    <!--            <dropdown class="auto" >-->
-    <!--                      <span data-toggle="dropdown" @click="hindsetting()"  >-->
-    <!--                        <img :src="srcsetting" alt=""><span>系统设置</span>-->
-    <!--                      </span>-->
-    <!--              <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-up dropstyle-chi" >-->
-    <!--                &lt;!&ndash;                <li>系统信息及设置</li>&ndash;&gt;-->
-    <!--                <li style="color: #ffffff;white-space: nowrap"  @click="show=true">修改密码</li>-->
-    <!--                <li style="color: #ffffff;white-space: nowrap"  @click="AddChangeMsgShow=true">系统版本</li>-->
-    <!--              </ul>-->
-    <!--            </dropdown>-->
-    <!--          </div>-->
+  <div @click="hindsetting1()">
 
-    <!--        </div>-->
-    <!--      </div>-->
-    <!--      <div class="system-left tree-flex" :class="{'system-left-1': !treeOrIcon}" id="top" v-el:top >-->
-    <!--        <div class="system-left-chi" :class="{'system-left-icon': !treeOrIcon}"  >-->
-    <!--          <div class="span system-left-tree" >-->
-    <!--            <left-tree :functions='functions.functions' :userid='userid' @isnodo="isnodo" :treeOrIcon="treeOrIcon"  :tabs="tabs" v-ref:tree></left-tree>-->
-    <!--            &lt;!&ndash;            <icon-tree :functions='functions.functions' :userid='userid' v-show="!treeOrIcon"></icon-tree>&ndash;&gt;-->
-    <!--          </div>-->
-    <!--        </div>-->
-    <!--        <div class="system-foot-stretch" >-->
-    <!--          <a @click="changeShow()"><img src="../../static/images/lefticon/菜单伸缩.png" alt=""></a>-->
-    <!--        </div>-->
-    <!--      </div>-->
-
-
-    <!--      <div class="system-right" :class="{'system-right-1': !treeOrIcon}" id="bottom" v-el:bottom>-->
-    <!--        <div class="span">-->
-    <!--          <echarts-box v-if="$refs.mic.tabs.length === 0"></echarts-box>-->
-    <!--          <dynamic :comps='[]' :showup="true" :showhide="false" name='main' :selecttab.sync="selecttab" @tab-changed="tabChange" @tabscg="tabcg" v-ref:mic v-show="!($refs.mic.tabs.length === 0)"></dynamic>-->
-    <!--        </div>-->
-    <!--      </div>-->
-    <!--            <div class="system-foot"  v-el:bottom>-->
-
-    <!--              <div class="system-foot-box">-->
-
-    <!--              </div>-->
-    <!--            </div>-->
-    <!--    </div>-->
     <div class='flex-row  system-main' id="box" v-el:box v-if="!isManger">
+
       <div class="auto "  :class="{'login-operator1':$refs.mic.tabs.length === 0,'login-operator':$refs.mic.tabs.length != 0}">
-            <span>
-               <img
-                 src="../assets/people.png" height="15" width="15">
-              登录人：</span>
-        <label>{{orgpathnames}}</label>
+          <span class="glyphicon glyphicon-asterisk" style="color:#a1d0f5"></span>
+          <span>组织编码:</span>
+         <label style="margin-right:14px;">{{$login.f.number}}</label>
+          <span class="glyphicon glyphicon-user"  style="color:#a1d0f5"></span>
+          <span>登录人：</span>
+          <label>{{orgpathnames}}</label>
       </div>
       <div class="system-left tree-flex" :class="{'tree-flex-icon': !treeOrIcon}" id="top" v-el:top >
         <div class="system-left-chi" :class="{'system-left-icon': !treeOrIcon}"  >
           <div class="span system-left-tree " style="height:85%">
-            <h3>{{systemname}}</h3>
+            <div class="logopicaode"  >
+              <div  class="aodeloginedlogo"></div>
+            </div>
+            <h3 style="margin-bottom: 12px;height: 35px;">&nbsp;&nbsp;</h3>
             <!--            <div class="span" style="margin-bottom:10px;padding-bottom:5px;padding-top:5px;flex: 1;border-top: 1px solid #e5e5e5;border-bottom: 1px solid #e5e5e5;">-->
             <left-tree :functions='functions.functions' :userid='userid' @isnodo="isnodo" v-show="treeOrIcon" :tabs="tabs" v-ref:tree></left-tree>
-            <!--&lt;!&ndash;              <icon-tree :functions='functions.functions' :userid='userid' v-show="!treeOrIcon"></icon-tree>&ndash;&gt;-->
           </div>
 
           <div class="tree-flex-footer">
@@ -85,6 +34,7 @@
                 <!-- <li>{{name}}</li> -->
                 <li>{{date}}</li>
                 <li @click="show=true">修改密码</li>
+                <li @click="clearCache">清除缓存</li>
                 <li @click="AddChangeMsgShow=true">系统版本:1.0.0</li>
               </ul>
 
@@ -121,47 +71,6 @@
   import vue from 'vue'
   import co from 'co'
 
-  let getwartermakr = async function(self){
-    let param = {
-      tablename:'t_singlevalue',
-      condition: " 1=1 and name=\'水印内容\'"
-    };
-    let result =await self.$resetpost('rs/sql/saleSingleTable',{data:param},{resolveMsg: null, rejectMsg: null});
-    if(result && result.data.length>0){
-      self.showwatermakeflag = true;
-      createWaterMark(result.data[0].value);
-    }else{
-      self.showwatermakeflag = false;
-    }
-  }
-
-  let createWaterMark = function(userName){
-    let style;
-    if (style) style.remove();
-    let width = window.parseInt(document.body.clientWidth);
-    let canvasWidth = width / window.parseInt(width / 320);
-    let fontFamily = window.getComputedStyle(document.body)["font-family"];
-    let canvas = document.createElement("canvas");
-    canvas.width = canvasWidth;
-    canvas.height = 200;
-    let ctx = canvas.getContext("2d");
-    ctx.rotate((-20 * Math.PI) / 180);
-    ctx.font = `20px ${fontFamily}`;
-    ctx.fillStyle = "rgba(8,8,8,.1)";
-    ctx.fillText(userName, 50, 200);
-    let imgSrc = canvas.toDataURL("image/png");
-    style = document.createElement("style");
-    style.innerHTML = `.with-watermark:before{
-        content: "";
-        width: 100%;
-        height: 100%;
-        display: block;
-        position: absolute;
-        background-image: url("${imgSrc}");
-    }`;
-    (document.head.append || document.head.appendChild).apply(document.head, [style]);
-  }
-
   window.onunload = () => {
     vue.http({url: `rs/user/update/${this.$login.f.ename}`, method: 'GET'})
   }
@@ -191,8 +100,8 @@
         tabs:[],       //已初始化页签数组
         selecttab:'',
         setting:true,
-        srcsetting:'../../static/newStyle/setting.png',
-        showwatermakeflag:false,
+        srcsetting:'../../static/newStyle/setting.png'
+
         // headerHint: true, // 右侧顶部提示信息
         // value: 25645.26,
         // AddChangeMsgShow: false,
@@ -200,7 +109,6 @@
       }
     },
     ready () {
-      getwartermakr(this);
       let component = this.$login.getUrlCompileParames('component')
       if (component) {
         this.isManger = true
@@ -327,6 +235,9 @@
             window.location.reload()
           }
         })
+      },
+      clearCache() {
+        this.$resetpost('/rs/search/clearCache', { userid: this.$login.f.id }, { resolveMsg: '清除缓存成功', rejectMsg: '清除缓存失败，请重试' })
       }
     },
     computed: {
@@ -546,6 +457,18 @@
   .tree-img {
     font-size: 1.2em;
   }
+  .aodeloginedlogo {
+    background:url(../../static/aodenewlogo.png);
+    background-size:80%;
+    background-repeat: no-repeat;
+  }
+  .logopicaode{
+    width: 100%;
+    height: 61px;
+    float: left;
+    margin-left: 2.5%;
+    margin-top: 10px;
+  }
 
   /*将较长信息截断显示，鼠标悬停显示全部信息*/
   .cutout50 {

package/src/components/equipment/EquipmentManage.vue

@@ -4,7 +4,7 @@
       <div class="form-horizontal select-overspread" style="background: white; padding: 0 1%;">
         <div class="row">
           <div class="col-sm-2 form-group">
-            <label class="font_normal_body" title="参数管理：终端类型">终端类型</label>
+            <label class="font_normal_body">终端类型</label>
             <v-select id="f_charge_type"
                       v-model="model.f_equipment_type"
                       placeholder='终端类型'

package/src/components/equipment/PcAdd.vue

@@ -1,23 +1,23 @@
 <template>
-  <div class="row select-overspread">
+  <div class="auto select-overspread">
     <validator name='v'>
       <ul class="nav nav-tabs" >
         <li role="presentation" class="active"><a href="#">PC端MAC</a></li>
       </ul>
       <form class="form-horizontal">
-          <div class="col-sm-6 form-group">
+          <div class="col-sm-6">
             <label class="font_normal_body">使用人员</label>
             <input type="text"  style="width: 60%" class="input_search" v-model="model.f_username" placeholder="使用人员" >
           </div>
-          <div class="col-sm-6 form-group">
+          <div class="col-sm-6">
             <label class="font_normal_body">所属地址</label>
             <input type="text"  style="width: 60%" class="input_search" v-model="model.f_mac_outlets" placeholder="所属地址" >
           </div>
-          <div class="col-sm-6 form-group">
+          <div class="col-sm-6">
             <label class="font_normal_body">mac地址</label>
             <input type="text"  style="width: 60%" class="input_search" v-model="model.f_mac_number" placeholder="mac地址" >
           </div>
-          <div class="col-sm-6 form-group">
+          <div class="col-sm-6">
             <label class="font_normal_body">使用公司</label>
 
               <res-select restype='organization'

package/src/components/equipment/PcList.vue

@@ -4,7 +4,7 @@
       <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
-          <div class="col-sm-3 form-group">
+          <div class="col-sm-3">
             <label class="font_normal_body">使用公司</label>
             <res-select restype='organization'
                         is-mul="false"
@@ -13,12 +13,12 @@
             </res-select>
           </div>
 
-          <div class="col-sm-3 form-group" >
+          <div class="col-sm-3" >
             <label class="font_normal_body">使用人员</label>
             <input  type="text" class="input_search" style="width:60%" v-model="model.f_username"
                     condition="f_username like '%{}%'" placeholder="使用人员">
           </div>
-          <div class="col-sm-3 form-group" >
+          <div class="col-sm-3" >
             <label class="font_normal_body">所属地址</label>
             <input  type="text" class="input_search" style="width:60%" v-model="model.f_mac_outlets"
                     condition="f_mac_outlets like '%{}%'" placeholder="所属地址">
@@ -31,7 +31,7 @@
             </div>
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
-          <div class="col-sm-3 form-group" >
+          <div class="col-sm-3" >
             <label class="font_normal_body">MAC地址</label>
             <input  type="text" class="input_search" style="width:60%" v-model="model.f_mac_number"
                     condition="f_mac_number like '%{}%'" placeholder="MAC地址">
@@ -58,7 +58,7 @@
             <td style="text-align:center">{{row.f_mac_outlets}}</td>
             <td style="text-align:center">{{row.f_mac_number}}</td>
             <td style="text-align:center">
-              <button class="btn btn-danger"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
+              <button class="btn btn-link"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
             </td>
           </tr>
         </template>

package/src/components/equipment/PhoneAdd.vue

@@ -1,20 +1,20 @@
 <template>
-  <div class="row select-overspread">
+  <div class="auto select-overspread">
     <validator name='v'>
       <ul class="nav nav-tabs" >
         <li role="presentation" class="active"><a href="#">Phone端设备号</a></li>
       </ul>
       <form class="form-horizontal">
 
-          <div class="col-sm-6 form-group">
+          <div class="col-sm-6">
             <label class="font_normal_body">使用人员</label>
             <input type="text" style="width: 60%" class="input_search" v-model="model.f_username" placeholder="使用人员" >
           </div>
-          <div class="col-sm-6 form-group">
+          <div class="col-sm-6">
             <label class="font_normal_body">设备号</label>
             <input type="text" style="width: 60%" class="input_search" v-model="model.f_terminal_number" placeholder="设备号" >
           </div>
-          <div class="col-sm-6 form-group">
+          <div class="col-sm-6">
             <label class="font_normal_body">使用公司</label>
               <right-tree :userid.sync='userid' :source.sync='source' @re-res="getRes"></right-tree>
           </div>

package/src/components/equipment/PhoneList.vue

@@ -4,17 +4,17 @@
       <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
-          <div class="col-sm-3 form-group">
+          <div class="col-sm-3">
             <label class="font_normal_body">使用公司</label>
             <right-tree :userid.sync='$parent.$parent.userid' :source.sync='$parent.$parent.source'  @re-res="$parent.$parent.getRes" > </right-tree>
           </div>
 
-          <div class="col-sm-3 form-group" >
+          <div class="col-sm-3" >
             <label class="font_normal_body">使用人员</label>
             <input  type="text" class="input_search" style="width:60%" v-model="model.f_username"
                     condition="f_username like '%{}%'" placeholder="使用人员">
           </div>
-          <div class="col-sm-3 form-group" >
+          <div class="col-sm-3" >
             <label class="font_normal_body">设备号</label>
             <input  type="text" class="input_search" style="width:60%" v-model="model.f_terminal_number"
                     condition="f_terminal_number like '%{}%'" placeholder="设备号">
@@ -41,7 +41,7 @@
             <td style="text-align:center">{{row.f_username}}</td>
             <td style="text-align:center">{{row.f_terminal_number}}</td>
             <td style="text-align:center">
-              <button class="btn btn-danger"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
+              <button class="btn btn-link"  @click.stop="$parent.$parent.$parent.del(row)">删除</button>
             </td>
           </tr>
         </template>