m

youxiw2000
1 parent ac914c25
Showing 8 changed files with 117 additions and 124 deletions
trash-admin/src/main/resources/application-dev.yml
trash-ui/dist.zip
trash-ui/src/api/three_step.js
trash-ui/src/api/vio_casefile.js
trash-ui/src/layout/index.vue
trash-ui/src/layout/index3.vue → trash-ui/src/layout/index44.vue
trash-ui/src/views/business/threestep/index.vue
trash-ui/vue.config.js
@@ -16,10 +16,10 @@ trash:
     # 验证码类型 math 数组计算 char 字符验证
     captchaType: math
     # 远程服务器地址
-    remotePath: http://175.6.47.84:8008
-    token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
-    #remotePath: http://183.66.242.6:14601
-    #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
+    #remotePath: http://175.6.47.84:8008
+    #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
+    remotePath: http://183.66.242.6:14601
+    token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
  
  
  
@@ -217,15 +217,15 @@ export default {
       this.authCon = this.$store.getters.user.conList;
       this.authConArea = this.$store.getters.user.conAreas;
  
-      if(this.authEarth.length == 0 && authCon.length > 0){
+      if(this.authEarth.length == 0 && this.authCon.length > 0){
         this.form.type = "0";
         this.typeLock = true;
-        if(authCon.length == 1){
+        if(this.authCon.length == 1){
           this.nameLock = true;
           this.areaLock = true;
-          this.getRemoteDataById(authCon[0]);
+          this.getRemoteDataById(this.authCon[0]);
         }
-      }else if(this.authEarth.length > 0 && authCon.length == 0){
+      }else if(this.authEarth.length > 0 && this.authCon.length == 0){
         this.form.type = "1";
         this.typeLock = true;
         if(this.authEarth.length == 1){
@@ -350,7 +350,7 @@ export default {
               this.remoteData.push(res.result.list[i]);
  
               if(res.result.list[i].name == this.form.name){
-                let item = this.remoteData[0];
+                let item = res.result.list[i];
                 this.form.objectId = item.id;
                 this.form.place = Number(item.areaCode);
                 this.getCompanyTrucks(item.id);
@@ -365,16 +365,15 @@ export default {
  
           });
         } else {
+          debugger;
           if(this.remoteQueryData.areaCode)
             this.remoteQueryData.areaCode = [this.remoteQueryData.areaCode+""];
-
-
             this.remoteQueryData.overdue = 0;
             earthsitesLedgerList(this.remoteQueryData).then(res => {
               for(let i in  res.result.list){
                 this.remoteData.push(res.result.list[i]);
                 if(res.result.list[i].name == this.form.name){
-                  let item = this.remoteData[0];
+                  let item = res.result.list[i];
                   this.form.objectId = item.id;
                   this.form.place = Number(item.areaCode) ;
                   break;
@@ -93,10 +93,10 @@ export default {
         {code: 11, name: "工地预警-视频设备离线超时报警"},
         {code: 12, name: "工地预警-三无车辆进入工地"},
         {code: 13, name: "工地预警-未按时间作业"},
-        {code: 14, name: "未报开工作业"},
-        {code: 15, name: "视频设备离线超时报警"},
-        {code: 16, name: "三无车辆进入处理场所"},
-        {code: 17, name: "未到指定的处理场所作业"},
+        {code: 14, name: "处理场所预警-未报开工作业"},
+        {code: 15, name: "处理场所预警-视频设备离线超时报警"},
+        {code: 16, name: "处理场所预警-三无车辆进入处理场所"},
+        {code: 17, name: "处理场所预警-未到指定的处理场所作业"},
         {code: 18, name: "离线运输报警（工）"},
         {code: 19, name: "离线运输报警（消）"},
         {code: 20, name: "未激活车辆作业"},
@@ -404,15 +404,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 />
+  <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>
@@ -147,7 +147,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row type="flex" justify="center" v-if="form.type == 0" >
           <el-col :span="24" >
             <el-form-item label="运输车辆" prop="trucks" >
@@ -391,7 +390,7 @@
         </el-row>
  
           <el-input v-model="form.earthsitesId" type="hidden" />
-        <el-input v-model="form.objectId" type="hidden" />
+        <el-input v-model="form.name" type="hidden" />
       </el-form>
  
       <div slot="footer" class="dialog-footer">
@@ -41,15 +41,10 @@ module.exports = {
         }
       },
         ['/api']: {
-          // target: `http://183.66.242.6:14601`,
-          target: `http://175.6.47.84:8008`,
+          target: `http://183.66.242.6:14601`,
+          // target: `http://175.6.47.84:8008`,
           changeOrigin: true,
-        },
-        ['^/remotedown']: {
-           // target: `http://183.66.242.6:14601/upload_files`,
-           target: `http://175.6.47.84:8008/upload_files`,
-           changeOrigin: true,
-        },
+        }
  
     },
     disableHostCheck: true