safecheck-client 4.0.0-89 → 4.0.0-90

package/src/components/Hello.vue

@@ -1,39 +1,39 @@
-<template>
-  <div class="hello">这是自己
-    <h1>Welcome to Your Vue.js App{{msg}} </h1>
-  </div>
-</template>
-
-<script>
-export default {
-  title: 'Hello',
-  name: 'hello',
-  props: ['msg'],
-  methods: {
-    toTable () {
-      this.$back()
-    }
-  }
-}
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-h1, h2 {
-  font-weight: normal;
-}
-
-ul {
-  list-style-type: none;
-  padding: 0;
-}
-
-li {
-  display: inline-block;
-  margin: 0 10px;
-}
-
-a {
-  color: #42b983;
-}
-</style>
+<template>
+  <div class="hello">这是自己
+    <h1>Welcome to Your Vue.js App{{msg}} </h1>
+  </div>
+</template>
+
+<script>
+export default {
+  title: 'Hello',
+  name: 'hello',
+  props: ['msg'],
+  methods: {
+    toTable () {
+      this.$back()
+    }
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped>
+h1, h2 {
+  font-weight: normal;
+}
+
+ul {
+  list-style-type: none;
+  padding: 0;
+}
+
+li {
+  display: inline-block;
+  margin: 0 10px;
+}
+
+a {
+  color: #42b983;
+}
+</style>

package/src/components/LeftTree.vue

@@ -1,27 +1,27 @@
-<template>
-  <div class='over'>
-    <tree :model='functions.functions' :is-click="false">
-      <span partial>{{row.data.name}}</span>
-    </tree>
-  </div>
-</template>
-
-<script>
-export default {
-  props: ['functions'],
-  title: '左侧树菜单',
-  methods: {
-    open (row) {
-      if (row.data.link) {
-        this.$goto(row.data.link, {f: this.functions}, 'home-page')
-      }
-    }
-  },
-  events: {
-    'select-changed': function (data) {
-      // 事件回调内的 `this` 自动绑定到注册它的实例上
-      this.open(data.val)
-    }
-  }
-}
-</script>
+<template>
+  <div class='over'>
+    <tree :model='functions.functions' :is-click="false">
+      <span partial>{{row.data.name}}</span>
+    </tree>
+  </div>
+</template>
+
+<script>
+export default {
+  props: ['functions'],
+  title: '左侧树菜单',
+  methods: {
+    open (row) {
+      if (row.data.link) {
+        this.$goto(row.data.link, {f: this.functions}, 'home-page')
+      }
+    }
+  },
+  events: {
+    'select-changed': function (data) {
+      // 事件回调内的 `this` 自动绑定到注册它的实例上
+      this.open(data.val)
+    }
+  }
+}
+</script>

package/src/components/android/AndroidDefectDetails.vue

@@ -142,10 +142,11 @@
                 <img src="../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
                 <label class="font text-left">隐患项：</label>
               </div>
-              <div class="col-xs-8">
-                <input class="search_input input-font"
-                       v-model=model.f_item_name condition=" tdi.f_item_name like '%{}%'"/>
-              </div>
+              <v-select id="f_user_type" :value.sync="model.f_item_name" class="input-font"
+                        :width="'60%'"
+                        :options='$parent.$parent.item_types' placeholder='隐患项'
+                        v-model="model.f_item_name" condition="f_item_name = '{}'" close-on-select
+                        clear-button></v-select>
             </div>
             <div class="row app-row">
               <div class="col-xs-4">
@@ -311,17 +312,17 @@
                   <p class="panel-title col-xs-5 text-left font"><b>备注:</b></p>
                   <p class="panel-title col-xs-7 text-left input-font">{{ row.f_comments }}</p>
                 </div>
-<!--                <div class="col-xs-12">-->
-<!--                  <button type="button" name="button" class="btn btn-primary"-->
-<!--                          style="background-color:#499edf;float: right"-->
-<!--                          @click="$parent.$parent.$parent.openshowModal(row)">查看-->
-<!--                  </button>-->
-                  <!--                  <button type="button" name="button" class="btn btn-primary"-->
-                  <!--                          style="background-color:#499edf;float: right;margin-right:10px;"-->
-                  <!--                          @click="$parent.$parent.$parent.openshowModal1(row)">处理-->
-                  <!--                  </button>-->
-                  <!--<button type="button" class="btn btn-default" @click="$parent.$parent.$parent.ceshi">确认2</button>-->
-<!--                </div>-->
+                <!--                <div class="col-xs-12">-->
+                <!--                  <button type="button" name="button" class="btn btn-primary"-->
+                <!--                          style="background-color:#499edf;float: right"-->
+                <!--                          @click="$parent.$parent.$parent.openshowModal(row)">查看-->
+                <!--                  </button>-->
+                <!--                  <button type="button" name="button" class="btn btn-primary"-->
+                <!--                          style="background-color:#499edf;float: right;margin-right:10px;"-->
+                <!--                          @click="$parent.$parent.$parent.openshowModal1(row)">处理-->
+                <!--                  </button>-->
+                <!--<button type="button" class="btn btn-default" @click="$parent.$parent.$parent.ceshi">确认2</button>-->
+                <!--                </div>-->
               </div>
             </div>
           </div>
@@ -469,6 +470,7 @@ export default {
         {label: '民用', value: '民用'},
         {label: '非民用', value: '非民用'}
       ],
+      item_types: [{label: '全部', value: ''}],
       f_filialeids: '',
       model: new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/defectDetails`, 20, {
         condition: 'this.condition',
@@ -483,8 +485,35 @@ export default {
   },
   ready() {
     this.selfSearch()
+    this.getDefectItemConfig()
   },
   methods: {
+    async getDefectItemConfig() {
+      const uniqueMap = new Map(); // 去重容器
+      const result = [];
+      if (Vue.config2 && Vue.config2.safecheck && Vue.config2.safecheck.DevicesConfig) {
+        const devicesConfig = Vue.config2.safecheck.DevicesConfig;
+        for (const key in devicesConfig) {
+          if (!uniqueMap.has(key)) {
+            uniqueMap.set(key, true);
+            result.push({ label: key, value: key });
+          }
+        }
+      }
+      if (Vue.config2 && Vue.config2.safecheck && Vue.config2.safecheck.DevicesSetConfig) {
+        const devicesSetConfig = Vue.config2.safecheck.DevicesSetConfig;
+        for (const key in devicesSetConfig) {
+          if (!uniqueMap.has(key)) {
+            uniqueMap.set(key, true);
+            result.push({ label: key, value: key });
+          }
+        }
+      }
+      this.item_types = [
+        { label: '全部', value: '' },
+        ...result
+      ];
+    },
     async deletebacklist() {
       ////tag)
       let http = new HttpResetClass()

package/src/components/android/AttendanceTally.vue

@@ -1,116 +1,116 @@
-<template>
-  <div>
-  <form>
-    <div class="form-group">
-      <label>日期：</label>
-      <datepicker placeholder="日期"
-        :value.sync="f_date"
-        :disabled-days-of-Week="[]"
-        :format="'yyyy-MM-dd'"
-        :show-reset-button="false">
-      </datepicker>
-    </div>
-    <div class="form-group">
-      <label>职工姓名：</label>
-      <v-select id="f_upload_state" :value.sync="f_emp"
-      :options='f_personnels' placeholder="请选择职工姓名"
-      close-on-select clear-button></v-select>
-    </div>
-    <div class="form-group">
-    上班时间:
-    <input type="time" class="form-control" v-model="timeToWork">
-    </div>
-    <div class="form-group">
-    下班时间:
-    <input type="time" class="form-control" v-model="timeToGo">
-    </div>
-    <button type="button" class="btn btn-default" @click="search">查询</button>
-
-    <data-grid :model="model" partial='list' v-ref:grid>
-      <template partial='head'>
-        <tr>
-        <th>姓名</th>
-        <th>上班时间</th>
-        <th>下班时间</th>
-        <th>状态</th>
-        </tr>
-      </template>
-      <template partial='body'>
-        <td>{{row.f_user_name}}</td>
-        <td>{{row.f_signin_time}}</td>
-        <td>{{row.f_knockoff_time}}</td>
-        <td>{{row.f_state}}</td>
-      </template>
-    </data-grid>
-  </form>
-  <div style="height:50px;"></div>
-  </div>
-</template>
-
-<script>
-import co from 'co'
-import Vue from 'vue'
-import Datepicker from 'vue-strap/src/Datepicker'
-import * as Util from '../Util'
-
-let fetchPersonnel = function * (self) {
-    let result = yield self.$resetpost(Vue.url + 'sql/得到所长管辖的员工?pageNo=1&pageSize=9999', {
-        data: {
-            id: Vue.user.id,
-            org_id: Vue.user.parentid
-        }
-    }, {
-        resolveMsg: null,
-        rejectMsg: '提取数据出错'
-    })
-    result.data.forEach(function(item) {
-      self.f_personnels.push(item)
-    })
-}
-
-let fetchAttendance = function * (self) {
-    let result = yield self.$resetpost(Vue.url + 'sql/提取考勤信息?pageNo=1&pageSize=9999', {
-        data: {
-            id: Vue.user.id,
-            org_id: Vue.user.parentid,
-            f_personnels: self.f_emp[0],
-            f_date: self.f_date
-        }
-    }, {
-        resolveMsg: null,
-        rejectMsg: '提取考勤信息出错'
-    })
-
-    for (var row of result.data) {
-      Util.getAttendanceState(row, self.timeToWork, self.timeToGo)
-    }
-
-    self.$set("model.rows", result.data)
-}
-
-export default {
-  title: '考勤页面',
-  data() {
-    return {
-      model : {},
-      f_personnels: [{label:'全部', value: '0'}],
-      f_date: Util.toStandardDateString(),
-      f_emp: ['0'],
-      timeToGo: '18:00:00',
-      timeToWork: '08:00:00'
-    }
-  },
-  ready() {
-    let fp = fetchPersonnel(this)
-    co(fp)
-  },
-  methods: {
-    search() {
-      if(!this.timeToGo || !this.timeToWork)
-        HostApp.alert('请检查上下班时间！')
-      let fa = fetchAttendance(this)
-      co(fa)
-    }
-  }
-}
-</script>
+<template>
+  <div>
+  <form>
+    <div class="form-group">
+      <label>日期：</label>
+      <datepicker placeholder="日期"
+        :value.sync="f_date"
+        :disabled-days-of-Week="[]"
+        :format="'yyyy-MM-dd'"
+        :show-reset-button="false">
+      </datepicker>
+    </div>
+    <div class="form-group">
+      <label>职工姓名：</label>
+      <v-select id="f_upload_state" :value.sync="f_emp"
+      :options='f_personnels' placeholder="请选择职工姓名"
+      close-on-select clear-button></v-select>
+    </div>
+    <div class="form-group">
+    上班时间:
+    <input type="time" class="form-control" v-model="timeToWork">
+    </div>
+    <div class="form-group">
+    下班时间:
+    <input type="time" class="form-control" v-model="timeToGo">
+    </div>
+    <button type="button" class="btn btn-default" @click="search">查询</button>
+
+    <data-grid :model="model" partial='list' v-ref:grid>
+      <template partial='head'>
+        <tr>
+        <th>姓名</th>
+        <th>上班时间</th>
+        <th>下班时间</th>
+        <th>状态</th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <td>{{row.f_user_name}}</td>
+        <td>{{row.f_signin_time}}</td>
+        <td>{{row.f_knockoff_time}}</td>
+        <td>{{row.f_state}}</td>
+      </template>
+    </data-grid>
+  </form>
+  <div style="height:50px;"></div>
+  </div>
+</template>
+
+<script>
+import co from 'co'
+import Vue from 'vue'
+import Datepicker from 'vue-strap/src/Datepicker'
+import * as Util from '../Util'
+
+let fetchPersonnel = function * (self) {
+    let result = yield self.$resetpost(Vue.url + 'sql/得到所长管辖的员工?pageNo=1&pageSize=9999', {
+        data: {
+            id: Vue.user.id,
+            org_id: Vue.user.parentid
+        }
+    }, {
+        resolveMsg: null,
+        rejectMsg: '提取数据出错'
+    })
+    result.data.forEach(function(item) {
+      self.f_personnels.push(item)
+    })
+}
+
+let fetchAttendance = function * (self) {
+    let result = yield self.$resetpost(Vue.url + 'sql/提取考勤信息?pageNo=1&pageSize=9999', {
+        data: {
+            id: Vue.user.id,
+            org_id: Vue.user.parentid,
+            f_personnels: self.f_emp[0],
+            f_date: self.f_date
+        }
+    }, {
+        resolveMsg: null,
+        rejectMsg: '提取考勤信息出错'
+    })
+
+    for (var row of result.data) {
+      Util.getAttendanceState(row, self.timeToWork, self.timeToGo)
+    }
+
+    self.$set("model.rows", result.data)
+}
+
+export default {
+  title: '考勤页面',
+  data() {
+    return {
+      model : {},
+      f_personnels: [{label:'全部', value: '0'}],
+      f_date: Util.toStandardDateString(),
+      f_emp: ['0'],
+      timeToGo: '18:00:00',
+      timeToWork: '08:00:00'
+    }
+  },
+  ready() {
+    let fp = fetchPersonnel(this)
+    co(fp)
+  },
+  methods: {
+    search() {
+      if(!this.timeToGo || !this.timeToWork)
+        HostApp.alert('请检查上下班时间！')
+      let fa = fetchAttendance(this)
+      co(fa)
+    }
+  }
+}
+</script>

package/src/components/android/Blank.vue

@@ -1,10 +1,10 @@
-<template>
-  <div>
-  </div>
-</template>
-
-<script>
-export default {
-  title: '空白过渡页面'
-}
-</script>
+<template>
+  <div>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '空白过渡页面'
+}
+</script>

package/src/components/android/CheckUnplanPage.vue

@@ -1,56 +1,56 @@
-<template>
-  <div class="app-bg auto">
-    <tools-page :need-back='false' title="无计划安检相关"></tools-page>
-      <div class="app-input flex-between" @click = "gotopage('lcheck-unplan')">
-        <label class="control-label text-left flex-full" style="flex: 1;">用户安检</label>
-        <span class="glyphicon glyphicon-chevqron-right flex-full text-right" ></span>
-      </div>
-      <div class="app-input flex-between" @click = "gotopage('upload-page')">
-        <label class="control-label text-left flex-full" style="flex: 1;">批量上传</label>
-        <span class="glyphicon glyphicon-chevron-right flex-full text-right"></span>
-      </div>
-      <div class="app-input flex-between" @click = "gotopage('query-check-history')">
-        <label class="control-label text-left flex-full" style="flex: 1;">历史安检信息查看</label>
-        <span class="glyphicon glyphicon-chevron-right flex-full text-right"></span>
-      </div>
-  </div>
-</template>
-
-<script>
-
-import co from 'co'
-import { PagedList } from 'vue-client'
-import Vue from 'vue'
-
-export default {
-    title: '安检计划相关',
-    data() {
-        return {
-            model: {}
-        }
-    },
-    methods: {
-      gotopage(param,props) {
-        this.$goto(param,props)
-      },
-      //头部事件回掉
-      back () {
-        this.$back()
-      },
-    }
-}
-
-</script>
-<style scoped>
-.flex-between {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-.flex-between span {
-  padding-right: 10px;
-}
-.flex-full {
-  flex: 1;
-}
-</style>
+<template>
+  <div class="app-bg auto">
+    <tools-page :need-back='false' title="无计划安检相关"></tools-page>
+      <div class="app-input flex-between" @click = "gotopage('lcheck-unplan')">
+        <label class="control-label text-left flex-full" style="flex: 1;">用户安检</label>
+        <span class="glyphicon glyphicon-chevqron-right flex-full text-right" ></span>
+      </div>
+      <div class="app-input flex-between" @click = "gotopage('upload-page')">
+        <label class="control-label text-left flex-full" style="flex: 1;">批量上传</label>
+        <span class="glyphicon glyphicon-chevron-right flex-full text-right"></span>
+      </div>
+      <div class="app-input flex-between" @click = "gotopage('query-check-history')">
+        <label class="control-label text-left flex-full" style="flex: 1;">历史安检信息查看</label>
+        <span class="glyphicon glyphicon-chevron-right flex-full text-right"></span>
+      </div>
+  </div>
+</template>
+
+<script>
+
+import co from 'co'
+import { PagedList } from 'vue-client'
+import Vue from 'vue'
+
+export default {
+    title: '安检计划相关',
+    data() {
+        return {
+            model: {}
+        }
+    },
+    methods: {
+      gotopage(param,props) {
+        this.$goto(param,props)
+      },
+      //头部事件回掉
+      back () {
+        this.$back()
+      },
+    }
+}
+
+</script>
+<style scoped>
+.flex-between {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.flex-between span {
+  padding-right: 10px;
+}
+.flex-full {
+  flex: 1;
+}
+</style>

package/src/components/android/Checker.vue

@@ -1,12 +1,12 @@
-<template>
-  <div>
-    <route :comp="{name: 'checker-main'}"></route>
-  </div>
-</template>
-
-<script>
-export default {
-  title: '安检导航界面',
-  props: ['orgs'],
-}
-</script>
+<template>
+  <div>
+    <route :comp="{name: 'checker-main'}"></route>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '安检导航界面',
+  props: ['orgs'],
+}
+</script>