safecheck-client 3.0.32 → 3.0.33-2

package/src/filiale/yongzhou/pc/safeStatistics.vue

@@ -80,6 +80,7 @@
               {{{ model.data.substring(26,model.data.length-8) }}}
             </th>
           </tr>
+          <tr style="height: 100px"></tr>
         </table>
       </div>
     </criteria-paged>

package/src/filiale/yongzhou/pc/safeStatisticsYear.vue

@@ -72,6 +72,7 @@
               {{{ model.data.substring(26,model.data.length-8) }}}
             </th>
           </tr>
+          <tr style="height: 100px"></tr>
         </table>
       </div>
     </criteria-paged>

package/src/filiale/yunchengminsheng/android/SafecheckDevices.vue

@@ -568,6 +568,9 @@ export default {
                 let multiple = this.config[this.device.device].items[item].multiple?this.config[this.device.device].items[item].multiple:false
                 let options = this.config[this.device.device].items[item].options
                 if ((this.config[this.device.device].items[item].type == 'selector' || this.config[this.device.device].items[item].type == 'inputSelector') && item == this.f_items[n].f_item_name) {
+                  if (val.length > 1 && val.indexOf('正常') != -1){
+                    this.f_items[n].f_item_value.splice(val.indexOf('正常'),1)
+                  }
                   for (let i in options) {
                     if(typeof options[i]=='function'){
                       continue

package/src/filiale/zhongyi/pc/DefectListNew.vue

@@ -201,7 +201,7 @@ const upSolveDefect = function * (self) {
       if (res.data.code === 200) {
         self.$showMessage('隐患已处理。')
         self.showSolveModal = false
-        self.model.search('f_repaire_type != \'无隐患\'', {})
+        self.model.search(`(f_repaire_type != '无隐患' or f_repaire_type is null)`, {})
       }
     })
 }
@@ -303,7 +303,7 @@ const sendRepair = function* (self) {
     let updateRes = yield self.$resetpost('/rs/logic/updateDefectStateNew', data)
     if (updateRes.data.code == 200) {
       self.$showMessage('隐患已转维修。')
-      self.model.search(`f_repaire_type != '无隐患'`, {})
+      self.model.search(`(f_repaire_type != '无隐患' or f_repaire_type is null)`, {})
     }
   }
 }
@@ -400,7 +400,7 @@ export default {
     this.model.f_item_value = `(SELECT stuff(( SELECT ',' + f_item_value FROM t_devices_items_lists WHERE ( f_is_defect = 'true' OR di.f_is_defect = 'true') AND f_item_id = di.id FOR xml path ( '' ) ),1,1,'' ) )`
     if (this.check) {
       this.model.f_paper_id = this.check.id
-      this.model.search(`f_repaire_type != '无隐患'`, {})
+      this.model.search(`(f_repaire_type != '无隐患' or f_repaire_type is null)`, {})
     }
     this.getEmp()
   },
@@ -415,7 +415,7 @@ export default {
       let http = new HttpResetClass()
       http.load('POST', 'rs/logic/DefectAuditUpdate', data, {resolveMsg: null, rejectMsg: null}).then((res) => {
         if(res.data.code == 200){
-          this.model.search(`f_repaire_type != '无隐患'`, {})
+          this.model.search(`(f_repaire_type != '无隐患' or f_repaire_type is null)`, {})
           this.showSolveModal = false
           this.showToRepairModal = false
           this.$showMessage('提交成功')
@@ -487,14 +487,14 @@ export default {
   watch: {
     'check'() {
       this.model.f_paper_id = this.check.id
-      this.model.search(`f_repaire_type != '无隐患'`, {})
+      this.model.search(`(f_repaire_type != '无隐患' or f_repaire_type is null)`, {})
     },
     'model.rows'() {
       //
       if (this.model.rows.length > 0) {
         let tempRow = this.model.rows
         for (let i = 0; i < tempRow.length; i++) {
-          if (tempRow[i].f_repaire_type == '未处理') {
+          if (tempRow[i].f_repaire_type == '未处理' ||  !tempRow[i].f_repaire_type ) {
             this.needRepair = true
             return
           }

package/src/main.js

@@ -1,33 +1,33 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import { system } from 'system-clients'
-import safecheck from './safecheck'
-import echarts from 'echarts'
-// import safecheck from './rongcheng'
-
-all()
-// 验证码开关赋值
-var Verificationfalg = false
-system(Verificationfalg)
-// system()
-safecheck(process.env.SAFE_CHECK);
-// safecheck('rizhao')
-require('./bootstrap/less/bootstrap.less')
-require('./expandcss.less')
-
-Vue.prototype.$echarts = echarts
-Vue.android = false
-
-Vue.url = '/SafeCheck/rs/'
-if(Vue.android)
-  Vue.url = Vue.staticUrl
-Vue.interval = 1*60*1000
-Vue.nopic = 'file:///android_asset/nopic.png'
-Vue.mapSetup = false
-
-/* eslint-disable no-new */
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import { system } from 'system-clients'
+import safecheck from './safecheck'
+import echarts from 'echarts'
+// import safecheck from './rongcheng'
+
+all()
+// 验证码开关赋值
+var Verificationfalg = false
+system(Verificationfalg)
+// system()
+safecheck('wensu');
+// safecheck('rizhao')
+require('./bootstrap/less/bootstrap.less')
+require('./expandcss.less')
+
+Vue.prototype.$echarts = echarts
+Vue.android = false
+
+Vue.url = '/SafeCheck/rs/'
+if(Vue.android)
+  Vue.url = Vue.staticUrl
+Vue.interval = 1*60*1000
+Vue.nopic = 'file:///android_asset/nopic.png'
+Vue.mapSetup = false
+
+/* eslint-disable no-new */
+new Vue({
+  el: 'body',
+  components: { App }
+})