safecheck-client 4.0.1-45 → 4.0.1-47

package/src/filiale/xinkang/android/AddPlanItem.vue

@@ -304,10 +304,10 @@
         })
         //tag
       },
-      inspect (info){
+      inspect(info) {
         // 当前系统时间
         let newdate = Util.toStandardTimeString()
-        if(info.f_last_check_state == '入户' && info.f_last_check_date && info.f_user_type=='民用'){
+        if (info.f_last_check_state == '入户' && info.f_last_check_date && info.f_user_type == '民用') {
           // 解析上次安检时间
           let lastCheckDate = new Date(info.f_last_check_date)
           let currentDate = new Date(newdate)
@@ -317,30 +317,28 @@
           // 6个月 = 6 * 30 * 24 * 60 * 60 * 1000 毫秒（约15552000000毫秒）
           // 更精确的计算：6个月 = 6 * 平均每月30.44天 * 24 * 60 * 60 * 1000
           let sixMonthsInMs = 6 * 30 * 24 * 60 * 60 * 1000
-          if(timeDiff < sixMonthsInMs){
+          if (timeDiff < sixMonthsInMs) {
             this.$showMessage('该用户半年内已进行入户安检，是否继续安检?', ['confirm', 'cancel']).then((res) => {
-              if (res !== 'confirm') {
-                return
+              if (res == 'confirm') {
+                info.id = ''
+                info.f_state = '未检'
+                info.f_no_checkplan = '无计划安检'
+                //tag
+                this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`, {data: {f_userid: info.f_userinfo_id}}).then((response) => {
+                  //tag)
+                  info['f_plan_meters'] = response.data
+                  var pardate = {
+                    _this: this,
+                    tittle: '安检详情',
+                    safe: true
+                  }
+                  this.$dispatch('gotoson', pardate)
+                  this.$goto('safecheck-order-v', {item: info, role: 'inspect', parentPage: 'AddPlanItem'}, 'self', this.reload)
+                })
               }
             })
           }
         }
-        info.id = ''
-        info.f_state = '未检'
-        info.f_no_checkplan = '无计划安检'
-        //tag
-        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
-          //tag)
-          info['f_plan_meters'] = response.data
-          var pardate = {
-            _this:this,
-            tittle:'安检详情',
-            safe:true
-          }
-          this.$dispatch('gotoson',pardate)
-          this.$goto('safecheck-order-v', {item: info, role: 'inspect',parentPage:'AddPlanItem'}, 'self', this.reload)
-
-        })
       },
       Mreadibook(){
         this.cbc=[]

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('meihekou')
-// 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('jinhong')
+// 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 }
+})