safecheck-client 4.0.1-7 → 4.0.1-70

package/src/components/android/MasterMain.vue

@@ -1,77 +1,77 @@
-<template>
-  <div class= "auto">
-    <div style="text-align:center">欢迎</div>
-    <div style="text-align:center">
-      <span>{{orgCrumb}}</span>
-      <img src="../../assets/mute.png" width="32" height="32" @click="mute"></img>
-    </div>
-    <route :comp="{name: 'attendance-tally'}" name="master-router"></route>
-    <footer class="navbar-default navbar-fixed-bottom">
-    <div class="container-fluid">
-      <table width="100%" height="30px">
-        <tr>
-          <td @click="go2('attendance-tally')">考勤<td>
-          <td @click="go2('track-state')">状态跟踪<td>
-          <td @click="trackPlan">任务跟踪<td>
-          <td @click="go2('system-setting')">设置<td>
-          <td @click="go2('check-notice')">公告<td>
-          <td @click="go2('phone-book')">通讯录<td>
-        </tr>
-      </table>
-    </div>
-    </footer>
-    <menu :show.sync="showModal" small>
-      <div slot="modal-body" class="modal-body">
-        <table align="center">
-          <tr><td>&nbsp;</td></tr>
-          <tr><td @click="this.showModal = false, go2('checker-annual')">安检员年度任务跟踪</td></tr>
-          <tr><td>&nbsp;</td></tr>
-          <tr><td @click="this.showModal = false, go2('checker-monthly')">安检员月度任务跟踪</td></tr>
-          <tr><td>&nbsp;</td></tr>
-          <tr><td @click="this.showModal = false, go2('plumber-annual')">维修员年度任务跟踪</td></tr>
-          <tr><td>&nbsp;</td></tr>
-          <tr><td @click="this.showModal = false, go2('plumber-monthly')">维修员月度任务跟踪</td></tr>
-          <tr><td>&nbsp;</td></tr>
-        </table>
-      </div>
-    <menu>
-  </div>
-</template>
-
-<script>
-import Vue from 'vue'
-
-export default {
-  title: '所长界面',
-  data() {
-    return {
-      orgs : Vue.orgs,
-      showModal: false
-    }
-  },
-  computed: {
-    orgCrumb: function() {
-      let oc = []
-      if(this.orgs) {
-        this.orgs.filter((item) => {
-          return item.level != 4
-        }).forEach(function(org) {
-            oc.push(org.name)
-        })
-      }
-      return oc.join('--')
-    }
-  },
-  methods: {
-    go2: function(widget, param) {
-      this.$goto(widget, {}, 'master-router')
-    },
-    mute: function() {
-      HostApp.mute()
-    },
-    trackPlan: function() {
-      this.showModal = true
-    }
-  },
-}
-</script>
+<template>
+  <div class= "auto">
+    <div style="text-align:center">欢迎</div>
+    <div style="text-align:center">
+      <span>{{orgCrumb}}</span>
+      <img src="../../assets/mute.png" width="32" height="32" @click="mute"></img>
+    </div>
+    <route :comp="{name: 'attendance-tally'}" name="master-router"></route>
+    <footer class="navbar-default navbar-fixed-bottom">
+    <div class="container-fluid">
+      <table width="100%" height="30px">
+        <tr>
+          <td @click="go2('attendance-tally')">考勤<td>
+          <td @click="go2('track-state')">状态跟踪<td>
+          <td @click="trackPlan">任务跟踪<td>
+          <td @click="go2('system-setting')">设置<td>
+          <td @click="go2('check-notice')">公告<td>
+          <td @click="go2('phone-book')">通讯录<td>
+        </tr>
+      </table>
+    </div>
+    </footer>
+    <menu :show.sync="showModal" small>
+      <div slot="modal-body" class="modal-body">
+        <table align="center">
+          <tr><td>&nbsp;</td></tr>
+          <tr><td @click="this.showModal = false, go2('checker-annual')">安检员年度任务跟踪</td></tr>
+          <tr><td>&nbsp;</td></tr>
+          <tr><td @click="this.showModal = false, go2('checker-monthly')">安检员月度任务跟踪</td></tr>
+          <tr><td>&nbsp;</td></tr>
+          <tr><td @click="this.showModal = false, go2('plumber-annual')">维修员年度任务跟踪</td></tr>
+          <tr><td>&nbsp;</td></tr>
+          <tr><td @click="this.showModal = false, go2('plumber-monthly')">维修员月度任务跟踪</td></tr>
+          <tr><td>&nbsp;</td></tr>
+        </table>
+      </div>
+    <menu>
+  </div>
+</template>
+
+<script>
+import Vue from 'vue'
+
+export default {
+  title: '所长界面',
+  data() {
+    return {
+      orgs : Vue.orgs,
+      showModal: false
+    }
+  },
+  computed: {
+    orgCrumb: function() {
+      let oc = []
+      if(this.orgs) {
+        this.orgs.filter((item) => {
+          return item.level != 4
+        }).forEach(function(org) {
+            oc.push(org.name)
+        })
+      }
+      return oc.join('--')
+    }
+  },
+  methods: {
+    go2: function(widget, param) {
+      this.$goto(widget, {}, 'master-router')
+    },
+    mute: function() {
+      HostApp.mute()
+    },
+    trackPlan: function() {
+      this.showModal = true
+    }
+  },
+}
+</script>

package/src/components/android/Menu.vue

@@ -1,132 +1,132 @@
-<template>
-  <div role="dialog" class='auto'
-    v-bind:class="{
-    'modal':true,
-    'fade':effect === 'fade',
-    'zoom':effect === 'zoom'
-    }"
-    >
-    <div v-bind:class="{'modal-dialog':true,'modal-lg':large,'modal-sm':small}" role="document"
-      v-bind:style="{width: optionalWidth}" class='auto'>
-      <div class="modal-content auto">
-        <slot name="modal-body">
-          <div class="modal-body"></div>
-        </slot>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import getScrollBarWidth from 'vue-client/src/vue-strap/src/utils/getScrollBarWidth.js'
-import EventListener from 'vue-client/src/vue-strap/src/utils/EventListener.js'
-
-  export default {
-    props: {
-      title: {
-        type: String,
-        default: ''
-      },
-      show: {
-        require: true,
-        type: Boolean,
-        twoWay: true
-      },
-      width: {
-        default: null
-      },
-      callback: {
-        type: Function,
-        default() {}
-      },
-      effect: {
-        type: String,
-        default: null
-      },
-      backdrop: {
-        type: Boolean,
-        default: true
-      },
-      large: {
-        type: Boolean,
-        default: false
-      },
-      small: {
-        type: Boolean,
-        default: false
-      }
-    },
-    ready() {
-      this.$watch('show', (val)=> {
-        const el = this.$el
-        const body = document.body
-        const scrollBarWidth =  getScrollBarWidth()
-        if (val) {
-          el.querySelector('.modal-content').focus()
-          el.style.display = 'block'
-          setTimeout(()=> el.classList.add('in'), 0)
-          body.classList.add('modal-open')
-          if (scrollBarWidth !== 0) {
-            body.style.paddingRight = scrollBarWidth + 'px'
-          }
-          if (this.backdrop) {
-            this._blurModalContentEvent = EventListener.listen(this.$el, 'click', (e)=> {
-              if (e.target === el) this.show = false
-            })
-          }
-        } else {
-          if (this._blurModalContentEvent) this._blurModalContentEvent.remove()
-          el.classList.remove('in')
-          setTimeout(()=> {
-            el.style.display = 'none'
-            body.classList.remove('modal-open')
-            body.style.paddingRight = '0'
-          }, 300)
-        }
-      }, { immediate: true })
-    },
-    computed: {
-      optionalWidth: function() {
-        if( this.width === null ) {
-          return null;
-        } else if( Number.isInteger(this.width) ) {
-          return this.width + "px";
-        }
-        return this.width;
-      },
-    },
-    methods: {
-      close() {
-        this.show = false
-      }
-    }
-  }
-</script>
-<style>
-.modal {
-  transition: all 0.3s ease;
-}
-.modal.in {
-  background-color: rgba(0,0,0,0.5);
-}
-.modal.zoom .modal-dialog {
-    -webkit-transform: scale(0.1);
-    -moz-transform: scale(0.1);
-    -ms-transform: scale(0.1);
-    transform: scale(0.1);
-    top: 300px;
-    opacity: 0;
-    -webkit-transition: all 0.3s;
-    -moz-transition: all 0.3s;
-    transition: all 0.3s;
-}
-.modal.zoom.in .modal-dialog {
-    -webkit-transform: scale(1);
-    -moz-transform: scale(1);
-    -ms-transform: scale(1);
-    transform: scale(1);
-    -webkit-transform: translate3d(0, -300px, 0);
-    transform: translate3d(0, -300px, 0);
-    opacity: 1;
-}
-</style>
+<template>
+  <div role="dialog" class='auto'
+    v-bind:class="{
+    'modal':true,
+    'fade':effect === 'fade',
+    'zoom':effect === 'zoom'
+    }"
+    >
+    <div v-bind:class="{'modal-dialog':true,'modal-lg':large,'modal-sm':small}" role="document"
+      v-bind:style="{width: optionalWidth}" class='auto'>
+      <div class="modal-content auto">
+        <slot name="modal-body">
+          <div class="modal-body"></div>
+        </slot>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import getScrollBarWidth from 'vue-client/src/vue-strap/src/utils/getScrollBarWidth.js'
+import EventListener from 'vue-client/src/vue-strap/src/utils/EventListener.js'
+
+  export default {
+    props: {
+      title: {
+        type: String,
+        default: ''
+      },
+      show: {
+        require: true,
+        type: Boolean,
+        twoWay: true
+      },
+      width: {
+        default: null
+      },
+      callback: {
+        type: Function,
+        default() {}
+      },
+      effect: {
+        type: String,
+        default: null
+      },
+      backdrop: {
+        type: Boolean,
+        default: true
+      },
+      large: {
+        type: Boolean,
+        default: false
+      },
+      small: {
+        type: Boolean,
+        default: false
+      }
+    },
+    ready() {
+      this.$watch('show', (val)=> {
+        const el = this.$el
+        const body = document.body
+        const scrollBarWidth =  getScrollBarWidth()
+        if (val) {
+          el.querySelector('.modal-content').focus()
+          el.style.display = 'block'
+          setTimeout(()=> el.classList.add('in'), 0)
+          body.classList.add('modal-open')
+          if (scrollBarWidth !== 0) {
+            body.style.paddingRight = scrollBarWidth + 'px'
+          }
+          if (this.backdrop) {
+            this._blurModalContentEvent = EventListener.listen(this.$el, 'click', (e)=> {
+              if (e.target === el) this.show = false
+            })
+          }
+        } else {
+          if (this._blurModalContentEvent) this._blurModalContentEvent.remove()
+          el.classList.remove('in')
+          setTimeout(()=> {
+            el.style.display = 'none'
+            body.classList.remove('modal-open')
+            body.style.paddingRight = '0'
+          }, 300)
+        }
+      }, { immediate: true })
+    },
+    computed: {
+      optionalWidth: function() {
+        if( this.width === null ) {
+          return null;
+        } else if( Number.isInteger(this.width) ) {
+          return this.width + "px";
+        }
+        return this.width;
+      },
+    },
+    methods: {
+      close() {
+        this.show = false
+      }
+    }
+  }
+</script>
+<style>
+.modal {
+  transition: all 0.3s ease;
+}
+.modal.in {
+  background-color: rgba(0,0,0,0.5);
+}
+.modal.zoom .modal-dialog {
+    -webkit-transform: scale(0.1);
+    -moz-transform: scale(0.1);
+    -ms-transform: scale(0.1);
+    transform: scale(0.1);
+    top: 300px;
+    opacity: 0;
+    -webkit-transition: all 0.3s;
+    -moz-transition: all 0.3s;
+    transition: all 0.3s;
+}
+.modal.zoom.in .modal-dialog {
+    -webkit-transform: scale(1);
+    -moz-transform: scale(1);
+    -ms-transform: scale(1);
+    transform: scale(1);
+    -webkit-transform: translate3d(0, -300px, 0);
+    transform: translate3d(0, -300px, 0);
+    opacity: 1;
+}
+</style>

package/src/components/android/NewCheckpaperAndroid.vue

@@ -53,11 +53,6 @@ div {
 
 <template>
   <div class="basic-main" style="height: 100%">
-    <!--    <div class="page-header app-header auto" style="padding: 15px;margin-right: 10px;right: 0%;height: 7%">-->
-    <!--      <div @click="back()">-->
-    <!--        <img src="../../assets/back.png" style="margin: 0px"/>-->
-    <!--      </div>-->
-    <!--    </div>-->
     <work-busy :is-busy="loading"></work-busy>
     <div class="container-fluid" style="overflow: scroll">
       <div class="row">
@@ -387,51 +382,15 @@ import Vue from 'vue'
 import * as Util from '../../components/Util'
 import {jsonSort} from '../../utils/LdapHelper'
 import {HttpResetClass} from "vue-client";
-
+import {isEmpty} from "../../components/Util";
 let asyncReady = async function (self) {
-  // 获取配置信息
   try {
-    let res = await new HttpResetClass().load('post', `${self.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
-      data: {
-        items: 'name,f_dir',
-        tablename: 't_organization',
-        condition: `id  = '${self.item.f_filialeid}'`,
-        orderitem: 'id'
-      }
-    })/*.then(res=>{*/
-    //tag
-    //tag)
-    if (res.data.length === 0) {
-      // self.$showMessage("该公司无组织目录，无法获取配置文件，将使用默认配置文件")
-      return
-    }
-    if (!res.data[0].f_dir) {
-      // self.$showMessage("该公司无组织目录，无法获取配置文件，请联系管理员确认")
-    } else {
-      //this.f_dir=res.data[0].f_dir
-      try {
-        let res1 = await new HttpResetClass().load('GET', `${self.$androidUtil.getProxyUrl()}/safecheck/rs/vue/DevicesConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {}, {
-          resolveMsg: '获取居民配置项成功！',
-          rejectMsg: '获取居民配置项出错！'
-        })/*.then(res=>{*/
-        //tag
-        //this.safeConfig["民用配置项"]=Object.assign({},res.data)
-        Vue.config.safecheck.DevicesConfig = res1.data
-        /*})*/
-        let res2 = await new HttpResetClass().load('GET', `${self.$androidUtil.getProxyUrl()}/safecheck/rs/vue/DevicesSetConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {}, {
-          resolveMsg: '获取非居民配置项成功！',
-          rejectMsg: '获取非居民配置项出错！'
-        })/*.then(res=>{*/
-        //tag
-        //this.safeConfig["非民用配置项"]=Object.assign({},res.data)
-        Vue.config.safecheck.DevicesSetConfig = res2.data
-        /*}).then(res=> {
-        })*/
-
-      } catch (e) {
-        // self.$showMessage("获取配置文件失败" + e)
-      }
-    }
+    let res = await new HttpResetClass().load('GET',`${self.$androidUtil.getProxyUrl()}/api/af-safecheck/vue`,null, {resolveMsg: null, rejectMsg: null})
+    self.delConfigKey(res.data)
+    Vue.config.safecheck=res.data
+    Vue.config.safecheck.DevicesConfig =res.data.DevicesConfig
+    Vue.config.safecheck.DevicesSetConfig = res.data.DevicesSetConfig
+    console.log('获取配置结果===', res.data)
   } catch (error) {
     // 忽略704,文件找不到异常R
     if (error.status !== 704) {
@@ -565,7 +524,22 @@ export default {
     }
   },
   methods: {
+    delConfigKey(obj){
+      // 从琉璃中获取的配置中会包含 $开头的一些额外描述新的key。为了兼容v3的代码逻辑在此函数中去掉
+      Object.keys(obj).forEach(key =>{
+        Object.keys(obj[key]).forEach(col => {
+          // 检查键是否以$开头
+          if (col.startsWith('$')) {
+            // 使用delete操作符删除键
+            delete obj[key][col];
+          }
+        })
+      })
+    },
     getimg(val){
+      if(isEmpty(val)){
+        return  ''
+      }
       console.log(`${this.$androidUtil.getProxyUrl()}/${val}`)
 
       return `${this.$androidUtil.getProxyUrl()}/${val}`