m

youxiw2000
1 parent 1d32c017
Showing 9 changed files with 100 additions and 100 deletions
trash-admin/src/main/resources/application-dev.yml
trash-ui/dist.zip
trash-ui/src/api/taskhismethod.js
trash-ui/src/api/taskmethod.js
trash-ui/src/layout/index.vue
trash-ui/src/layout/index4.vue → trash-ui/src/layout/index3.vue
trash-ui/src/main.js
trash-ui/vue.config.js
trash-workFlow/src/main/resources/mapper/TruckActivateMapper.xml
@@ -19,7 +19,7 @@ trash:
     # 远程服务器地址
     #remotePath: https://175.6.47.84:8008
     #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
-    remotePath: https://183.66.242.6:14601
+    remotePath: http://183.66.242.6:14601
     token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
@@ -216,13 +216,13 @@ export default {
                 this.contract = true;
               }else if(res.data.type == 4){
                 this.vehicle = true;
-              }else if(type == 5){
+              }else if(res.data.type == 5){
                 this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":") + 1);
                 this.logisticsInfoOpen = true;
-              }else if(type == 6){
+              }else if(res.data.type == 6){
                 this.caseOffline = true;
                 return;
-              }else if(type == 7){
+              }else if(res.data.type == 7){
                 this.violationCaseFile = true;
                 this.videoSrc1 = [];
                 this.slides1 = [];
@@ -289,13 +289,13 @@ export default {
                 this.contract = true;
               }else if(res.data.type == 4){
                 this.vehicle = true;
-              }else if(type == 5){
+              }else if(res.data.type == 5){
                 this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":") + 1);
                 this.logisticsInfoOpen = true;
-              }else if(type == 6){
+              }else if(res.data.type == 6){
                 this.caseOffline = true;
                 return;
-              }else if(type == 7){
+              }else if(res.data.type == 7){
                 this.violationCaseFile = true;
                 this.videoSrc1 = [];
                 this.slides1 = [];
 <template>
-  <div :class="classObj" class="app-wrapper">
-    <sidebar class="sidebar-container" />
-    <div :class="{ hasTagsView: false }" class="main-container">
-      <tags-view v-if="needTagsView" />
       <app-main />
-
-    </div>
-  </div>
 </template>
 <script>
 import RightPanel from '@/components/RightPanel'
-import { mapState } from 'vuex'
 import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
 import ResizeMixin from './mixin/ResizeHandler'
+import { mapState } from 'vuex'
 export default {
   name: 'Layout',
@@ -52,56 +45,45 @@ export default {
 </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>
+  <div :class="classObj" class="app-wrapper">
+    <sidebar class="sidebar-container" />
+    <div :class="{ hasTagsView: false }" class="main-container">
+      <tags-view v-if="needTagsView" />
       <app-main />
+
+    </div>
+  </div>
 </template>
 <script>
 import RightPanel from '@/components/RightPanel'
+import { mapState } from 'vuex'
 import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
 import ResizeMixin from './mixin/ResizeHandler'
-import { mapState } from 'vuex'
 export default {
   name: 'Layout',
@@ -45,45 +52,56 @@ export default {
 </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%;
-
-    &.mobile.openSidebar {
-      position: fixed;
-      top: 0;
-    }
-  }
+.app-wrapper {
+  @include clearfix;
+  position: relative;
+  height: 100%;
+  width: 100%;
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
-
-  .fixed-header {
+  &.mobile.openSidebar {
     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;
+}
+
+.hideSidebar .fixed-header {
+  width: calc(100% - 54px)
+}
+
+.mobile .fixed-header {
+  width: 100%;
+}
+
+.preview figure {
+  float: left;
+  width: 30%;
+  height: calc(30vw - 0px);
+  margin: 1.5%;
+}
+
+.preview figure img {
+  width: 400px;
+}
 </style>
@@ -42,8 +42,8 @@ Vue.use(plugins)
 Vue.prototype.$aMapKey = "902732b0ff4758e4b39f0f34f0cb1cb0";// 高德地图key
-Vue.prototype.remoteFrame = "https://183.66.242.6:14601"
-// Vue.prototype.remoteFrame = "https://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" });
@@ -41,14 +41,14 @@ module.exports = {
         }
       },
         ['/api']: {
-          target: `https://183.66.242.6:14601`,
+          target: `http://183.66.242.6:14601`,
           // target: `http://175.6.47.84:8008`,
           changeOrigin: true,
         }
     },
     disableHostCheck: true,
-    https: true,
+    // https: true,
   },
   configureWebpack: {
     name: name,
@@ -244,7 +244,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     </select>
    <select id="getTruckHistoryListByObjects" parameterType="TruckActivate" resultMap="TruckActivateResult">
-   		 from truck_activate
+   		select * from truck_activate
         <where>
             <if test="startTime != null "> and activate_time BETWEEN #{startTime} and #{endTime}</if>
         	and object_id in