safecheck-client 3.0.30-72 → 3.0.30-73

package/src/filiale/liaoyuan/android.js

@@ -1,16 +1,16 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-//手机特殊目录注册到该文件中
-let specialComp = {
-  'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
-  'add-plan-item': (resolve) => { require(['./android/AddPlanItem'], resolve) },
-  'safecheck-devices': (resolve) => { require(['./android/SafecheckDevices'], resolve) },
-  'current-create' : (resolve) => { require(['./android/CurrentCreate'], resolve) },
-  'safecheck-userinfo': (resolve) => { require(['./android/SafecheckUserInfo'], resolve) }
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+//手机特殊目录注册到该文件中
+let specialComp = {
+  'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
+  'add-plan-item': (resolve) => { require(['./android/AddPlanItem'], resolve) },
+  'safecheck-devices': (resolve) => { require(['./android/SafecheckDevices'], resolve) },
+  'current-create' : (resolve) => { require(['./android/CurrentCreate'], resolve) },
+  'safecheck-userinfo': (resolve) => { require(['./android/SafecheckUserInfo'], resolve) }
+}
+exports.specialComp = specialComp
+
+
+
+

package/src/filiale/tianke/pc/checkScreen.vue

@@ -199,7 +199,7 @@
           source: `root.getResourceById($${this.$login.f.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($需要定位人员$) != -1)`,
           userid: this.$login.f.id
         }, {resolveMsg: null, rejectMsg: null})
-        let arr1=await new HttpResetClass().load("GET", `/rs/safePsoition/getPosition`, {},{resolveMsg: null, rejectMsg: null})
+        let arr1=await new HttpResetClass().load("GET", `/rs/safePosition/getPosition`, {},{resolveMsg: null, rejectMsg: null})
         //tag+'---------'+typeof arr1)
         //let d=this.toStandardTimeString()
         this.checkers=[]
@@ -232,7 +232,7 @@
         }
         let td=Util.toStandardDateString()
         //获取今天上传的所有隐患
-        let arr=await new HttpResetClass().load("POST", `rs/sql/defectDetails`, {data:{condition:` f_filialeid in ('${this.$login.f.orgid}') and tdil.f_create_time>'${Util.toStartDateYearString()} 00:00:00' and tdi.F_LONGITUDE is not null`}},
+        let arr=await new HttpResetClass().load("POST", `rs/sql/defectDetails`, {data:{condition:` f_filialeid in ('${this.$login.f.orgid}') and f_upload_date>'${Util.toStartDateYearString()} 00:00:00' and f_longitude is not null`}},
           {resolveMsg: null, rejectMsg: null})
         //tag)
         if(arr.data){

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(process.env.SAFE_CHECK);
+ safecheck('tianke')
+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 }
+})