m

youxiw2000
1 parent a137c291
Showing 10 changed files with 63 additions and 166 deletions
trash-admin/src/main/resources/application-dev.yml
trash-quartz/src/main/java/com/trash/quartz/task/GpsTask.java
trash-ui/dist.zip
trash-ui/src/api/truck_active.js
trash-ui/src/layout/index.vue
trash-ui/src/layout/index3.vue
trash-ui/src/main.js
trash-ui/src/views/h5/task/companyInfo.vue
trash-unit/src/main/java/com/trash/gps/mapper/GpsOrientationMapper.java
trash-workFlow/src/main/java/com/trash/business/controller/TruckActivateController.java
@@ -22,8 +22,6 @@ trash:
     token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
-    
-    
 # 数据源配置
 spring:
     datasource:
 package com.trash.quartz.task;
+import java.util.Collection;
+import java.util.Date;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
 import com.alibaba.fastjson.JSONObject;
 import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.DateUtils;
 import com.trash.gps.domain.GpsOrientation;
 import com.trash.gps.mapper.GpsOrientationMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
 @Component("GpsTask")
 public class GpsTask {
@@ -221,7 +221,6 @@ export default {
       constructionById(item.objectId).then(res => {
-        debugger;
         for(let i in this.remoteCompanys){
           if(this.remoteCompanys[i].id == res.result.transportCompanyId){
             if(this.remoteCompanys[i].auditStatus != 1){
@@ -291,7 +290,6 @@ export default {
           let list = tres.result.list;
           let qr = {
-            company:value,
             status:0
           }
@@ -445,15 +443,15 @@ export default {
         this.queryParams.startTime = this.queryParams.createTime[0];
         this.queryParams.endTime = this.queryParams.createTime[1];
       }
-      
+
       const query = {};
-      
+
       for(var i in this.queryParams){
         query[i] = this.queryParams[i];
       }
-      
+
       query.createTime = null;
-      
+
       this.$confirm('是否确认导出所有车辆激活数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
 <template>
-  <div :class="classObj" class="app-wrapper">
-    <sidebar class="sidebar-container"/>
-    <div :class="{hasTagsView:needTagsView}" class="main-container">
-      <tags-view v-if="needTagsView"/>
-      <app-main/>
-
-    </div>
-  </div>
+      <app-main />
 </template>
 <script>
 import RightPanel from '@/components/RightPanel'
-import {AppMain, Navbar, Settings, Sidebar, TagsView} from './components'
+import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
 import ResizeMixin from './mixin/ResizeHandler'
-import {mapState} from 'vuex'
+import { mapState } from 'vuex'
 export default {
   name: 'Layout',
@@ -45,63 +38,52 @@ export default {
   },
   methods: {
     handleClickOutside() {
-      this.$store.dispatch('app/closeSideBar', {withoutAnimation: false})
+      this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
     }
   }
 }
 </script>
 <style lang="scss" scoped>
-@import "~@/assets/styles/mixin.scss";
-@import "~@/assets/styles/variables.scss";
+  @import "~@/assets/styles/mixin.scss";
+  @import "~@/assets/styles/variables.scss";
-.app-wrapper {
-  @include clearfix;
-  position: relative;
-  height: 100%;
-  width: 100%;
+  .app-wrapper {
+    @include clearfix;
+    position: relative;
+    height: 100%;
+    width: 100%;
-  &.mobile.openSidebar {
-    position: fixed;
-    top: 0;
+    &.mobile.openSidebar {
+      position: fixed;
+      top: 0;
+    }
   }
-}
-.drawer-bg {
-  background: #000;
-  opacity: 0.3;
-  width: 100%;
-  top: 0;
-  height: 100%;
-  position: absolute;
-  z-index: 999;
-}
-
-.fixed-header {
-  position: fixed;
-  top: 0;
-  right: 0;
-  z-index: 9;
-  width: calc(100% - #{$sideBarWidth});
-  transition: width 0.28s;
-}
-
-.hideSidebar .fixed-header {
-  width: calc(100% - 54px)
-}
+  .drawer-bg {
+    background: #000;
+    opacity: 0.3;
+    width: 100%;
+    top: 0;
+    height: 100%;
+    position: absolute;
+    z-index: 999;
+  }
-.mobile .fixed-header {
-  width: 100%;
-}
+  .fixed-header {
+    position: fixed;
+    top: 0;
+    right: 0;
+    z-index: 9;
+    width: calc(100% - #{$sideBarWidth});
+    transition: width 0.28s;
+  }
-.preview figure {
-  float: left;
-  width: 30%;
-  height:calc(30vw - 0px);
-  margin: 1.5%;
-}
+  .hideSidebar .fixed-header {
+    width: calc(100% - 54px)
+  }
-.preview figure img {
-  width: 400px;
-}
+  .mobile .fixed-header {
+    width: 100%;
+  }
 </style>
-<template>
-      <app-main />
-</template>
-
-<script>
-import RightPanel from '@/components/RightPanel'
-import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
-import ResizeMixin from './mixin/ResizeHandler'
-import { mapState } from 'vuex'
-
-export default {
-  name: 'Layout',
-  components: {
-    AppMain,
-    Navbar,
-    RightPanel,
-    Settings,
-    Sidebar,
-    TagsView
-  },
-  mixins: [ResizeMixin],
-  computed: {
-    ...mapState({
-      sidebar: state => state.app.sidebar,
-      device: state => state.app.device,
-      showSettings: state => state.settings.showSettings,
-      needTagsView: state => state.settings.tagsView,
-      fixedHeader: state => state.settings.fixedHeader
-    }),
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened,
-        withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === 'mobile'
-      }
-    }
-  },
-  methods: {
-    handleClickOutside() {
-      this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-  @import "~@/assets/styles/mixin.scss";
-  @import "~@/assets/styles/variables.scss";
-
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-
-    &.mobile.openSidebar {
-      position: fixed;
-      top: 0;
-    }
-  }
-
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
-
-  .fixed-header {
-    position: fixed;
-    top: 0;
-    right: 0;
-    z-index: 9;
-    width: calc(100% - #{$sideBarWidth});
-    transition: width 0.28s;
-  }
-
-  .hideSidebar .fixed-header {
-    width: calc(100% - 54px)
-  }
-
-  .mobile .fixed-header {
-    width: 100%;
-  }
-</style>
@@ -42,8 +42,8 @@ Vue.use(plugins)
 Vue.prototype.$aMapKey = "902732b0ff4758e4b39f0f34f0cb1cb0";// 高德地图key
-// Vue.prototype.remoteFrame = "http://183.66.242.6:14601"
-Vue.prototype.remoteFrame = "http://175.6.47.84:8008"
+Vue.prototype.remoteFrame = "http://183.66.242.6:14601"
+// Vue.prototype.remoteFrame = "http://175.6.47.84:8008"
 Vue.prototype.msgSuccess = function (msg) {
   this.$message({ showClose: true, message: msg, type: "success" });
@@ -92,6 +92,8 @@ import store from &quot;@/store&quot;;
           this.src = http + "/h5/#/driverDetail?id=" + id + "&isThird=1";
         }
     },
+
+
   }
 </script>
@@ -76,4 +76,6 @@ public interface GpsOrientationMapper {
      * @return 结果
      */
     int createGpsTable(String yearMonth);
+    
+    
 }
@@ -64,10 +64,15 @@ public class TruckActivateController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(TruckActivate truckActivate)
     {	
-
-		List<String> tables = truckActivateMapper.getTables("truck_activate%");
-		
-		truckActivate.setMyTables(tables);
+    	
+    	if(truckActivate.getStatus() == 0){
+    		truckActivate.setMyTables(new ArrayList<>());
+    		truckActivate.getMyTables().add("truck_activate");
+    	}else{
+    		List<String> tables = truckActivateMapper.getTables("truck_activate%");
+    		truckActivate.setMyTables(tables);
+    	}
+    	
         startPage();