Merge branch 'master' of http://git.2weisou.com/wangxiao/zkPCproject

src/page/index/top/index.vue

@@ -308,7 +308,6 @@ export default {
         .zkorg({
           current: 1,
           size: 10,
-          name: this.companyName,
           orgType: localStorage.getItem("orgType"),
         })
         .then((res) => {

src/views/Equipment/index.vue

@@ -981,6 +981,7 @@ export default {
         .equipmentManagement({
           size: this.size,
           current: this.currentPage,
+          timeType:1,
           orgType: localStorage.getItem("orgType"),
           orgCode: localStorage.getItem("orgCode"),
           agentId: localStorage.getItem("agentId"),

src/views/Equipment/state.vue

@@ -785,6 +785,7 @@ export default {
         .equipmentZxOnFindByPage({
           size: this.size,
           current: this.currentPage,
+          timeType:2,
           orgType: localStorage.getItem("orgType"),
           orgCode: localStorage.getItem("orgCode"),
           agentId: localStorage.getItem("agentId"),

src/views/File/index.vue

@@ -152,7 +152,8 @@ export default {
         this.$api.http.filefindByPage({
           username:this.username,
           imei:this.imei,
-          sourceCode:Number(this.sourceCode),
+          // sourceCode:Number(this.sourceCode),
+          sourceCode:this.sourceCode/1||null,
           size:this.size,
           current:this.current
         }).then((res) => {

src/views/Statistics/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="box-center">
+  <div class="box-center" ref="boxcenter">
     <!-- 头 -->
     <div class="app-top">
     <div class="app-titel2" style="margin-bottom: 10px">
@@ -189,8 +189,9 @@ export default {
   methods: {
 
     	backTop(){
-        document.documentElement.offsetHeight=0
-         console.log('111111111111111',document.documentElement.offsetHeight)
+        //  console.log(this.$refs.boxcenter.offsetHeight)
+         console.log($('#avue-view').scrollTop())
+         $('#avue-view').scrollTop(800)
 			},
       	movePlace(index){
 				if(index==0){

vue.config.js

@@ -3,9 +3,9 @@
  * https://cli.vuejs.org/zh/config/
  */
 // const url = 'http://pigx-gateway'
-const url = 'http://39.97.167.65:9999' //测试
+// const url = 'http://39.97.167.65:9999' //测试
 // const url = 'http://192.168.31.169:9999' //长龙
-// const url = 'http://192.168.31.134:9999' //嘉豪
+const url = 'http://192.168.31.134:9999' //嘉豪
 // const url = 'http://192.168.31.100:9999' //王笑
 // const url = 'http://nitu5e.natappfree.cc' //王笑