system-clients 3.1.93 → 3.1.95-aode

package/src/styles/less/aofeng/themeOne/BinaryTemplate.less

@@ -137,8 +137,8 @@
 @media screen and (max-width: 1920px) {
 
   .basic-main {
-    padding: 0.4%;
-    margin: 0.4% 0.4%;
+    padding: 0.6%;
+    margin: 0.6% 0.6%;
     width: 98.8%;
     height: auto;
     background-color: #ffffff;
@@ -213,8 +213,8 @@
   //  background-color: #ffffff!important;
   //}
   .binary-left {
-    padding: 0.4%;
-    margin: 0.4% 0.4%;
+    padding: 0.6%;
+    margin: 0.6% 0.6%;
     width: 58%;
     height: auto;
     background-color: #ffffff;
@@ -223,8 +223,8 @@
   }
 
   .binary-right {
-    padding: 0.4%;
-    margin: 0.4% 0.4% 0.4% 0;
+    padding: 0.6%;
+    margin: 0.6% 0.6% 0.6% 0;
     width: 40%;
     height: auto;
     background-color: #ffffff;
@@ -255,12 +255,12 @@
 }
 
 
-/*分辨率@1600*1080*/
+/*分辨率@1920*1080*/
 @media screen and (max-width: 1600px) {
 
   .basic-main {
-    padding: 0.4%;
-    margin: 0.4% 0.4%;
+    padding: 0.6%;
+    margin: 0.6% 0.6%;
     width: 98.8%;
     height: auto;
     background-color: #ffffff;
@@ -335,8 +335,8 @@
   //  background-color: #ffffff!important;
   //}
   .binary-left {
-    padding: 0.4%;
-    margin: 0.4% 0.4%;
+    padding: 0.6%;
+    margin: 0.6% 0.6%;
     width: 58%;
     height: auto;
     background-color: #ffffff;
@@ -345,8 +345,8 @@
   }
 
   .binary-right {
-    padding: 0.4%;
-    margin: 0.4% 0.4% 0.4% 0;
+    padding: 0.6%;
+    margin: 0.6% 0.6% 0.6% 0;
     width: 40%;
     height: auto;
     background-color: #ffffff;

package/src/styles/less/aofeng/themeOne/systemStyle.less

@@ -333,7 +333,7 @@ input{outline:none;}
   //system左侧树列表
   .system-left {
     float: left;
-    width: 8%;
+    width: 9%;
     height: 100%;
 
     .system-left-chi {
@@ -760,7 +760,7 @@ input{outline:none;}
   //system左侧树列表
   .system-left{
     float: left;
-    width: 9%;
+    width: 10%;
 
     height: 100%;
 
@@ -1193,7 +1193,7 @@ input{outline:none;}
   //system左侧树列表
   .system-left{
     float: left;
-    width: 10%;
+    width: 11%;
     height: 100%;
     .system-left-chi{
       height: 96%;
@@ -1610,7 +1610,7 @@ input{outline:none;}
   //system左侧树列表
   .system-left{
     float: left;
-    width: 10%;
+    width: 11%;
     height:100%;
     .system-left-chi{
       height: 96%;
@@ -2033,7 +2033,7 @@ input{outline:none;}
   //system左侧树列表
   .system-left{
     float: left;
-    width: 10%;
+    width: 11%;
     height: 100%;
     .system-left-chi{
       height: 96%;
@@ -2448,7 +2448,7 @@ input{outline:none;}
   //system左侧树列表
   .system-left{
     float: left;
-    width: 12%;
+    width: 13%;
     height: 100%;
     .system-left-chi{
       height: 96%;

package/src/styles/less/tables.less

@@ -71,57 +71,7 @@ th {
   }
 }
 
-.tablenew {
-  width: 100%;
-  max-width: 100%;
-  margin-bottom: @line-height-computed;
-  // Cells
-  > thead,
-  > tbody,
-  > tfoot {
-    > tr {
-      > th,
-      > td {
-        padding: 4px !important;
-        line-height: @line-height-base;
-        vertical-align: middle; // 原本为top
-        border-top: 0px solid @table-border-color; // 原本为0px
-        text-align: left;// 原本没有
-        color: #304A66;
-        // 原本没有，自己添加
-        font-family: 微软雅黑;
-
-      }
-    }
-  }
-  // Bottom align for column headings
-  > thead > tr > th {
-    text-align: center;
-    vertical-align: middle; // 原本为bottom
-    border-bottom: 2px solid @table-border-color;
-    font-weight: 600;
-  }
-  // Remove top border from thead by default
-  > caption + thead,
-  > colgroup + thead,
-  > thead:first-child {
-    > tr:first-child {
-      > th,
-      > td {
-        border-top: 0;
-      }
-    }
-  }
-  // Account for multiple tbody instances
-  > tbody + tbody {
-    border-top: 2px solid @table-border-color;
-  }
 
-  // Nesting
-  .table {
-    background-color: @body-bg;
-  }
-}
 // Condensed table w/ half padding
 
 .table-condensed {

package/src/styles/less/type.less

@@ -131,7 +131,7 @@ mark,
   .bg-variant(@state-success-bg);
 }
 .bg-info {
-  //.bg-variant(@state-info-bg);
+  .bg-variant(@state-info-bg);
   font-weight: 600;
 }
 .bg-warning {
@@ -140,20 +140,7 @@ mark,
 .bg-danger {
   .bg-variant(@state-danger-bg);
 }
-//----------------------------报表样式
-.report-primary {
-  color: #000809;
-  .bg-variant(@report-bg);
-  border-color: darken(@border, 25%);
-}
-.report-title{
-  color: #000809;
-  .bg-variant(@report-title);
-  border-color: darken(@border, 25%);
-}
-.report-success {
-  .bg-variant(@report-success);
-}
+
 
 // Page header
 // -------------------------
@@ -245,7 +232,7 @@ dd {
 
 // Abbreviations and acronyms
 abbr[title],
-  // Add data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257
+// Add data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257
 abbr[data-original-title] {
   cursor: help;
   border-bottom: 1px dotted @abbr-border-color;

package/src/styles/less/variables.less

@@ -19,10 +19,7 @@
 @brand-info:            #5bc0de;
 @brand-warning:         #f0ad4e;
 @brand-danger:          #d9534f;
-@report-bg:             #dfedfb;
-@report-success:        #ffffff;
-@border:                #adacac;
-@report-title:          #80add9;
+
 
 //== Scaffolding
 //
@@ -51,14 +48,14 @@
 @font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace;
 @font-family-base:        @font-family-sans-serif;
 
-@font-size-base:          14px;
+@font-size-base:          16px;
 @font-size-large:         ceil((@font-size-base * 1.25)); // ~18px
 @font-size-small:         ceil((@font-size-base * 0.85)); // ~12px
 
 @font-size-h1:            floor((@font-size-base * 2.6)); // ~36px
 @font-size-h2:            floor((@font-size-base * 2.15)); // ~30px
 @font-size-h3:            ceil((@font-size-base * 1.7)); // ~24px
-@font-size-h4:            ceil((@font-size-base * 1.06)); // ~18px
+@font-size-h4:            ceil((@font-size-base * 1.25)); // ~18px
 @font-size-h5:            @font-size-base;
 @font-size-h6:            ceil((@font-size-base * 0.85)); // ~12px
 

package/src/system.js

@@ -1,93 +1,83 @@
-import Vue from 'vue'
-import GetLoginInfoService from './plugins/GetLoginInfoService'
-import GetAppDataService from './stores/AppData'
-// 热力
-import HeatGetLoginInfoService from './plugins/HeatGetLoginInfoService'
-import HeatGetAppDataService from './stores/HeatAppData'
-// 热力登陆控制
-Vue.$heatCompatibility  = Vue.prototype.$heatCompatibility = false
-
-// /** **************************登录与主界面相关******************************/
-
-import login from './components/server/Login'
-import changeDeclare from './components/server/ChangeDeclare'
-import addChangemsg from './components/server/AddChangeMsg'
-import homePage from './components/Main'
-import leftTree from './components/server/LeftTree'
-import iconTree from './components/server/IconTree'
-import modifyPw from './components/server/ModifyPw'
-import LoadData from './components/server/LoadData'
-import RightTree from './components/server/RightTree'
-import TestRightTree from './components/server/TestRightTree'
-//资源选择
-import ResSelect from './components/server/ResSelect'
-import ResSelectGroup from './components/server/ResSelectGroup'
-
-//资源选择测试
-import TestResSelect from './components/server/TestResSelect'
-import RoleSelector from "./components/server/RoleSelector";
-export default function (val) {
-  //验证码开关赋值
-  if(val!=null){
-    GetLoginInfoService.Verification=val
-  }
-  Vue.use(GetLoginInfoService)
-  Vue.use(GetAppDataService)
-  Vue.use(HeatGetLoginInfoService)
-  Vue.use(HeatGetAppDataService)
-
-  Vue.component('login', login)
-  Vue.component('change-declare', changeDeclare)
-  Vue.component('add-changemsg', addChangemsg)
-  Vue.component('home-page', homePage)
-  Vue.component('left-tree', leftTree)
-  Vue.component('icon-tree', iconTree)
-  Vue.component('modify-pw', modifyPw)
-  Vue.component('load-data', LoadData)
-  Vue.component('right-tree', RightTree)
-  Vue.component('test-right-tree', TestRightTree)
-  Vue.component('role-selector', RoleSelector)
-  //资源选择
-  Vue.component('res-select', ResSelect)
-  Vue.component('res-select-group', ResSelectGroup)
- //资源选择测试
-  Vue.component('test-res-select', TestResSelect)
-
-  // 参数管理(新)
-  Vue.component('param-manage', (resolve) => { require(['./components/parammanage/ParamManage'], resolve) })
-  // 参数管理
-  Vue.component('param-page', (resolve) => { require(['./components/parammanage/ParamPage'], resolve) })
-  // 参数管理
-  Vue.component('single-page', (resolve) => { require(['./components/parammanage/SinglePage'], resolve) })
-
-  // 参数管理(旧)
-  Vue.component('param-manages', (resolve) => { require(['./components/parammanage/ParamManages'], resolve) })
-  // 参数管理
-  Vue.component('param-pages', (resolve) => { require(['./components/parammanage/ParamPages'], resolve) })
-  // 参数管理
-  Vue.component('single-pages', (resolve) => { require(['./components/parammanage/SinglePages'], resolve) })
-
-  // 终端管理
-  Vue.component('equipment-manage', (resolve) => { require(['./components/equipment/EquipmentManage'], resolve) })
-  // pc端控制
-  Vue.component('pc-manage', (resolve) => { require(['./components/equipment/PcManage'], resolve) })
-  // phone端控制
-  Vue.component('phone-manage', (resolve) => { require(['./components/equipment/PhoneManage'], resolve) })
-  // pos端控制
-  Vue.component('pos-manage', (resolve) => { require(['./components/equipment/PosManage'], resolve) })
-  // pos管理
-  Vue.component('pos-manage-both', (resolve) => { require(['./components/equipment/PosManageBoth'], resolve) })
-  // pos参数管理
-  Vue.component('pos-param-manage', (resolve) => { require(['./components/equipment/PosParamManage'], resolve) })
-
-  // 材料字典
-  Vue.component('material-data', (resolve) => { require(['./components/materialManage/materialData.vue'], resolve) })
-  Vue.component('material-data-list', (resolve) => { require(['./components/materialManage/materialList.vue'], resolve) })
-  // 图片查看器
-  Vue.component('image-viewer', (resolve) => { require(['./components/server/ImageViewer'], resolve) })
-  // 测试图片查看器
-  Vue.component('image-viewer-test', (resolve) => { require(['./components/server/ImageVieweTest'], resolve) })
-
-  //省市区、街道、小区、楼栋级联查询
-  Vue.component('pcd-building-select', (resolve) => { require(['./components/server/PcdBuildingSelect'], resolve) })
-}
+import Vue from 'vue'
+import GetLoginInfoService from './plugins/GetLoginInfoService'
+import GetAppDataService from './stores/AppData'
+// 热力
+import HeatGetLoginInfoService from './plugins/HeatGetLoginInfoService'
+import HeatGetAppDataService from './stores/HeatAppData'
+// 热力登陆控制
+Vue.$heatCompatibility  = Vue.prototype.$heatCompatibility = false
+
+// /** **************************登录与主界面相关******************************/
+
+import login from './components/server/Login'
+import changeDeclare from './components/server/ChangeDeclare'
+import addChangemsg from './components/server/AddChangeMsg'
+import homePage from './components/Main'
+import leftTree from './components/server/LeftTree'
+import iconTree from './components/server/IconTree'
+import modifyPw from './components/server/ModifyPw'
+import LoadData from './components/server/LoadData'
+import RightTree from './components/server/RightTree'
+import TestRightTree from './components/server/TestRightTree'
+//资源选择
+import ResSelect from './components/server/ResSelect'
+import ResSelectGroup from './components/server/ResSelectGroup'
+
+//资源选择测试
+import TestResSelect from './components/server/TestResSelect'
+import RoleSelector from "./components/server/RoleSelector";
+export default function (val) {
+  //验证码开关赋值
+  if(val!=null){
+    GetLoginInfoService.Verification=val
+  }
+  Vue.use(GetLoginInfoService)
+  Vue.use(GetAppDataService)
+  Vue.use(HeatGetLoginInfoService)
+  Vue.use(HeatGetAppDataService)
+
+  Vue.component('login', login)
+  Vue.component('change-declare', changeDeclare)
+  Vue.component('add-changemsg', addChangemsg)
+  Vue.component('home-page', homePage)
+  Vue.component('left-tree', leftTree)
+  Vue.component('icon-tree', iconTree)
+  Vue.component('modify-pw', modifyPw)
+  Vue.component('load-data', LoadData)
+  Vue.component('right-tree', RightTree)
+  Vue.component('test-right-tree', TestRightTree)
+  Vue.component('role-selector', RoleSelector)
+  //资源选择
+  Vue.component('res-select', ResSelect)
+  Vue.component('res-select-group', ResSelectGroup)
+ //资源选择测试
+  Vue.component('test-res-select', TestResSelect)
+
+  // 参数管理(新)
+  Vue.component('param-manage', (resolve) => { require(['./components/parammanage/ParamManage'], resolve) })
+  // 参数管理
+  Vue.component('param-page', (resolve) => { require(['./components/parammanage/ParamPage'], resolve) })
+  // 参数管理
+  Vue.component('single-page', (resolve) => { require(['./components/parammanage/SinglePage'], resolve) })
+
+  // 参数管理(旧)
+  Vue.component('param-manages', (resolve) => { require(['./components/parammanage/ParamManages'], resolve) })
+  // 参数管理
+  Vue.component('param-pages', (resolve) => { require(['./components/parammanage/ParamPages'], resolve) })
+  // 参数管理
+  Vue.component('single-pages', (resolve) => { require(['./components/parammanage/SinglePages'], resolve) })
+
+  // 终端管理
+  Vue.component('equipment-manage', (resolve) => { require(['./components/equipment/EquipmentManage'], resolve) })
+  // pc端控制
+  Vue.component('pc-manage', (resolve) => { require(['./components/equipment/PcManage'], resolve) })
+  // phone端控制
+  Vue.component('phone-manage', (resolve) => { require(['./components/equipment/PhoneManage'], resolve) })
+  // pos端控制
+  Vue.component('pos-manage', (resolve) => { require(['./components/equipment/PosManage'], resolve) })
+
+  // 材料字典
+  Vue.component('material-data', (resolve) => { require(['./components/materialManage/materialData.vue'], resolve) })
+  Vue.component('material-data-list', (resolve) => { require(['./components/materialManage/materialList.vue'], resolve) })
+
+}

package/src/components/TabButton.vue

@@ -1,201 +0,0 @@
-<template>
-  <div class='flex foot_tabset1'>
-    <!-- Nav tabs -->
-    <ul class="nav nav-{{navStyle}}" role="tablist" style="margin-left: 1%">
-      <li style="margin-right: 10px;height: 100%"
-          :id="'vc-tabset-li-'+attach +'-'+$index"
-          v-for="r in renderData"
-          @click.prevent="handleTabListClick($index, r)"
-          :disabled="r.disabled"
-      >
-        <button v-if="button" class="button_new" style="width: max-content" v-bind:class="{
-            'btn-succ': ($index === active),
-            'disabled': r.disabled
-          }">
-          <slot name="header">
-            {{ r.header }}
-          </slot>
-          <!-- 关闭按钮 -->
-          <span class="glyphicon glyphicon-remove" style="margin-left: 15px;" @click="deletetTab(r)" v-if="close"
-                :id="'vc-tabset-close-'+attach +'-'+$index"></span>
-        </button>
-        <span v-if="!button" v-bind:class="{
-            'span-active': ($index === active),
-            'span-disable': ($index !== active)
-          }">
-          <slot name="header">
-            {{ r.header }}
-          </slot>
-          <!-- 关闭按钮 -->
-          <span class="glyphicon glyphicon-remove" style="margin-left: 15px;" @click="deletetTab(r)" v-if="close"
-                :id="'vc-tabset-close-'+attach +'-'+$index"></span>
-        </span>
-
-      </li>
-    </ul>
-
-    <!-- Tab panes -->
-    <div class="tab-content span" v-el:tab-content>
-      <slot></slot>
-    </div>
-  </div>
-</template>
-
-<script>
-import {remove} from 'vue-client/src/stores/Remove.js'
-
-export default {
-  props: {
-    navStyle: {
-      type: String,
-      default: 'tabs'
-    },
-    effect: {
-      type: String,
-      default: 'fadein'
-    },
-    active: {
-      type: Number,
-      default: 0
-    },
-    close: {
-      type: Boolean,
-      default: false
-    },
-    button: {
-      type: Boolean,
-      default: true
-    },
-    attach: {
-      type: String,
-      default: 'vuestrap'
-    },
-    content: {}
-  },
-  ready() {
-    remove.$on('remove', (name) => {
-      console.log('tabset收$on 到的名字为：', name)
-      this.$removeTab(name)
-    })
-  },
-  data() {
-    return {
-      // 数据格式：{comp, header，disabled}
-      // - comp: 当前页签对应的tab组件
-      renderData: []
-    }
-  },
-  methods: {
-    handleTabListClick(index, el) {
-      // 没有打开过, 则添加显示
-      this.$dispatch('tab-changed')
-      if (!this.$parent.show.includes(el.header)) {
-        this.$parent.show.push(el.header)
-      }
-      if (el.comp._scope && el.comp._scope.tab) {
-        this.$dispatch('tab-changed', el.comp._scope.tab.comp.name)
-      }
-      if (!el.disabled) this.active = index
-    },
-    // deletetab函数为自己添加
-    deletetTab(el) {
-      this.$removeTab(el.comp._scope.tab.comp.name)
-      remove.$emit('delete', el.comp._scope.tab.comp.name)
-    },
-    // 根据删除也下标，修改所有页签的下标
-    modifyAllIndex(index) {
-      let cur = this.active
-      this.$nextTick(() => {
-        // 关闭页签以后的多有页签的的下标向前挪动一位,之前的页签不动
-        for (var i = index; i < this.renderData.length; i++) {
-          this.renderData[i].comp.index -= 1
-        }
-        // 修改激活页
-        // 获取当前激活页签下标，关闭在当前激活页之后（包含当前激活页），当前激活页下标不变
-        // 当关闭当前激活页之前（激活页向前移动一位）
-        if (this.active > index || this.active === this.renderData.length) {
-          this.active = cur - 1
-        } else if (cur === 0) {
-          this.active = 0
-        } else {
-          this.active = cur
-        }
-        if (this.active === -1) {
-          this.$dispatch('tab-changed', null)
-        } else {
-          this.$dispatch('tab-changed', this.renderData[this.active].comp._scope.tab.comp.name)
-        }
-      })
-    }
-  },
-  events: {
-    'delete'(index) {
-      this.modifyAllIndex(index)
-    }
-  }
-}
-</script>
-
-<style scoped>
-ul > li > a {
-  position: relative;
-}
-
-ul > li > a > span {
-  display: none;
-}
-
-.span-active {
-  width: max-content;
-  border-bottom: 3px solid #5ac0d9;
-  height: 100%;
-  display: inline-block;
-  font-size: 1.5rem;
-  color: #666;
-  font-weight: 550;
-  padding: 0px 10px;
-  padding-top: 3px;
-  vertical-align: bottom;
-}
-
-.span-disable {
-  width: max-content;
-  height: 100%;
-  display: inline-block;
-  font-size: 1.5rem;
-  color: #666;
-  font-weight: 550;
-  padding: 0px 10px;
-  padding-top: 3px;
-  vertical-align: bottom;
-}
-
-/*ul > li > a:hover > span {*/
-/*display: initial;*/
-/*position: absolute;*/
-/*right: 0;*/
-/*top: 35%;*/
-/*border: 1px solid #EAEAEA;*/
-/*}*/
-/*ul > li > a:hover > span:hover {*/
-/*border: 1px solid #EAEAEA;*/
-/*color: #5cb95c;*/
-/*}*/
-ul > li > button {
-  background-color: #FFFFFF;
-  border-radius: 4px;
-  color: #999;
-  border: 1px solid #5cb95c;
-}
-
-.btn-succ {
-  background-color: #6aa6e2;
-  border-radius: 4px;
-  color: #fff;
-}
-
-.foot_tabset1 > .nav {
-  /*overflow-x: scroll;*/
-  white-space: nowrap;
-}
-</style>