system-clients 3.2.1-24 → 3.2.1-25

package/src/components/server/LoadData.vue

@@ -1,55 +1,55 @@
-<template>
-  <div class="loadingdata" :class="{'loaderror': show, 'loadsuccess': !show}">
-    <!-- <h2 style="margin: 0" v-if="show">{{msg}}</h2> -->
-    <h2 style="margin: 0" v-if="show">参数加载失败，请检查网络状态和服务状态...</h2>
-  </div>
-</template>
-
-<script>
-  export default {
-    title: '加载参数',
-    data () {
-      return {
-        msg: '',
-        show: false
-      }
-    },
-    props: {
-      componentName: {}
-    },
-    async ready () {
-      this.$nextTick(() => {
-        window.addEventListener('message', messageEvent => {
-          try {
-            const data = messageEvent.data
-            console.log('接收到数据', data)
-            this.$login = Object.assign(this.$login, data.login)
-            this.$appdata = Object.assign(this.$appdata, data.appdata)
-            if (!data.page) {
-              this.$showMessage('没有功能连接, 请配置!')
-              return
-            }
-            this.$goto(data.page)
-          } catch (e) {
-            console.log('登陆异常', e)
-          }
-        })
-      })
-    }
-  }
-</script>
-<style media="screen">
-  .loadingdata {
-    position: fixed;
-    background: #fff;
-    opacity: 0.6;
-    top: 0;
-    width: 100%;
-  }
-  .loaderror {
-    opacity: 1;
-  }
-  .loadsuccess {
-    display: none;
-  }
-</style>
+<template>
+  <div class="loadingdata" :class="{'loaderror': show, 'loadsuccess': !show}">
+    <!-- <h2 style="margin: 0" v-if="show">{{msg}}</h2> -->
+    <h2 style="margin: 0" v-if="show">参数加载失败，请检查网络状态和服务状态...</h2>
+  </div>
+</template>
+
+<script>
+  export default {
+    title: '加载参数',
+    data () {
+      return {
+        msg: '',
+        show: false
+      }
+    },
+    props: {
+      componentName: {}
+    },
+    async ready () {
+      this.$nextTick(() => {
+        window.addEventListener('message', messageEvent => {
+          try {
+            const data = messageEvent.data
+            console.log('接收到数据', data)
+            this.$login = Object.assign(this.$login, data.login)
+            this.$appdata = Object.assign(this.$appdata, data.appdata)
+            if (!data.page) {
+              this.$showMessage('没有功能连接, 请配置!')
+              return
+            }
+            this.$goto(data.page)
+          } catch (e) {
+            console.log('登陆异常', e)
+          }
+        })
+      })
+    }
+  }
+</script>
+<style media="screen">
+  .loadingdata {
+    position: fixed;
+    background: #fff;
+    opacity: 0.6;
+    top: 0;
+    width: 100%;
+  }
+  .loaderror {
+    opacity: 1;
+  }
+  .loadsuccess {
+    display: none;
+  }
+</style>

package/src/filiale/rizhao/Login.vue

@@ -81,8 +81,8 @@
     </div>
 
     <modal v-if="depPromptShow" :show.sync="depPromptShow" :backdrop="false" v-ref:modal >
-      <header slot="modal-header" class="modal-header">
-        <h4 class="modal-title">登录信息</h4>
+      <header slot="modal-header" style="height: 8vh" class="modal-header">
+        <!--<h4 class="modal-title">登录信息</h4>-->
       </header>
       <article slot="modal-body" class="modal-body">
         <form class="form-horizontal">
@@ -91,13 +91,13 @@
               <label class="col-sm-5 ">当前登录人:</label>
               <label style="font-weight:normal">{{$login.f.name}}</label>
             </div>
-            <div class="col-sm-12 form-group" v-if="$login.f.number">
-              <label class="col-sm-5 ">组&nbsp;织&nbsp;编&nbsp;码:</label>
-              <label style="font-weight:normal">{{$login.f.number}}</label>
-              <!-- <div class="col-sm-7">
-                <span >{{$login.f.number}}</span>
-              </div> -->
-            </div>
+            <!--<div class="col-sm-12 form-group" v-if="$login.f.number">-->
+            <!--<label class="col-sm-5 ">组&nbsp;织&nbsp;编&nbsp;码:</label>-->
+            <!--<label style="font-weight:normal">{{$login.f.number}}</label>-->
+            <!-- <div class="col-sm-7">
+              <span >{{$login.f.number}}</span>
+            </div> -->
+            <!--</div>-->
             <div class="col-sm-12 form-group">
               <label class="col-sm-5">所在销售点:</label>
               <label style="font-weight:normal">{{$login.f.deps}}</label>
@@ -108,12 +108,11 @@
           </div>
         </form>
       </article>
-      <footer  slot="modal-footer" class="modal-footer">
+      <footer  slot="modal-footer" style="height: 8vh;padding: 2vh" class="modal-footer">
         <button class="button_search" @click="depPromptConfirm">确认</button>
         <button class="button_clear" @click="depPromptCancel">取消</button>
       </footer>
     </modal>
-
     <!-- 修改密码组件 -->
     <modify-pw :show.sync="modifyPwShow" v-if="modifyPwShow"></modify-pw>
   </div>

package/src/system.js

@@ -1,109 +1,109 @@
-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";
-
-// BAinformation备案信息展示(空不展示, 传入什么展示什么,可以传标签)
-export default function (val,filiale, {showLogin = false, show_daiBan = false, BAinformation = null} = {}) {
-  console.log(val,filiale,showLogin)
-  //验证码开关赋值
-  if(val!=null){
-    GetLoginInfoService.Verification=val
-  }
-  //登录提示赋值
-  GetLoginInfoService.depPrompt=showLogin
-  //展示待办赋值
-  GetLoginInfoService.showDaiBan=show_daiBan
-  // 备案信息复制
-  GetLoginInfoService.BAinformation = BAinformation
-  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}/system`).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";
+
+// BAinformation备案信息展示(空不展示, 传入什么展示什么,可以传标签)
+export default function (val,filiale, {showLogin = false, show_daiBan = false, BAinformation = null} = {}) {
+  console.log(val,filiale,showLogin)
+  //验证码开关赋值
+  if(val!=null){
+    GetLoginInfoService.Verification=val
+  }
+  //登录提示赋值
+  GetLoginInfoService.depPrompt=showLogin
+  //展示待办赋值
+  GetLoginInfoService.showDaiBan=show_daiBan
+  // 备案信息复制
+  GetLoginInfoService.BAinformation = BAinformation
+  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}/system`).specialComp
+    for (let key in filialeComp) {
+      Vue.component(key, filialeComp[key])
+    }
+  }
+}