safecheck-client 3.0.34-6 → 3.0.34-60

package/src/components/android/PaperDeviceNoncivil.vue

@@ -1,214 +1,214 @@
-<template>
-  <div>
-    <table class="table table-bordered">
-      <tr>
-        <td>
-          <table class="table">
-            <thead class="thead-inverse">
-              <th colspan="2">
-                燃气表{{'[' + f_meters.length + ']'}}&nbsp;&nbsp;&nbsp;&nbsp;<span :class="style__" class="glyphicon glyphicon-plus" @click="addMeter"></span>
-              </th>
-            </thead>
-            <tbody v-for="row in f_meters">
-              <tr>
-                <td>{{$index+1}}.</td>
-                <td>
-                  &nbsp;&nbsp;&nbsp;&nbsp;<!--<span :class="style__" class="glyphicon glyphicon-remove" @click="removeMeter(row)"></span>-->
-                  &nbsp;&nbsp;&nbsp;&nbsp;<span class="glyphicon glyphicon-th-list" @click="editMeter($index)"></span>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </td>
-        <td>
-          <table class="table">
-            <thead class="thead-inverse">
-              <th colspan="2">
-                燃气管道{{'[' + f_plumbs.length + ']'}}&nbsp;&nbsp;&nbsp;&nbsp;<span :class="style__"  class="glyphicon glyphicon-plus" @click="addPlumb"></span>
-              </th>
-            </thead>
-            <tbody v-for="row in f_plumbs">
-              <tr>
-                <td>{{$index+1}}.</td>
-                <td>
-                  &nbsp;&nbsp;&nbsp;&nbsp;<span  :class="style__" class="glyphicon glyphicon-remove" @click="removePlumb(row)"></span>
-                  &nbsp;&nbsp;&nbsp;&nbsp;<span class="glyphicon glyphicon-th-list" @click="editPlumb($index)"></span>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <table class="table">
-            <thead class="thead-inverse">
-              <th colspan="2">
-                阀门{{'[' + f_valves.length + ']'}}&nbsp;&nbsp;&nbsp;&nbsp;<span  :class="style__" class="glyphicon glyphicon-plus" @click="addValve"></span>
-              </th>
-            </thead>
-            <tbody v-for="row in f_valves">
-              <tr>
-                <td>{{$index+1}}.</td>
-                <td>
-                  &nbsp;&nbsp;&nbsp;&nbsp;<span  :class="style__" class="glyphicon glyphicon-remove" @click="removeValve(row)"></span>
-                  &nbsp;&nbsp;&nbsp;&nbsp;<span class="glyphicon glyphicon-th-list" @click="editValve($index)"></span>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </td>
-        <td>
-          <table class="table">
-            <thead class="thead-inverse">
-              <th colspan="2">
-                报警系统{{'[' + f_alarms.length + ']'}}&nbsp;&nbsp;&nbsp;&nbsp;<span  :class="style__" class="glyphicon glyphicon-plus" @click="addAlarm"></span>
-              </th>
-            </thead>
-            <tbody v-for="row in f_alarms">
-              <tr>
-                <td>{{$index+1}}.</td>
-                <td>
-                  &nbsp;&nbsp;&nbsp;&nbsp;<span :class="style__" class="glyphicon glyphicon-remove" @click="removeAlarm(row)"></span>
-                  &nbsp;&nbsp;&nbsp;&nbsp;<span class="glyphicon glyphicon-th-list" @click="editAlarm($index)"></span>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <table class="table">
-            <thead class="thead-inverse">
-              <th colspan="2">
-                锅炉{{'[' + f_furnaces.length + ']'}}&nbsp;&nbsp;&nbsp;&nbsp;<span  :class="style__" class="glyphicon glyphicon-plus" @click="addFurnace"></span>
-              </th>
-            </thead>
-            <tbody v-for="row in f_furnaces">
-              <tr>
-                <td>{{$index+1}}.</td>
-                <td>
-                  &nbsp;&nbsp;&nbsp;&nbsp;<span :class="style__" class="glyphicon glyphicon-remove" @click="removeFurnace(row)"></span>
-                  &nbsp;&nbsp;&nbsp;&nbsp;<span class="glyphicon glyphicon-th-list" @click="editFurnace($index)"></span>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </td>
-        <td>
-          <table class="table">
-            <thead class="thead-inverse">
-              <th colspan="2">
-                燃气具{{'[' + f_cookers.length + ']'}}&nbsp;&nbsp;&nbsp;&nbsp;<span  :class="style__" class="glyphicon glyphicon-plus" @click="addCooker"></span>
-              </th>
-            </thead>
-            <tbody v-for="row in f_cookers">
-              <tr>
-                <td>{{$index+1}}.</td>
-                <td>
-                  &nbsp;&nbsp;&nbsp;&nbsp;<span :class="style__" class="glyphicon glyphicon-remove" @click="removeCooker(row)"></span>
-                  &nbsp;&nbsp;&nbsp;&nbsp;<span class="glyphicon glyphicon-th-list" @click="editCooker($index)"></span>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </td>
-      </tr>
-    </table>
-    <div style="height:50px;"></div>
-  </div>
-</template>
-
-<script>
-import Vue from 'vue'
-
-export default {
-  title: '安检设备界面',
-  data() {
-    return this.$parent.$parent.data
-  },
-  methods: {
-    addMeter() {
-      let meter = {}
-      this.f_meters.push(meter)
-      this.$goto('paper-meter-noncivil', {idx: this.f_meters.length-1}, 'paper-router')
-    },
-    editMeter(idx) {
-      this.$goto('paper-meter-noncivil', {idx: idx}, 'paper-router')
-    },
-    removeMeter(item) {
-      this.f_meters.$remove(item)
-    },
-    addPlumb() {
-      let plumb = {}
-      this.f_plumbs.push(plumb)
-      this.$goto('paper-plumb-noncivil', {idx: this.f_plumbs.length-1}, 'paper-router')
-    },
-    editPlumb(idx) {
-      this.$goto('paper-plumb-noncivil', {idx: idx}, 'paper-router')
-    },
-    removePlumb(item) {
-      this.f_plumbs.$remove(item)
-    },
-    addValve() {
-      let valve = {}
-      this.f_valves.push(valve)
-      this.$goto('paper-valve-noncivil', {idx: this.f_valves.length-1}, 'paper-router')
-    },
-    editValve(idx) {
-      this.$goto('paper-valve-noncivil', {idx: idx}, 'paper-router')
-    },
-    removeValve(item) {
-      this.f_valves.$remove(item)
-    },
-    addAlarm() {
-      let alarm = {}
-      this.f_alarms.push(alarm)
-      this.$goto('paper-alarm-noncivil', {idx: this.f_alarms.length-1}, 'paper-router')
-    },
-    editAlarm(idx) {
-      this.$goto('paper-alarm-noncivil', {idx: idx}, 'paper-router')
-    },
-    removeAlarm(item) {
-      this.f_alarms.$remove(item)
-    },
-    addCooker() {
-      let cooker = {}
-      this.f_cookers.push(cooker)
-      this.$goto('paper-piece-noncivil', {idx: this.f_cookers.length-1}, 'paper-router')
-    },
-    editCooker(idx) {
-      this.$goto('paper-piece-noncivil', {idx: idx}, 'paper-router')
-    },
-    removeCooker(item) {
-      this.f_cookers.$remove(item)
-    },
-    addFurnace() {
-      let furnace = {}
-      this.f_furnaces.push(furnace)
-      this.$goto('paper-furnace-noncivil', {idx: this.f_furnaces.length-1}, 'paper-router')
-    },
-    editFurnace(idx) {
-      this.$goto('paper-furnace-noncivil', {idx: idx}, 'paper-router')
-    },
-    removeFurnace(item) {
-      this.f_furnaces.$remove(item)
-    },
-  },
-  ready() {
-    if(!this.f_meters)
-      this.$set('f_meters', [])
-    if(!this.f_plumbs)
-      this.$set('f_plumbs', [])
-    if(!this.f_valves)
-      this.$set('f_valves', [])
-    if(!this.f_alarms)
-      this.$set('f_alarms', [])
-    if(!this.f_furnaces)
-      this.$set('f_furnaces', [])
-    if(!this.f_cookers)
-      this.$set('f_cookers', [])
-  }
-}
-</script>
+<template>
+  <div>
+    <table class="table table-bordered">
+      <tr>
+        <td>
+          <table class="table">
+            <thead class="thead-inverse">
+              <th colspan="2">
+                燃气表{{'[' + f_meters.length + ']'}}&nbsp;&nbsp;&nbsp;&nbsp;<span :class="style__" class="glyphicon glyphicon-plus" @click="addMeter"></span>
+              </th>
+            </thead>
+            <tbody v-for="row in f_meters">
+              <tr>
+                <td>{{$index+1}}.</td>
+                <td>
+                  &nbsp;&nbsp;&nbsp;&nbsp;<!--<span :class="style__" class="glyphicon glyphicon-remove" @click="removeMeter(row)"></span>-->
+                  &nbsp;&nbsp;&nbsp;&nbsp;<span class="glyphicon glyphicon-th-list" @click="editMeter($index)"></span>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </td>
+        <td>
+          <table class="table">
+            <thead class="thead-inverse">
+              <th colspan="2">
+                燃气管道{{'[' + f_plumbs.length + ']'}}&nbsp;&nbsp;&nbsp;&nbsp;<span :class="style__"  class="glyphicon glyphicon-plus" @click="addPlumb"></span>
+              </th>
+            </thead>
+            <tbody v-for="row in f_plumbs">
+              <tr>
+                <td>{{$index+1}}.</td>
+                <td>
+                  &nbsp;&nbsp;&nbsp;&nbsp;<span  :class="style__" class="glyphicon glyphicon-remove" @click="removePlumb(row)"></span>
+                  &nbsp;&nbsp;&nbsp;&nbsp;<span class="glyphicon glyphicon-th-list" @click="editPlumb($index)"></span>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <table class="table">
+            <thead class="thead-inverse">
+              <th colspan="2">
+                阀门{{'[' + f_valves.length + ']'}}&nbsp;&nbsp;&nbsp;&nbsp;<span  :class="style__" class="glyphicon glyphicon-plus" @click="addValve"></span>
+              </th>
+            </thead>
+            <tbody v-for="row in f_valves">
+              <tr>
+                <td>{{$index+1}}.</td>
+                <td>
+                  &nbsp;&nbsp;&nbsp;&nbsp;<span  :class="style__" class="glyphicon glyphicon-remove" @click="removeValve(row)"></span>
+                  &nbsp;&nbsp;&nbsp;&nbsp;<span class="glyphicon glyphicon-th-list" @click="editValve($index)"></span>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </td>
+        <td>
+          <table class="table">
+            <thead class="thead-inverse">
+              <th colspan="2">
+                报警系统{{'[' + f_alarms.length + ']'}}&nbsp;&nbsp;&nbsp;&nbsp;<span  :class="style__" class="glyphicon glyphicon-plus" @click="addAlarm"></span>
+              </th>
+            </thead>
+            <tbody v-for="row in f_alarms">
+              <tr>
+                <td>{{$index+1}}.</td>
+                <td>
+                  &nbsp;&nbsp;&nbsp;&nbsp;<span :class="style__" class="glyphicon glyphicon-remove" @click="removeAlarm(row)"></span>
+                  &nbsp;&nbsp;&nbsp;&nbsp;<span class="glyphicon glyphicon-th-list" @click="editAlarm($index)"></span>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <table class="table">
+            <thead class="thead-inverse">
+              <th colspan="2">
+                锅炉{{'[' + f_furnaces.length + ']'}}&nbsp;&nbsp;&nbsp;&nbsp;<span  :class="style__" class="glyphicon glyphicon-plus" @click="addFurnace"></span>
+              </th>
+            </thead>
+            <tbody v-for="row in f_furnaces">
+              <tr>
+                <td>{{$index+1}}.</td>
+                <td>
+                  &nbsp;&nbsp;&nbsp;&nbsp;<span :class="style__" class="glyphicon glyphicon-remove" @click="removeFurnace(row)"></span>
+                  &nbsp;&nbsp;&nbsp;&nbsp;<span class="glyphicon glyphicon-th-list" @click="editFurnace($index)"></span>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </td>
+        <td>
+          <table class="table">
+            <thead class="thead-inverse">
+              <th colspan="2">
+                燃气具{{'[' + f_cookers.length + ']'}}&nbsp;&nbsp;&nbsp;&nbsp;<span  :class="style__" class="glyphicon glyphicon-plus" @click="addCooker"></span>
+              </th>
+            </thead>
+            <tbody v-for="row in f_cookers">
+              <tr>
+                <td>{{$index+1}}.</td>
+                <td>
+                  &nbsp;&nbsp;&nbsp;&nbsp;<span :class="style__" class="glyphicon glyphicon-remove" @click="removeCooker(row)"></span>
+                  &nbsp;&nbsp;&nbsp;&nbsp;<span class="glyphicon glyphicon-th-list" @click="editCooker($index)"></span>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </td>
+      </tr>
+    </table>
+    <div style="height:50px;"></div>
+  </div>
+</template>
+
+<script>
+import Vue from 'vue'
+
+export default {
+  title: '安检设备界面',
+  data() {
+    return this.$parent.$parent.data
+  },
+  methods: {
+    addMeter() {
+      let meter = {}
+      this.f_meters.push(meter)
+      this.$goto('paper-meter-noncivil', {idx: this.f_meters.length-1}, 'paper-router')
+    },
+    editMeter(idx) {
+      this.$goto('paper-meter-noncivil', {idx: idx}, 'paper-router')
+    },
+    removeMeter(item) {
+      this.f_meters.$remove(item)
+    },
+    addPlumb() {
+      let plumb = {}
+      this.f_plumbs.push(plumb)
+      this.$goto('paper-plumb-noncivil', {idx: this.f_plumbs.length-1}, 'paper-router')
+    },
+    editPlumb(idx) {
+      this.$goto('paper-plumb-noncivil', {idx: idx}, 'paper-router')
+    },
+    removePlumb(item) {
+      this.f_plumbs.$remove(item)
+    },
+    addValve() {
+      let valve = {}
+      this.f_valves.push(valve)
+      this.$goto('paper-valve-noncivil', {idx: this.f_valves.length-1}, 'paper-router')
+    },
+    editValve(idx) {
+      this.$goto('paper-valve-noncivil', {idx: idx}, 'paper-router')
+    },
+    removeValve(item) {
+      this.f_valves.$remove(item)
+    },
+    addAlarm() {
+      let alarm = {}
+      this.f_alarms.push(alarm)
+      this.$goto('paper-alarm-noncivil', {idx: this.f_alarms.length-1}, 'paper-router')
+    },
+    editAlarm(idx) {
+      this.$goto('paper-alarm-noncivil', {idx: idx}, 'paper-router')
+    },
+    removeAlarm(item) {
+      this.f_alarms.$remove(item)
+    },
+    addCooker() {
+      let cooker = {}
+      this.f_cookers.push(cooker)
+      this.$goto('paper-piece-noncivil', {idx: this.f_cookers.length-1}, 'paper-router')
+    },
+    editCooker(idx) {
+      this.$goto('paper-piece-noncivil', {idx: idx}, 'paper-router')
+    },
+    removeCooker(item) {
+      this.f_cookers.$remove(item)
+    },
+    addFurnace() {
+      let furnace = {}
+      this.f_furnaces.push(furnace)
+      this.$goto('paper-furnace-noncivil', {idx: this.f_furnaces.length-1}, 'paper-router')
+    },
+    editFurnace(idx) {
+      this.$goto('paper-furnace-noncivil', {idx: idx}, 'paper-router')
+    },
+    removeFurnace(item) {
+      this.f_furnaces.$remove(item)
+    },
+  },
+  ready() {
+    if(!this.f_meters)
+      this.$set('f_meters', [])
+    if(!this.f_plumbs)
+      this.$set('f_plumbs', [])
+    if(!this.f_valves)
+      this.$set('f_valves', [])
+    if(!this.f_alarms)
+      this.$set('f_alarms', [])
+    if(!this.f_furnaces)
+      this.$set('f_furnaces', [])
+    if(!this.f_cookers)
+      this.$set('f_cookers', [])
+  }
+}
+</script>

package/src/components/android/PaperFeedback.vue

@@ -315,6 +315,21 @@
       <button  type="button" name="button" class="col-sm-3 btn btn-primary" @click="deletecancel()">取消</button>
     </div>
   </modal>
+  <modal :show.sync="showgas && showgasmodel" v-ref:modal>
+    <div slot="modal-header" class="modal-header">
+      <h4 class="modal-title">
+        用户须知
+      </h4>
+    </div>
+    <div slot="modal-body" class="modal-body">
+      <div class="row" style="margin-top: 6px">
+        <sapn>{{ gasinstructions ? gasinstructions : '请配置用户须知' }}</sapn>
+      </div>
+    </div>
+    <div slot="modal-footer" class="modal-footer">
+      <button type="button" name="button" class="col-sm-3 btn btn-primary" @click="closeshowgas()">确认</button>
+    </div>
+  </modal>
 </template>
 
 <script>
@@ -496,6 +511,9 @@ export default {
       showmodel: false,
       showbacklist:'是',
       backlistisselect: false,
+      showgas: false,
+      showgasmodel:this.$appdata.getSingleValue('用户须知查看') || false,
+      gasinstructions:'',
       deletebacklistisselect: false,
       radios: [
         {
@@ -1114,6 +1132,9 @@ export default {
       }
 
     },
+    closeshowgas() {
+      this.showgas = false
+    },
     //确认安检转维修
 
     undo() {
@@ -1291,6 +1312,13 @@ export default {
       this.$set('style__', '')
       this.$set('style_view_', '')
     }
+    if (Vue.config.safecheck != undefined) {
+      if (Vue.config.safecheck.ApproveConfig != undefined) {
+        if (Vue.config.safecheck.ApproveConfig.gasinstructions != undefined) {
+          this.gasinstructions = Vue.config.safecheck.ApproveConfig.gasinstructions
+        }
+      }
+    }
 
     for (let item of this.radios) {
       if (this.paper.f_client_evaluation == item.label) {
@@ -1381,6 +1409,11 @@ export default {
     '$parent.$parent.isUpload'(val) {
       ////tag
     },
+    'paper.f_read_instructions'(val) {
+      if (val == true) {
+        this.showgas = true
+      }
+    },
     'meading'(val) {
       ////tag
       this.$parent.$parent.meading = val

package/src/components/android/PlumberAnnual.vue

@@ -1,83 +1,83 @@
-<template>
-  <div>
-    <form>
-      <div class="form-group">
-        <label for="c_plan_year">年份：</label>
-        <v-select id="c_plan_year" :value.sync="c_plan_year"
-        :options='c_year_list' close-on-select clear-button></v-select>
-      </div>
-    </form>
-    <data-grid :model="model" partial='list' v-ref:grid>
-      <template partial='head'>
-        <tr>
-          <th>维修员</th>
-          <th>已维修</th>
-          <th>在维修</th>
-          <th>未维修</th>
-          <th></th>
-        </tr>
-      </template>
-      <template partial='body'>
-        <td>{{row.f_repairman}}</td>
-        <td>{{row.checked}}</td>
-        <td>{{row.checking}}</td>
-        <td>{{row.unchecked}}</td>
-        <td v-on:click.stop.prevent='$parent.$parent.showDetail(row)'><span class="glyphicon glyphicon-option-horizontal"></span></td>
-      </template>
-    </data-grid>
-    <div style="height:50px;"></div>
-  </div>
-</template>
-
-<script>
-import co from 'co'
-import Vue from 'vue'
-
-let aggCheckerTask = function * (self) {
-    let result = yield self.$post(Vue.url + 'sql/统计维修员年任务?pageNo=1&pageSize=9999', {
-        data: {
-            id: Vue.user.id,
-            org_id: Vue.user.parentid,
-            f_plan_year: self.c_plan_year[0],
-            f_subcompany: Vue.user.f_subcompany
-        }
-    }, {
-        resolveMsg: null,
-        rejectMsg: '提取任务出错'
-    })
-    self.$set("model.rows", result.data)
-}
-
-export default {
-  title: '维修员年任务',
-  data() {
-    let options = []
-    let year = (new Date()).getFullYear()
-    options.push({label: year+'', value: year+''})
-    year++
-    options.push({label: year+'', value: year+''})
-    return {
-      c_plan_year: options[0].value,
-      c_year_list: options,
-      model: {
-        rows: [],
-      }
-    }
-  },
-  ready () {
-    this.$watch('c_plan_year', function (val) {
-        this.getPlan()
-    })
-    this.getPlan()
-  },
-  methods: {
-    getPlan () {
-      let fp = aggCheckerTask(this)
-      co(fp)
-    },
-    showDetail (row) {
-      this.$parent.$goto('plumber-annual-detail', {f_plan_year: this.c_plan_year[0], f_repairman: row.f_repairman}, 'master-router')
-    }
-  }
-}
-</script>
+<template>
+  <div>
+    <form>
+      <div class="form-group">
+        <label for="c_plan_year">年份：</label>
+        <v-select id="c_plan_year" :value.sync="c_plan_year"
+        :options='c_year_list' close-on-select clear-button></v-select>
+      </div>
+    </form>
+    <data-grid :model="model" partial='list' v-ref:grid>
+      <template partial='head'>
+        <tr>
+          <th>维修员</th>
+          <th>已维修</th>
+          <th>在维修</th>
+          <th>未维修</th>
+          <th></th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <td>{{row.f_repairman}}</td>
+        <td>{{row.checked}}</td>
+        <td>{{row.checking}}</td>
+        <td>{{row.unchecked}}</td>
+        <td v-on:click.stop.prevent='$parent.$parent.showDetail(row)'><span class="glyphicon glyphicon-option-horizontal"></span></td>
+      </template>
+    </data-grid>
+    <div style="height:50px;"></div>
+  </div>
+</template>
+
+<script>
+import co from 'co'
+import Vue from 'vue'
+
+let aggCheckerTask = function * (self) {
+    let result = yield self.$post(Vue.url + 'sql/统计维修员年任务?pageNo=1&pageSize=9999', {
+        data: {
+            id: Vue.user.id,
+            org_id: Vue.user.parentid,
+            f_plan_year: self.c_plan_year[0],
+            f_subcompany: Vue.user.f_subcompany
+        }
+    }, {
+        resolveMsg: null,
+        rejectMsg: '提取任务出错'
+    })
+    self.$set("model.rows", result.data)
+}
+
+export default {
+  title: '维修员年任务',
+  data() {
+    let options = []
+    let year = (new Date()).getFullYear()
+    options.push({label: year+'', value: year+''})
+    year++
+    options.push({label: year+'', value: year+''})
+    return {
+      c_plan_year: options[0].value,
+      c_year_list: options,
+      model: {
+        rows: [],
+      }
+    }
+  },
+  ready () {
+    this.$watch('c_plan_year', function (val) {
+        this.getPlan()
+    })
+    this.getPlan()
+  },
+  methods: {
+    getPlan () {
+      let fp = aggCheckerTask(this)
+      co(fp)
+    },
+    showDetail (row) {
+      this.$parent.$goto('plumber-annual-detail', {f_plan_year: this.c_plan_year[0], f_repairman: row.f_repairman}, 'master-router')
+    }
+  }
+}
+</script>