system-clients 3.0.42 → 3.0.43-fanxian

package/src/components/server/ResSelectGroup.vue

@@ -1,140 +1,140 @@
-<template>
-  <div :class="style">
-    <label class="font_normal_body">公&emsp;&emsp;司</label>
-    <right-tree @re-res="getorg"
-                :initresid='initres.org'></right-tree>
-  </div>
-  <div :class="style">
-    <label class="font_normal_body">部&emsp;&emsp;门</label>
-    <res-select restype='department'
-                @res-select="getdep"
-                :parentresid="depresid"
-                :initresid='initres.dep'
-                :is-mul="mul">
-    </res-select>
-  </div>
-  <div :class="style">
-    <label class="font_normal_body">人&emsp;&emsp;员</label>
-    <res-select restype='user'
-                @res-select="getuser"
-                :parentresid="userresid"
-                :initresid='initres.user'
-                :is-mul="mul">
-    </res-select>
-  </div>
-  <div :class="style " >
-    <label class="font_normal_body">片&emsp;&emsp;区</label>
-    <v-select :value.sync="slice_area" v-model="slice_area"  @change='getarea'
-              :options='sliceArea' placeholder='片区/管理站' filer-key="name"
-              close-on-select v-ref:slice>
-    </v-select>
-  </div>
-</template>
-<script>
-  import plugin from '../../plugins/GetLoginInfoService'
-  export default {
-    title: '资源选择测试',
-    props: {
-      style: {
-        type: String,
-        default: 'col-sm-2'
-      },
-      mul: {
-        type: Boolean,
-        default: true
-      },
-      //初始值
-      initres: {
-        type: Object,
-        default: null,
-      },
-    },
-    data () {
-      return {
-        orgresid:[this.$login.f.orgid],
-        depresid:[],
-        userresid:[],
-        sliceArea: [],
-        slice_area:[],
-
-        obj:{
-          orgnames:[],
-          depnames:[],
-          operatornames:[]
-        }
-      }
-    },
-    ready () {
-      console.log('开始获取组织结构。。。')
-      this.initAreas(this.$login.f.orgid)
-    },
-    methods:{
-
-      // 初始化片区
-      async initAreas (val) {
-        if (val) {
-          let getAllArea = await this.$resetpost('/rs/search', {
-            source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
-            userid: this.$login.f.id
-          }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
-          let arr = getAllArea.data.filter((res) => {
-            return res.parentid == val
-          })
-          console.log('过滤之后的片区', arr)
-          this.sliceArea = []
-          arr.forEach((res) => {
-            this.sliceArea.push({label: res.name, value: {name: res.name, code:res.number}})
-          })
-        }
-      },
-      returnOrg(ids){
-
-        let condition;
-        if(this.depresid.length > 0)
-          condition = " and f_orgid in " + plugin.convertToIn(this.depresid);
-        else
-          condition = " and f_orgid = " + this.$login.f.orgid;
-        if(this.userresid.length > 0){
-          condition += " and f_depid in " + plugin.convertToIn(this.userresid);
-        }
-        if(ids && ids.length > 0){
-          condition += " and f_operatorid in " + plugin.convertToIn(ids);
-        }
-        if(this.slice_area.length>0){
-          condition += " and f_zones = '" + this.slice_area[0].name+"'"
-        }
-        this.$dispatch('re-res',condition,this.obj)
-      },
-      getorg (obj) {
-        console.log("选中公司的数据11",obj.resids)
-        this.depresid=obj.resids
-        this.obj.orgnames = obj.res
-        this.initAreas(obj.resids)
-        this.returnOrg();
-      },
-      getdep(obj,val) {
-        console.log("选中部门的数据22",obj)
-        this.obj.depnames = val
-        this.userresid=obj
-        this.returnOrg();
-      },
-      getuser(obj) {
-        this.obj.operatornames = obj
-        console.log("选中用户的数据33",obj)
-        this.returnOrg(obj);
-      },
-      getarea(val) {
-        this.slice_area=val
-        console.log("选中的大区",val)
-        if(this.obj.operatornames){
-          this.returnOrg(this.obj.operatornames);
-        }else{
-          this.returnOrg();
-        }
-      }
-    },
-    watch: {
-
-    }
-  }
-</script>
+<template>
+  <div :class="style">
+    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
+    <right-tree @re-res="getorg"
+                :initresid='initres.org'></right-tree>
+  </div>
+  <div :class="style">
+    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp;</label>
+    <res-select restype='department'
+                @res-select="getdep"
+                :parentresid="depresid"
+                :initresid='initres.dep'
+                :is-mul="mul">
+    </res-select>
+  </div>
+  <div :class="style">
+    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp;</label>
+    <res-select restype='user'
+                @res-select="getuser"
+                :parentresid="userresid"
+                :initresid='initres.user'
+                :is-mul="mul">
+    </res-select>
+  </div>
+  <div :class="style " >
+    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;片区&nbsp;&nbsp;&nbsp;</label>
+    <v-select :value.sync="slice_area" v-model="slice_area"  @change='getarea'
+              :options='sliceArea' placeholder='片区/管理站' filer-key="name"
+              close-on-select v-ref:slice>
+    </v-select>
+  </div>
+</template>
+<script>
+  import plugin from '../../plugins/GetLoginInfoService'
+  export default {
+    title: '资源选择测试',
+    props: {
+      style: {
+        type: String,
+        default: 'col-sm-2'
+      },
+      mul: {
+        type: Boolean,
+        default: true
+      },
+      //初始值
+      initres: {
+        type: Object,
+        default: null,
+      },
+    },
+    data () {
+      return {
+        orgresid:[this.$login.f.orgid],
+        depresid:[],
+        userresid:[],
+        sliceArea: [],
+        slice_area:[],
+
+        obj:{
+          orgnames:[],
+          depnames:[],
+          operatornames:[]
+        }
+      }
+    },
+    ready () {
+      console.log('开始获取组织结构。。。')
+      this.initAreas(this.$login.f.orgid)
+    },
+    methods:{
+
+      // 初始化片区
+      async initAreas (val) {
+        if (val) {
+          let getAllArea = await this.$resetpost('/rs/search', {
+            source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
+            userid: this.$login.f.id
+          }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
+          let arr = getAllArea.data.filter((res) => {
+            return res.parentid == val
+          })
+          console.log('过滤之后的片区', arr)
+          this.sliceArea = []
+          arr.forEach((res) => {
+            this.sliceArea.push({label: res.name, value: {name: res.name, code:res.number}})
+          })
+        }
+      },
+      returnOrg(ids){
+
+        let condition;
+        if(this.depresid.length > 0)
+          condition = " and f_orgid in " + plugin.convertToIn(this.depresid);
+        else
+          condition = " and f_orgid = " + this.$login.f.orgid;
+        if(this.userresid.length > 0){
+          condition += " and f_depid in " + plugin.convertToIn(this.userresid);
+        }
+        if(ids && ids.length > 0){
+          condition += " and f_operatorid in " + plugin.convertToIn(ids);
+        }
+        if(this.slice_area.length>0){
+          condition += " and f_zones = '" + this.slice_area[0].name+"'"
+        }
+        this.$dispatch('re-res',condition,this.obj)
+      },
+      getorg (obj) {
+        console.log("选中公司的数据11",obj.resids)
+        this.depresid=obj.resids
+        this.obj.orgnames = obj.res
+        this.initAreas(obj.resids)
+        this.returnOrg();
+      },
+      getdep(obj,val) {
+        console.log("选中部门的数据22",obj)
+        this.obj.depnames = val
+        this.userresid=obj
+        this.returnOrg();
+      },
+      getuser(obj) {
+        this.obj.operatornames = obj
+        console.log("选中用户的数据33",obj)
+        this.returnOrg(obj);
+      },
+      getarea(val) {
+        this.slice_area=val
+        console.log("选中的大区",val)
+        if(this.obj.operatornames){
+          this.returnOrg(this.obj.operatornames);
+        }else{
+          this.returnOrg();
+        }
+      }
+    },
+    watch: {
+
+    }
+  }
+</script>

package/src/system.js

@@ -1,76 +1,78 @@
-import Vue from 'vue'
-import GetLoginInfoService from './plugins/GetLoginInfoService'
-import GetAppDataService from './stores/AppData'
-
-// /** **************************登录与主界面相关******************************/
-
-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.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) })
-
-}
+import Vue from 'vue'
+import GetLoginInfoService from './plugins/GetLoginInfoService'
+import GetAppDataService from './stores/AppData'
+
+// /** **************************登录与主界面相关******************************/
+
+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.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('alarm-information', (resolve) => { require(['./components/parammanage/AlarmInformation'], 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) })
+
+}