system-clients 3.2.1-8 → 3.2.1-aodeToV4

package/src/styles/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/system.js

@@ -1,100 +1,85 @@
-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, filiale) {
-  //验证码开关赋值
-  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) })
-
-  if (filiale) {
-    let filialeComp = require(`./filiale/${filiale}/sale`).specialComp
-    for (let key in filialeComp) {
-      Vue.component(key, filialeComp[key])
-    }
-  }
-}
+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";
+import NewResSelectGroup from "./components/server/NewResSelectGroup.vue";
+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('new-select-group', NewResSelectGroup)
+ //资源选择测试
+  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/.gradle/buildOutputCleanup/cache.properties.lock

@@ -1 +0,0 @@
-

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>

package/src/components/Tabs.vue

@@ -1,67 +0,0 @@
-<template>
-  <div role="tabpanel" class="tab-pane"
-       v-bind:class="{hide:!show}"
-       v-show="show"
-       :transition="transition"
-  >
-    <slot></slot>
-  </div>
-</template>
-
-<script>
-  import coerceBoolean from 'vue-client/src/vue-strap/src/utils/coerceBoolean.js'
-
-  export default {
-    props: {
-      header: {
-        type: String
-      },
-      disabled: {
-        type: Boolean,
-        coerce: coerceBoolean,
-        default: false
-      }
-    },
-    data () {
-      return {
-        index: 0,
-        show: false
-      }
-    },
-    watch: {
-      'header' (val) {
-        // header变化时，通知tabset
-        let data = this.$parent.renderData.find((v) => v.comp === this)
-        data.header = val
-      }
-    },
-    computed: {
-      show () {
-        return (this.$parent.active === this.index)
-      },
-      transition () {
-        return this.$parent.effect
-      }
-    },
-    created () {
-      this.$parent.renderData.push({
-        comp: this,
-        header: this.header,
-        disabled: this.disabled
-      })
-    },
-    ready () {
-      // 找到当前tab的索引
-      this.index = this.$parent.$children.findIndex((v) => v.$el === this.$el)
-    },
-    beforeDestroy () {
-      this.$parent.renderData.splice(this.index, 1)
-    }
-  }
-</script>
-
-<style scoped>
-  .tab-content > .tab-pane {
-    display: block;
-  }
-</style>

package/src/components/equipment/PosManageBoth.vue

@@ -1,125 +0,0 @@
-<template>
-  <div class="flex-row" v-if="$login.r.includes('POS参数管理')">
-    <tab-button :button="false" :class="{'basic-main':!isChange&&!isParamChange,'binary-left':isChange||isParamChange}">
-      <tabs header="设备管理">
-        <pos-list :row="row" @dblclick="selected" style="width:auto;" :f_filialeid.sync="f_filialeids"
-                  :isshowless="isChange" v-ref:poslist></pos-list>
-      </tabs>
-      <tabs header="POS参数管理">
-        <pos-param-list @add="addParam" @close="closeParam"  v-ref:listp></pos-param-list>
-      </tabs>
-    </tab-button>
-    <div class="binary-right" style="margin-left: 5px;overflow-x: scroll" v-if="isChange||isParamChange">
-      <pos-param-add :param_id="param_id" v-ref:addp v-if="isParamChange"></pos-param-add>
-      <pos-add :data="row" :info="infoadd" :f_filialeids.sync="f_filialeids" v-if="isChange"
-               v-ref:addbox></pos-add>
-    </div>
-  </div>
-  <pos-manage v-if="!$login.r.includes('POS参数管理')"></pos-manage>
-</template>
-
-<script>
-import TabButton from '../TabButton'
-import Tabs from '../Tabs'
-import PosList from "./PosList";
-import PosAdd from "./PosAdd";
-import PosParamList from './PosParamList'
-import PosParamAdd from './PosParamAdd'
-
-export default {
-  name: "PosManageBoth",
-  title: 'POS管理',
-  data() {
-    return {
-      show: [],
-      data: {},
-      param_id: '',
-      f_filialeids: '',
-      isChange: false,
-      isParamChange: false,
-      row: null,
-      infoadd: true,  // 判断是否显示 升级 等按钮（true/false）
-      batchPos: false,
-    }
-  },
-  components: {Tabs, TabButton, PosList, PosAdd, PosParamList, PosParamAdd},
-  ready() {
-  },
-  methods: {
-    selected(obj, idx) {
-      console.log(obj)
-      if (!(obj instanceof MouseEvent)) {
-        this.isChange = true
-        this.infoadd = true
-        this.row = obj
-      } else {
-        this.$showAlert('如需新增，请点击增加按钮！', 'info', 1000)
-      }
-    },
-    addParam() {
-      this.isParamChange = true
-      this.isChange = false
-      setTimeout(() => {
-        this.$refs.addp.initModel()
-      }, 100)
-    },
-    closeParam() {
-      this.isParamChange = false
-    }
-  },
-  events: {
-    'researchParam'() {
-      this.$refs.listp.search()
-      this.isParamChange = false
-      this.isChange = false
-    },
-    'search'() {
-      this.infoadd = true
-      this.isParamChange = false
-      this.isChange = false
-      this.row = null
-      this.$refs.list.$refs.paged.$refs.cri.search()
-    },
-    'tab-changed'() {
-      console.log("tabchanged")
-      this.isParamChange = false
-      this.isChange = false
-    },
-    'refresh'() {
-      this.isParamChange = false
-      this.isChange = false
-      this.row = null
-      this.$refs.poslist.search()
-    },
-    'error'(name, row, res) {
-      this.isParamChange = false
-      this.isChange = false
-      this.row = null
-    },
-    'close'() {
-      this.isParamChange = false
-      this.isChange = false
-      this.row = null
-    },
-    'add'(val) {
-      this.f_filialeids = val
-      this.infoadd = false
-      this.row = null
-      this.isChange = true
-      this.$refs.list.$refs.paged.$refs.grid.selectStore.selected = null
-    },
-    'modify'(row) {
-      this.isChange = false
-      this.isParamChange = true
-      setTimeout(() => {
-        this.$refs.addp.curorgid = []
-        this.$refs.addp.edit(row.f_param_id)
-      }, 100)
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>