m

youxiw2000
1 parent 16e96083
Showing 7 changed files with 119 additions and 102 deletions
trash-ui/dist.zip
trash-ui/src/api/three_step.js
trash-ui/src/api/warningInfo.js
trash-ui/src/layout/index.vue
trash-ui/src/layout/index4.vue → trash-ui/src/layout/index55.vue
trash-ui/src/main.js
trash-ui/src/views/business/truckActivate/truckActivateInfo.vue
@@ -354,6 +354,7 @@ export default {
                 this.form.objectId = item.id;
                 this.form.place = Number(item.areaCode);
                 this.getCompanyTrucks(item.id);
+                break;
               }
  
             }
@@ -376,6 +377,7 @@ export default {
                   let item = this.remoteData[0];
                   this.form.objectId = item.id;
                   this.form.place = Number(item.areaCode) ;
+                  break;
                 }
               }
             });
@@ -271,8 +271,22 @@ export default {
     },
     /** 查询违规预警信息列表 */
     getList() {
-      this.loading = true;
-      listViolationWarningInformation(this.queryParams).then(response => {
+      this.loading = true;
+      if(this.queryParams.createTime){
+        this.queryParams.startTime = this.queryParams.createTime[0];
+        this.queryParams.endTime = this.queryParams.createTime[1];
+      }
+      
+      let query = {};
+      
+      for(var i in this.queryParams){
+        query[i] = this.queryParams[i];
+      }
+      
+      query.createTime = null;
+      
+      
+      listViolationWarningInformation(query).then(response => {
         this.violationWarningInformationList = response.rows;
         this.total = response.total;
         this.loading = false;
 <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 />
+  <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>
 </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',
@@ -38,52 +45,63 @@ 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";
-
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-
-    &.mobile.openSidebar {
-      position: fixed;
-      top: 0;
-    }
-  }
+@import "~@/assets/styles/mixin.scss";
+@import "~@/assets/styles/variables.scss";
  
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
+.app-wrapper {
+  @include clearfix;
+  position: relative;
+  height: 100%;
+  width: 100%;
  
-  .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>
@@ -37,8 +37,8 @@ Vue.prototype.handleTree = handleTree
 Vue.prototype.parseStatus = parseStatus
 Vue.prototype.checkPer = checkPermi
  
-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" });
@@ -52,16 +52,17 @@
           <el-col :span="24" class="title">路线描述</el-col>
         </el-row>
         <el-row  >
-        <el-col :span="24" class="content" ><span  v-if="scope.row.activateTime != null">{{truckObj.routeName}}</span></el-col>
+          <!-- v-if="truckObj.activateTime != null" -->
+        <el-col :span="24" class="content" ><span >{{truckObj.routeName}}</span></el-col>
         </el-row>
         <el-row  >
           <el-col :span="24" class="title">卸区描述</el-col>
         </el-row>
         <el-row  >
-        <el-col :span="24" class="content"><span  v-if="scope.row.activateTime != null">{{truckObj.earthName}}</span></el-col>
+        <el-col :span="24" class="content"><span >{{truckObj.earthName}}</span></el-col>
         </el-row>
-        
-        
+
+
   </div>
 </template>