safecheck-client 3.0.33-126 → 3.0.33-128

package/src/components/paper/RepairVerifyForm.vue

@@ -1,76 +1,76 @@
-<template>
-<div>
-    <validator name='v'>
-        <a href="#" class="btn btn-primary" @click="this.$back('items')">&lt;&lt;</a>
-        <form novalidate class="form-horizontal">
-            <div class="form-group">
-                <label class="col-sm-2 control-lable">审核人：</label>
-                <div class="col-sm-8">
-                    <input readonly='readonly' class="form-control" type="text" v-model="item.f_repair_approved_by" v-validate:f_repair_approved_by='{ required: true }' />
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-2 control-lable">审核结果：</label>
-                <div class="col-sm-8">
-                    <input readonly='readonly' class="form-control" type="text" v-model="item.f_repair_approved" v-validate:f_repair_approved='{ required: true }' />
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-2 control-lable">审核时间：</label>
-                <div class="col-sm-8">
-                    <input readonly='readonly' class="form-control" type="text" v-model="item.f_repair_approved_time"/>
-                </div>
-            </div>
-            <div class="form-group">
-              <label class="col-sm-2 control-lable">审核备注：</label>
-              <div class="col-sm-8">
-                  <textarea class="form-control" type="text" v-model="item.f_repair_approved_note"></textarea>
-              </div>
-          </div>
-            <div class="form-group col-sm-12">
-              <button :disabled="item.f_repair_approved != '未审核' && item.f_repair_approved != '重修'" type="button" class="btn btn-primary col-sm-3" @click="approve">
-                 <span class="glyphicon glyphicon-ok"></span> 通过
-              </button>
-              <button :disabled="item.f_repair_approved != '未审核' && item.f_repair_approved != '重修'" type="button" class="btn btn-primary col-sm-3" @click="disapprove">
-                 <span class="glyphicon glyphicon-remove"></span> 打回
-              </button>
-            </div>
-        </form>
-    </validator>
-</div>
-
-</template>
-
-<script>
-import * as Util from '../Util'
-import co from 'co'
-import Vue from 'vue'
-
-let syncVerify = function * (self) {
-  yield self.$resetpost('rs/logic/ApprovePaper', {data:{item: self.item}}, {resolveMsg: '操作成功！', rejectMsg: '操作失败！'})
-}
-
-export default {
-  title: '维修审核',
-  props: ['item', 'name'],
-  ready () {
-    if(this.item.f_repair_approved == '未审核') {
-      this.item.f_repair_approved_time = Util.toStandardTimeString()
-      this.item.f_repair_approved_by = this.name
-    }
-  },
-  methods: {
-    approve () {
-      this.item.f_repair_approved = '已审核'
-      let gen = syncVerify(this)
-      return co(gen)
-    },
-    disapprove () {
-      this.item.f_repair_approved = '打回'
-      let gen = syncVerify(this)
-      return co(gen)
-    },
-  }
-}
-
-</script>
+<template>
+<div>
+    <validator name='v'>
+        <a href="#" class="btn btn-primary" @click="this.$back('items')">&lt;&lt;</a>
+        <form novalidate class="form-horizontal">
+            <div class="form-group">
+                <label class="col-sm-2 control-lable">审核人：</label>
+                <div class="col-sm-8">
+                    <input readonly='readonly' class="form-control" type="text" v-model="item.f_repair_approved_by" v-validate:f_repair_approved_by='{ required: true }' />
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-2 control-lable">审核结果：</label>
+                <div class="col-sm-8">
+                    <input readonly='readonly' class="form-control" type="text" v-model="item.f_repair_approved" v-validate:f_repair_approved='{ required: true }' />
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-2 control-lable">审核时间：</label>
+                <div class="col-sm-8">
+                    <input readonly='readonly' class="form-control" type="text" v-model="item.f_repair_approved_time"/>
+                </div>
+            </div>
+            <div class="form-group">
+              <label class="col-sm-2 control-lable">审核备注：</label>
+              <div class="col-sm-8">
+                  <textarea class="form-control" type="text" v-model="item.f_repair_approved_note"></textarea>
+              </div>
+          </div>
+            <div class="form-group col-sm-12">
+              <button :disabled="item.f_repair_approved != '未审核' && item.f_repair_approved != '重修'" type="button" class="btn btn-primary col-sm-3" @click="approve">
+                 <span class="glyphicon glyphicon-ok"></span> 通过
+              </button>
+              <button :disabled="item.f_repair_approved != '未审核' && item.f_repair_approved != '重修'" type="button" class="btn btn-primary col-sm-3" @click="disapprove">
+                 <span class="glyphicon glyphicon-remove"></span> 打回
+              </button>
+            </div>
+        </form>
+    </validator>
+</div>
+
+</template>
+
+<script>
+import * as Util from '../Util'
+import co from 'co'
+import Vue from 'vue'
+
+let syncVerify = function * (self) {
+  yield self.$resetpost('rs/logic/ApprovePaper', {data:{item: self.item}}, {resolveMsg: '操作成功！', rejectMsg: '操作失败！'})
+}
+
+export default {
+  title: '维修审核',
+  props: ['item', 'name'],
+  ready () {
+    if(this.item.f_repair_approved == '未审核') {
+      this.item.f_repair_approved_time = Util.toStandardTimeString()
+      this.item.f_repair_approved_by = this.name
+    }
+  },
+  methods: {
+    approve () {
+      this.item.f_repair_approved = '已审核'
+      let gen = syncVerify(this)
+      return co(gen)
+    },
+    disapprove () {
+      this.item.f_repair_approved = '打回'
+      let gen = syncVerify(this)
+      return co(gen)
+    },
+  }
+}
+
+</script>

package/src/components/pc/NewCheckpaper.vue

@@ -894,6 +894,7 @@ import Vue from 'vue'
 import * as Util from '../Util'
 import {jsonSort} from '../../utils/LdapHelper'
 import {HttpResetClass} from "vue-client";
+import {forEach} from "mocha/lib/utils";
 
 let asyncReady = async function (self) {
   // 获取配置信息
@@ -1293,6 +1294,9 @@ export default {
       if (this.deviceCollects.length > 0) {
         this.hasDevice = true
       }
+      this.deviceconfig2 = this.deviceconfig2.filter(row => {
+        return !(row.checkname == '$configProp' || row.checkname == '$globalProp');
+      })
       this.ajresult = JSON.parse(this.data.f_defect_content).result
       this.showimg3 = this.data.f_noanswer_path
       this.showimg5 = this.data.f_noanswer1_path

package/src/components/phonestate/DailyTraffic.vue

@@ -1,57 +1,57 @@
-<template>
-  <div>
-      <div class="auto">
-        <label>{{f_user_name}}日流量列表</label>
-        <button type="button" class="btn btn-default" @click="this.$back('asd')">&lt;&lt;</button>
-      </div>
-      <data-grid :model="model" partial='list' v-ref:grid>
-        <template partial='head'>
-          <tr>
-            <th>日期</th>
-            <th>流量Mb</th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <td>{{row.f_datetime}}</td>
-          <td>{{row.f_traffic}}</td>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-import { PagedList } from 'vue-client'
-import * as Util from '../Util'
-import co from 'co'
-
-let fetchDailyTrafficList = function * (self) {
-    let result = yield self.$post('rs/sql/日流量明细?pageNo=1&pageSize=9999', {
-        data: {
-            f_userinfoid: self.f_userinfoid,
-            f_user_name: self.f_user_name,
-            f_ym: self.f_ym
-        }
-    }, {
-        resolveMsg: null,
-        rejectMsg: '提取任务出错'
-    })
-    self.$set("model.rows", result.data)
-}
-
-export default {
-  title: '日流量明细',
-  props: ['f_userinfoid', 'f_user_name', 'f_ym'],
-  data() {
-    return {
-      model: {
-        rows: []
-      }
-    }
-  },
-  ready () {
-    let fp = fetchDailyTrafficList(this)
-    co(fp)
-  }
-}
-</script>
+<template>
+  <div>
+      <div class="auto">
+        <label>{{f_user_name}}日流量列表</label>
+        <button type="button" class="btn btn-default" @click="this.$back('asd')">&lt;&lt;</button>
+      </div>
+      <data-grid :model="model" partial='list' v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th>日期</th>
+            <th>流量Mb</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td>{{row.f_datetime}}</td>
+          <td>{{row.f_traffic}}</td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import { PagedList } from 'vue-client'
+import * as Util from '../Util'
+import co from 'co'
+
+let fetchDailyTrafficList = function * (self) {
+    let result = yield self.$post('rs/sql/日流量明细?pageNo=1&pageSize=9999', {
+        data: {
+            f_userinfoid: self.f_userinfoid,
+            f_user_name: self.f_user_name,
+            f_ym: self.f_ym
+        }
+    }, {
+        resolveMsg: null,
+        rejectMsg: '提取任务出错'
+    })
+    self.$set("model.rows", result.data)
+}
+
+export default {
+  title: '日流量明细',
+  props: ['f_userinfoid', 'f_user_name', 'f_ym'],
+  data() {
+    return {
+      model: {
+        rows: []
+      }
+    }
+  },
+  ready () {
+    let fp = fetchDailyTrafficList(this)
+    co(fp)
+  }
+}
+</script>

package/src/components/phonestate/LastKnownState.vue

@@ -1,74 +1,74 @@
-<template>
-  <div>
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='search'>
-        <div novalidate class="form-inline auto" partial>
-          <button class="btn btn-default" @click="search()">刷新</button>
-          <button type="button" class="btn btn-default" @click="$parent.$parent.lastKnownPos">位置地图&nbsp;&nbsp;&nbsp;&nbsp;<span class="glyphicon glyphicon-map-marker"></span></button>
-          <div class="form-group">
-            部门:
-            <chooser :userid.sync='$parent.$parent.f.id' resource-type="organization" :width='200' :select-data.sync='$parent.$parent.model.chosenOrg'></chooser>
-          </div>
-          {{$parent.$parent.model.chosenOrg.fullname}}
-        </div>
-      </criteria>
-      <data-grid :model="model" partial='list' v-ref:grid>
-        <template partial='head'>
-          <tr>
-            <th>时间</th>
-            <th>手机使用者</th>
-            <th>手机串码</th>
-            <th>经度</th>
-            <th>纬度</th>
-            <th>海拔(米)</th>
-            <th>电量%</th>
-            <th>信号强度</th>
-            <th>剩余空间M</th>
-            <th>流量Kb</th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <td>{{row.f_datetime}}</td>
-          <td v-on:click.stop.prevent='$parent.$parent.$parent.footprint(row)'>{{row.f_user_name}}&nbsp;&nbsp;&nbsp;&nbsp;<span class="glyphicon glyphicon-option-horizontal"></span></td>
-          <td>{{row.f_sn}}</td>
-          <td>{{row.f_longitude}}</td>
-          <td>{{row.f_latitude}}</td>
-          <td>{{row.f_altitude}}</td>
-          <td>{{row.f_battery_level}}</td>
-          <td>{{row.f_signal_strength}}</td>
-          <td>{{row.f_internal_quote}}</td>
-          <td>{{row.f_traffic/1000}}</td>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-import { PagedList } from 'vue-client'
-
-export default {
-  title: '足迹及手机状态监控',
-  props: ['f'],
-  data () {
-    let model = new PagedList('rs/sql/最后在线位置及状态', 20, {f_loggedOnUserId: 'this.f_loggedOnUserId', f_loggedOnOrgId: 'this.chosenOrg.id'})
-    model.chosenOrg = {id:0}
-    return {
-      model: model
-    }
-  },
-  methods: {
-    lastKnownPos () {
-      this.$goto('post-map', {lonlats: this.model.rows}, 'self')
-    },
-    footprint (row) {
-      this.$goto('footprint-map', {f_userinfoid: row.f_userinfoid, f_user_name: row.f_user_name}, 'self')
-    }
-  },
-  ready () {
-    this.model.f_loggedOnUserId = this.f.id
-    this.model.chosenOrg.id = this.f.parent.id
-    this.model.search()
-  }
-}
-</script>
+<template>
+  <div>
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='search'>
+        <div novalidate class="form-inline auto" partial>
+          <button class="btn btn-default" @click="search()">刷新</button>
+          <button type="button" class="btn btn-default" @click="$parent.$parent.lastKnownPos">位置地图&nbsp;&nbsp;&nbsp;&nbsp;<span class="glyphicon glyphicon-map-marker"></span></button>
+          <div class="form-group">
+            部门:
+            <chooser :userid.sync='$parent.$parent.f.id' resource-type="organization" :width='200' :select-data.sync='$parent.$parent.model.chosenOrg'></chooser>
+          </div>
+          {{$parent.$parent.model.chosenOrg.fullname}}
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th>时间</th>
+            <th>手机使用者</th>
+            <th>手机串码</th>
+            <th>经度</th>
+            <th>纬度</th>
+            <th>海拔(米)</th>
+            <th>电量%</th>
+            <th>信号强度</th>
+            <th>剩余空间M</th>
+            <th>流量Kb</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td>{{row.f_datetime}}</td>
+          <td v-on:click.stop.prevent='$parent.$parent.$parent.footprint(row)'>{{row.f_user_name}}&nbsp;&nbsp;&nbsp;&nbsp;<span class="glyphicon glyphicon-option-horizontal"></span></td>
+          <td>{{row.f_sn}}</td>
+          <td>{{row.f_longitude}}</td>
+          <td>{{row.f_latitude}}</td>
+          <td>{{row.f_altitude}}</td>
+          <td>{{row.f_battery_level}}</td>
+          <td>{{row.f_signal_strength}}</td>
+          <td>{{row.f_internal_quote}}</td>
+          <td>{{row.f_traffic/1000}}</td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import { PagedList } from 'vue-client'
+
+export default {
+  title: '足迹及手机状态监控',
+  props: ['f'],
+  data () {
+    let model = new PagedList('rs/sql/最后在线位置及状态', 20, {f_loggedOnUserId: 'this.f_loggedOnUserId', f_loggedOnOrgId: 'this.chosenOrg.id'})
+    model.chosenOrg = {id:0}
+    return {
+      model: model
+    }
+  },
+  methods: {
+    lastKnownPos () {
+      this.$goto('post-map', {lonlats: this.model.rows}, 'self')
+    },
+    footprint (row) {
+      this.$goto('footprint-map', {f_userinfoid: row.f_userinfoid, f_user_name: row.f_user_name}, 'self')
+    }
+  },
+  ready () {
+    this.model.f_loggedOnUserId = this.f.id
+    this.model.chosenOrg.id = this.f.parent.id
+    this.model.search()
+  }
+}
+</script>

package/src/components/phonestate/MonthlyTraffic.vue

@@ -1,66 +1,66 @@
-<template>
-  <div>
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='search'>
-        <div novalidate class="form-inline auto" partial>
-          <div class="form-group">
-            <label class="col-sm-12 control-label">选择年月：</label>
-            <div class="col-sm-12">
-              <datepicker placeholder="请选择年月"
-                :value.sync="$parent.$parent.model.f_ym"
-                :disabled-days-of-Week="[]"
-                :format="'yyyy-MM'">
-              </datepicker>
-              <button class="btn btn-default" @click="search()">查询</button>
-              <div class="form-group">
-                部门:
-                <chooser :userid.sync='$parent.$parent.f.id' resource-type="organization" :width='200' :select-data.sync='$parent.$parent.model.chosenOrg'></chooser>
-              </div>
-              {{$parent.$parent.model.chosenOrg.fullname}}
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <data-grid :model="model" partial='list' v-ref:grid>
-        <template partial='head'>
-          <tr>
-            <th>手机使用者</th>
-            <th>流量Mb</th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <td v-on:click.stop.prevent='$parent.$parent.$parent.dailyTraffic(row)'>{{row.f_user_name}}&nbsp;&nbsp;&nbsp;&nbsp;<span class="glyphicon glyphicon-option-horizontal"></span></td>
-          <td>{{row.f_traffic}}</td>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-import { PagedList } from 'vue-client'
-import * as Util from '../Util'
-
-export default {
-  title: '月流量统计',
-  props: ['f'],
-  data () {
-    let model = new PagedList('rs/rcq/月度流量统计', 20, {f_loggedOnUserId: 'this.f_loggedOnUserId', f_loggedOnOrgId: 'this.chosenOrg.id', f_ym: 'this.f_ym'})
-    model.f_ym = Util.toStandardYearMonth()
-    model.chosenOrg = {id:0}
-    return {
-      model: model,
-    }
-  },
-  methods: {
-    dailyTraffic (row) {
-      this.$goto('daily-traffic', {f_userinfoid: row.f_userinfoid, f_user_name: row.f_user_name, f_ym: this.model.f_ym}, 'self')
-    }
-  },
-  ready () {
-    this.model.f_loggedOnUserId = this.f.id
-    this.model.chosenOrg.id = this.f.parent.id
-    this.model.search()
-  }
-}
-</script>
+<template>
+  <div>
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='search'>
+        <div novalidate class="form-inline auto" partial>
+          <div class="form-group">
+            <label class="col-sm-12 control-label">选择年月：</label>
+            <div class="col-sm-12">
+              <datepicker placeholder="请选择年月"
+                :value.sync="$parent.$parent.model.f_ym"
+                :disabled-days-of-Week="[]"
+                :format="'yyyy-MM'">
+              </datepicker>
+              <button class="btn btn-default" @click="search()">查询</button>
+              <div class="form-group">
+                部门:
+                <chooser :userid.sync='$parent.$parent.f.id' resource-type="organization" :width='200' :select-data.sync='$parent.$parent.model.chosenOrg'></chooser>
+              </div>
+              {{$parent.$parent.model.chosenOrg.fullname}}
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th>手机使用者</th>
+            <th>流量Mb</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td v-on:click.stop.prevent='$parent.$parent.$parent.dailyTraffic(row)'>{{row.f_user_name}}&nbsp;&nbsp;&nbsp;&nbsp;<span class="glyphicon glyphicon-option-horizontal"></span></td>
+          <td>{{row.f_traffic}}</td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import { PagedList } from 'vue-client'
+import * as Util from '../Util'
+
+export default {
+  title: '月流量统计',
+  props: ['f'],
+  data () {
+    let model = new PagedList('rs/rcq/月度流量统计', 20, {f_loggedOnUserId: 'this.f_loggedOnUserId', f_loggedOnOrgId: 'this.chosenOrg.id', f_ym: 'this.f_ym'})
+    model.f_ym = Util.toStandardYearMonth()
+    model.chosenOrg = {id:0}
+    return {
+      model: model,
+    }
+  },
+  methods: {
+    dailyTraffic (row) {
+      this.$goto('daily-traffic', {f_userinfoid: row.f_userinfoid, f_user_name: row.f_user_name, f_ym: this.model.f_ym}, 'self')
+    }
+  },
+  ready () {
+    this.model.f_loggedOnUserId = this.f.id
+    this.model.chosenOrg.id = this.f.parent.id
+    this.model.search()
+  }
+}
+</script>

package/src/components/phonestate/MonthlyTrafficRouter.vue

@@ -1,15 +1,15 @@
-<template>
-  <div>
-    <route :comp="{name: 'void-page'}" name="traffic-router"></route>
-  </div>
-</template>
-
-<script>
-export default {
-  title: '月流量统计',
-  props: ['f'],
-  ready () {
-    this.$goto('monthly-traffic-list', {f: this.f}, 'self')
-  }
-}
-</script>
+<template>
+  <div>
+    <route :comp="{name: 'void-page'}" name="traffic-router"></route>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '月流量统计',
+  props: ['f'],
+  ready () {
+    this.$goto('monthly-traffic-list', {f: this.f}, 'self')
+  }
+}
+</script>