m

youxiw2000
1 parent 4abf4eea
Showing 5 changed files with 115 additions and 96 deletions
trash-ui/dist.rar
trash-ui/src/api/truck_active.js
trash-ui/src/layout/index.vue
trash-ui/src/layout/index5.vue → trash-ui/src/layout/index44.vue
trash-ui/src/main.js
@@ -112,6 +112,22 @@ export default {
   },
   created() {
  
+
+    if(window.location.search){
+      let params = window.location.search.replace("?","");
+      let arr = params.split("&");
+      let type = -1;
+      let name = null;
+      for(let j in arr){
+        if(arr[j].split("=")[0] == "objType"){
+            this.queryParams.activateStatus = arr[j].split("=")[1];
+        }
+        if(arr[j].split("=")[0] == "objValue"){
+            this.queryParams.construction = arr[j].split("=")[1];
+        }
+      }
+
+
     let dep = {type: "CSUserDepartmentType"};
  
     getDict(dep).then(res => {
@@ -346,6 +362,9 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.activateStatus = null;
+      this.queryParams.construction = null;
+
       this.handleQuery();
     },
     // 多选框选中数据
 <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" });