system-phone 3.0.49-9 → 3.1.0

package/src/systemphonegrid.js

@@ -1,210 +1,185 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import GetAppDataService from './stores/AppData'
-import GetStringData from './plugins/GetStringData'
-/* require('./assets/fonttype/fontAndroid.less')*/
-
-/** **************************通用组件******************************/
-
-export default function () {
-  Vue.use(GetAppDataService)
-  Vue.use(GetStringData)
-// 测试
-  Vue.component('test', (resolve) => {
-    require(['./components/Test'], resolve)
-  })
-// android登录
-  Vue.component('login-app', (resolve) => {
-    require(['./components/LoginApp'], resolve)
-  })
-  // android登录
-  Vue.component('login-app-new', (resolve) => {
-    require(['./components/LoginAppNew'], resolve)
-  })
-// 导航
-  Vue.component('nav-bottom', (resolve) => {
-    require(['./components/NavBottomVVV'], resolve)
-  })
-  // 导航
-  Vue.component('tab-bar', (resolve) => {
-    require(['./components/TabBarPhone'], resolve)
-  })
-// 只加载参数（只有下拉框所需参数）
-  Vue.component('load-appdata', (resolve) => {
-    require(['./components/LoadAppdata'], resolve)
-  })
-  // 头部标题
-  Vue.component('tools-page', (resolve) => {
-    require(['./components/ToolsPage'], resolve)
-  })
-  // 用户信息查找
-  Vue.component('phone-user-find', (resolve) => {
-    require(['./components/PhoneUserFind'], resolve)
-  })
-  // 用户查找
-  Vue.component('phone-user', (resolve) => {
-    require(['./components/PhoneUser'], resolve)
-  })
-  // 用户详情查找
-  Vue.component('phone-user-detil', (resolve) => {
-    require(['./components/PhoneUserDetil'], resolve)
-  })
-  // 用户信息查找
-  Vue.component('phone-info-table', (resolve) => {
-    require(['./components/PhoneInfoTable'], resolve)
-  })
-  // 用户信息查找
-  Vue.component('phone-sell-info', (resolve) => {
-    require(['./components/PhoneSellInfo'], resolve)
-  })
-  // 总用户信息查找
-  Vue.component('phone-all-info', (resolve) => {
-    require(['./components/PhoneAllInfo'], resolve)
-  })
-  // 用户换表信息查找
-  Vue.component('phone-meter-info', (resolve) => {
-    require(['./components/PhoneMeterInfo'], resolve)
-  })
-  // 用户购气记录查询
-  Vue.component('phone-sell-info-lite', (resolve) => {
-    require(['./components/PhoneSellInfoLite'], resolve)
-  })
-  // 用户信息查找
-  Vue.component('phone-changemeter-info', (resolve) => {
-    require(['./components/PhoneChangemeterInfo'], resolve)
-  })
-  // 用户信息查找
-  Vue.component('phone-repair-info', (resolve) => {
-    require(['./components/PhoneRepairInfo'], resolve)
-  })
-  // 用户信息查找
-  Vue.component('phone-safe-info', (resolve) => {
-    require(['./components/PhoneSafeInfo'], resolve)
-  })
-  // 设置
-  Vue.component('system-setup', (resolve) => {
-    require(['./components/SystemSetUp'], resolve)
-  })
-  // 待办工作
-  Vue.component('attend-manage', (resolve) => {
-    require(['./components/AttendManage'], resolve)
-  })
-  // 上传工作
-  Vue.component('upload-manage', (resolve) => {
-    require(['./components/UploadManage'], resolve)
-  })
-  // 已办工作
-  Vue.component('already-service', (resolve) => {
-    require(['./components/AlreadyService'], resolve)
-  })
-  // 在线业务
-  Vue.component('online-manage', (resolve) => {
-    require(['./components/OnlineManage'], resolve)
-  })
-  // 修改密码
-  Vue.component('modify-pass-word', (resolve) => {
-    require(['./components/ModifyPassWord'], resolve)
-  })
-  Vue.component('wasm-test', (resolve) => {
-    require(['./components/wasm'], resolve)
-  })
-  Vue.component('right-tree', (resolve) => {
-    require(['./components/RightTree'], resolve)
-  })
-  Vue.component('apply-online', (resolve) => {
-    require(['./components/online/ApplyOnline'], resolve)
-  })
-  //反馈人建议添加
-  Vue.component('feedback-add', (resolve) => {
-    require(['./components/idea/feedbackAdd'], resolve)
-  })
-  //反馈人建议查询
-  Vue.component('feedback', (resolve) => {
-    require(['./components/idea/feedBack'], resolve)
-  })
-  //档案查询
-  Vue.component('query-file',(resolve) => {
-    require(['./components/userinfo/queryFile'],resolve)
-  })
-  //缴费查询
-  Vue.component('payment-query',(resolve) => {
-    require(['./components/userinfo/paymentQuery'],resolve)
-  })
-  // 用户查找
-  Vue.component('phone-user', (resolve) => {
-    require(['./components/PhoneUser'], resolve)
-  })
-  // 用户详情查找
-  Vue.component('phone-user-detil', (resolve) => {
-    require(['./components/PhoneUserDetil'], resolve)
-  })
-  // 物联网监控-主
-  Vue.component('iot-monitoring-main', (resolve) => {
-    require(['./components/iot/iotMonitoringMain'], resolve)
-  })
-  // 物联网监控表具信息
-  Vue.component('iot-meter-info', (resolve) => {
-    require(['./components/iot/IotMeterInfo'], resolve)
-  })
-  // 物联网监控基础信息
-  Vue.component('iot-base-info', (resolve) => {
-    require(['./components/iot/IotBaseInfo'], resolve)
-  })
-  // 物联网监控指令信息
-  Vue.component('instruct-message', (resolve) => {
-    require(['./components/iot/InstructMessage'], resolve)
-  })
-
-  Vue.component('find-userinfo', (resolve) => {
-    require(['./components/info/FindUserInfo'], resolve)
-  })
-
-  Vue.component('info-table', (resolve) => {
-    require(['./components/info/InfoTable'], resolve)
-  })
-
-  Vue.component('config-info', (resolve) => {
-    require(['./components/info/ConfigInfo'], resolve)
-  })
-  //手机大屏
-  // Vue.component('total-user-number', (resolve) => {
-  //   require(['./components/screen/TotalUserNumber'], resolve)
-  // })
-  // Vue.component('content-page', (resolve) => {
-  //   require(['./components/screen/ContentPage'], resolve)
-  // })
-  // Vue.component('module-title', (resolve) => {
-  //   require(['./components/screen/ModuleTitle'], resolve)
-  // })
-  // Vue.component('work-order-item', (resolve) => {
-  //   require(['./components/screen/WorkOrderItem'], resolve)
-  // })
-  // Vue.component('gongdan-content-page', (resolve) => {
-  //   require(['./components/screen/GongdanContentPage'], resolve)
-  // })
-  // Vue.component('work-order-right-item', (resolve) => {
-  //   require(['./components/screen/WorkOrderRightItem'], resolve)
-  // })
-  // Vue.component('work-order-right-down-item', (resolve) => {
-  //   require(['./components/screen/WorkOrderRightDownItem'], resolve)
-  // })
-  // Vue.component('total-item', (resolve) => {
-  //   require(['./components/screen/TotalItem'], resolve)
-  // })
-  // Vue.component('charge-content-page', (resolve) => {
-  //   require(['./components/screen/ChargeContentPage'], resolve)
-  // })
-  // Vue.component('list-count-item', (resolve) => {
-  //   require(['./components/screen/ListCountItem'], resolve)
-  // })
-  // Vue.component('safeorder-content-page', (resolve) => {
-  //   require(['./components/screen/SafeOrderContentPage'], resolve)
-  // })
-  // Vue.component('security-check-item', (resolve) => {
-  //   require(['./components/screen/SecurityCheckItem'], resolve)
-  // })
-
-// // 只加载参数（只有下拉框所需参数）
-// Vue.component('alone-load-params', (resolve) => { require(['./components/AloneLoadParams'], resolve) })
-}
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import GetAppDataService from './stores/AppData'
+import GetStringData from './plugins/GetStringData'
+/* require('./assets/fonttype/fontAndroid.less')*/
+
+/** **************************通用组件******************************/
+
+export default function (filiale) {
+  Vue.use(GetAppDataService)
+  Vue.use(GetStringData)
+// 测试
+  Vue.component('test', (resolve) => {
+    require(['./components/Test'], resolve)
+  })
+// android登录
+  Vue.component('login-app', (resolve) => {
+    require(['./components/LoginApp'], resolve)
+  })
+// android登录
+  Vue.component('login-app-v4', (resolve) => {
+    require(['./components/LoginAppV4.vue'], resolve)
+  })
+  // android登录
+  Vue.component('login-app-new', (resolve) => {
+    require(['./components/LoginAppNew'], resolve)
+  })
+// 导航
+  Vue.component('nav-bottom', (resolve) => {
+    require(['./components/NavBottomVVV'], resolve)
+  })
+  // 导航
+  Vue.component('tab-bar', (resolve) => {
+    require(['./components/TabBarPhone'], resolve)
+  })
+// 只加载参数（只有下拉框所需参数）
+  Vue.component('load-appdata', (resolve) => {
+    require(['./components/LoadAppdata'], resolve)
+  })
+  // 头部标题
+  Vue.component('tools-page', (resolve) => {
+    require(['./components/ToolsPage'], resolve)
+  })
+  // 用户信息查找
+  Vue.component('phone-user-find', (resolve) => {
+    require(['./components/PhoneUserFind'], resolve)
+  })
+  // 用户查找
+  Vue.component('phone-user', (resolve) => {
+    require(['./components/PhoneUser'], resolve)
+  })
+  // 用户详情查找
+  Vue.component('phone-user-detil', (resolve) => {
+    require(['./components/PhoneUserDetil'], resolve)
+  })
+  // 用户信息查找
+  Vue.component('phone-info-table', (resolve) => {
+    require(['./components/PhoneInfoTable'], resolve)
+  })
+  // 用户信息查找
+  Vue.component('phone-sell-info', (resolve) => {
+    require(['./components/PhoneSellInfo'], resolve)
+  })
+  // 总用户信息查找
+  Vue.component('phone-all-info', (resolve) => {
+    require(['./components/PhoneAllInfo'], resolve)
+  })
+  // 用户换表信息查找
+  Vue.component('phone-meter-info', (resolve) => {
+    require(['./components/PhoneMeterInfo'], resolve)
+  })
+  // 用户购气记录查询
+  Vue.component('phone-sell-info-lite', (resolve) => {
+    require(['./components/PhoneSellInfoLite'], resolve)
+  })
+  // 用户信息查找
+  Vue.component('phone-changemeter-info', (resolve) => {
+    require(['./components/PhoneChangemeterInfo'], resolve)
+  })
+  // 用户信息查找
+  Vue.component('phone-repair-info', (resolve) => {
+    require(['./components/PhoneRepairInfo'], resolve)
+  })
+  Vue.component('phone-image-info', (resolve) => {
+    require(['./components/PhoneImageInfo'], resolve)
+  })
+  // 用户信息查找
+  Vue.component('phone-safe-info', (resolve) => {
+    require(['./components/PhoneSafeInfo'], resolve)
+  })
+  // 设置
+  Vue.component('system-setup', (resolve) => {
+    require(['./components/SystemSetUp'], resolve)
+  })
+  // 待办工作
+  Vue.component('attend-manage', (resolve) => {
+    require(['./components/AttendManage'], resolve)
+  })
+  // 上传工作
+  Vue.component('upload-manage', (resolve) => {
+    require(['./components/UploadManage'], resolve)
+  })
+  // 已办工作
+  Vue.component('already-service', (resolve) => {
+    require(['./components/AlreadyService'], resolve)
+  })
+  // 在线业务
+  Vue.component('online-manage', (resolve) => {
+    require(['./components/OnlineManage'], resolve)
+  })
+  // 修改密码
+  Vue.component('modify-pass-word', (resolve) => {
+    require(['./components/ModifyPassWord'], resolve)
+  })
+  Vue.component('wasm-test', (resolve) => {
+    require(['./components/wasm'], resolve)
+  })
+  Vue.component('right-tree', (resolve) => {
+    require(['./components/RightTree'], resolve)
+  })
+  Vue.component('apply-online', (resolve) => {
+    require(['./components/online/ApplyOnline'], resolve)
+  })
+  //反馈人建议添加
+  Vue.component('feedback-add', (resolve) => {
+    require(['./components/idea/feedbackAdd'], resolve)
+  })
+  //反馈人建议查询
+  Vue.component('feedback', (resolve) => {
+    require(['./components/idea/feedBack'], resolve)
+  })
+  //档案查询
+  Vue.component('query-file',(resolve) => {
+    require(['./components/userinfo/queryFile'],resolve)
+  })
+  //缴费查询
+  Vue.component('payment-query',(resolve) => {
+    require(['./components/userinfo/paymentQuery'],resolve)
+  })
+  // 用户查找
+  Vue.component('phone-user', (resolve) => {
+    require(['./components/PhoneUser'], resolve)
+  })
+  // 用户详情查找
+  Vue.component('phone-user-detil', (resolve) => {
+    require(['./components/PhoneUserDetil'], resolve)
+  })
+  // 物联网监控-主
+  Vue.component('iot-monitoring-main', (resolve) => {
+    require(['./components/iot/iotMonitoringMain'], resolve)
+  })
+  // 物联网监控表具信息
+  Vue.component('iot-meter-info', (resolve) => {
+    require(['./components/iot/IotMeterInfo'], resolve)
+  })
+  // 物联网监控基础信息
+  Vue.component('iot-base-info', (resolve) => {
+    require(['./components/iot/IotBaseInfo'], resolve)
+  })
+  // 物联网监控指令信息
+  Vue.component('instruct-message', (resolve) => {
+    require(['./components/iot/InstructMessage'], resolve)
+  })
+
+  Vue.component('find-userinfo', (resolve) => {
+    require(['./components/info/FindUserInfo'], resolve)
+  })
+
+  Vue.component('info-table', (resolve) => {
+    require(['./components/info/InfoTable'], resolve)
+  })
+
+  Vue.component('config-info', (resolve) => {
+    require(['./components/info/ConfigInfo'], resolve)
+  })
+
+  // 分公司特殊页面注册替换
+  if (filiale) {
+    let filialeComp = require(`./filiale/${filiale}/systemphonegrid`).specialComp
+    for (let key in filialeComp) {
+      Vue.component(key, filialeComp[key])
+    }
+  }
+}

package/src/util/LdapHelper.js

@@ -1,75 +1,75 @@
-/**
- * 获得给定资源的名称全路径
- * @param res: 资源
- * @param name: 全路径字段
- */
-export function getFullName (res, name) {
-  let result = ''
-  while (res != null) {
-    if (result === '') {
-      result = res[name]
-    } else {
-      result = res[name] + '.' + result
-    }
-    res = res.parent
-  }
-  return result
-}
-
-/**
- * 给拿到的资源添加父关系
- * @param res
- */
-export function procParent (reses) {
-  for (let value of reses) {
-    procInnerParent(value)
-  }
-}
-
-// 给资源res的所有子，添加父关系
-function procInnerParent (res) {
-  for (let value of res.children) {
-    value.parent = res
-    procInnerParent(value)
-  }
-}
-
-/**
- * 从给定一批资源中，递归找到给定号码的资源
- * @param model：给定的一批资源
- * @param id：要查找的资源id串
- */
-export function find (model, id) {
-  // 返回最后一个id信息
-  let index = id.lastIndexOf('.')
-  if (index !== -1) {
-    id = id.substr(index + 1)
-  }
-
-  // 子中有，返回子里的
-  for (let value of model) {
-    let ret = getInnerResourceById(value, id)
-    if (ret) {
-      return ret
-    }
-  }
-
-  return null
-}
-
-// 根据id号取资源，自己不是，递归从子中找
-function getInnerResourceById (res, id) {
-  if (res.id === id) {
-    return res
-  }
-
-  // 子中有，返回子里的
-  for (let value of res.children) {
-    let ret = getInnerResourceById(value, id)
-    if (ret) {
-      return ret
-    }
-  }
-
-  return null
-}
+/**
+ * 获得给定资源的名称全路径
+ * @param res: 资源
+ * @param name: 全路径字段
+ */
+export function getFullName (res, name) {
+  let result = ''
+  while (res != null) {
+    if (result === '') {
+      result = res[name]
+    } else {
+      result = res[name] + '.' + result
+    }
+    res = res.parent
+  }
+  return result
+}
+
+/**
+ * 给拿到的资源添加父关系
+ * @param res
+ */
+export function procParent (reses) {
+  for (let value of reses) {
+    procInnerParent(value)
+  }
+}
+
+// 给资源res的所有子，添加父关系
+function procInnerParent (res) {
+  for (let value of res.children) {
+    value.parent = res
+    procInnerParent(value)
+  }
+}
+
+/**
+ * 从给定一批资源中，递归找到给定号码的资源
+ * @param model：给定的一批资源
+ * @param id：要查找的资源id串
+ */
+export function find (model, id) {
+  // 返回最后一个id信息
+  let index = id.lastIndexOf('.')
+  if (index !== -1) {
+    id = id.substr(index + 1)
+  }
+
+  // 子中有，返回子里的
+  for (let value of model) {
+    let ret = getInnerResourceById(value, id)
+    if (ret) {
+      return ret
+    }
+  }
+
+  return null
+}
+
+// 根据id号取资源，自己不是，递归从子中找
+function getInnerResourceById (res, id) {
+  if (res.id === id) {
+    return res
+  }
+
+  // 子中有，返回子里的
+  for (let value of res.children) {
+    let ret = getInnerResourceById(value, id)
+    if (ret) {
+      return ret
+    }
+  }
+
+  return null
+}