From 5fa57eb9f24e7d19812a0ee5e44fa3bc35ea9f6d Mon Sep 17 00:00:00 2001
From: "DESKTOP-VMMLSOQ\\wangzg" <1161909281@qq.com>
Date: Sun, 21 Jul 2024 08:23:30 +0800
Subject: [PATCH 1/9] 11111

---
 README.md                                     | 10 +-
 pages/{wuzuzhi => video}/list.vue             |  2 +-
 .../index.vue => wuzuzhi/huanjingzhili.vue}   | 32 +++----
 pages/wuzuzhi/huanweixunhang.vue              | 13 +++
 pages/wuzuzhi/paifang.vue                     | 39 ++++++++
 pages/wuzuzhi/xichejiguanli.vue               | 13 +++
 pages/youzuzhi/paifang.vue                    | 94 +++++++++++++++++++
 pages/youzuzhi/paifangtongji.vue              | 43 +++++++++
 8 files changed, 227 insertions(+), 19 deletions(-)
 rename pages/{wuzuzhi => video}/list.vue (80%)
 rename pages/{web3/index.vue => wuzuzhi/huanjingzhili.vue} (96%)
 create mode 100644 pages/wuzuzhi/huanweixunhang.vue
 create mode 100644 pages/wuzuzhi/paifang.vue
 create mode 100644 pages/wuzuzhi/xichejiguanli.vue
 create mode 100644 pages/youzuzhi/paifang.vue
 create mode 100644 pages/youzuzhi/paifangtongji.vue

diff --git a/README.md b/README.md
index a11d1ed..9a2c116 100644
--- a/README.md
+++ b/README.md
@@ -53,16 +53,22 @@ https://1x.antdv.com/components/icon/
 首页 /home
 
 #### 有组织
-有组织 
+有组织排放 /youzuzhi/paifang 待联调
+有组织排放统计 /youzuzhi/paifangtongji 待联调
 
 #### 无组织 
+无组织排放 /wuzuzhi/paifang 待联调
+洗车机管理 /wuzuzhi/xichejiguanli 未做
+环境治理 /wuzuzhi/huanjingzhili 待联调
+环卫巡航 /wuzuzhi/huanweixunhang 未做
 
 #### 清洁运输
 清洁运输 /cleanTravel/home
 厂区车辆台账 /cleanTravel/ledger
 清洁运输趋势 /cleanTravel/trend
-磅秤台账 /cleanTravel/bangcheng
+磅秤台账 /cleanTravel/bangcheng 未做
 
 #### 视频广场
+视频广场  /video/list 未做
 
 
diff --git a/pages/wuzuzhi/list.vue b/pages/video/list.vue
similarity index 80%
rename from pages/wuzuzhi/list.vue
rename to pages/video/list.vue
index fde1b4f..e5a049a 100644
--- a/pages/wuzuzhi/list.vue
+++ b/pages/video/list.vue
@@ -5,7 +5,7 @@ export default {
 </script>
 
 <template>
-
+  <div class="list"></div>
 </template>
 
 <style scoped lang="less">
diff --git a/pages/web3/index.vue b/pages/wuzuzhi/huanjingzhili.vue
similarity index 96%
rename from pages/web3/index.vue
rename to pages/wuzuzhi/huanjingzhili.vue
index 41827e3..9a7512c 100644
--- a/pages/web3/index.vue
+++ b/pages/wuzuzhi/huanjingzhili.vue
@@ -133,22 +133,22 @@ export default {
         }
       ],
       columnsForTable:  [
-      {
-        title: '设备掉线',
-        dataIndex: 'deviceName',
-        width: '33.333%'
-      },
-      {
-        title: '故障异常',
-        dataIndex: 'errorName',
-        width: '33.333%'
-      },
-      {
-        title: '异常报警',
-        dataIndex: 'errorImg',
-        width: '33.333%'
-      }
-    ],
+        {
+          title: '设备掉线',
+          dataIndex: 'deviceName',
+          width: '33.333%'
+        },
+        {
+          title: '故障异常',
+          dataIndex: 'errorName',
+          width: '33.333%'
+        },
+        {
+          title: '异常报警',
+          dataIndex: 'errorImg',
+          width: '33.333%'
+        }
+      ],
       columns: [
         {
           title: '排放标准',
diff --git a/pages/wuzuzhi/huanweixunhang.vue b/pages/wuzuzhi/huanweixunhang.vue
new file mode 100644
index 0000000..9ec54dd
--- /dev/null
+++ b/pages/wuzuzhi/huanweixunhang.vue
@@ -0,0 +1,13 @@
+<script>
+export default {
+  name: "huanweixunhang"
+}
+</script>
+
+<template>
+  <div class="huanweixunhang"></div>
+</template>
+
+<style scoped lang="less">
+
+</style>
diff --git a/pages/wuzuzhi/paifang.vue b/pages/wuzuzhi/paifang.vue
new file mode 100644
index 0000000..7e1923d
--- /dev/null
+++ b/pages/wuzuzhi/paifang.vue
@@ -0,0 +1,39 @@
+
+<template>
+  <div class="paifang">
+    <a-page-header
+      :ghost="false"
+      style="border-bottom: 1px solid rgb(235, 237, 240)"
+      title="无组织排放"
+      @back="() => $router.go(-1)"
+    />
+
+
+    <a-row :gutter="16">
+      <a-col :span="18">
+        <Map></Map>
+      </a-col>
+      <a-col :span="6">
+        <a-card title="国Ⅵ输车辆" size="small">
+          <p>card content</p>
+        </a-card>
+      </a-col>
+    </a-row>
+
+  </div>
+</template>
+
+<script>
+import Map from "../../components/Map.vue";
+export default {
+  name: "paifang",
+  components: {
+    Map
+  }
+}
+</script>
+
+
+<style scoped lang="less">
+
+</style>
diff --git a/pages/wuzuzhi/xichejiguanli.vue b/pages/wuzuzhi/xichejiguanli.vue
new file mode 100644
index 0000000..430d3f5
--- /dev/null
+++ b/pages/wuzuzhi/xichejiguanli.vue
@@ -0,0 +1,13 @@
+<script>
+export default {
+  name: "xichejiguanli"
+}
+</script>
+
+<template>
+  <div class="xichejiguanli"></div>
+</template>
+
+<style scoped lang="less">
+
+</style>
diff --git a/pages/youzuzhi/paifang.vue b/pages/youzuzhi/paifang.vue
new file mode 100644
index 0000000..2e6a0e4
--- /dev/null
+++ b/pages/youzuzhi/paifang.vue
@@ -0,0 +1,94 @@
+
+
+<template>
+  <div class="paifang" style="height: 100vh;overflow: hidden">
+    <a-page-header
+      :ghost="false"
+      style="border-bottom: 1px solid rgb(235, 237, 240)"
+      title="有组织排放"
+      @back="() => $router.go(-1)"
+    />
+    <a-row :gutter="16">
+      <a-col :span="6">
+        <a-card title="全厂有组织排放源" size="small">
+          <p>card content</p>
+        </a-card>
+      </a-col>
+      <a-col :span="6">
+        <a-card title="全厂重要排放源" size="small">
+          <p>card content</p>
+        </a-card>
+      </a-col>
+      <a-col :span="6">
+        <a-card title="当前区域排放源" size="small">
+          <p>card content</p>
+        </a-card>
+      </a-col>
+      <a-col :span="6">
+        <a-card title="当前区域其中重要排放源"  size="small">
+          <p>card content</p>
+        </a-card>
+      </a-col>
+    </a-row>
+    <a-row style="height: calc(100% - 147px);margin-top: 16px;"  :gutter="16">
+      <a-col :span="6" style="height: 100%;">
+        <a-card title="工序步骤" size="small">
+          <a-button type="primary" block>
+            Primary
+          </a-button>
+          <a-button type="primary" block class="mt16">
+            Primary
+          </a-button>
+          <a-button type="primary" block class="mt16">
+            Primary
+          </a-button>
+          <a-button type="primary" block class="mt16">
+            Primary
+          </a-button>
+          <a-button type="primary" block class="mt16">
+            Primary
+          </a-button>
+          <a-button type="primary" block class="mt16">
+            Primary
+          </a-button>
+
+        </a-card>
+      </a-col>
+      <a-col :span="12" style="height: 100%;">
+        <div style="height: 100%;position: relative">
+          <Map></Map>
+        </div>
+      </a-col>
+      <a-col :span="6" style="height: 100%;">
+        <a-table :columns="columns" :data-source="data" />
+      </a-col>
+    </a-row>
+  </div>
+</template>
+
+<script>
+import Map from "../../components/Map.vue";
+export default {
+  name: "paifang",
+  components: {
+    Map
+  },
+  data () {
+    return {
+      data: [],
+      columns: [
+        { title: '名词', key: 'name' },
+        { title: 'NO', key: 'NO' },
+        { title: 'SO2', key: 'SO2' },
+        { title: 'TSP', key: 'TSP' },
+      ]
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+  .mt16 {
+    margin-top: 16px;
+  }
+</style>
diff --git a/pages/youzuzhi/paifangtongji.vue b/pages/youzuzhi/paifangtongji.vue
new file mode 100644
index 0000000..82bd5ff
--- /dev/null
+++ b/pages/youzuzhi/paifangtongji.vue
@@ -0,0 +1,43 @@
+
+
+<template>
+  <div class="paifangtongji" style="height: 100vh;overflow: hidden">
+    <a-page-header
+      :ghost="false"
+      style="border-bottom: 1px solid rgb(235, 237, 240)"
+      title="有组织排放统计"
+      @back="() => $router.go(-1)"
+    />
+
+
+    <a-row :gutter="16">
+      <a-col :span="18">
+
+      </a-col>
+      <a-col :span="6">
+        <a-table :columns="columns" :data-source="data" />
+      </a-col>
+    </a-row>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "paifangtongji",
+  data () {
+    return {
+      data: [],
+      columns: [
+        { title: '名词', key: 'name' },
+        { title: 'NO', key: 'NO' },
+        { title: 'SO2', key: 'SO2' },
+        { title: 'TSP', key: 'TSP' },
+      ]
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

From 6db583171832e83cfd95a9c794a1248601babbe3 Mon Sep 17 00:00:00 2001
From: "DESKTOP-VMMLSOQ\\wangzg" <1161909281@qq.com>
Date: Tue, 30 Jul 2024 23:55:13 +0800
Subject: [PATCH 2/9] 1111

---
 components/smallCommon/CusButton.vue          |  3 ++
 middleware/auth.js                            | 46 +++++++++++++++++++
 nuxt.config.js                                |  4 ++
 pages/cleanTravel/home.vue                    | 13 ++++--
 pages/home/index.vue                          | 17 +++++--
 pages/manager/login.vue                       |  6 ++-
 .../PeakCoalMonitoring.vue                    |  1 -
 pages/visual/PeakCoalView.vue                 |  1 -
 pages/wuzuzhi/huanjingzhili.vue               |  1 -
 plugins/setup.js                              |  1 -
 store/user.js                                 | 20 ++++++++
 11 files changed, 98 insertions(+), 15 deletions(-)
 create mode 100644 middleware/auth.js
 create mode 100644 store/user.js

diff --git a/components/smallCommon/CusButton.vue b/components/smallCommon/CusButton.vue
index de6252b..6fe6da5 100644
--- a/components/smallCommon/CusButton.vue
+++ b/components/smallCommon/CusButton.vue
@@ -39,6 +39,9 @@ export default {
     color: rgba(255, 255, 255, 1);
     text-align: left;
     vertical-align: top;
+    a {
+      color: rgba(255, 255, 255, 1) !important;
+    }
     &.small {
       padding: 2px 10px;
       background: linear-gradient(180deg, rgba(188, 216, 247, 0.4) 0%, rgba(152, 217, 237, 0.15) 48.61%, rgba(156, 255, 248, 0.4) 100%);
diff --git a/middleware/auth.js b/middleware/auth.js
new file mode 100644
index 0000000..f909bd5
--- /dev/null
+++ b/middleware/auth.js
@@ -0,0 +1,46 @@
+// 在某个适当的时间点检查登录状态是否过期
+function isLoginExpired(loginTimestamp, expirationDuration) {
+  // 获取登录时间戳
+  // 如果没有登录时间戳，说明用户未登录或状态已过期
+  if (!loginTimestamp) {
+    return true;
+  }
+
+  // 计算登录时间和现在的时间差
+  const currentTimestamp = Date.now();
+  const duration = currentTimestamp - loginTimestamp;
+
+  // 如果时间差大于3小时的毫秒数，则登录状态过期
+  return duration > expirationDuration;
+}
+
+
+export default function ({ route,  redirect, store }) {
+  if (route.name === 'manager-login') {
+    return
+  }
+  if (localStorage.getItem('userInfo')) {
+    const cache = JSON.parse(localStorage.getItem('userInfo'))
+    const { expire, loginTime } = cache
+    // 在页面加载时检查登录状态
+    if (isLoginExpired(loginTime, expire)) {
+      // 用户登录已过期，执行登录过期的逻辑
+      console.log('登录已过期');
+      return redirect('/manager/login')
+    } else {
+      // 用户登录有效，执行登录有效的逻辑
+      store.dispatch('user/setUserInfo', cache)
+      if (route.path === '/') {
+        return redirect('/home')
+      }
+    }
+  } else {
+    // 假设用户信息存储在 Vuex store 中
+    const user = store.state.user
+    // 检查路由是否需要认证
+    if (!user.isLogin) {
+      return redirect('/manager/login')
+    }
+  }
+
+}
diff --git a/nuxt.config.js b/nuxt.config.js
index 6e46e09..a9e5073 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -39,6 +39,10 @@ export default {
     '@/assets/styles/mixin.less'
   ],
 
+  router: {
+    middleware: 'auth' // 应用全局中间件
+  },
+
   // Plugins to run before rendering page: https://go.nuxtjs.dev/config-plugins
   plugins: [
     '@/plugins/antd-ui',
diff --git a/pages/cleanTravel/home.vue b/pages/cleanTravel/home.vue
index 985e7a3..942f3c0 100644
--- a/pages/cleanTravel/home.vue
+++ b/pages/cleanTravel/home.vue
@@ -87,9 +87,15 @@
             </BFC>
           </ModuleContent>
           <butgroup>
-            <cus-button>厂区车辆台账</cus-button>
-            <cus-button>清洁运输趋势</cus-button>
-            <cus-button>磅秤台账</cus-button>
+            <cus-button>
+              <nuxt-link to="/cleanTravel/ledger">厂区车辆台账</nuxt-link>
+            </cus-button>
+            <cus-button>
+              <nuxt-link to="/cleanTravel/trend">清洁运输趋势</nuxt-link>
+              </cus-button>
+            <cus-button>
+              <nuxt-link to="/cleanTravel/bangcheng">磅秤台账</nuxt-link>
+              </cus-button>
             <cus-button>门禁监控</cus-button>
           </butgroup>
         </flex-col>
@@ -346,7 +352,6 @@ body, html, #__nuxt, #__layout {
   width: 100%;
   height: 100%;
   overflow: hidden;
-  background: #09151F;
 }
 
 .list-enter-active, .list-leave-active {
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 80e0c0a..64a40bf 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -80,10 +80,18 @@
 
 
             <butgroup class="real-data">
-              <cus-button>有组织</cus-button>
-              <cus-button>无组织</cus-button>
-              <cus-button>清洁运输</cus-button>
-              <cus-button>视频广场</cus-button>
+              <cus-button>
+                <nuxt-link to="/youzuzhi/paifang">有组织</nuxt-link>
+              </cus-button>
+              <cus-button>
+                <nuxt-link to="/wuzuzhi/paifang">无组织</nuxt-link>
+                </cus-button>
+              <cus-button>
+                <nuxt-link to="/cleanTravel/home">清洁运输</nuxt-link>
+                </cus-button>
+              <cus-button>
+                <nuxt-link to="/video/list">视频广场</nuxt-link>
+                </cus-button>
             </butgroup>
           </div>
         </BFC>
@@ -355,7 +363,6 @@ body, html, #__nuxt, #__layout {
   width: 100%;
   height: 100%;
   overflow: hidden;
-  background: #09151F;
 }
 
 .list-enter-active, .list-leave-active {
diff --git a/pages/manager/login.vue b/pages/manager/login.vue
index aa12265..2a10971 100644
--- a/pages/manager/login.vue
+++ b/pages/manager/login.vue
@@ -37,6 +37,7 @@
 </template>
 
 <script>
+import { mapActions } from 'vuex'
 function hasErrors(fieldsError) {
   return Object.keys(fieldsError).some(field => fieldsError[field]);
 }
@@ -54,6 +55,7 @@ export default {
     });
   },
   methods: {
+    ...mapActions('user', ['setUserInfo']),
     // Only show error after a field is touched.
     usernameError() {
       const { getFieldError, isFieldTouched } = this.form;
@@ -69,8 +71,8 @@ export default {
       this.form.validateFields(async (err, values) => {
         if (!err) {
           const { data } = await this.$post('/api/User/login', values)
-          localStorage.setItem('userInfo', JSON.stringify(data))
-          this.$router.replace({ path: '/web1' })
+          this.setUserInfo({ expire: 1 * 60 * 60 * 1000, userInfo: data, loginTime: Date.now() })
+          this.$router.replace({ path: '/home' })
         }
       });
     },
diff --git a/pages/peak-coal-monitoring/PeakCoalMonitoring.vue b/pages/peak-coal-monitoring/PeakCoalMonitoring.vue
index 6cffd5c..21f8376 100644
--- a/pages/peak-coal-monitoring/PeakCoalMonitoring.vue
+++ b/pages/peak-coal-monitoring/PeakCoalMonitoring.vue
@@ -156,7 +156,6 @@ body, html, #__nuxt, #__layout {
   width: 100%;
   height: 100%;
   overflow: hidden;
-  background: #09151F;
 }
 
 .list-enter-active, .list-leave-active {
diff --git a/pages/visual/PeakCoalView.vue b/pages/visual/PeakCoalView.vue
index ec97eed..7f06880 100644
--- a/pages/visual/PeakCoalView.vue
+++ b/pages/visual/PeakCoalView.vue
@@ -260,7 +260,6 @@ export default {
 body, html, #__nuxt, #__layout {
   width: 100%;
   height: 100%;
-  background-color: #000;
   overflow: hidden;
 }
 
diff --git a/pages/wuzuzhi/huanjingzhili.vue b/pages/wuzuzhi/huanjingzhili.vue
index 9a7512c..be40c69 100644
--- a/pages/wuzuzhi/huanjingzhili.vue
+++ b/pages/wuzuzhi/huanjingzhili.vue
@@ -276,7 +276,6 @@ body, html, #__nuxt, #__layout {
   width: 100%;
   height: 100%;
   overflow: hidden;
-  background: #09151F;
 }
 
 .list-enter-active, .list-leave-active {
diff --git a/plugins/setup.js b/plugins/setup.js
index 9ab8508..280e82b 100644
--- a/plugins/setup.js
+++ b/plugins/setup.js
@@ -1,5 +1,4 @@
 import Vue from 'vue'
 
 
-
 Vue.prototype.$evBus = new Vue()
diff --git a/store/user.js b/store/user.js
new file mode 100644
index 0000000..c8986e5
--- /dev/null
+++ b/store/user.js
@@ -0,0 +1,20 @@
+
+
+export const state = {
+  isLogin: false,
+  userInfo: {}
+}
+
+export const mutations = {
+  setUserInfo (state, userInfo) {
+    state.userInfo = userInfo
+  }
+}
+
+export const actions = {
+  setUserInfo (state, userInfo) {
+    state.isLogin = true
+    state.userInfo = userInfo
+    localStorage.setItem('userInfo', JSON.stringify(userInfo))
+  }
+}

From 52e60f5d6563c404c6efb7dc8a1b2efebd15ddbf Mon Sep 17 00:00:00 2001
From: lankuixing <799745985@qq.com>
Date: Wed, 31 Jul 2024 22:04:10 +0800
Subject: [PATCH 3/9] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E6=B4=97?=
 =?UTF-8?q?=E8=BD=A6=E6=9C=BA=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=202?=
 =?UTF-8?q?=E3=80=81=E6=96=B0=E5=A2=9E=E7=8E=AF=E5=8D=AB=E5=B7=A1=E8=88=AA?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=203=E3=80=81=E6=96=B0=E5=A2=9E=E7=A3=85?=
 =?UTF-8?q?=E7=A7=A4=E5=8F=B0=E8=B4=A6=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                        |  23 ++-
 components/smallCommon/Curd.vue  | 103 ++++++-----
 pages/cleanTravel/bangcheng.vue  | 253 ++++++++++++++++++++++------
 pages/wuzuzhi/huanweixunhang.vue |  35 +++-
 pages/wuzuzhi/xichejiguanli.vue  | 281 ++++++++++++++++++++++++++++++-
 5 files changed, 583 insertions(+), 112 deletions(-)

diff --git a/README.md b/README.md
index 9a2c116..e1fcade 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ $ yarn generate
 
 ## Special Directories
 
-### mixins 
+### mixins
 
 vue混入代码，主要是自适应相关的代码
 
@@ -36,39 +36,46 @@ vue混入代码，主要是自适应相关的代码
 布局目录，多了一个管理页
 
 ## 组件库文档地址
+
 https://1x.antdv.com/components/icon/
 
-
 ## 路由说明
+
 登录页 /login
 
 ### 管理页
+
 用户管理 /manager/user
-角色管理  /manager/role
+角色管理 /manager/role
 菜单管理 /manager/menu
 设备管理 /manager/device
 工序管理 /manager/organized
 
 ### 用户端
+
 首页 /home
 
 #### 有组织
+
 有组织排放 /youzuzhi/paifang 待联调
 有组织排放统计 /youzuzhi/paifangtongji 待联调
 
-#### 无组织 
+#### 无组织
+
 无组织排放 /wuzuzhi/paifang 待联调
-洗车机管理 /wuzuzhi/xichejiguanli 未做
+洗车机管理 /wuzuzhi/xichejiguanli （已做）待联调
 环境治理 /wuzuzhi/huanjingzhili 待联调
-环卫巡航 /wuzuzhi/huanweixunhang 未做
+环卫巡航 /wuzuzhi/huanweixunhang （已做）待联调
 
 #### 清洁运输
+
 清洁运输 /cleanTravel/home
 厂区车辆台账 /cleanTravel/ledger
 清洁运输趋势 /cleanTravel/trend
-磅秤台账 /cleanTravel/bangcheng 未做
+磅秤台账 /cleanTravel/bangcheng （已做）待联调
 
 #### 视频广场
-视频广场  /video/list 未做
+
+视频广场 /video/list 未做
 
 
diff --git a/components/smallCommon/Curd.vue b/components/smallCommon/Curd.vue
index 390a9bc..941a263 100644
--- a/components/smallCommon/Curd.vue
+++ b/components/smallCommon/Curd.vue
@@ -1,9 +1,8 @@
-
-
 <template>
   <div style="text-align: left">
     <div class="table-search" v-if="searchItems.length > 0">
-      <a-form class="ant-advanced-search-form" :form="form" @submit="handleSearch" layout="inline" @change="handleSearchFormChange">
+      <a-form class="ant-advanced-search-form" :form="form" @submit="handleSearch" layout="inline"
+              @change="handleSearchFormChange">
         <a-form-item v-for="menuItem in searchItems" :key="menuItem.key" :label="menuItem.label">
           <a-input
             v-decorator="[menuItem.key]"
@@ -15,30 +14,39 @@
             :placeholder="menuItem.placeholder || ''"
             v-else-if="menuItem.type === 'select'"
           >
-            <a-select-option :value="cItem.value" v-for="cItem in menuItem.children || []" :key="cItem.value">{{ cItem.label }}</a-select-option>
+            <a-select-option :value="cItem.value" v-for="cItem in menuItem.children || []" :key="cItem.value">
+              {{ cItem.label }}
+            </a-select-option>
           </a-select>
           <a-range-picker
-            :placeholder="menuItem.placeholder || ''"  v-decorator="[menuItem.key]" v-else-if="menuItem.type === 'dateRange'" format="YYYY-MM-DD" />
+            :placeholder="menuItem.placeholder || ''" v-decorator="[menuItem.key]"
+            v-else-if="menuItem.type === 'dateRange'" format="YYYY-MM-DD"/>
+        </a-form-item>
+        <a-form-item>
+          <a-button type="primary" html-type="submit" v-if="!hideSearch">查询</a-button>
+          <a-button :style="{ marginLeft: '8px' }" @click="reset" v-if="!hideSearch">重置</a-button>
+          <slot name="search-button" v-bind:search="form.getFieldsValue()"></slot>
         </a-form-item>
-       <a-form-item>
-         <a-button type="primary" html-type="submit" v-if="!hideSearch">查询</a-button>
-         <a-button :style="{ marginLeft: '8px' }" @click="reset" v-if="!hideSearch">重置</a-button>
-         <slot name="search-button" v-bind:search="form.getFieldsValue()"></slot>
-       </a-form-item>
       </a-form>
     </div>
-    <a-divider v-if="!hideButton && searchItems.length > 0" />
+    <a-divider v-if="!hideButton && searchItems.length > 0"/>
     <div class="table-operations" v-if="!hideButton">
       <a-button @click="addRow" type="primary">
         添加
       </a-button>
     </div>
-    <a-table v-bind="tableProps" :pagination="page" :row-key="primaryKey" :columns="realColumns" :data-source="tableDataSource" @change="handleChange" >
+    <a-table v-bind="tableProps" :pagination="page" :row-key="primaryKey" :columns="realColumns"
+             :data-source="tableDataSource" @change="handleChange">
       <span slot="action" slot-scope="text, record">
         <a-button type="danger" size="small" @click="deleteRow(record)">删除</a-button>
-        <a-divider type="vertical" />
+        <a-divider type="vertical"/>
         <a-button type="primary" size="small" @click="editRow(record)">编辑</a-button>
       </span>
+      <span slot="details" slot-scope="text, record">
+<!--        <a-button type="danger" size="small" @click="deleteRow(record)">删除</a-button>-->
+        <!--        <a-divider type="vertical"/>-->
+        <a-button type="primary" size="small" @click="viewDetails(record)">详情</a-button>
+      </span>
     </a-table>
     <a-modal
       :title="dialog.title"
@@ -48,7 +56,7 @@
       @cancel="handleCancel"
     >
       <a-form class="ant-advanced-search-form" :form="editForm" @submit="handleSearch" @change="handleSearchFormChange">
-        <a-form-item v-for="menuItem in formItems" :key="menuItem.key"  :label="menuItem.label" v-if="!menuItem.hide">
+        <a-form-item v-for="menuItem in formItems" :key="menuItem.key" :label="menuItem.label" v-if="!menuItem.hide">
           <a-input
             v-bind="menuItem.props || {}"
             v-decorator="gtDecorator(menuItem)"
@@ -61,7 +69,9 @@
             v-else-if="menuItem.type === 'select'"
             v-bind="menuItem.props || {}"
           >
-            <a-select-option :value="cItem.value" v-for="cItem in menuItem.children || []" :key="cItem.value">{{ cItem.label }}</a-select-option>
+            <a-select-option :value="cItem.value" v-for="cItem in menuItem.children || []" :key="cItem.value">
+              {{ cItem.label }}
+            </a-select-option>
           </a-select>
           <a-tree-select
             v-bind="menuItem.props || {}"
@@ -74,9 +84,12 @@
             :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
             v-else-if="menuItem.type === 'treeSelect'"
           >
-            <a-select-option :value="cItem.value" v-for="cItem in menuItem.children || []" :key="cItem.value">{{ cItem.label }}</a-select-option>
+            <a-select-option :value="cItem.value" v-for="cItem in menuItem.children || []" :key="cItem.value">
+              {{ cItem.label }}
+            </a-select-option>
           </a-tree-select>
-          <a-range-picker  v-bind="menuItem.props || {}" v-decorator="gtDecorator(menuItem)" v-else-if="menuItem.type === 'dateRange'" format="YYYY-MM-DD" />
+          <a-range-picker v-bind="menuItem.props || {}" v-decorator="gtDecorator(menuItem)"
+                          v-else-if="menuItem.type === 'dateRange'" format="YYYY-MM-DD"/>
         </a-form-item>
       </a-form>
     </a-modal>
@@ -85,12 +98,12 @@
 <script>
 export default {
   name: "user",
-  data () {
+  data() {
     return {
       isValidate: false,
       tableDataSource: [],
-      form: this.$form.createForm(this, { name: `form_${new Date().valueOf()}` }),
-      editForm: this.$form.createForm(this, { name: `edit_form_${new Date().valueOf()}` }),
+      form: this.$form.createForm(this, {name: `form_${new Date().valueOf()}`}),
+      editForm: this.$form.createForm(this, {name: `edit_form_${new Date().valueOf()}`}),
       dialog: {
         title: '',
         visible: false,
@@ -126,12 +139,12 @@ export default {
     // 表单内容配置
     formItems: {
       type: Array,
-      default: ()=> []
+      default: () => []
     },
     // 列表列配置
     columns: {
       type: Array,
-      default: ()=> []
+      default: () => []
     },
     primaryKey: {
       type: String,
@@ -144,36 +157,37 @@ export default {
     },
   },
   computed: {
-    searchItems () {
+    searchItems() {
       return this.formItems.filter(item => !!item.isSearch)
     },
-    realColumns () {
-      if (this.hideAction) return [ ...this.columns ]
+    realColumns() {
+      if (this.hideAction) return [...this.columns]
       return [
         ...this.columns,
         {
           title: '操作',
           dataIndex: 'action',
-          scopedSlots: { customRender: 'action' },
+          scopedSlots: {customRender: 'action'},
           fixed: 'right',
           width: 155
         },
       ]
     }
   },
-  watch: {
-
-  },
+  watch: {},
   mounted() {
     this.handleSearch()
   },
   methods: {
-    gtDecorator (menuItem) {
+    viewDetails(data){
+      this.$emit('viewDetails',data)
+    },
+    gtDecorator(menuItem) {
       if (menuItem.rules) {
         this.isValidate = true
         return [
           menuItem.key,
-          { rules: menuItem.rules }
+          {rules: menuItem.rules}
         ]
       }
       return [
@@ -181,9 +195,9 @@ export default {
       ]
     },
     handleSearchFormChange(changedFields) {
-     this.searchFormModel = { ...this.searchFormModel, ...changedFields }
+      this.searchFormModel = {...this.searchFormModel, ...changedFields}
     },
-    addRow () {
+    addRow() {
       this.handleCancel()
       this.$emit('edit', false)
       this.dialog.visible = true
@@ -191,7 +205,7 @@ export default {
     async editRow(row) {
       if (this.apiConf.detailApi) {
         const {api, method, detailHandler} = this.apiConf.detailApi
-        const { data } = await this[`$${method}`](api, { [this.primaryKey]: row[this.primaryKey] })
+        const {data} = await this[`$${method}`](api, {[this.primaryKey]: row[this.primaryKey]})
         this.selectRow = detailHandler && detailHandler(data) || data
       } else {
         this.selectRow = row
@@ -215,7 +229,7 @@ export default {
         cancelText: '再想想',
         onOk() {
 
-          const { api,deleteKey, paramsType, method  } = self.apiConf.deleteApi
+          const {api, deleteKey, paramsType, method} = self.apiConf.deleteApi
           let params = {}
           if (paramsType === 'Array') {
             params = [row[self.primaryKey]]
@@ -229,21 +243,20 @@ export default {
       });
 
 
-
     },
-    handleChange ({ pageSize, current }) {
+    handleChange({pageSize, current}) {
       this.page.pageSize = pageSize
       this.page.current = current
       this.handleSearch()
     },
     reset() {
       this.form.resetFields();
-      },
+    },
     async handleSearch(e) {
       e && e.preventDefault();
       const values = this.form.getFieldsValue()
-      const { api, noPage, method  } = this.apiConf.listApi
-      const { data } = await this[`$${method}`](api, {
+      const {api, noPage, method} = this.apiConf.listApi
+      const {data} = await this[`$${method}`](api, {
         ...values,
         pageSize: this.page.pageSize,
         current: this.page.current,
@@ -261,13 +274,13 @@ export default {
         this.editForm.validateFields(async (err, values) => {
           if (!err) {
             if (this.dialog.isEdit) {
-              const { api, method, updateKey  } = this.apiConf.editApi
+              const {api, method, updateKey} = this.apiConf.editApi
               await this[`$${method}`](api, {
                 [updateKey || this.primaryKey]: this.selectRow[this.primaryKey],
                 ...values
               })
             } else {
-              const { api, method  } = this.apiConf.addApi
+              const {api, method} = this.apiConf.addApi
               await this[`$${method}`](api, values)
             }
             this.handleCancel()
@@ -277,13 +290,13 @@ export default {
       } else {
         const values = this.editForm.getFieldsValue()
         if (this.dialog.isEdit) {
-          const { api, method, updateKey  } = this.apiConf.editApi
+          const {api, method, updateKey} = this.apiConf.editApi
           await this[`$${method}`](api, {
             [updateKey || this.primaryKey]: this.selectRow[this.primaryKey],
             ...values
           })
         } else {
-          const { api, method  } = this.apiConf.addApi
+          const {api, method} = this.apiConf.addApi
           await this[`$${method}`](api, values)
         }
         this.handleCancel()
@@ -306,9 +319,11 @@ export default {
 .table-operations {
   margin-bottom: 16px;
 }
+
 .ant-form-item {
   margin-bottom: 0;
 }
+
 .ant-divider-horizontal {
   margin: 16px 0;
 }
diff --git a/pages/cleanTravel/bangcheng.vue b/pages/cleanTravel/bangcheng.vue
index 63a2b8d..c9cd189 100644
--- a/pages/cleanTravel/bangcheng.vue
+++ b/pages/cleanTravel/bangcheng.vue
@@ -1,62 +1,95 @@
-
-
 <template>
   <div>
     <a-page-header
       :ghost="false"
       style="border-bottom: 1px solid rgb(235, 237, 240)"
-      title="厂区车辆台账"
+      title="磅秤台账"
       @back="() => $router.go(-1)"
     />
-    <a-row :gutter="16">
-      <a-col :span="6">
-        <a-card title="运输车辆" size="small">
-          <p>card content</p>
-        </a-card>
-      </a-col>
-      <a-col :span="6">
-        <a-card title="国Ⅵ输车辆" size="small">
-          <p>card content</p>
-        </a-card>
-      </a-col>
-      <a-col :span="6">
-        <a-card title="非道路工程机械" size="small">
-          <p>card content</p>
-        </a-card>
-      </a-col>
-      <a-col :span="6">
-        <a-card title="燃油运输车辆"  size="small">
-          <p>card content</p>
-        </a-card>
-      </a-col>
-    </a-row>
+    <div class="type-button">
+      <div :class="['tabs-button',activeTabsButton == null?'active-tabs-button':'']" @click="tabsChange(null)">
+        全部
+      </div>
+      <div :class="['tabs-button',activeTabsButton == 1?'active-tabs-button':'']" @click="tabsChange(1)">
+        东门
+      </div>
+      <div :class="['tabs-button',activeTabsButton == 2?'active-tabs-button':'']" @click="tabsChange(2)">
+        东门
+      </div>
+      <div :class="['tabs-button',activeTabsButton == 3?'active-tabs-button':'']" @click="tabsChange(3)">
+        东门
+      </div>
+      <div :class="['tabs-button',activeTabsButton == 4?'active-tabs-button':'']" @click="tabsChange(4)">
+        东门
+      </div>
+    </div>
 
-    <a-divider />
-    <Curd
-      hide-action
-      hide-search
-      hide-button
-      :columns="columns"
-      :api-conf="apiConf"
-      :form-items="formItems"
-      @edit="editHandler"
-    >
-      <template slot="search-button" slot-scope="{ search }">
-        <a-button type="primary" @click="exportList(search)">导出历史数据</a-button>
-      </template>
-    </Curd>
+    <div class="data-info">
+      <div class="left-table">
+        <Curd
+          hide-action
+          hide-search
+          hide-button
+          :columns="columns"
+          :api-conf="apiConf"
+          :form-items="formItems"
+          @edit="editHandler"
+          @viewDetails="viewDetails"
+        >
+          <template slot="search-button" slot-scope="{ search }">
+            <a-button type="primary" @click="exportList(search)">导出历史数据</a-button>
+          </template>
+        </Curd>
+      </div>
+      <div class="right-details" v-if="isShowInfoDetails">
+        <div class="header-title">驾驶人详情</div>
+
+        <img src=""/>
+
+        <div class="group-button">
+          <div :class="['_button',activeButton == 1?'active_button':'']" @click="viewImgByType(1)">出入场抓拍图</div>
+          <div :class="['_button',activeButton == 2?'active_button':'']" @click="viewImgByType(2)">行驶证-正面</div>
+          <div :class="['_button',activeButton == 3?'active_button':'']" @click="viewImgByType(3)">行驶证-反面</div>
+          <div :class="['_button',activeButton == 4?'active_button':'']" @click="viewImgByType(4)">环保清单</div>
+        </div>
+
+        <div class="details-info">
+          <div class="details-info-item">
+            <div class="_title">排放标准：</div>
+            <div class="_title">国0</div>
+          </div>
+          <div class="details-info-item">
+            <div class="_title">VIN：</div>
+            <div class="_title">国0</div>
+          </div>
+          <div class="details-info-item">
+            <div class="_title">发动机号：</div>
+            <div class="_title">国0</div>
+          </div>
+          <div class="details-info-item">
+            <div class="_title">注册日期：</div>
+            <div class="_title">国0</div>
+          </div>
+        </div>
+
+        <div class="footer-button">
+          <Button type="primary" @click="closeDetails">关闭详情</Button>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 <script>
 import Curd from "../../components/smallCommon/Curd.vue";
 import moment from 'moment'
+
 export default {
   name: "user",
   layout: "user",
   components: {
     Curd
   },
-  data () {
+  data() {
     return {
       isEdit: false,
       roles: [],
@@ -80,7 +113,7 @@ export default {
           dataIndex: 'newCar',
           key: 'newCar',
           title: '新能源',
-          customRender (text) {
+          customRender(text) {
             if (text) return '是'
             return '否'
           }
@@ -94,16 +127,26 @@ export default {
           dataIndex: 'createDateTime',
           key: 'createDateTime',
           title: '出厂日期'
-        }
+        },
+        {
+          title: '操作',
+          key: 'operation',
+          scopedSlots: {customRender: 'details'},
+          fixed: 'right',
+          width: 100
+        },
       ],
       apiConf: {
-        listApi: { api: '/api/Ledger/list', method: 'get' },
-      }
+        listApi: {api: '/api/Ledger/list', method: 'get'},
+      },
+      isShowInfoDetails: false,
+      activeButton: 1,
+      activeTabsButton: null
     }
   },
 
   computed: {
-    formItems () {
+    formItems() {
       return [
         {
           type: 'dateRange',
@@ -112,7 +155,7 @@ export default {
           isSearch: true,
           placeholder: ['请选择开始日期', '请选择结束日期'],
           rules: [
-            { required: true, message: '请选择时间范围' }
+            {required: true, message: '请选择时间范围'}
           ],
           fields: ['startTime', 'endTime']
         }
@@ -123,13 +166,30 @@ export default {
   },
 
   methods: {
-    editHandler (isEdit) {
+    editHandler(isEdit) {
       this.isEdit = isEdit
     },
-    exportList ({ time }) {
-      const [ start, end ] = time
+    exportList({time}) {
+      const [start, end] = time
       const fmt = 'YYYY-MM-DD'
       window.open(`http://101.43.201.20:5000/api/Ledger/export?start=${moment(start).format(fmt)}&end=${moment(end).format(fmt)}`, '_blank')
+    },
+    viewDetails(data) {
+      console.log('data:', data)
+      this.isShowInfoDetails = true
+    },
+    //根据选中的图片类型查看图片
+    viewImgByType(value) {
+      this.activeButton = value
+    },
+    //关闭详情
+    closeDetails() {
+      this.isShowInfoDetails = false
+    },
+
+    //方位改变
+    tabsChange(value){
+      this.activeTabsButton = value
     }
 
   }
@@ -137,4 +197,99 @@ export default {
 </script>
 <style scoped lang="less">
 
+.type-button {
+  margin: 20px 300px;
+  display: flex;
+  flex-flow: row;
+  justify-content: space-between;
+
+  .tabs-button {
+    height: 40px;
+    cursor: pointer;
+    border: 1px solid #e8e8e8;
+    width: 200px;
+    text-align: center;
+    line-height: 40px;
+  }
+
+  .active-tabs-button {
+    background: #0088ff;
+    color: #FFFFFF;
+  }
+}
+
+
+.data-info {
+  display: flex;
+  flex-flow: row;
+
+  .left-table {
+    flex: 1;
+  }
+
+  .right-details {
+    width: 600px;
+    height: 700px;
+    display: flex;
+    flex-flow: column;
+    align-items: center;
+    border: 1px solid #e8e8e8;
+    margin-left: 10px;
+
+    .header-title {
+      font-size: 18px;
+      text-align: center;
+    }
+
+    img {
+      margin-top: 10px;
+      width: 500px;
+      height: 300px;
+    }
+
+    .group-button {
+      margin-top: 20px;
+      display: flex;
+      flex-flow: row;
+      width: 500px;
+      justify-content: space-between;
+
+      ._button {
+        width: 100px;
+        height: 50px;
+        border: 1px solid #777777;
+        cursor: pointer;
+        text-align: center;
+        line-height: 50px;
+      }
+
+      .active_button {
+        background: #0088ff;
+        color: #FFFFFF;
+      }
+    }
+
+    .details-info {
+      padding-left: 50px;
+      width: 100%;
+      flex: 1;
+      display: flex;
+      flex-flow: column;
+      justify-content: space-around;
+      align-items: flex-start;
+
+      .details-info-item {
+        display: flex;
+        flex-flow: row;
+      }
+
+    }
+
+    .footer-button {
+      height: 30px;
+      margin-bottom: 10px;
+      cursor: pointer;
+    }
+  }
+}
 </style>
diff --git a/pages/wuzuzhi/huanweixunhang.vue b/pages/wuzuzhi/huanweixunhang.vue
index 9ec54dd..0b35553 100644
--- a/pages/wuzuzhi/huanweixunhang.vue
+++ b/pages/wuzuzhi/huanweixunhang.vue
@@ -1,13 +1,38 @@
+<template>
+  <div class="huanweixunhang">
+    <a-page-header
+      :ghost="false"
+      style="border-bottom: 1px solid rgb(235, 237, 240)"
+      title="环卫巡航"
+      @back="() => $router.go(-1)"
+    />
+    <div class="_map">
+      <Map></Map>
+    </div>
+  </div>
+</template>
+
 <script>
+import Map from "../../components/Map.vue";
+
 export default {
-  name: "huanweixunhang"
+  name: "huanweixunhang",
+  components: {
+    Map
+  }
 }
 </script>
 
-<template>
-  <div class="huanweixunhang"></div>
-</template>
-
 <style scoped lang="less">
+.huanweixunhang {
+  height: 100vh;
+  display: flex;
+  flex-flow: column;
 
+  ._map {
+    height: 0;
+    flex: 1;
+    position: relative;
+  }
+}
 </style>
diff --git a/pages/wuzuzhi/xichejiguanli.vue b/pages/wuzuzhi/xichejiguanli.vue
index 430d3f5..294bc73 100644
--- a/pages/wuzuzhi/xichejiguanli.vue
+++ b/pages/wuzuzhi/xichejiguanli.vue
@@ -1,13 +1,282 @@
+<template>
+  <div class="xichejiguanli">
+    <a-page-header
+      :ghost="false"
+      style="border-bottom: 1px solid rgb(235, 237, 240)"
+      title="洗车机管理"
+      @back="() => $router.go(-1)"
+    />
+    <div class="_body">
+      <div class="left-list">
+
+        <div :class="['car-washing-machine-tabs',activeCarTabs ==1?'active-car-washing-machine-tabs':'']"
+             @click="carChange(1)">
+          <div class="rank-num">1</div>
+          <div class="car-washing-machine-name">西门洗车</div>
+          <div class="state-icon">
+            正常
+          </div>
+        </div>
+
+        <div :class="['car-washing-machine-tabs',activeCarTabs ==2?'active-car-washing-machine-tabs':'']"
+             @click="carChange(2)">
+          <div class="rank-num">1</div>
+          <div class="car-washing-machine-name">西门洗车</div>
+          <div class="state-icon">
+            正常
+          </div>
+        </div>
+
+        <div :class="['car-washing-machine-tabs',activeCarTabs ==3?'active-car-washing-machine-tabs':'']"
+             @click="carChange(3)">
+          <div class="rank-num">1</div>
+          <div class="car-washing-machine-name">西门洗车</div>
+          <div class="state-icon">
+            正常
+          </div>
+        </div>
+      </div>
+
+      <div class="center-content">
+        <div class="map-content">
+          <Map></Map>
+        </div>
+        <div class="table-content">
+          <Curd
+            hide-action
+            hide-search
+            hide-button
+            :columns="columns"
+            :api-conf="apiConf"
+            :form-items="formItems"
+            @edit="editHandler"
+          >
+            <template slot="search-button" slot-scope="{ search }">
+              <a-button type="primary" @click="exportList(search)">导出历史数据</a-button>
+            </template>
+          </Curd>
+        </div>
+      </div>
+
+      <div class="right-content">
+        <div class="_title">洗车机视频</div>
+        <div class="car-wash-video">
+        </div>
+
+        <div class="_title">洗车机运行信息</div>
+        <div class="car-run-info">
+          <div class="_title" style="text-align: center;">xxx洗车机</div>
+
+          <div class="details-info">
+            <div class="details-info-item">
+              <div class="_title">运行状态：</div>
+              <div class="_title">正常</div>
+            </div>
+            <div class="details-info-item">
+              <div class="_title">冲洗压力：</div>
+              <div class="_title">500KPA</div>
+            </div>
+            <div class="details-info-item">
+              <div class="_title">冲洗电流：</div>
+              <div class="_title">50A</div>
+            </div>
+            <div class="details-info-item">
+              <div class="_title">冲洗电压：</div>
+              <div class="_title">500KV</div>
+            </div>
+          </div>
+
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
 <script>
+import Map from "../../components/Map.vue";
+import Curd from "../../components/smallCommon/Curd.vue";
+import moment from "moment/moment";
+
 export default {
-  name: "xichejiguanli"
+  name: "xichejiguanli",
+  components: {
+    Map,
+    Curd
+  },
+  data() {
+    return {
+      activeCarTabs: 1,
+      columns: [
+        {
+          dataIndex: 'outTime',
+          key: 'outTime',
+          title: '进场日期'
+        },
+        {
+          dataIndex: 'carNum',
+          key: 'carNum',
+          title: '车牌号'
+        },
+        {
+          dataIndex: 'carModel',
+          key: 'carModel',
+          title: '车型'
+        },
+        {
+          dataIndex: 'createDateTime',
+          key: 'createDateTime',
+          title: '清洗时间'
+        }
+      ],
+      apiConf: {
+        listApi: {api: '/api/Ledger/list', method: 'get'},
+      },
+    }
+  },
+  computed: {
+    formItems() {
+      return [
+        {
+          type: 'dateRange',
+          key: 'time',
+          label: '日期',
+          isSearch: true,
+          placeholder: ['请选择开始日期', '请选择结束日期'],
+          rules: [
+            {required: true, message: '请选择时间范围'}
+          ],
+          fields: ['startTime', 'endTime']
+        }
+      ]
+    }
+  },
+  methods: {
+    carChange(value) {
+      this.activeCarTabs = value
+    },
+    editHandler(isEdit) {
+      this.isEdit = isEdit
+    },
+    exportList({time}) {
+      const [start, end] = time
+      const fmt = 'YYYY-MM-DD'
+      window.open(`http://101.43.201.20:5000/api/Ledger/export?start=${moment(start).format(fmt)}&end=${moment(end).format(fmt)}`, '_blank')
+    },
+  }
 }
 </script>
-
-<template>
-  <div class="xichejiguanli"></div>
-</template>
-
 <style scoped lang="less">
+.xichejiguanli {
+  height: 100vh;
+  display: flex;
+  flex-flow: column;
 
+  ._body {
+    flex: 1;
+    display: flex;
+    flex-flow: row;
+    padding: 20px;
+
+    .left-list {
+      width: 240px;
+      height: 100%;
+      border: 1px solid #e8e8e8;
+      border-radius: 10px;
+
+      .car-washing-machine-tabs {
+        height: 40px;
+        display: flex;
+        flex-flow: row;
+        align-items: center;
+        padding: 10px;
+        cursor: pointer;
+        border: 1px solid #e8e8e8;
+        margin-top: 10px;
+
+        &:first-child {
+          margin-top: 0;
+        }
+
+        border-radius: 10px;
+
+        .rank-num {
+
+        }
+
+        .car-washing-machine-name {
+          padding-left: 10px;
+          flex: 1;
+        }
+      }
+
+      .active-car-washing-machine-tabs {
+        background: #0088ff;
+        color: #FFFFFF;
+      }
+    }
+
+    .center-content {
+      flex: 1;
+      margin: 0 10px;
+      border: 1px solid #e8e8e8;
+      border-radius: 10px;
+      display: flex;
+      flex-flow: column;
+
+      .map-content {
+        height: 400px;
+        width: 100%;
+        position: relative;
+      }
+
+      .table-content {
+        flex: 1;
+        padding-top: 10px;
+      }
+    }
+
+    .right-content {
+      width: 300px;
+      border: 1px solid #e8e8e8;
+      border-radius: 10px;
+      padding: 10px;
+
+      ._title {
+        height: 30px;
+        line-height: 30px;
+        font-size: 16px;
+        font-weight: 700;
+      }
+
+      .car-wash-video {
+        margin: 20px 0;
+        height: 400px;
+        border: 1px solid #e8e8e8;
+      }
+
+      .car-run-info {
+        margin-top: 20px;
+        border: 1px solid #e8e8e8;
+        height: 260px;
+        padding: 10px;
+        display: flex;
+        flex-flow: column;
+
+        .details-info {
+          width: 100%;
+          flex: 1;
+          display: flex;
+          flex-flow: column;
+          justify-content: space-around;
+          align-items: flex-start;
+
+          .details-info-item {
+            display: flex;
+            flex-flow: row;
+          }
+
+        }
+      }
+    }
+  }
+}
 </style>

From b11b73b2e657c7e1c99dc26e8414f7029350328d Mon Sep 17 00:00:00 2001
From: "DESKTOP-VMMLSOQ\\wangzg" <1161909281@qq.com>
Date: Wed, 31 Jul 2024 22:26:14 +0800
Subject: [PATCH 4/9] 111

---
 plugins/axios.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/axios.js b/plugins/axios.js
index 1651afd..d015726 100644
--- a/plugins/axios.js
+++ b/plugins/axios.js
@@ -4,7 +4,7 @@ import Vue from 'vue'
 axios.defaults.withcredentials =true
 // create an axios instance
 const service = axios.create({
-  baseURL: process.env.NODE_ENV === 'development' ? '' : 'http://101.43.201.20', // 所有异步请求都加上/api,nginx转发到后端Springboot
+  baseURL: process.env.NODE_ENV === 'development' ? '' : 'http://101.43.201.20:5000', // 所有异步请求都加上/api,nginx转发到后端Springboot
   timeout: 5000 // request timeout
 })
 

From 790e9a7ef05dcc7f130f0f9324f78e27408746cf Mon Sep 17 00:00:00 2001
From: "DESKTOP-VMMLSOQ\\wangzg" <1161909281@qq.com>
Date: Tue, 6 Aug 2024 00:17:35 +0800
Subject: [PATCH 5/9] 111

---
 README.md                              |   8 +-
 components/NewBg.vue                   |   2 +-
 components/smallCommon/Curd.vue        |  20 ++-
 components/smallCommon/CusDesc.vue     |   8 +-
 components/smallCommon/CustomTable.vue |  17 ++-
 components/smallCommon/SystemTitle.vue |  57 +++++++-
 pages/cleanTravel/home.vue             |  77 +++++++---
 pages/cleanTravel/ledger.vue           |  64 ++++++++-
 pages/home/index.vue                   |   5 +
 pages/test.vue                         |  15 ++
 pages/wuzuzhi/xichejiguanli.vue        |   1 +
 pages/youzuzhi/paifang.vue             | 188 ++++++++++++++++---------
 pages/youzuzhi/paifangtongji.vue       |  21 +--
 plugins/axios.js                       |   5 +-
 14 files changed, 369 insertions(+), 119 deletions(-)
 create mode 100644 pages/test.vue

diff --git a/README.md b/README.md
index e1fcade..c6ee696 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ https://1x.antdv.com/components/icon/
 首页 /home
 
 #### 有组织
-
+ 
 有组织排放 /youzuzhi/paifang 待联调
 有组织排放统计 /youzuzhi/paifangtongji 待联调
 
@@ -69,9 +69,9 @@ https://1x.antdv.com/components/icon/
 
 #### 清洁运输
 
-清洁运输 /cleanTravel/home
-厂区车辆台账 /cleanTravel/ledger
-清洁运输趋势 /cleanTravel/trend
+清洁运输 /cleanTravel/home 联调完成
+厂区车辆台账 /cleanTravel/ledger 联调完成
+清洁运输趋势 /cleanTravel/trend 
 磅秤台账 /cleanTravel/bangcheng （已做）待联调
 
 #### 视频广场
diff --git a/components/NewBg.vue b/components/NewBg.vue
index 81507ad..785e04e 100644
--- a/components/NewBg.vue
+++ b/components/NewBg.vue
@@ -21,7 +21,7 @@
   .bg {
     width: 100%;
     box-sizing: border-box;
-    height: 100%;
+    height: 100vh;
     box-sizing: border-box;
     background: url('~/assets/images/new/大背景.png') center  no-repeat;
     background-size: 100% 100%;
diff --git a/components/smallCommon/Curd.vue b/components/smallCommon/Curd.vue
index 941a263..8a0e624 100644
--- a/components/smallCommon/Curd.vue
+++ b/components/smallCommon/Curd.vue
@@ -90,6 +90,9 @@
           </a-tree-select>
           <a-range-picker v-bind="menuItem.props || {}" v-decorator="gtDecorator(menuItem)"
                           v-else-if="menuItem.type === 'dateRange'" format="YYYY-MM-DD"/>
+
+          <a-date-picker style="width: 100%" v-decorator="gtDecorator(menuItem)" v-bind="menuItem.props || {}"
+                         v-else-if="menuItem.type === 'date'" format="YYYY-MM-DD"/>
         </a-form-item>
       </a-form>
     </a-modal>
@@ -100,6 +103,7 @@ export default {
   name: "user",
   data() {
     return {
+      cacheData: [],
       isValidate: false,
       tableDataSource: [],
       form: this.$form.createForm(this, {name: `form_${new Date().valueOf()}`}),
@@ -155,6 +159,11 @@ export default {
       type: Object,
       default: () => ({})
     },
+    customSearch: {
+      type: Function,
+      default: () => null
+
+    }
   },
   computed: {
     searchItems() {
@@ -179,8 +188,8 @@ export default {
     this.handleSearch()
   },
   methods: {
-    viewDetails(data){
-      this.$emit('viewDetails',data)
+    viewDetails(data) {
+      this.$emit('viewDetails', data)
     },
     gtDecorator(menuItem) {
       if (menuItem.rules) {
@@ -252,6 +261,11 @@ export default {
     reset() {
       this.form.resetFields();
     },
+    doSearch () {
+      if (this.customSearch) {
+        this.tableDataSource = this.customSearch(JSON.parse(JSON.stringify(this.cacheData)))
+      }
+    },
     async handleSearch(e) {
       e && e.preventDefault();
       const values = this.form.getFieldsValue()
@@ -263,9 +277,11 @@ export default {
       })
       if (noPage) {
         this.page = false
+        this.cacheData = data
         this.tableDataSource = data
       } else {
         this.page.total = data.total || 0
+        this.cacheData = data.items
         this.tableDataSource = data.items
       }
     },
diff --git a/components/smallCommon/CusDesc.vue b/components/smallCommon/CusDesc.vue
index 260c587..e358bc5 100644
--- a/components/smallCommon/CusDesc.vue
+++ b/components/smallCommon/CusDesc.vue
@@ -1,9 +1,9 @@
 
 <template>
   <div class="cusdesc">
-    <div class="desc" v-for="(col, index) in columns" :key="index">
+    <div class="desc" v-for="(col, index) in columns" :key="index" :style="{ width: col.width || '50%' }">
       <div class="desc-title">{{ col.title }}:</div>
-      <div class="desc-value">{{ data[col.key] }}</div>
+      <div class="desc-value">{{ data[col.key || col.dataIndex] }}</div>
     </div>
   </div>
 </template>
@@ -37,7 +37,11 @@ export default {
     text-align: left;
     vertical-align: top;
     .desc {
+      width: 100%;
       margin-top: 16px;
+      display: flex;
+      justify-content: flex-start;
+      align-items: center;
       &:first-child {
         margin-top: 0;
       }
diff --git a/components/smallCommon/CustomTable.vue b/components/smallCommon/CustomTable.vue
index 66b7f82..7126181 100644
--- a/components/smallCommon/CustomTable.vue
+++ b/components/smallCommon/CustomTable.vue
@@ -2,7 +2,7 @@
 
 <template>
   <div class="custom-table">
-    <Curd v-bind="$attrs" v-on="$listeners"></Curd>
+    <Curd v-bind="$attrs" v-on="$listeners" ref="curd"></Curd>
   </div>
 </template>
 <script>
@@ -10,11 +10,24 @@ import Curd from "./Curd.vue";
 
 export default {
   name: "CustomTable",
-  components: {Curd}
+  components: {Curd},
+  methods : {
+    doSearch () {
+      this.$refs.curd.doSearch()
+    },
+  }
 }
 </script>
 <style scoped lang="less">
   .custom-table {
+    /deep/ .ant-table-header {
+      background-color: transparent !important;
+      border-bottom: 0px ;
+    }
+    /deep/ .ant-table-fixed-header > .ant-table-content > .ant-table-scroll > .ant-table-body {
+      background-color: transparent !important;
+
+    }
     /deep/ .ant-table-thead > tr > th {
       background: linear-gradient(180deg, rgba(255, 255, 255, 0.15) 0%, rgba(255, 255, 255, 0) 100%);
       color: rgba(255, 255, 255, 1);
diff --git a/components/smallCommon/SystemTitle.vue b/components/smallCommon/SystemTitle.vue
index f2ca7a4..7f8abc3 100644
--- a/components/smallCommon/SystemTitle.vue
+++ b/components/smallCommon/SystemTitle.vue
@@ -5,7 +5,15 @@
     <div class="header-content">
       <div class="time"><a-icon type="clock-circle" style="margin-right: 10px;" />{{ time }}</div>
       <div class="tq">{{ tq }}</div>
-      <p class="_title">{{ title }}一体化平台</p>
+      <p class="_title" v-if="customTitle">{{ customTitle }}</p>
+      <p class="_title" v-else>{{ customTitle || title }}一体化平台</p>
+      <div class="back" v-if="showBack" @click="() => $router.go(-1)">返回</div>
+      <div class="btn-box">
+        <div class="btn" :key="btn.key" v-for="btn in btns" @click="$emit('click', btn)">
+          {{ btn.title }}
+        </div>
+      </div>
+
     </div>
   </div>
 </template>
@@ -27,6 +35,20 @@ export default {
       return ''
     }
   },
+  props: {
+    customTitle: {
+      type: String,
+      default: ''
+    },
+    showBack: {
+      type: Boolean,
+      default: false
+    },
+    btns: {
+      type: Array,
+      default: () => []
+    }
+  },
   data () {
     return {
       time: moment().format('YYYY-MM-DD HH:mm:ss'),
@@ -56,6 +78,39 @@ export default {
       box-sizing: border-box;
       padding-top: 5px;
       position: relative;
+      .btn-box {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        margin-top: 20px;
+        position: absolute;
+        top: 30px;
+        left: 50%;
+        transform: translateX(-50%);
+        .btn {
+          height: 30px;
+          pointer-events: auto;
+          color: #fff;
+          padding: 5px 10px;
+          background-color: #1890ff;
+          cursor: pointer;
+          margin-left: 10px;
+          &:first-child {
+            margin-left: 0;
+          }
+        }
+      }
+
+      .back {
+        position: absolute;
+        right: 10px;
+        top: 40px;
+        border-radius: 10px;
+        padding: 5px 20px;
+        color: #fff;
+        background-color: #1890ff;
+        cursor: pointer;
+      }
       .time {
         position: absolute;
         left: 20px;
diff --git a/pages/cleanTravel/home.vue b/pages/cleanTravel/home.vue
index 942f3c0..bcf2175 100644
--- a/pages/cleanTravel/home.vue
+++ b/pages/cleanTravel/home.vue
@@ -2,7 +2,7 @@
 <template>
   <new-bg>
     <flex-col>
-      <system-title/>
+      <system-title  />
       <ModuleContent padding="20px">
         <flex-col>
           <web2-title>清洁运输</web2-title>
@@ -27,9 +27,9 @@
                             <img :src="selectedRecord.imgUrl" alt="" class="car-preview">
                             <butgroup2>
                               <cus-button2 flex>进出场抓拍图</cus-button2>
-                              <cus-button2>行驶证-正面</cus-button2>
-                              <cus-button2>行驶证-反面</cus-button2>
-                              <cus-button2>环保清单</cus-button2>
+<!--                              <cus-button2>行驶证-正面</cus-button2>-->
+<!--                              <cus-button2>行驶证-反面</cus-button2>-->
+<!--                              <cus-button2>环保清单</cus-button2>-->
                             </butgroup2>
                             <ModuleContent padding="20px 27px" class="desc">
                               <cus-desc :data="selectedRecord" :columns="descColumns"></cus-desc>
@@ -75,7 +75,9 @@
                         hide-button
                         :columns="columns"
                         :api-conf="apiConf"
-                        :tableProps="tableProps"
+                        :table-props="tableProps"
+                        :custom-search="customSearch"
+                        ref="cusTable"
                       />
 
                     </div>
@@ -93,10 +95,10 @@
             <cus-button>
               <nuxt-link to="/cleanTravel/trend">清洁运输趋势</nuxt-link>
               </cus-button>
-            <cus-button>
+<!--            <cus-button>
               <nuxt-link to="/cleanTravel/bangcheng">磅秤台账</nuxt-link>
               </cus-button>
-            <cus-button>门禁监控</cus-button>
+            <cus-button>门禁监控</cus-button>-->
           </butgroup>
         </flex-col>
       </ModuleContent>
@@ -148,6 +150,7 @@ export default {
     const self = this
     return {
       tableProps: {
+        scroll: {y: 500},
         customRow (record) {
           return {
             on: {
@@ -163,7 +166,7 @@ export default {
         }
       },
       apiConf: {
-        listApi: { api: '/api/Transport/list', method: 'get' },
+        listApi: { api: '/api/Transport/list', method: 'get', noPage: true },
       },
       selectedRecord: {},
       bgStr,
@@ -178,19 +181,37 @@ export default {
       dataSource: [],
       descColumns: [
         {
-          title: '设备掉线',
-          dataIndex: 'deviceName',
-          width: '33.333%'
-        },
-        {
-          title: '故障异常',
-          dataIndex: 'errorName',
-          width: '33.333%'
-        },
-        {
-          title: '异常报警',
-          dataIndex: 'errorImg',
-          width: '33.333%'
+          title: '车牌号',
+          dataIndex: 'carNumber',
+          width: '100%'
+        },{
+          title: '车牌颜色',
+          dataIndex: 'carColorString',
+          width: '100%'
+        },{
+          title: '车辆类型',
+          dataIndex: 'carType',
+          width: '100%'
+        },{
+          title: '车辆类型',
+          dataIndex: 'carType',
+          width: '100%'
+        },{
+          title: '排放等级',
+          dataIndex: 'effluent',
+          width: '100%'
+        },{
+          title: 'VIN',
+          dataIndex: 'vin',
+          width: '100%'
+        },{
+          title: '发动机号',
+          dataIndex: 'entryExitPictureUrl',
+          width: '100%'
+        },{
+          title: '注册日期',
+          dataIndex: 'registrationDate',
+          width: '100%'
         }
       ],
       columns: [
@@ -236,6 +257,15 @@ export default {
       title: state => state.system.title,
     })
   },
+  watch : {
+    searchCarNum () {
+      this.$nextTick(() => {
+        if (this.$refs.cusTable) {
+          this.$refs.cusTable.doSearch()
+        }
+      })
+    }
+  },
   mounted() {
     this.getCount()
     this.getDataSource()
@@ -343,6 +373,11 @@ export default {
         })
       }
     },
+
+    customSearch (data = []) {
+      if (!this.searchCarNum) return data
+      return data.filter(item => item.carNumber.indexOf(this.searchCarNum) >= 0)
+    }
   }
 }
 </script>
diff --git a/pages/cleanTravel/ledger.vue b/pages/cleanTravel/ledger.vue
index 63a2b8d..31232ea 100644
--- a/pages/cleanTravel/ledger.vue
+++ b/pages/cleanTravel/ledger.vue
@@ -11,31 +11,30 @@
     <a-row :gutter="16">
       <a-col :span="6">
         <a-card title="运输车辆" size="small">
-          <p>card content</p>
+          <p>{{ headCount.t1 || 0 }}</p>
         </a-card>
       </a-col>
       <a-col :span="6">
         <a-card title="国Ⅵ输车辆" size="small">
-          <p>card content</p>
+          <p>{{ headCount.t2 || 0 }}</p>
         </a-card>
       </a-col>
       <a-col :span="6">
         <a-card title="非道路工程机械" size="small">
-          <p>card content</p>
+          <p>{{ headCount.t3 || 0 }}</p>
         </a-card>
       </a-col>
       <a-col :span="6">
         <a-card title="燃油运输车辆"  size="small">
-          <p>card content</p>
+          <p>{{ headCount.t4 || 0 }}</p>
         </a-card>
       </a-col>
     </a-row>
 
     <a-divider />
     <Curd
-      hide-action
       hide-search
-      hide-button
+      hide-action
       :columns="columns"
       :api-conf="apiConf"
       :form-items="formItems"
@@ -58,6 +57,7 @@ export default {
   },
   data () {
     return {
+      headCount: {},
       isEdit: false,
       roles: [],
       columns: [
@@ -88,7 +88,7 @@ export default {
         {
           dataIndex: 'emissions',
           key: 'emissions',
-          title: '燃油车'
+          title: '燃油车标准'
         },
         {
           dataIndex: 'createDateTime',
@@ -98,6 +98,7 @@ export default {
       ],
       apiConf: {
         listApi: { api: '/api/Ledger/list', method: 'get' },
+        addApi: {api: '/api/Ledger/add', method: 'post',}
       }
     }
   },
@@ -110,19 +111,68 @@ export default {
           key: 'time',
           label: '日期',
           isSearch: true,
+          hide: true,
           placeholder: ['请选择开始日期', '请选择结束日期'],
           rules: [
             { required: true, message: '请选择时间范围' }
           ],
           fields: ['startTime', 'endTime']
+        },
+        {
+          type: 'date',
+          key: 'outTime',
+          label: '日期',
+          placeholder: '请选择日期'
+        },
+        {
+          type: 'input',
+          key: 'carNum',
+          label: '车牌号',
+          placeholder: '请输入车牌号'
+        },
+        {
+          type: 'input',
+          key: 'carModel',
+          label: '车型',
+          placeholder: '请输入车型'
+        },
+        {
+          type: 'select',
+          key: 'newCar',
+          label: '新能源',
+          placeholder: '是否新能源',
+          children: [
+            { label: '是', value: '是' },
+            { label: '否', value: '否' },
+          ]
+        },
+        {
+          type: 'select',
+          key: 'emissions',
+          label: '燃油车标准',
+          placeholder: '',
+        },
+        {
+          type: 'date',
+          key: 'createDateTime',
+          label: '出厂日期',
+          placeholder: '',
         }
       ]
     }
   },
   created() {
+    this.$http.get('/api/Ledger/HeaderCount').then(({data}) => {
+      this.headCount = data || {}
+    })
+
+
   },
 
   methods: {
+    add () {
+
+    },
     editHandler (isEdit) {
       this.isEdit = isEdit
     },
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 64a40bf..7f441f8 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -1,6 +1,10 @@
 <!--峰煤监控系统-->
 <template>
   <new-bg>
+    <flex-col>
+      <system-title />
+
+
     <div class="center-panel">
       <Map type="middle" @pointClick="pointClick" />
     </div>
@@ -97,6 +101,7 @@
         </BFC>
       </ModuleContent>
     </flex-col>
+    </flex-col>
   </new-bg>
 </template>
 
diff --git a/pages/test.vue b/pages/test.vue
new file mode 100644
index 0000000..6a61d49
--- /dev/null
+++ b/pages/test.vue
@@ -0,0 +1,15 @@
+<script>
+export default {
+  name: "test",
+
+
+}
+</script>
+
+<template>
+<div></div>
+</template>
+
+<style scoped lang="less">
+
+</style>
diff --git a/pages/wuzuzhi/xichejiguanli.vue b/pages/wuzuzhi/xichejiguanli.vue
index 294bc73..a441bb9 100644
--- a/pages/wuzuzhi/xichejiguanli.vue
+++ b/pages/wuzuzhi/xichejiguanli.vue
@@ -15,6 +15,7 @@
           <div class="car-washing-machine-name">西门洗车</div>
           <div class="state-icon">
             正常
+ 
           </div>
         </div>
 
diff --git a/pages/youzuzhi/paifang.vue b/pages/youzuzhi/paifang.vue
index 2e6a0e4..5197f0c 100644
--- a/pages/youzuzhi/paifang.vue
+++ b/pages/youzuzhi/paifang.vue
@@ -1,94 +1,142 @@
-
-
 <template>
-  <div class="paifang" style="height: 100vh;overflow: hidden">
-    <a-page-header
-      :ghost="false"
-      style="border-bottom: 1px solid rgb(235, 237, 240)"
-      title="有组织排放"
-      @back="() => $router.go(-1)"
-    />
-    <a-row :gutter="16">
-      <a-col :span="6">
-        <a-card title="全厂有组织排放源" size="small">
-          <p>card content</p>
-        </a-card>
-      </a-col>
-      <a-col :span="6">
-        <a-card title="全厂重要排放源" size="small">
-          <p>card content</p>
-        </a-card>
-      </a-col>
-      <a-col :span="6">
-        <a-card title="当前区域排放源" size="small">
-          <p>card content</p>
-        </a-card>
-      </a-col>
-      <a-col :span="6">
-        <a-card title="当前区域其中重要排放源"  size="small">
-          <p>card content</p>
-        </a-card>
-      </a-col>
-    </a-row>
-    <a-row style="height: calc(100% - 147px);margin-top: 16px;"  :gutter="16">
-      <a-col :span="6" style="height: 100%;">
-        <a-card title="工序步骤" size="small">
-          <a-button type="primary" block>
-            Primary
-          </a-button>
-          <a-button type="primary" block class="mt16">
-            Primary
-          </a-button>
-          <a-button type="primary" block class="mt16">
-            Primary
-          </a-button>
-          <a-button type="primary" block class="mt16">
-            Primary
-          </a-button>
-          <a-button type="primary" block class="mt16">
-            Primary
-          </a-button>
-          <a-button type="primary" block class="mt16">
-            Primary
-          </a-button>
+  <new-bg>
+    <flex-col>
+      <system-title @click="changeTab" show-back custom-title="有组织排放" :btns="btns"/>
 
-        </a-card>
-      </a-col>
-      <a-col :span="12" style="height: 100%;">
-        <div style="height: 100%;position: relative">
-          <Map></Map>
+      <ModuleContent padding="0px 20px 20px">
+        <div style="height: 144px;width: 100%;">
+          <ModuleContent2 bg bg-str :border="false">
+            <butgroup2 style="height: 100%;">
+              <ModuleContent2 bg bg-color border>
+                <miaoshu title="全厂有组织排放源" :value="count.comeCount" color="rgba(42, 207, 255, 1)"></miaoshu>
+              </ModuleContent2>
+
+              <ModuleContent2 bg bg-color border style="margin-left: 16px;">
+                <miaoshu title="全厂重要排放源" :value="count.outCount" color="rgba(255, 171, 87, 1)"></miaoshu>
+              </ModuleContent2>
+
+              <ModuleContent2 bg bg-color border style="margin-left: 16px;">
+                <miaoshu title="当前区域排放源" :value="count.inCount" color="rgba(122, 175, 255, 1)"></miaoshu>
+              </ModuleContent2>
+
+              <ModuleContent2 bg bg-color border style="margin-left: 16px;">
+                <miaoshu title="当前区域其中重要排放源" :value="count.addCount" color="rgba(76, 243, 129, 1)"></miaoshu>
+              </ModuleContent2>
+            </butgroup2>
+          </ModuleContent2>
         </div>
-      </a-col>
-      <a-col :span="6" style="height: 100%;">
-        <a-table :columns="columns" :data-source="data" />
-      </a-col>
-    </a-row>
-  </div>
+
+        <div class="paifang" style="height: calc(100% - 144px);overflow: hidden">
+          <a-row style="height: 100%;margin-top: 16px;" :gutter="16">
+            <a-col :span="3" style="height: 100%;">
+              <web3-title>工序步骤</web3-title>
+              <div class="gongxu-box">
+                <div class="gongxu-item" v-for="item in gongxu" :key="item.id">
+                  {{ item.name }}
+                </div>
+              </div>
+            </a-col>
+            <a-col :span="17" style="height: 100%;">
+              <div style="height: 100%;position: relative">
+                <div class="map-cv" style="height: calc(100% - 80px);position: relative">
+                  <Map></Map>
+                </div>
+                <butgroup>
+                  <cus-button>
+                    <nuxt-link to="/youzuzhi/paifangtongji">环保排放统计</nuxt-link>
+                  </cus-button>
+                  <!--            <cus-button>
+                                <nuxt-link to="/cleanTravel/bangcheng">磅秤台账</nuxt-link>
+                                </cus-button>
+                              <cus-button>门禁监控</cus-button>-->
+                </butgroup>
+              </div>
+            </a-col>
+            <a-col :span="4" style="height: 100%;">
+              <web3-title>排放源清单</web3-title>
+              <a-table :columns="columns" :data-source="data"/>
+            </a-col>
+          </a-row>
+        </div>
+      </ModuleContent>
+    </flex-col>
+  </new-bg>
 </template>
 
 <script>
 import Map from "../../components/Map.vue";
+import NewBg from "../../components/NewBg.vue";
+import SystemTitle from "../../components/smallCommon/SystemTitle.vue";
+import FlexCol from "../../components/FlexCol.vue";
+import ModuleContent from "../../components/ModuleContent.vue";
+import Butgroup2 from "../../components/smallCommon/butgroup2.vue";
+import Miaoshu from "../../components/smallCommon/miaoshu.vue";
+import ModuleContent2 from "../../components/smallCommon/ModuleContent2.vue";
+import Web3Title from "../../components/smallCommon/Web3Title.vue";
+import CusButton from "../../components/smallCommon/CusButton.vue";
+import Butgroup from "../../components/smallCommon/butgroup.vue";
+
 export default {
   name: "paifang",
   components: {
+    Butgroup, CusButton,
+    Web3Title,
+    ModuleContent2, Miaoshu, Butgroup2,
+    ModuleContent,
+    FlexCol,
+    SystemTitle,
+    NewBg,
     Map
   },
-  data () {
+  data() {
     return {
+      btns: [
+        { title: 'VOC', key: '1' },
+        { title: 'CEMS', key: '2' },
+      ],
+      count: {},
       data: [],
+      gongxu: [],
       columns: [
-        { title: '名词', key: 'name' },
-        { title: 'NO', key: 'NO' },
-        { title: 'SO2', key: 'SO2' },
-        { title: 'TSP', key: 'TSP' },
+        {title: '名词', key: 'name'},
+        {title: 'NO', key: 'NO'},
+        {title: 'SO2', key: 'SO2'},
+        {title: 'TSP', key: 'TSP'},
       ]
     }
+  },
+  mounted() {
+    this.getData(1)
+  },
+  methods: {
+    changeTab (tab) {
+      this.getData(tab)
+    },
+    getData (deviceType) {
+      this.$http.get('/api/Organized/listanddevice', {
+        organizedType: 1,
+        deviceType: deviceType
+      }).then(({data}) => {
+        this.gongxu = data || []
+      })
+    }
   }
 }
 </script>
 
 <style scoped lang="less">
-  .mt16 {
-    margin-top: 16px;
+.mt16 {
+  margin-top: 16px;
+}
+.gongxu-box {
+  height: calc(100% - 48px);
+  overflow-y: auto;
+  .gongxu-item {
+    cursor: pointer;
+    padding: 16px 0;
+    color: #fff;
+    font-size: 18px;
+    border-bottom: 1px solid rgba(238, 238, 238, 0.54);
   }
+}
 </style>
diff --git a/pages/youzuzhi/paifangtongji.vue b/pages/youzuzhi/paifangtongji.vue
index 82bd5ff..345a36f 100644
--- a/pages/youzuzhi/paifangtongji.vue
+++ b/pages/youzuzhi/paifangtongji.vue
@@ -1,15 +1,11 @@
 
 
 <template>
+  <new-bg>
+    <flex-col>
+      <system-title show-back custom-title="有组织排放统计"/>
+      <ModuleContent padding="0px 20px 20px">
   <div class="paifangtongji" style="height: 100vh;overflow: hidden">
-    <a-page-header
-      :ghost="false"
-      style="border-bottom: 1px solid rgb(235, 237, 240)"
-      title="有组织排放统计"
-      @back="() => $router.go(-1)"
-    />
-
-
     <a-row :gutter="16">
       <a-col :span="18">
 
@@ -19,11 +15,20 @@
       </a-col>
     </a-row>
   </div>
+      </ModuleContent>
+    </flex-col>
+  </new-bg>
 </template>
 
 <script>
+import FlexCol from "../../components/FlexCol.vue";
+import SystemTitle from "../../components/smallCommon/SystemTitle.vue";
+import NewBg from "../../components/NewBg.vue";
+import ModuleContent from "../../components/ModuleContent.vue";
+
 export default {
   name: "paifangtongji",
+  components: {ModuleContent, NewBg, SystemTitle, FlexCol},
   data () {
     return {
       data: [],
diff --git a/plugins/axios.js b/plugins/axios.js
index d015726..c7f7d5f 100644
--- a/plugins/axios.js
+++ b/plugins/axios.js
@@ -1,6 +1,7 @@
 import axios from 'axios' //引用axios
 import { message } from 'ant-design-vue';
 import Vue from 'vue'
+import checkTypes from "../utils/checkTypes";
 axios.defaults.withcredentials =true
 // create an axios instance
 const service = axios.create({
@@ -23,7 +24,9 @@ service.interceptors.request.use(
 service.interceptors.response.use(
   response => {
     const res = response.data //res is my own data
-
+    if (!checkTypes.isObject(res)) {
+      return { data: res }
+    }
     if (`${res.code}` === '0') {
       return res
     } else {

From 6d2ae6196bf43290b5f534e9fe0c6e8abda5ec71 Mon Sep 17 00:00:00 2001
From: "DESKTOP-VMMLSOQ\\wangzg" <1161909281@qq.com>
Date: Tue, 6 Aug 2024 22:30:41 +0800
Subject: [PATCH 6/9] 111

---
 components/smallCommon/CustomTable.vue |   9 +-
 pages/cleanTravel/bangcheng.vue        | 225 +++++++++++++++----------
 pages/cleanTravel/home.vue             |  10 +-
 pages/cleanTravel/ledger.vue           |  82 +++++----
 pages/cleanTravel/trend.vue            |  73 ++++----
 pages/video/list.vue                   |  16 +-
 pages/wuzuzhi/huanjingzhili.vue        |   5 +-
 pages/wuzuzhi/huanweixunhang.vue       |  36 ++--
 pages/wuzuzhi/paifang.vue              |  94 ++++++++---
 pages/wuzuzhi/xichejiguanli.vue        | 192 ++++++++++-----------
 pages/youzuzhi/paifang.vue             |  10 +-
 11 files changed, 437 insertions(+), 315 deletions(-)

diff --git a/components/smallCommon/CustomTable.vue b/components/smallCommon/CustomTable.vue
index 7126181..36cc9f2 100644
--- a/components/smallCommon/CustomTable.vue
+++ b/components/smallCommon/CustomTable.vue
@@ -2,7 +2,11 @@
 
 <template>
   <div class="custom-table">
-    <Curd v-bind="$attrs" v-on="$listeners" ref="curd"></Curd>
+    <Curd v-bind="$attrs" v-on="$listeners" ref="curd">
+      <template slot="search-button" slot-scope="{ search }">
+        <slot name="search-button" v-bind:search="search"></slot>
+      </template>
+    </Curd>
   </div>
 </template>
 <script>
@@ -20,6 +24,9 @@ export default {
 </script>
 <style scoped lang="less">
   .custom-table {
+    /deep/ .ant-form-item-label > label {
+      color: #fff !important;
+    }
     /deep/ .ant-table-header {
       background-color: transparent !important;
       border-bottom: 0px ;
diff --git a/pages/cleanTravel/bangcheng.vue b/pages/cleanTravel/bangcheng.vue
index c9cd189..b42b931 100644
--- a/pages/cleanTravel/bangcheng.vue
+++ b/pages/cleanTravel/bangcheng.vue
@@ -1,98 +1,144 @@
 <template>
-  <div>
-    <a-page-header
-      :ghost="false"
-      style="border-bottom: 1px solid rgb(235, 237, 240)"
-      title="磅秤台账"
-      @back="() => $router.go(-1)"
-    />
-    <div class="type-button">
-      <div :class="['tabs-button',activeTabsButton == null?'active-tabs-button':'']" @click="tabsChange(null)">
-        全部
-      </div>
-      <div :class="['tabs-button',activeTabsButton == 1?'active-tabs-button':'']" @click="tabsChange(1)">
-        东门
-      </div>
-      <div :class="['tabs-button',activeTabsButton == 2?'active-tabs-button':'']" @click="tabsChange(2)">
-        东门
-      </div>
-      <div :class="['tabs-button',activeTabsButton == 3?'active-tabs-button':'']" @click="tabsChange(3)">
-        东门
-      </div>
-      <div :class="['tabs-button',activeTabsButton == 4?'active-tabs-button':'']" @click="tabsChange(4)">
-        东门
-      </div>
-    </div>
+  <new-bg>
+    <flex-col>
+      <system-title show-back custom-title="磅秤台账"/>
+      <ModuleContent padding="0px 20px 20px">
+        <flex-col>
+          <Butgroup2 class="type-button">
+            <cus-button :class="['tabs-button',activeTabsButton == null?'active-tabs-button':'']"
+                        @click="tabsChange(null)">
+              全部
+            </cus-button>
+            <cus-button :class="['tabs-button',activeTabsButton == 1?'active-tabs-button':'']" @click="tabsChange(1)">
+              东门
+            </cus-button>
+            <cus-button :class="['tabs-button',activeTabsButton == 2?'active-tabs-button':'']" @click="tabsChange(2)">
+              东门
+            </cus-button>
+            <cus-button :class="['tabs-button',activeTabsButton == 3?'active-tabs-button':'']" @click="tabsChange(3)">
+              东门
+            </cus-button>
+            <cus-button :class="['tabs-button',activeTabsButton == 4?'active-tabs-button':'']" @click="tabsChange(4)">
+              东门
+            </cus-button>
+          </Butgroup2>
+          <Split num="10"></Split>
+          <ModuleContent2 bg padding="20px">
+            <a-row :gutter="16">
+              <a-col :span="18">
 
-    <div class="data-info">
-      <div class="left-table">
-        <Curd
-          hide-action
-          hide-search
-          hide-button
-          :columns="columns"
-          :api-conf="apiConf"
-          :form-items="formItems"
-          @edit="editHandler"
-          @viewDetails="viewDetails"
-        >
-          <template slot="search-button" slot-scope="{ search }">
-            <a-button type="primary" @click="exportList(search)">导出历史数据</a-button>
-          </template>
-        </Curd>
-      </div>
-      <div class="right-details" v-if="isShowInfoDetails">
-        <div class="header-title">驾驶人详情</div>
+                <CustomTable
+                  hide-action
+                  hide-search
+                  hide-button
+                  :columns="columns"
+                  :api-conf="apiConf"
+                  :form-items="formItems"
+                  @edit="editHandler"
+                  @viewDetails="viewDetails"
+                >
+                  <template slot="search-button" slot-scope="{ search }">
+                    <a-button type="primary" @click="exportList(search)">导出历史数据</a-button>
+                    <Split num="10"></Split>
+                  </template>
+                </CustomTable>
+              </a-col>
+              <a-col :span="6">
+                <flex-col>
+                  <web3-title>驾驶人详情</web3-title>
+                  <ModuleContent padding="0">
+                    <flex-col>
+                      <img :src="selectedRecord.imgUrl" alt="" class="car-preview">
+                      <butgroup2>
+                        <cus-button2 flex>进出场抓拍图</cus-button2>
+                        <!--                              <cus-button2>行驶证-正面</cus-button2>-->
+                        <!--                              <cus-button2>行驶证-反面</cus-button2>-->
+                        <!--                              <cus-button2>环保清单</cus-button2>-->
+                      </butgroup2>
+                      <ModuleContent padding="20px 27px" class="desc">
+                        <cus-desc :data="selectedRecord" :columns="descColumns"></cus-desc>
+                      </ModuleContent>
+                    </flex-col>
 
-        <img src=""/>
+                  </ModuleContent>
+                </flex-col>
 
-        <div class="group-button">
-          <div :class="['_button',activeButton == 1?'active_button':'']" @click="viewImgByType(1)">出入场抓拍图</div>
-          <div :class="['_button',activeButton == 2?'active_button':'']" @click="viewImgByType(2)">行驶证-正面</div>
-          <div :class="['_button',activeButton == 3?'active_button':'']" @click="viewImgByType(3)">行驶证-反面</div>
-          <div :class="['_button',activeButton == 4?'active_button':'']" @click="viewImgByType(4)">环保清单</div>
-        </div>
-
-        <div class="details-info">
-          <div class="details-info-item">
-            <div class="_title">排放标准：</div>
-            <div class="_title">国0</div>
-          </div>
-          <div class="details-info-item">
-            <div class="_title">VIN：</div>
-            <div class="_title">国0</div>
-          </div>
-          <div class="details-info-item">
-            <div class="_title">发动机号：</div>
-            <div class="_title">国0</div>
-          </div>
-          <div class="details-info-item">
-            <div class="_title">注册日期：</div>
-            <div class="_title">国0</div>
-          </div>
-        </div>
-
-        <div class="footer-button">
-          <Button type="primary" @click="closeDetails">关闭详情</Button>
-        </div>
-      </div>
-    </div>
-  </div>
+              </a-col>
+            </a-row>
+          </ModuleContent2>
+        </flex-col>
+      </ModuleContent>
+    </flex-col>
+  </new-bg>
 </template>
 <script>
 import Curd from "../../components/smallCommon/Curd.vue";
 import moment from 'moment'
+import SystemTitle from "../../components/smallCommon/SystemTitle.vue";
+import NewBg from "../../components/NewBg.vue";
+import FlexCol from "../../components/FlexCol.vue";
+import ModuleContent from "../../components/ModuleContent.vue";
+import ModuleContent2 from "../../components/smallCommon/ModuleContent2.vue";
+import CustomTable from "../../components/smallCommon/CustomTable.vue";
+import Split from "../../components/Split.vue";
+import Web3Title from "../../components/smallCommon/Web3Title.vue";
+import CusDesc from "../../components/smallCommon/CusDesc.vue";
+import CusButton2 from "../../components/smallCommon/CusButton2.vue";
+import Butgroup2 from "../../components/smallCommon/butgroup2.vue";
+import CusButton from "../../components/smallCommon/CusButton4.vue";
 
 export default {
   name: "user",
-  layout: "user",
   components: {
+    CusButton,
+    Butgroup2, CusButton2, CusDesc,
+    Web3Title,
+    Split,
+    CustomTable,
+    ModuleContent2,
+    ModuleContent, FlexCol, NewBg, SystemTitle,
     Curd
   },
   data() {
     return {
       isEdit: false,
       roles: [],
+      descColumns: [
+        {
+          title: '车牌号',
+          dataIndex: 'carNumber',
+          width: '100%'
+        }, {
+          title: '车牌颜色',
+          dataIndex: 'carColorString',
+          width: '100%'
+        }, {
+          title: '车辆类型',
+          dataIndex: 'carType',
+          width: '100%'
+        }, {
+          title: '车辆类型',
+          dataIndex: 'carType',
+          width: '100%'
+        }, {
+          title: '排放等级',
+          dataIndex: 'effluent',
+          width: '100%'
+        }, {
+          title: 'VIN',
+          dataIndex: 'vin',
+          width: '100%'
+        }, {
+          title: '发动机号',
+          dataIndex: 'entryExitPictureUrl',
+          width: '100%'
+        }, {
+          title: '注册日期',
+          dataIndex: 'registrationDate',
+          width: '100%'
+        }
+      ],
+      selectedRecord: {},
       columns: [
         {
           dataIndex: 'outTime',
@@ -127,14 +173,7 @@ export default {
           dataIndex: 'createDateTime',
           key: 'createDateTime',
           title: '出厂日期'
-        },
-        {
-          title: '操作',
-          key: 'operation',
-          scopedSlots: {customRender: 'details'},
-          fixed: 'right',
-          width: 100
-        },
+        }
       ],
       apiConf: {
         listApi: {api: '/api/Ledger/list', method: 'get'},
@@ -188,7 +227,7 @@ export default {
     },
 
     //方位改变
-    tabsChange(value){
+    tabsChange(value) {
       this.activeTabsButton = value
     }
 
@@ -196,12 +235,18 @@ export default {
 }
 </script>
 <style scoped lang="less">
+.car-preview {
+  width: 100%;
+  height: 260px;
+}
+
+.desc {
+  background: rgba(24, 131, 201, 0.2);
+  border: 1px solid rgba(15, 81, 122, 1);
+}
 
 .type-button {
-  margin: 20px 300px;
-  display: flex;
-  flex-flow: row;
-  justify-content: space-between;
+  max-width: 70%;
 
   .tabs-button {
     height: 40px;
diff --git a/pages/cleanTravel/home.vue b/pages/cleanTravel/home.vue
index bcf2175..a60e5fc 100644
--- a/pages/cleanTravel/home.vue
+++ b/pages/cleanTravel/home.vue
@@ -2,10 +2,9 @@
 <template>
   <new-bg>
     <flex-col>
-      <system-title  />
+      <system-title custom-title="清洁运输" show-back  />
       <ModuleContent padding="20px">
         <flex-col>
-          <web2-title>清洁运输</web2-title>
           <ModuleContent padding="0 20px 20px">
             <BFC>
               <div class="sou-suo-kuang" slot="right">
@@ -95,10 +94,9 @@
             <cus-button>
               <nuxt-link to="/cleanTravel/trend">清洁运输趋势</nuxt-link>
               </cus-button>
-<!--            <cus-button>
+            <cus-button>
               <nuxt-link to="/cleanTravel/bangcheng">磅秤台账</nuxt-link>
-              </cus-button>
-            <cus-button>门禁监控</cus-button>-->
+            </cus-button>
           </butgroup>
         </flex-col>
       </ModuleContent>
@@ -271,7 +269,7 @@ export default {
     this.getDataSource()
     this.$nextTick(() => {
       const win = window.top
-      this.$http.get('http://101.43.201.20:5000/api/Home/view').then(({data}) => {
+      this.$get('http://101.43.201.20:5000/api/Home/view').then(({data}) => {
         win.document.title = data.home.title
         this.setTitle(data.home.title)
         this.setInfo(data)
diff --git a/pages/cleanTravel/ledger.vue b/pages/cleanTravel/ledger.vue
index 31232ea..2d55630 100644
--- a/pages/cleanTravel/ledger.vue
+++ b/pages/cleanTravel/ledger.vue
@@ -1,38 +1,35 @@
 
 
 <template>
-  <div>
-    <a-page-header
-      :ghost="false"
-      style="border-bottom: 1px solid rgb(235, 237, 240)"
-      title="厂区车辆台账"
-      @back="() => $router.go(-1)"
-    />
-    <a-row :gutter="16">
-      <a-col :span="6">
-        <a-card title="运输车辆" size="small">
-          <p>{{ headCount.t1 || 0 }}</p>
-        </a-card>
-      </a-col>
-      <a-col :span="6">
-        <a-card title="国Ⅵ输车辆" size="small">
-          <p>{{ headCount.t2 || 0 }}</p>
-        </a-card>
-      </a-col>
-      <a-col :span="6">
-        <a-card title="非道路工程机械" size="small">
-          <p>{{ headCount.t3 || 0 }}</p>
-        </a-card>
-      </a-col>
-      <a-col :span="6">
-        <a-card title="燃油运输车辆"  size="small">
-          <p>{{ headCount.t4 || 0 }}</p>
-        </a-card>
-      </a-col>
-    </a-row>
+  <new-bg>
+    <flex-col>
+      <system-title show-back custom-title="厂区车辆台账" />
+      <ModuleContent padding="0px 20px 20px">
+
+        <div style="height: 144px;width: 100%;">
+          <ModuleContent2 bg bg-str :border="false">
+            <butgroup2 style="height: 100%;">
+              <ModuleContent2 bg bg-color border>
+                <miaoshu title="运输车辆" :value="headCount.t1" color="rgba(42, 207, 255, 1)"></miaoshu>
+              </ModuleContent2>
+
+              <ModuleContent2 bg bg-color border style="margin-left: 16px;">
+                <miaoshu title="国Ⅵ输车辆" :value="headCount.t2" color="rgba(255, 171, 87, 1)"></miaoshu>
+              </ModuleContent2>
+
+              <ModuleContent2 bg bg-color border style="margin-left: 16px;">
+                <miaoshu title="非道路工程机械" :value="headCount.t3" color="rgba(122, 175, 255, 1)"></miaoshu>
+              </ModuleContent2>
+
+              <ModuleContent2 bg bg-color border style="margin-left: 16px;">
+                <miaoshu title="燃油运输车辆" :value="headCount.t4" color="rgba(76, 243, 129, 1)"></miaoshu>
+              </ModuleContent2>
+            </butgroup2>
+          </ModuleContent2>
+        </div>
 
     <a-divider />
-    <Curd
+    <CustomTable
       hide-search
       hide-action
       :columns="columns"
@@ -42,17 +39,34 @@
     >
       <template slot="search-button" slot-scope="{ search }">
         <a-button type="primary" @click="exportList(search)">导出历史数据</a-button>
+        <Split height="10"></Split>
       </template>
-    </Curd>
-  </div>
+    </CustomTable>
+      </ModuleContent>
+    </flex-col>
+  </new-bg>
+
 </template>
 <script>
 import Curd from "../../components/smallCommon/Curd.vue";
 import moment from 'moment'
+import SystemTitle from "../../components/smallCommon/SystemTitle.vue";
+import NewBg from "../../components/NewBg.vue";
+import FlexCol from "../../components/FlexCol.vue";
+import ModuleContent from "../../components/ModuleContent.vue";
+import CustomTable from "../../components/smallCommon/CustomTable.vue";
+import Miaoshu from "../../components/smallCommon/miaoshu.vue";
+import ModuleContent2 from "../../components/smallCommon/ModuleContent2.vue";
+import Butgroup2 from "../../components/smallCommon/butgroup2.vue";
+import Split from "../../components/smallCommon/Split.vue";
 export default {
   name: "user",
-  layout: "user",
   components: {
+    Split,
+    Butgroup2, ModuleContent2, Miaoshu,
+    CustomTable,
+    ModuleContent,
+    FlexCol, NewBg, SystemTitle,
     Curd
   },
   data () {
@@ -162,7 +176,7 @@ export default {
     }
   },
   created() {
-    this.$http.get('/api/Ledger/HeaderCount').then(({data}) => {
+    this.$get('/api/Ledger/HeaderCount').then(({data}) => {
       this.headCount = data || {}
     })
 
diff --git a/pages/cleanTravel/trend.vue b/pages/cleanTravel/trend.vue
index 86cbde8..683b357 100644
--- a/pages/cleanTravel/trend.vue
+++ b/pages/cleanTravel/trend.vue
@@ -1,49 +1,52 @@
 
 
 <template>
-  <div>
-    <a-page-header
-      :ghost="false"
-      title="清洁运输+趋势"
-      @back="() => $router.go(-1)"
-    />
-    <a-divider style="margin-top: 0;" />
+  <new-bg>
+    <flex-col>
+      <system-title show-back custom-title="清洁运输+趋势" />
+      <ModuleContent padding="0px 20px 20px">
     <a-row :gutter="16">
-      <a-col :span="12">
-        <a-card>
-          <div slot="title">
-            运输总量: {{ yunshuzongliang }}
-          </div>
-
-          <Curd
-            hide-action
-            hide-search
-            hide-button
-            :columns="columns"
-            :api-conf="apiConf"
-            :form-items="formItems"
-          >
-          </Curd>
-        </a-card>
+      <a-col :span="6">
 
       </a-col>
-      <a-col :span="12">
-        <a-card title="国Ⅵ输车辆" size="small">
-          <p>card content</p>
-        </a-card>
+      <a-col :span="18">
+        <CustomTable
+          hide-action
+          hide-search
+          hide-button
+          :columns="columns"
+          :api-conf="apiConf"
+          :form-items="formItems"
+        >
+          <template slot="search-button" slot-scope="{ search }">
+            <a-button type="primary" @click="exportList(search)">查询</a-button>
+            <a-button type="primary" @click="exportList(search)" style="margin-left: 10px;">导出</a-button>
+            <Split height="10"></Split>
+          </template>
+        </CustomTable>
       </a-col>
     </a-row>
 
+      </ModuleContent>
+    </flex-col>
+  </new-bg>
 
-  </div>
 </template>
 <script>
 import Curd from "../../components/smallCommon/Curd.vue";
 import moment from 'moment'
+import SystemTitle from "../../components/smallCommon/SystemTitle.vue";
+import NewBg from "../../components/NewBg.vue";
+import FlexCol from "../../components/FlexCol.vue";
+import ModuleContent from "../../components/ModuleContent.vue";
+import CustomTable from "../../components/smallCommon/CustomTable.vue";
+import Split from "../../components/smallCommon/Split.vue";
 export default {
   name: "user",
-  layout: "user",
   components: {
+    Split,
+    CustomTable,
+    ModuleContent, FlexCol, NewBg, SystemTitle,
     Curd
   },
   data () {
@@ -96,6 +99,18 @@ export default {
   computed: {
     formItems () {
       return [
+        {
+          type: 'dateRange',
+          key: 'time',
+          label: '日期',
+          isSearch: true,
+          hide: true,
+          placeholder: ['请选择开始日期', '请选择结束日期'],
+          rules: [
+            { required: true, message: '请选择时间范围' }
+          ],
+          fields: ['startTime', 'endTime']
+        },
       ]
     }
   },
diff --git a/pages/video/list.vue b/pages/video/list.vue
index e5a049a..0c22147 100644
--- a/pages/video/list.vue
+++ b/pages/video/list.vue
@@ -1,11 +1,23 @@
 <script>
+import SystemTitle from "../../components/smallCommon/SystemTitle.vue";
+import NewBg from "../../components/NewBg.vue";
+import FlexCol from "../../components/FlexCol.vue";
+import ModuleContent from "../../components/ModuleContent.vue";
+
 export default {
-  name: "list"
+  name: "list",
+  components: {ModuleContent, FlexCol, NewBg, SystemTitle}
 }
 </script>
 
 <template>
-  <div class="list"></div>
+  <new-bg>
+    <flex-col>
+      <system-title show-back custom-title="视频广场" />
+      <ModuleContent padding="0px 20px 20px">
+      </ModuleContent>
+    </flex-col>
+  </new-bg>
 </template>
 
 <style scoped lang="less">
diff --git a/pages/wuzuzhi/huanjingzhili.vue b/pages/wuzuzhi/huanjingzhili.vue
index be40c69..0e1efab 100644
--- a/pages/wuzuzhi/huanjingzhili.vue
+++ b/pages/wuzuzhi/huanjingzhili.vue
@@ -5,11 +5,10 @@
       <Map type="middle" @pointClick="pointClick" />
     </div>
     <flex-col class="main">
-      <system-title/>
+      <system-title show-back custom-title="环境治理"/>
       <ModuleContent none-event padding="0 20px 20px">
         <BFC>
           <flex-col slot="left" width="412">
-            <web2-title>环境治理</web2-title>
             <ModuleContent padding="20px 0" height="218">
               <div class="video"></div>
             </ModuleContent>
@@ -177,7 +176,7 @@ export default {
   mounted() {
     this.$nextTick(() => {
       const win = window.top
-      this.$http.get('http://101.43.201.20:5000/api/Home/view').then(({data}) => {
+      this.$get('http://101.43.201.20:5000/api/Home/view').then(({data}) => {
         win.document.title = data.home.title
         this.setTitle(data.home.title)
         this.setInfo(data)
diff --git a/pages/wuzuzhi/huanweixunhang.vue b/pages/wuzuzhi/huanweixunhang.vue
index 0b35553..96aa6dc 100644
--- a/pages/wuzuzhi/huanweixunhang.vue
+++ b/pages/wuzuzhi/huanweixunhang.vue
@@ -1,38 +1,36 @@
-<template>
-  <div class="huanweixunhang">
-    <a-page-header
-      :ghost="false"
-      style="border-bottom: 1px solid rgb(235, 237, 240)"
-      title="环卫巡航"
-      @back="() => $router.go(-1)"
-    />
+<template><new-bg>
+  <flex-col>
+    <system-title  show-back custom-title="环卫巡航" />
+    <ModuleContent padding="0px 20px 20px">
     <div class="_map">
       <Map></Map>
     </div>
-  </div>
+    </ModuleContent>
+  </flex-col>
+</new-bg>
 </template>
 
 <script>
 import Map from "../../components/Map.vue";
+import SystemTitle from "../../components/smallCommon/SystemTitle.vue";
+import NewBg from "../../components/NewBg.vue";
+import FlexCol from "../../components/FlexCol.vue";
+import ModuleContent from "../../components/ModuleContent.vue";
 
 export default {
   name: "huanweixunhang",
   components: {
+    ModuleContent,
+    FlexCol, NewBg, SystemTitle,
     Map
   }
 }
 </script>
 
 <style scoped lang="less">
-.huanweixunhang {
-  height: 100vh;
-  display: flex;
-  flex-flow: column;
-
-  ._map {
-    height: 0;
-    flex: 1;
-    position: relative;
-  }
+._map {
+  width: 100%;
+  height: 100%;
+  position: relative;
 }
 </style>
diff --git a/pages/wuzuzhi/paifang.vue b/pages/wuzuzhi/paifang.vue
index 7e1923d..761bc8c 100644
--- a/pages/wuzuzhi/paifang.vue
+++ b/pages/wuzuzhi/paifang.vue
@@ -1,34 +1,90 @@
-
 <template>
-  <div class="paifang">
-    <a-page-header
-      :ghost="false"
-      style="border-bottom: 1px solid rgb(235, 237, 240)"
-      title="无组织排放"
-      @back="() => $router.go(-1)"
-    />
+  <new-bg>
+    <flex-col>
+      <system-title show-back custom-title="无组织排放" :btns="btns"/>
+      <ModuleContent padding="0px 20px 20px">
 
+        <a-row :gutter="16" style="height: 100%;margin-top: 16px;">
+          <a-col :span="4" style="height: 100%;">
+            <div class="con" style="height: 100%;display: flex;flex-direction: column; width: 100%;">
 
-    <a-row :gutter="16">
-      <a-col :span="18">
-        <Map></Map>
-      </a-col>
-      <a-col :span="6">
-        <a-card title="国Ⅵ输车辆" size="small">
-          <p>card content</p>
-        </a-card>
-      </a-col>
-    </a-row>
+              <web3-title>设备数量统计</web3-title>
+              <Split height="10"></Split>
+              <ModuleContent2  height="30%">
+                <cus-desc :data="tongji" :columns="descColumns"></cus-desc>
+              </ModuleContent2>
+              <web3-title>报警类型数据分析</web3-title>
+              <Split height="10"></Split>
+              <ModuleContent2 >
+              </ModuleContent2>
+            </div>
 
-  </div>
+          </a-col>
+          <a-col :span="16" style="height: 100%;">
+            <div style="height: 100%;position: relative">
+            <div class="map-cv" style="height: calc(100% - 80px);position: relative">
+              <Map></Map>
+            </div>
+            <butgroup>
+              <cus-button>
+                <nuxt-link to="/wuzuzhi/xichejiguanli">洗车机管理</nuxt-link>
+              </cus-button>
+              <cus-button>
+                <nuxt-link to="/wuzuzhi/huanjingzhili">环境治理</nuxt-link>
+              </cus-button>
+              <cus-button>
+                <nuxt-link to="/wuzuzhi/huanweixunhang">环卫巡航</nuxt-link>
+              </cus-button>
+            </butgroup>
+            </div>
+          </a-col>
+          <a-col :span="4">
+            <a-card title="国Ⅵ输车辆" size="small">
+              <p>card content</p>
+            </a-card>
+          </a-col>
+        </a-row>
+      </ModuleContent>
+      >
+    </flex-col>
+  </new-bg>
 </template>
 
 <script>
 import Map from "../../components/Map.vue";
+import SystemTitle from "../../components/smallCommon/SystemTitle.vue";
+import NewBg from "../../components/NewBg.vue";
+import FlexCol from "../../components/FlexCol.vue";
+import ModuleContent from "../../components/ModuleContent.vue";
+import Butgroup from "../../components/smallCommon/butgroup.vue";
+import CusButton from "../../components/smallCommon/CusButton.vue";
+import Web3Title from "../../components/smallCommon/Web3Title.vue";
+import ModuleContent2 from "../../components/smallCommon/ModuleContent2.vue";
+import Split from "../../components/smallCommon/Split.vue";
+import CusDesc from "../../components/smallCommon/CusDesc.vue";
+
 export default {
   name: "paifang",
   components: {
+    CusDesc,
+    Split,
+    ModuleContent2,
+    Web3Title,
+    CusButton, Butgroup,
+    ModuleContent,
+    FlexCol, NewBg, SystemTitle,
     Map
+  },
+  data () {
+    return {
+      tongji: {},
+      descColumns: [
+        { title: '设备数量', key: 'total' },
+        { title: '运行设备数量', key: 'total' },
+        { title: '设备异常数量', key: 'total' },
+        { title: '关闭设备数量', key: 'total' },
+      ]
+    }
   }
 }
 </script>
diff --git a/pages/wuzuzhi/xichejiguanli.vue b/pages/wuzuzhi/xichejiguanli.vue
index a441bb9..259c4ba 100644
--- a/pages/wuzuzhi/xichejiguanli.vue
+++ b/pages/wuzuzhi/xichejiguanli.vue
@@ -1,105 +1,93 @@
 <template>
-  <div class="xichejiguanli">
-    <a-page-header
-      :ghost="false"
-      style="border-bottom: 1px solid rgb(235, 237, 240)"
-      title="洗车机管理"
-      @back="() => $router.go(-1)"
-    />
-    <div class="_body">
-      <div class="left-list">
+  <new-bg>
+    <flex-col>
+      <system-title show-back custom-title="洗车机管理" />
+      <ModuleContent padding="0px 20px 20px">
+        <a-row :gutter="16" style="height: 100%;">
+          <a-col :span="4" style="height: 100%;">
+            <FlexCol>
+              <web3-title>洗车机列表</web3-title>
+              <Split height="10"></Split>
+              <ModuleContent2 >
+                <div :class="['car-washing-machine-tabs',activeCarTabs ==1?'active-car-washing-machine-tabs':'']"
+                     @click="carChange(1)">
+                  <div class="rank-num">1</div>
+                  <div class="car-washing-machine-name">西门洗车</div>
+                  <div class="state-icon">
+                    正常
 
-        <div :class="['car-washing-machine-tabs',activeCarTabs ==1?'active-car-washing-machine-tabs':'']"
-             @click="carChange(1)">
-          <div class="rank-num">1</div>
-          <div class="car-washing-machine-name">西门洗车</div>
-          <div class="state-icon">
-            正常
- 
-          </div>
-        </div>
+                  </div>
+                </div>
+              </ModuleContent2>
+            </FlexCol>
 
-        <div :class="['car-washing-machine-tabs',activeCarTabs ==2?'active-car-washing-machine-tabs':'']"
-             @click="carChange(2)">
-          <div class="rank-num">1</div>
-          <div class="car-washing-machine-name">西门洗车</div>
-          <div class="state-icon">
-            正常
-          </div>
-        </div>
+          </a-col>
+          <a-col :span="15" style="height: 100%;">
+            <FlexCol>
 
-        <div :class="['car-washing-machine-tabs',activeCarTabs ==3?'active-car-washing-machine-tabs':'']"
-             @click="carChange(3)">
-          <div class="rank-num">1</div>
-          <div class="car-washing-machine-name">西门洗车</div>
-          <div class="state-icon">
-            正常
-          </div>
-        </div>
-      </div>
+              <div class="map-content">
+                <Map></Map>
+              </div>
+              <Split height="10"></Split>
+              <ModuleContent2 >
+                <CustomTable
+                  hide-action
+                  hide-search
+                  hide-button
+                  :columns="columns"
+                  :api-conf="apiConf"
+                  :form-items="formItems"
+                  @edit="editHandler"
+                >
+                  <template slot="search-button" slot-scope="{ search }">
+                    <a-button type="primary" @click="exportList(search)">导出历史数据</a-button>
+                    <Split height="10"></Split>
+                  </template>
+                </CustomTable>
+              </ModuleContent2>
+            </FlexCol>
+          </a-col>
+          <a-col :span="5" style="height: 100%;">
+            <FlexCol>
+              <web3-title>洗车机视频</web3-title>
+              <Split height="10"></Split>
+              <ModuleContent2 height="300px">
 
-      <div class="center-content">
-        <div class="map-content">
-          <Map></Map>
-        </div>
-        <div class="table-content">
-          <Curd
-            hide-action
-            hide-search
-            hide-button
-            :columns="columns"
-            :api-conf="apiConf"
-            :form-items="formItems"
-            @edit="editHandler"
-          >
-            <template slot="search-button" slot-scope="{ search }">
-              <a-button type="primary" @click="exportList(search)">导出历史数据</a-button>
-            </template>
-          </Curd>
-        </div>
-      </div>
+              </ModuleContent2>
+              <web3-title>洗车机运行信息</web3-title>
+              <Split height="10"></Split>
+              <ModuleContent2>
 
-      <div class="right-content">
-        <div class="_title">洗车机视频</div>
-        <div class="car-wash-video">
-        </div>
-
-        <div class="_title">洗车机运行信息</div>
-        <div class="car-run-info">
-          <div class="_title" style="text-align: center;">xxx洗车机</div>
-
-          <div class="details-info">
-            <div class="details-info-item">
-              <div class="_title">运行状态：</div>
-              <div class="_title">正常</div>
-            </div>
-            <div class="details-info-item">
-              <div class="_title">冲洗压力：</div>
-              <div class="_title">500KPA</div>
-            </div>
-            <div class="details-info-item">
-              <div class="_title">冲洗电流：</div>
-              <div class="_title">50A</div>
-            </div>
-            <div class="details-info-item">
-              <div class="_title">冲洗电压：</div>
-              <div class="_title">500KV</div>
-            </div>
-          </div>
-
-        </div>
-      </div>
-    </div>
-  </div>
+              </ModuleContent2>
+            </FlexCol>
+          </a-col>
+        </a-row>
+      </ModuleContent>
+    </flex-col>
+  </new-bg>
 </template>
 <script>
 import Map from "../../components/Map.vue";
 import Curd from "../../components/smallCommon/Curd.vue";
 import moment from "moment/moment";
+import SystemTitle from "../../components/smallCommon/SystemTitle.vue";
+import NewBg from "../../components/NewBg.vue";
+import FlexCol from "../../components/FlexCol.vue";
+import ModuleContent from "../../components/ModuleContent.vue";
+import Web3Title from "../../components/smallCommon/Web3Title.vue";
+import Split from "../../components/smallCommon/Split.vue";
+import ModuleContent2 from "../../components/smallCommon/ModuleContent2.vue";
+import CustomTable from "../../components/smallCommon/CustomTable.vue";
 
 export default {
   name: "xichejiguanli",
   components: {
+    CustomTable,
+    ModuleContent2,
+    Split,
+    Web3Title,
+    ModuleContent,
+    FlexCol, NewBg, SystemTitle,
     Map,
     Curd
   },
@@ -166,6 +154,18 @@ export default {
 }
 </script>
 <style scoped lang="less">
+.map-content {
+  height: 400px;
+  width: 100%;
+  position: relative;
+}
+
+.table-content {
+  flex: 1;
+  padding-top: 10px;
+}
+
+
 .xichejiguanli {
   height: 100vh;
   display: flex;
@@ -215,25 +215,7 @@ export default {
       }
     }
 
-    .center-content {
-      flex: 1;
-      margin: 0 10px;
-      border: 1px solid #e8e8e8;
-      border-radius: 10px;
-      display: flex;
-      flex-flow: column;
 
-      .map-content {
-        height: 400px;
-        width: 100%;
-        position: relative;
-      }
-
-      .table-content {
-        flex: 1;
-        padding-top: 10px;
-      }
-    }
 
     .right-content {
       width: 300px;
diff --git a/pages/youzuzhi/paifang.vue b/pages/youzuzhi/paifang.vue
index 5197f0c..86931fc 100644
--- a/pages/youzuzhi/paifang.vue
+++ b/pages/youzuzhi/paifang.vue
@@ -45,10 +45,6 @@
                   <cus-button>
                     <nuxt-link to="/youzuzhi/paifangtongji">环保排放统计</nuxt-link>
                   </cus-button>
-                  <!--            <cus-button>
-                                <nuxt-link to="/cleanTravel/bangcheng">磅秤台账</nuxt-link>
-                                </cus-button>
-                              <cus-button>门禁监控</cus-button>-->
                 </butgroup>
               </div>
             </a-col>
@@ -109,11 +105,11 @@ export default {
     this.getData(1)
   },
   methods: {
-    changeTab (tab) {
-      this.getData(tab)
+    changeTab ({ key }) {
+      this.getData(key)
     },
     getData (deviceType) {
-      this.$http.get('/api/Organized/listanddevice', {
+      this.$get('/api/Organized/listanddevice', {
         organizedType: 1,
         deviceType: deviceType
       }).then(({data}) => {

From 7da697bdc297fde83c5f2d4f06f6861f72709f5d Mon Sep 17 00:00:00 2001
From: "DESKTOP-VMMLSOQ\\wangzg" <1161909281@qq.com>
Date: Wed, 7 Aug 2024 23:44:13 +0800
Subject: [PATCH 7/9] 111

---
 README.md                                 | 28 +++++++++++------------
 components/BFC.vue                        |  7 +-----
 components/FlexCenter.vue                 |  7 +-----
 components/FlexCol.vue                    |  7 +-----
 components/FlexRow.vue                    |  7 +-----
 components/ModuleContent.vue              |  7 +-----
 components/NewBg.vue                      |  7 +-----
 components/TabItem.vue                    |  7 +-----
 components/smallCommon/ModuleContent2.vue |  7 +-----
 pages/autoPeakCoalMonitoring.vue          |  7 +-----
 pages/cleanTravel/bangcheng.vue           |  1 -
 pages/index.vue                           |  7 +-----
 utils/animate.js                          |  7 +-----
 13 files changed, 25 insertions(+), 81 deletions(-)

diff --git a/README.md b/README.md
index c6ee696..32ba2d2 100644
--- a/README.md
+++ b/README.md
@@ -41,15 +41,15 @@ https://1x.antdv.com/components/icon/
 
 ## 路由说明
 
-登录页 /login
+登录页 /login 对接完成
 
 ### 管理页
 
-用户管理 /manager/user
-角色管理 /manager/role
-菜单管理 /manager/menu
-设备管理 /manager/device
-工序管理 /manager/organized
+用户管理 /manager/user 对接完成
+角色管理 /manager/role 对接完成
+菜单管理 /manager/menu 对接完成
+设备管理 /manager/device 对接完成
+工序管理 /manager/organized 对接完成
 
 ### 用户端
 
@@ -57,22 +57,22 @@ https://1x.antdv.com/components/icon/
 
 #### 有组织
  
-有组织排放 /youzuzhi/paifang 待联调
-有组织排放统计 /youzuzhi/paifangtongji 待联调
+有组织排放 /youzuzhi/paifang  缺少排放源清单接口
+有组织排放统计 /youzuzhi/paifangtongji 待联调 接口暂无
 
 #### 无组织
 
-无组织排放 /wuzuzhi/paifang 待联调
-洗车机管理 /wuzuzhi/xichejiguanli （已做）待联调
-环境治理 /wuzuzhi/huanjingzhili 待联调
-环卫巡航 /wuzuzhi/huanweixunhang （已做）待联调
+无组织排放 /wuzuzhi/paifang 待联调 接口暂无
+洗车机管理 /wuzuzhi/xichejiguanli 待联调  缺少导出接口  监控信息  运行信息
+环境治理 /wuzuzhi/huanjingzhili 待联调  缺少 实时数据的接口
+环卫巡航 /wuzuzhi/huanweixunhang 待联调
 
 #### 清洁运输
 
 清洁运输 /cleanTravel/home 联调完成
 厂区车辆台账 /cleanTravel/ledger 联调完成
-清洁运输趋势 /cleanTravel/trend 
-磅秤台账 /cleanTravel/bangcheng （已做）待联调
+清洁运输趋势 /cleanTravel/trend 待联调  /api/Transport/gettransport
+磅秤台账 /cleanTravel/bangcheng 待联调 不要了
 
 #### 视频广场
 
diff --git a/components/BFC.vue b/components/BFC.vue
index 94f8523..83bdee1 100644
--- a/components/BFC.vue
+++ b/components/BFC.vue
@@ -1,9 +1,4 @@
-<!--
-* @Description: Description
-* @ComponentName: BFC
-* @Author: wangzhigang11
-* @Date: 2023-05-10 18:59
--->
+
 <template>
   <div class="BFC">
     <div v-if="showLeft" class="left" :style="curStyle">
diff --git a/components/FlexCenter.vue b/components/FlexCenter.vue
index 833bdc1..0fea8fc 100644
--- a/components/FlexCenter.vue
+++ b/components/FlexCenter.vue
@@ -1,9 +1,4 @@
-<!--
-* @Description: Description
-* @ComponentName: FlexCol
-* @Author: wangzhigang11
-* @Date: 2023-05-10 13:42
--->
+
 <template>
   <div class="FlexCenter" :style="{height: cHeight}">
     <slot></slot>
diff --git a/components/FlexCol.vue b/components/FlexCol.vue
index c22aeaf..7486659 100644
--- a/components/FlexCol.vue
+++ b/components/FlexCol.vue
@@ -1,9 +1,4 @@
-<!--
-* @Description: Description
-* @ComponentName: FlexCol
-* @Author: wangzhigang11
-* @Date: 2023-05-10 13:42
--->
+
 <template>
   <div class="FlexCol" :style="curStyle">
     <slot></slot>
diff --git a/components/FlexRow.vue b/components/FlexRow.vue
index 10c0476..7e24b0f 100644
--- a/components/FlexRow.vue
+++ b/components/FlexRow.vue
@@ -1,9 +1,4 @@
-<!--
-* @Description: Description
-* @ComponentName: FlexCol
-* @Author: wangzhigang11
-* @Date: 2023-05-10 13:42
--->
+
 <template>
   <div class="FlexRow" :style="{height: cHeight}">
     <slot></slot>
diff --git a/components/ModuleContent.vue b/components/ModuleContent.vue
index dc7f827..e76b587 100644
--- a/components/ModuleContent.vue
+++ b/components/ModuleContent.vue
@@ -1,9 +1,4 @@
-<!--
-* @Description: 内容
-* @ComponentName: ModuleContent
-* @Author: wangzhigang11
-* @Date: 2023-05-06 18:30
--->
+
 <template>
   <div class="Content " :style="curStyle">
     <div class="content-box" :style="{padding}" :class="{ noneEvent }">
diff --git a/components/NewBg.vue b/components/NewBg.vue
index 785e04e..0c15def 100644
--- a/components/NewBg.vue
+++ b/components/NewBg.vue
@@ -1,9 +1,4 @@
-<!--
-* @Description: 内容
-* @ComponentName: ModuleContent
-* @Author: wangzhigang11
-* @Date: 2023-05-06 18:30
--->
+
 <template>
   <div class="bg">
     <slot></slot>
diff --git a/components/TabItem.vue b/components/TabItem.vue
index 05cd1b6..3ced960 100644
--- a/components/TabItem.vue
+++ b/components/TabItem.vue
@@ -1,9 +1,4 @@
-<!--
-* @description:
-* @component: TabItem
-* @author: wangzhigang11
-* @date: 2023/11/9 11:12
--->
+
 <template>
   <div class="TabItem" :class="{ selected }" v-on="$listeners" v-bind="$attrs">
     <slot></slot>
diff --git a/components/smallCommon/ModuleContent2.vue b/components/smallCommon/ModuleContent2.vue
index 5fd29f3..052e439 100644
--- a/components/smallCommon/ModuleContent2.vue
+++ b/components/smallCommon/ModuleContent2.vue
@@ -1,9 +1,4 @@
-<!--
-* @Description: 内容
-* @ComponentName: ModuleContent
-* @Author: wangzhigang11
-* @Date: 2023-05-06 18:30
--->
+
 <template>
   <div class="Content " :style="curStyle">
     <div class="content-header" :class="{ border }"></div>
diff --git a/pages/autoPeakCoalMonitoring.vue b/pages/autoPeakCoalMonitoring.vue
index d729439..53d7947 100644
--- a/pages/autoPeakCoalMonitoring.vue
+++ b/pages/autoPeakCoalMonitoring.vue
@@ -1,9 +1,4 @@
-<!--
-* @description:
-* @component: index
-* @author: wangzhigang11
-* @date: 2023/8/21 19:30
--->
+
 <template>
   <div class="index">
     <div :style="autoStyle" class="iframe-container">
diff --git a/pages/cleanTravel/bangcheng.vue b/pages/cleanTravel/bangcheng.vue
index b42b931..5ad8d19 100644
--- a/pages/cleanTravel/bangcheng.vue
+++ b/pages/cleanTravel/bangcheng.vue
@@ -26,7 +26,6 @@
           <ModuleContent2 bg padding="20px">
             <a-row :gutter="16">
               <a-col :span="18">
-
                 <CustomTable
                   hide-action
                   hide-search
diff --git a/pages/index.vue b/pages/index.vue
index b2f89ab..395f7b4 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,9 +1,4 @@
-<!--
-* @description:
-* @component: index
-* @author: wangzhigang11
-* @date: 2023/8/21 19:30
--->
+
 <template>
   <div class="index">
     <div :style="autoStyle" class="iframe-container">
diff --git a/utils/animate.js b/utils/animate.js
index 519201d..decb383 100644
--- a/utils/animate.js
+++ b/utils/animate.js
@@ -1,9 +1,4 @@
-/**
- * @Description: 工具类
- * @ComponentName: tools
- * @Author: wangzhigang11
- * @Date: 2022-08-08 14:30
- */
+
 // 开始动画
 export const raf =
   window.requestAnimationFrame ||

From 432199be726566d2daa6b6b417a6f5aaf83bb1e9 Mon Sep 17 00:00:00 2001
From: "DESKTOP-VMMLSOQ\\wangzg" <1161909281@qq.com>
Date: Mon, 19 Aug 2024 07:14:54 +0800
Subject: [PATCH 8/9] 111

---
 assets/styles/global.less              |  41 ++++++++
 components/Map.vue                     |  25 ++++-
 components/ModuleContent.vue           |   1 +
 components/smallCommon/CusButton5.vue  |  60 +++++++++++
 components/smallCommon/CusDesc2.vue    |  61 ++++++++++++
 components/smallCommon/Faguang.vue     |  24 +++++
 components/smallCommon/SystemTitle.vue |  15 ++-
 components/smallCommon/Web5Title.vue   |  45 +++++++++
 pages/cleanTravel/ledger.vue           |   7 +-
 pages/cleanTravel/trend.vue            |  77 ++++++++------
 pages/wuzuzhi/huanjingzhili.vue        |   2 +-
 pages/wuzuzhi/paifang.vue              |  81 +++++++++------
 pages/wuzuzhi/xichejiguanli.vue        | 117 ++++++++++++----------
 pages/youzuzhi/paifang.vue             | 133 +++++++++++++++----------
 pages/youzuzhi/paifangtongji.vue       |  42 ++++----
 15 files changed, 536 insertions(+), 195 deletions(-)
 create mode 100644 components/smallCommon/CusButton5.vue
 create mode 100644 components/smallCommon/CusDesc2.vue
 create mode 100644 components/smallCommon/Faguang.vue
 create mode 100644 components/smallCommon/Web5Title.vue

diff --git a/assets/styles/global.less b/assets/styles/global.less
index d5feb91..ff1a65b 100644
--- a/assets/styles/global.less
+++ b/assets/styles/global.less
@@ -42,3 +42,44 @@
     }
   }
 }
+
+
+.event-none {
+  pointer-events: none;
+}
+
+.event-auto {
+  pointer-events: auto;
+}
+
+.bottom-btn {
+  position: absolute;
+  .event-auto;
+  width: 100%;
+  bottom: 0;
+  left: 0;
+}
+
+
+.custom-tab {
+  .ant-tabs-ink-bar {
+    background: rgba(120, 240, 253, 1);
+  }
+  .ant-tabs-nav .ant-tabs-tab-active {
+    color: #fff;
+  }
+  .ant-tabs-bar  {
+    margin: 0;
+  }
+  .ant-tabs-nav  {
+    color: #fff;
+  }
+  .ant-tabs-nav-wrap {
+    background: linear-gradient(90deg, rgba(0, 107, 207, 0.4) 0%, rgba(0, 128, 247, 0.08) 100%) !important;
+
+  }
+
+  .ant-tabs-nav-scroll {
+    background: linear-gradient(90deg, rgba(0, 107, 207, 0.4) 0%, rgba(0, 128, 247, 0.08) 100%) !important;
+  }
+}
diff --git a/components/Map.vue b/components/Map.vue
index 65c0439..4150bd1 100644
--- a/components/Map.vue
+++ b/components/Map.vue
@@ -1,5 +1,8 @@
 <template>
-  <div class="map-container" ref="mapRef" id="mars3dContainer"></div>
+  <div class="map-wrapper">
+    <div class="bg event-none"></div>
+    <div class="map-container" ref="mapRef" id="mars3dContainer"></div>
+  </div>
 </template>
 
 <script>
@@ -18,7 +21,6 @@ const mapLayerTypeToPointIcon = {
 
 export default {
   async asyncData({ $axios }) {
-    console.log('axios:', 1)
     const { data } = await $axios.$get('http://101.43.201.20:5000/api/Home/view');
     return { pageTitle: data.home.title }; // 假设接口返回格式为 { data: '标题内容' }
   },
@@ -208,6 +210,23 @@ export default {
 </style>
 
 <style scoped lang="less">
+.map-wrapper {
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  transform: translateX(-50%);
+  left: 50%;
+  top: 0;
+  z-index: 1;
+  .bg {
+    background: radial-gradient(transparent, rgba(3, 5, 51, 0.19), rgba(3, 5, 51, 0.68), #020433);
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    left: 0;
+    top: 0;
+    z-index: 2;
+  }
   .map-container {
     width: 100%;
     height: 100%;
@@ -217,4 +236,6 @@ export default {
     top: 0;
     z-index: 1;
   }
+}
+
 </style>
diff --git a/components/ModuleContent.vue b/components/ModuleContent.vue
index e76b587..5b4b66c 100644
--- a/components/ModuleContent.vue
+++ b/components/ModuleContent.vue
@@ -79,6 +79,7 @@ import {getSize} from "@/utils/tools";
     overflow: hidden;
     position: relative;
     pointer-events: none;
+    z-index: 111;
     .content-border {
 
     }
diff --git a/components/smallCommon/CusButton5.vue b/components/smallCommon/CusButton5.vue
new file mode 100644
index 0000000..76369c0
--- /dev/null
+++ b/components/smallCommon/CusButton5.vue
@@ -0,0 +1,60 @@
+
+
+<template>
+  <div class="cusbutton" @click="$emit('click')" :class="{ flex, selected }">
+    <slot></slot>
+  </div>
+</template>
+<script>
+export default {
+  name: "CusButton5",
+  props: {
+    flex: {
+      type: Boolean,
+      default: false
+    },
+    selected: {
+      type: Boolean,
+      default: false
+    }
+  }
+}
+</script>
+<style scoped lang="less">
+  .cusbutton {
+    display: inline-block;
+    border-radius: 2.56px;
+    padding: 10px 13px;
+    /** 文本1 */
+    font-size: 16px;
+    font-weight: 400;
+    letter-spacing: 0px;
+    color: #fff;
+    text-align: center;
+    vertical-align: top;
+    cursor: pointer;
+
+
+
+
+    background: rgba(0, 128, 247, 0.2);
+
+
+
+    &.flex {
+      flex: 1;
+    }
+
+    &.selected {
+      background: rgba(0, 128, 247, 0.5);
+
+    }
+
+    &:hover {
+      background: rgba(0, 128, 247, 0.5);
+    }
+
+
+
+  }
+</style>
diff --git a/components/smallCommon/CusDesc2.vue b/components/smallCommon/CusDesc2.vue
new file mode 100644
index 0000000..ddc922e
--- /dev/null
+++ b/components/smallCommon/CusDesc2.vue
@@ -0,0 +1,61 @@
+
+<template>
+  <div class="cusdesc">
+    <div class="desc" v-for="(col, index) in columns" :key="index">
+      <div class="desc-title">{{ col.title }}</div>
+      <div class="desc-value">{{ data[col.key || col.dataIndex] || defaultValue }}</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "CusDesc2",
+  props: {
+    columns: {
+      type: Array,
+      default: () => []
+    },
+    data: {
+      type: Object,
+      default: () => ({})
+    },
+    defaultValue: {
+      type: String,
+      default: ''
+    }
+  }
+}
+</script>
+
+
+<style scoped lang="less">
+  .cusdesc {
+    width: 100%;
+    /** 文本1 */
+    font-size: 16px;
+    font-weight: 400;
+    letter-spacing: 0px;
+    line-height: 23.17px;
+    color: rgba(255, 255, 255, 1);
+    text-align: left;
+    vertical-align: top;
+    .desc {
+      width: 100%;
+      margin-top: 16px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height: 36px;
+      line-height: 36px;
+      background: rgba(1, 105, 216, 0.2);
+      border: 1px solid rgba(212, 230, 255, 0.1);
+      padding: 0 16px;
+      box-sizing: border-box;
+      &:first-child {
+        margin-top: 0;
+      }
+    }
+
+  }
+</style>
diff --git a/components/smallCommon/Faguang.vue b/components/smallCommon/Faguang.vue
new file mode 100644
index 0000000..600fa73
--- /dev/null
+++ b/components/smallCommon/Faguang.vue
@@ -0,0 +1,24 @@
+
+
+<template>
+  <div class="faguiang event-auto">
+    <slot></slot>
+  </div>
+</template>
+<script>
+export default {
+  name: "Faguang"
+}
+</script>
+<style scoped lang="less">
+  .faguiang {
+    padding: 28px 24px;
+    opacity: 1;
+    background: linear-gradient(180deg, rgba(0, 196, 255, 0) 0%, rgba(16, 134, 173, 0.2) 100%);
+
+    border: 1px solid rgba(224, 254, 255, 1);
+
+    box-shadow:inset 1px 1px 13px  rgba(0, 191, 255, 0.96), 0px 0px 17px  rgba(0, 170, 255, 0.69);
+    border-radius: 10px;
+  }
+</style>
diff --git a/components/smallCommon/SystemTitle.vue b/components/smallCommon/SystemTitle.vue
index 7f8abc3..48195f2 100644
--- a/components/smallCommon/SystemTitle.vue
+++ b/components/smallCommon/SystemTitle.vue
@@ -7,7 +7,9 @@
       <div class="tq">{{ tq }}</div>
       <p class="_title" v-if="customTitle">{{ customTitle }}</p>
       <p class="_title" v-else>{{ customTitle || title }}一体化平台</p>
-      <div class="back" v-if="showBack" @click="() => $router.go(-1)">返回</div>
+      <div class="back" v-if="showBack" @click="() => $router.go(-1)">
+        <a-icon type="arrow-left" />  返回</div>
+
       <div class="btn-box">
         <div class="btn" :key="btn.key" v-for="btn in btns" @click="$emit('click', btn)">
           {{ btn.title }}
@@ -105,10 +107,13 @@ export default {
         position: absolute;
         right: 10px;
         top: 40px;
-        border-radius: 10px;
-        padding: 5px 20px;
-        color: #fff;
-        background-color: #1890ff;
+        opacity: 1;
+        font-size: 20px;
+        font-weight: 400;
+        letter-spacing: 0px;
+        line-height: 28.96px;
+        color: rgba(35, 209, 232, 1);
+        vertical-align: top;
         cursor: pointer;
       }
       .time {
diff --git a/components/smallCommon/Web5Title.vue b/components/smallCommon/Web5Title.vue
new file mode 100644
index 0000000..90ba0a7
--- /dev/null
+++ b/components/smallCommon/Web5Title.vue
@@ -0,0 +1,45 @@
+
+
+<template>
+  <div class="web2tit">
+    <slot></slot>
+  </div>
+</template>
+<script>
+export default {
+  name: "Web5Title"
+}
+</script>
+<style scoped lang="less">
+ .web2tit {
+   width: 100%;
+   height: 48px;
+   line-height: 48px;
+   border-bottom: 1px solid rgba(255, 255, 255, 0.4);
+   /** 文本1 */
+   font-size: 14px;
+   font-weight: 500;
+   letter-spacing: 0px;
+   color: rgba(255, 255, 255, 1);
+   text-align: left;
+   vertical-align: top;
+   background-size: 10px 16px;
+   box-sizing: border-box;
+   padding-left: 20px;
+   position: relative;
+   &::after {
+     position: absolute;
+     left: 0;
+     top: 50%;
+     transform: translateY(-50%);
+     display: table;
+     content: ' ';
+     width: 10px;
+     height: 10px;
+     opacity: 1;
+     border: 2px solid rgba(255, 255, 255, 1);
+     border-radius: 50%;
+
+   }
+ }
+</style>
diff --git a/pages/cleanTravel/ledger.vue b/pages/cleanTravel/ledger.vue
index 2d55630..38fdd29 100644
--- a/pages/cleanTravel/ledger.vue
+++ b/pages/cleanTravel/ledger.vue
@@ -3,9 +3,10 @@
 <template>
   <new-bg>
     <flex-col>
-      <system-title show-back custom-title="厂区车辆台账" />
+      <system-title show-back/>
       <ModuleContent padding="0px 20px 20px">
-
+        <web2-title>厂区车辆台账</web2-title>
+        <Split :height="16"></Split>
         <div style="height: 144px;width: 100%;">
           <ModuleContent2 bg bg-str :border="false">
             <butgroup2 style="height: 100%;">
@@ -59,9 +60,11 @@ import Miaoshu from "../../components/smallCommon/miaoshu.vue";
 import ModuleContent2 from "../../components/smallCommon/ModuleContent2.vue";
 import Butgroup2 from "../../components/smallCommon/butgroup2.vue";
 import Split from "../../components/smallCommon/Split.vue";
+import Web2Title from "../../components/smallCommon/Web2Title.vue";
 export default {
   name: "user",
   components: {
+    Web2Title,
     Split,
     Butgroup2, ModuleContent2, Miaoshu,
     CustomTable,
diff --git a/pages/cleanTravel/trend.vue b/pages/cleanTravel/trend.vue
index 683b357..1604ee2 100644
--- a/pages/cleanTravel/trend.vue
+++ b/pages/cleanTravel/trend.vue
@@ -1,31 +1,34 @@
-
-
 <template>
   <new-bg>
     <flex-col>
-      <system-title show-back custom-title="清洁运输+趋势" />
+      <system-title show-back/>
       <ModuleContent padding="0px 20px 20px">
-    <a-row :gutter="16">
-      <a-col :span="6">
-
-      </a-col>
-      <a-col :span="18">
-        <CustomTable
-          hide-action
-          hide-search
-          hide-button
-          :columns="columns"
-          :api-conf="apiConf"
-          :form-items="formItems"
-        >
-          <template slot="search-button" slot-scope="{ search }">
-            <a-button type="primary" @click="exportList(search)">查询</a-button>
-            <a-button type="primary" @click="exportList(search)" style="margin-left: 10px;">导出</a-button>
-            <Split height="10"></Split>
-          </template>
-        </CustomTable>
-      </a-col>
-    </a-row>
+        <web2-title>清洁运输+趋势</web2-title>
+        <Split height="16"/>
+        <a-row :gutter="16">
+          <a-col :span="6">
+            <ModuleContent2 :border="false" padding="0">
+              <web3-title>运输车辆占比</web3-title>
+              <web3-title>运输量占比</web3-title>
+            </ModuleContent2>
+          </a-col>
+          <a-col :span="18">
+            <CustomTable
+              hide-action
+              hide-search
+              hide-button
+              :columns="columns"
+              :api-conf="apiConf"
+              :form-items="formItems"
+            >
+              <template slot="search-button" slot-scope="{ search }">
+                <a-button type="primary" @click="exportList(search)">查询</a-button>
+                <a-button type="primary" @click="exportList(search)" style="margin-left: 10px;">导出</a-button>
+                <Split height="10"></Split>
+              </template>
+            </CustomTable>
+          </a-col>
+        </a-row>
 
       </ModuleContent>
     </flex-col>
@@ -41,15 +44,23 @@ import FlexCol from "../../components/FlexCol.vue";
 import ModuleContent from "../../components/ModuleContent.vue";
 import CustomTable from "../../components/smallCommon/CustomTable.vue";
 import Split from "../../components/smallCommon/Split.vue";
+import Web2Title from "../../components/smallCommon/Web2Title.vue";
+import ModuleContent2 from "../../components/smallCommon/ModuleContent2.vue";
+import CustomDesc2 from "../../components/smallCommon/CusDesc2.vue";
+import Web3Title from "../../components/smallCommon/Web3Title.vue";
+
 export default {
   name: "user",
   components: {
+    Web3Title,
+    CustomDesc2, ModuleContent2,
+    Web2Title,
     Split,
     CustomTable,
     ModuleContent, FlexCol, NewBg, SystemTitle,
     Curd
   },
-  data () {
+  data() {
     return {
       yunshuzongliang: 0,
       isEdit: false,
@@ -74,7 +85,7 @@ export default {
           dataIndex: 'newCar',
           key: 'newCar',
           title: '新能源',
-          customRender (text) {
+          customRender(text) {
             if (text) return '是'
             return '否'
           }
@@ -91,13 +102,13 @@ export default {
         }
       ],
       apiConf: {
-        listApi: { api: '/api/Transport/list', method: 'get' },
+        listApi: {api: '/api/Transport/list', method: 'get'},
       }
     }
   },
 
   computed: {
-    formItems () {
+    formItems() {
       return [
         {
           type: 'dateRange',
@@ -107,7 +118,7 @@ export default {
           hide: true,
           placeholder: ['请选择开始日期', '请选择结束日期'],
           rules: [
-            { required: true, message: '请选择时间范围' }
+            {required: true, message: '请选择时间范围'}
           ],
           fields: ['startTime', 'endTime']
         },
@@ -119,16 +130,16 @@ export default {
   },
 
   methods: {
-    getyunshuzongliang () {
+    getyunshuzongliang() {
       /*this.$get('/api/Transport/count').then(({ data }) => {
         this.yunshuzongliang = data
       })*/
     },
-    editHandler (isEdit) {
+    editHandler(isEdit) {
       this.isEdit = isEdit
     },
-    exportList ({ time }) {
-      const [ start, end ] = time
+    exportList({time}) {
+      const [start, end] = time
       const fmt = 'YYYY-MM-DD'
       window.open(`http://101.43.201.20:5000/api/Ledger/export?start=${moment(start).format(fmt)}&end=${moment(end).format(fmt)}`, '_blank')
     }
diff --git a/pages/wuzuzhi/huanjingzhili.vue b/pages/wuzuzhi/huanjingzhili.vue
index 0e1efab..44a5ad1 100644
--- a/pages/wuzuzhi/huanjingzhili.vue
+++ b/pages/wuzuzhi/huanjingzhili.vue
@@ -6,7 +6,7 @@
     </div>
     <flex-col class="main">
       <system-title show-back custom-title="环境治理"/>
-      <ModuleContent none-event padding="0 20px 20px">
+      <ModuleContent none-event padding="0 50px 20px">
         <BFC>
           <flex-col slot="left" width="412">
             <ModuleContent padding="20px 0" height="218">
diff --git a/pages/wuzuzhi/paifang.vue b/pages/wuzuzhi/paifang.vue
index 761bc8c..e5c07fa 100644
--- a/pages/wuzuzhi/paifang.vue
+++ b/pages/wuzuzhi/paifang.vue
@@ -1,51 +1,64 @@
 <template>
   <new-bg>
     <flex-col>
-      <system-title show-back custom-title="无组织排放" :btns="btns"/>
-      <ModuleContent padding="0px 20px 20px">
-
-        <a-row :gutter="16" style="height: 100%;margin-top: 16px;">
-          <a-col :span="4" style="height: 100%;">
+      <system-title show-back/>
+      <Map></Map>
+      <ModuleContent padding="0px 50px 20px" class="event-none" none-event>
+        <web2-title>无组织排放</web2-title>
+        <a-row :gutter="16" style="height: calc(100% - 62px);margin-top: 16px;">
+          <a-col :span="5" style="height: 100%;">
             <div class="con" style="height: 100%;display: flex;flex-direction: column; width: 100%;">
-
               <web3-title>设备数量统计</web3-title>
               <Split height="10"></Split>
-              <ModuleContent2  height="30%">
-                <cus-desc :data="tongji" :columns="descColumns"></cus-desc>
+              <ModuleContent2 :border="false"  height="30%" padding="0">
+                <custom-desc2 default-value="0" :data="tongji" :columns="descColumns"></custom-desc2>
               </ModuleContent2>
               <web3-title>报警类型数据分析</web3-title>
               <Split height="10"></Split>
-              <ModuleContent2 >
+              <ModuleContent2 :border="false" padding="0">
               </ModuleContent2>
             </div>
 
           </a-col>
-          <a-col :span="16" style="height: 100%;">
-            <div style="height: 100%;position: relative">
-            <div class="map-cv" style="height: calc(100% - 80px);position: relative">
-              <Map></Map>
-            </div>
-            <butgroup>
-              <cus-button>
-                <nuxt-link to="/wuzuzhi/xichejiguanli">洗车机管理</nuxt-link>
-              </cus-button>
-              <cus-button>
-                <nuxt-link to="/wuzuzhi/huanjingzhili">环境治理</nuxt-link>
-              </cus-button>
-              <cus-button>
-                <nuxt-link to="/wuzuzhi/huanweixunhang">环卫巡航</nuxt-link>
-              </cus-button>
+          <a-col span="14">
+            <butgroup :bg="false">
+              <cus-button5>干雾点位置</cus-button5>
+              <cus-button5>TSP点位</cus-button5>
+              <cus-button5>微站点位</cus-button5>
+              <cus-button5>雾炮点位</cus-button5>
+              <cus-button5>雾桩点位</cus-button5>
+              <cus-button5>洗车机点位</cus-button5>
             </butgroup>
-            </div>
           </a-col>
-          <a-col :span="4">
-            <a-card title="国Ⅵ输车辆" size="small">
-              <p>card content</p>
-            </a-card>
+          <a-col :span="5" class="event-auto" style="height: 100%;">
+            <FlexCol>
+              <ModuleContent2  :border="false" padding="0">
+
+              </ModuleContent2>
+              <web3-title>项目介绍</web3-title>
+              <Split height="10"></Split>
+              <ModuleContent2  :border="false" padding="0">
+              </ModuleContent2>
+
+            </FlexCol>
           </a-col>
         </a-row>
+
+        <butgroup class="bottom-btn">
+          <cus-button>
+            <nuxt-link to="/wuzuzhi/xichejiguanli">洗车机管理</nuxt-link>
+          </cus-button>
+          <cus-button>
+            <nuxt-link to="/wuzuzhi/huanjingzhili">环境治理</nuxt-link>
+          </cus-button>
+          <cus-button>
+            <nuxt-link to="/wuzuzhi/huanweixunhang">环卫巡航</nuxt-link>
+          </cus-button>
+        </butgroup>
       </ModuleContent>
-      >
+
+
+
     </flex-col>
   </new-bg>
 </template>
@@ -62,10 +75,18 @@ import Web3Title from "../../components/smallCommon/Web3Title.vue";
 import ModuleContent2 from "../../components/smallCommon/ModuleContent2.vue";
 import Split from "../../components/smallCommon/Split.vue";
 import CusDesc from "../../components/smallCommon/CusDesc.vue";
+import Web2Title from "../../components/smallCommon/Web2Title.vue";
+import CustomDesc2 from "../../components/smallCommon/CusDesc2.vue";
+import CusButton3 from "../../components/smallCommon/CusButton3.vue";
+import CusButton5 from "../../components/smallCommon/CusButton5.vue";
 
 export default {
   name: "paifang",
   components: {
+    CusButton5,
+    CusButton3,
+    CustomDesc2,
+    Web2Title,
     CusDesc,
     Split,
     ModuleContent2,
diff --git a/pages/wuzuzhi/xichejiguanli.vue b/pages/wuzuzhi/xichejiguanli.vue
index 259c4ba..426a94e 100644
--- a/pages/wuzuzhi/xichejiguanli.vue
+++ b/pages/wuzuzhi/xichejiguanli.vue
@@ -1,62 +1,73 @@
 <template>
   <new-bg>
     <flex-col>
-      <system-title show-back custom-title="洗车机管理" />
-      <ModuleContent padding="0px 20px 20px">
-        <a-row :gutter="16" style="height: 100%;">
-          <a-col :span="4" style="height: 100%;">
-            <FlexCol>
-              <web3-title>洗车机列表</web3-title>
-              <Split height="10"></Split>
-              <ModuleContent2 >
-                <div :class="['car-washing-machine-tabs',activeCarTabs ==1?'active-car-washing-machine-tabs':'']"
-                     @click="carChange(1)">
-                  <div class="rank-num">1</div>
-                  <div class="car-washing-machine-name">西门洗车</div>
-                  <div class="state-icon">
-                    正常
-
-                  </div>
-                </div>
-              </ModuleContent2>
-            </FlexCol>
-
-          </a-col>
-          <a-col :span="15" style="height: 100%;">
-            <FlexCol>
-
-              <div class="map-content">
-                <Map></Map>
-              </div>
-              <Split height="10"></Split>
-              <ModuleContent2 >
-                <CustomTable
-                  hide-action
-                  hide-search
-                  hide-button
-                  :columns="columns"
-                  :api-conf="apiConf"
-                  :form-items="formItems"
-                  @edit="editHandler"
-                >
-                  <template slot="search-button" slot-scope="{ search }">
-                    <a-button type="primary" @click="exportList(search)">导出历史数据</a-button>
-                    <Split height="10"></Split>
-                  </template>
-                </CustomTable>
-              </ModuleContent2>
-            </FlexCol>
-          </a-col>
+      <system-title show-back/>
+      <Map></Map>
+      <ModuleContent padding="0px 50px 20px" class="event-none" none-event>
+        <web2-title>洗车机管理</web2-title>
+        <Split height="16"></Split>
+        <a-row :gutter="16" style="height: calc(100% - 62px);">
           <a-col :span="5" style="height: 100%;">
             <FlexCol>
-              <web3-title>洗车机视频</web3-title>
-              <Split height="10"></Split>
-              <ModuleContent2 height="300px">
+              <ModuleContent2 bg height="490">
+                <FlexCol>
+                  <web3-title>洗车机列表</web3-title>
+                  <Split height="10"></Split>
+                  <ModuleContent2 :border="false" padding="0">
+                    <div :class="['car-washing-machine-tabs',activeCarTabs ==1?'active-car-washing-machine-tabs':'']"
+                         @click="carChange(1)">
+                      <div class="rank-num">1</div>
+                      <div class="car-washing-machine-name">西门洗车</div>
+                      <div class="state-icon">
+                        正常
+
+                      </div>
+                    </div>
+                  </ModuleContent2>
+                </FlexCol>
 
               </ModuleContent2>
-              <web3-title>洗车机运行信息</web3-title>
-              <Split height="10"></Split>
-              <ModuleContent2>
+              <ModuleContent2 bg>
+                <FlexCol>
+                  <web3-title>历史记录</web3-title>
+                  <Split height="10"></Split>
+                  <ModuleContent2 :border="false" padding="0">
+                    <CustomTable
+                      hide-action
+                      hide-search
+                      hide-button
+                      :columns="columns"
+                      :api-conf="apiConf"
+                      :form-items="formItems"
+                      @edit="editHandler"
+                    >
+                      <template slot="search-button" slot-scope="{ search }">
+                        <a-button type="primary" @click="exportList(search)">导出历史数据</a-button>
+                        <Split height="10"></Split>
+                      </template>
+                    </CustomTable>
+                  </ModuleContent2>
+                </FlexCol>
+              </ModuleContent2>
+            </FlexCol>
+
+          </a-col>
+          <a-col :span="5" :offset="14" style="height: 100%;">
+            <FlexCol>
+              <ModuleContent2 bg>
+                <FlexCol>
+                  <web3-title>洗车机视频</web3-title>
+                  <Split height="10"></Split>
+                  <ModuleContent2 padding="0" :border="false" height="300px" >
+
+                  </ModuleContent2>
+                  <web3-title>洗车机运行信息</web3-title>
+                  <Split height="10"></Split>
+                  <ModuleContent2 padding="0" :border="false">
+
+                  </ModuleContent2>
+                </FlexCol>
+
 
               </ModuleContent2>
             </FlexCol>
@@ -78,10 +89,12 @@ import Web3Title from "../../components/smallCommon/Web3Title.vue";
 import Split from "../../components/smallCommon/Split.vue";
 import ModuleContent2 from "../../components/smallCommon/ModuleContent2.vue";
 import CustomTable from "../../components/smallCommon/CustomTable.vue";
+import Web2Title from "../../components/smallCommon/Web2Title.vue";
 
 export default {
   name: "xichejiguanli",
   components: {
+    Web2Title,
     CustomTable,
     ModuleContent2,
     Split,
diff --git a/pages/youzuzhi/paifang.vue b/pages/youzuzhi/paifang.vue
index 86931fc..a7d997e 100644
--- a/pages/youzuzhi/paifang.vue
+++ b/pages/youzuzhi/paifang.vue
@@ -1,59 +1,64 @@
 <template>
   <new-bg>
     <flex-col>
-      <system-title @click="changeTab" show-back custom-title="有组织排放" :btns="btns"/>
+      <system-title @click="changeTab" show-back/>
+      <Map></Map>
+      <ModuleContent padding="0px 50px 20px" class="event-none" none-event>
+        <web2-title>有组织排放</web2-title>
+        <a-row style="margin-top: 16px;" :gutter="16" class="event-none">
+          <a-col :span="17">
+            <div style="height: 112px;width: 100%;" class="event-auto">
+              <ModuleContent2  :border="false" padding="0">
+                <butgroup2 style="height: 100%;">
+                  <ModuleContent2 bg bg-color border>
+                    <miaoshu title="全厂有组织排放源" :value="count.comeCount" color="rgba(42, 207, 255, 1)"></miaoshu>
+                  </ModuleContent2>
 
-      <ModuleContent padding="0px 20px 20px">
-        <div style="height: 144px;width: 100%;">
-          <ModuleContent2 bg bg-str :border="false">
-            <butgroup2 style="height: 100%;">
-              <ModuleContent2 bg bg-color border>
-                <miaoshu title="全厂有组织排放源" :value="count.comeCount" color="rgba(42, 207, 255, 1)"></miaoshu>
+                  <ModuleContent2 bg bg-color border style="margin-left: 16px;">
+                    <miaoshu title="全厂重要排放源" :value="count.outCount" color="rgba(255, 171, 87, 1)"></miaoshu>
+                  </ModuleContent2>
+
+                  <ModuleContent2 bg bg-color border style="margin-left: 16px;">
+                    <miaoshu title="当前区域排放源" :value="count.inCount" color="rgba(122, 175, 255, 1)"></miaoshu>
+                  </ModuleContent2>
+
+                  <ModuleContent2 bg bg-color border style="margin-left: 16px;">
+                    <miaoshu title="当前区域其中重要排放源" :value="count.addCount" color="rgba(76, 243, 129, 1)"></miaoshu>
+                  </ModuleContent2>
+                </butgroup2>
               </ModuleContent2>
-
-              <ModuleContent2 bg bg-color border style="margin-left: 16px;">
-                <miaoshu title="全厂重要排放源" :value="count.outCount" color="rgba(255, 171, 87, 1)"></miaoshu>
-              </ModuleContent2>
-
-              <ModuleContent2 bg bg-color border style="margin-left: 16px;">
-                <miaoshu title="当前区域排放源" :value="count.inCount" color="rgba(122, 175, 255, 1)"></miaoshu>
-              </ModuleContent2>
-
-              <ModuleContent2 bg bg-color border style="margin-left: 16px;">
-                <miaoshu title="当前区域其中重要排放源" :value="count.addCount" color="rgba(76, 243, 129, 1)"></miaoshu>
-              </ModuleContent2>
-            </butgroup2>
-          </ModuleContent2>
-        </div>
-
-        <div class="paifang" style="height: calc(100% - 144px);overflow: hidden">
-          <a-row style="height: 100%;margin-top: 16px;" :gutter="16">
-            <a-col :span="3" style="height: 100%;">
-              <web3-title>工序步骤</web3-title>
-              <div class="gongxu-box">
-                <div class="gongxu-item" v-for="item in gongxu" :key="item.id">
-                  {{ item.name }}
+              <div class="gongxu-wrapper event-auto">
+                <web3-title>工序步骤</web3-title>
+                <div class="gongxu-box">
+                  <div class="gongxu-item" v-for="item in gongxu" :key="item.id">
+                    {{ item.name }}
+                  </div>
                 </div>
               </div>
-            </a-col>
-            <a-col :span="17" style="height: 100%;">
-              <div style="height: 100%;position: relative">
-                <div class="map-cv" style="height: calc(100% - 80px);position: relative">
-                  <Map></Map>
-                </div>
-                <butgroup>
-                  <cus-button>
-                    <nuxt-link to="/youzuzhi/paifangtongji">环保排放统计</nuxt-link>
-                  </cus-button>
-                </butgroup>
-              </div>
-            </a-col>
-            <a-col :span="4" style="height: 100%;">
-              <web3-title>排放源清单</web3-title>
-              <a-table :columns="columns" :data-source="data"/>
-            </a-col>
-          </a-row>
-        </div>
+
+            </div>
+          </a-col>
+          <a-col :span="7">
+            <faguang class="custom-tab">
+              <a-tabs default-active-key="1" class="custom-tab">
+                <a-tab-pane key="1" tab="VOC">
+                  <web3-title>排放源清单</web3-title>
+                  <a-table :columns="columns" :data-source="data"/>
+                </a-tab-pane>
+                <a-tab-pane key="2" tab="CEMS" force-render>
+                  <web3-title>排放源清单</web3-title>
+                  <a-table :columns="columns" :data-source="data"/>
+                </a-tab-pane>
+              </a-tabs>
+            </faguang>
+          </a-col>
+        </a-row>
+
+        <butgroup class="bottom-btn">
+          <cus-button>
+            <nuxt-link to="/youzuzhi/paifangtongji">环保排放统计</nuxt-link>
+          </cus-button>
+        </butgroup>
       </ModuleContent>
     </flex-col>
   </new-bg>
@@ -71,10 +76,14 @@ import ModuleContent2 from "../../components/smallCommon/ModuleContent2.vue";
 import Web3Title from "../../components/smallCommon/Web3Title.vue";
 import CusButton from "../../components/smallCommon/CusButton.vue";
 import Butgroup from "../../components/smallCommon/butgroup.vue";
+import Web2Title from "../../components/smallCommon/Web2Title.vue";
+import Faguang from "../../components/smallCommon/Faguang.vue";
 
 export default {
   name: "paifang",
   components: {
+    Faguang,
+    Web2Title,
     Butgroup, CusButton,
     Web3Title,
     ModuleContent2, Miaoshu, Butgroup2,
@@ -124,15 +133,37 @@ export default {
 .mt16 {
   margin-top: 16px;
 }
+.gongxu-wrapper {
+  width: 132px;
+  max-height: 500px;
+  margin-top: 16px;
+}
 .gongxu-box {
   height: calc(100% - 48px);
   overflow-y: auto;
   .gongxu-item {
     cursor: pointer;
-    padding: 16px 0;
     color: #fff;
-    font-size: 18px;
     border-bottom: 1px solid rgba(238, 238, 238, 0.54);
+    width: 132px;
+    height: 48px;
+    opacity: 1;
+    background: rgba(0, 128, 247, 0.5);
+    box-sizing: border-box;
+    margin-top: 16px;
+    line-height: 48px;
+    /** 文本1 */
+    font-size: 18px;
+    font-weight: 400;
+    letter-spacing: 0px;
+    color: rgba(255, 255, 255, 1);
+    text-align: center;
+    vertical-align: top;
+    &.selected, &:hover {
+      background: rgba(7, 65, 119, 0.98);
+      font-weight: 500;
+      color: rgba(45, 205, 255, 1);
+    }
   }
 }
 </style>
diff --git a/pages/youzuzhi/paifangtongji.vue b/pages/youzuzhi/paifangtongji.vue
index 345a36f..34602fb 100644
--- a/pages/youzuzhi/paifangtongji.vue
+++ b/pages/youzuzhi/paifangtongji.vue
@@ -1,20 +1,21 @@
-
-
 <template>
   <new-bg>
     <flex-col>
-      <system-title show-back custom-title="有组织排放统计"/>
+      <system-title show-back />
       <ModuleContent padding="0px 20px 20px">
-  <div class="paifangtongji" style="height: 100vh;overflow: hidden">
-    <a-row :gutter="16">
-      <a-col :span="18">
-
-      </a-col>
-      <a-col :span="6">
-        <a-table :columns="columns" :data-source="data" />
-      </a-col>
-    </a-row>
-  </div>
+        <web2-title>有组织排放统计</web2-title>
+        <split num="16"></split>
+        <a-tabs default-active-key="1" class="custom-tab">
+          <a-tab-pane key="1" tab="总体排放">
+            <a-table :columns="columns" :data-source="data"/>
+          </a-tab-pane>
+          <a-tab-pane key="2" tab="VOC">
+            <a-table :columns="columns" :data-source="data"/>
+          </a-tab-pane>
+          <a-tab-pane key="3" tab="CEMS" force-render>
+            <a-table :columns="columns" :data-source="data"/>
+          </a-tab-pane>
+        </a-tabs>
       </ModuleContent>
     </flex-col>
   </new-bg>
@@ -25,18 +26,21 @@ import FlexCol from "../../components/FlexCol.vue";
 import SystemTitle from "../../components/smallCommon/SystemTitle.vue";
 import NewBg from "../../components/NewBg.vue";
 import ModuleContent from "../../components/ModuleContent.vue";
+import Web2Title from "../../components/smallCommon/Web2Title.vue";
+import Web3Title from "../../components/smallCommon/Web3Title.vue";
+import Split from "../../components/Split.vue";
 
 export default {
   name: "paifangtongji",
-  components: {ModuleContent, NewBg, SystemTitle, FlexCol},
-  data () {
+  components: {Split, Web3Title, Web2Title, ModuleContent, NewBg, SystemTitle, FlexCol},
+  data() {
     return {
       data: [],
       columns: [
-        { title: '名词', key: 'name' },
-        { title: 'NO', key: 'NO' },
-        { title: 'SO2', key: 'SO2' },
-        { title: 'TSP', key: 'TSP' },
+        {title: '名词', key: 'name'},
+        {title: 'NO', key: 'NO'},
+        {title: 'SO2', key: 'SO2'},
+        {title: 'TSP', key: 'TSP'},
       ]
     }
   }

From 6616b60bf48914a71af08c166f1b2b9abdb9ca3e Mon Sep 17 00:00:00 2001
From: "DESKTOP-VMMLSOQ\\wangzg" <1161909281@qq.com>
Date: Mon, 19 Aug 2024 22:26:28 +0800
Subject: [PATCH 9/9] 1111

---
 components/Map.vue                      | 34 +++++++++++------------
 components/smallCommon/ProgressDesc.vue |  2 +-
 layouts/default.vue                     | 36 +++++++++++++++++++++++++
 layouts/loginLayout.vue                 | 17 ++++++++++++
 pages/cleanTravel/home.vue              |  8 +-----
 pages/home/index.vue                    | 14 +++++-----
 pages/manager/login.vue                 |  1 +
 pages/wuzuzhi/huanjingzhili.vue         |  6 -----
 plugins/setup.js                        |  1 -
 store/system.js                         |  6 +++--
 webpack.config.js                       |  9 +++++++
 11 files changed, 93 insertions(+), 41 deletions(-)
 create mode 100644 layouts/default.vue
 create mode 100644 layouts/loginLayout.vue
 create mode 100644 webpack.config.js

diff --git a/components/Map.vue b/components/Map.vue
index 4150bd1..a99ce72 100644
--- a/components/Map.vue
+++ b/components/Map.vue
@@ -20,11 +20,6 @@ const mapLayerTypeToPointIcon = {
 }
 
 export default {
-  async asyncData({ $axios }) {
-    const { data } = await $axios.$get('http://101.43.201.20:5000/api/Home/view');
-    return { pageTitle: data.home.title }; // 假设接口返回格式为 { data: '标题内容' }
-  },
-
   name: "Map",
   data () {
     return {
@@ -41,18 +36,23 @@ export default {
       default: 'big'
     }
   },
-  mounted() {
-    this.$nextTick(() => {
-      if (this.$refs.mapRef) {
-        const win = window.top
-        this.$http.get('http://101.43.201.20:5000/api/Home/view').then(({ data }) => {
-          win.document.title = data.home.title
-          this.setTitle(data.home.title)
-          this.setInfo(data)
-          this.initMap(data.home.center)
-        })
+  watch: {
+    info: {
+      immediate: true,
+      deep: true,
+      handler (info) {
+        if (info) {
+          this.$nextTick(() => {
+            if (this.$refs.mapRef) {
+              this.initMap(info.home.center)
+            }
+          })
+        }
       }
-    })
+    }
+  },
+
+  mounted() {
     this.$evBus.$on('setVisibility', (layerType, show) => {
       this.setVisibility(layerType, show)
     })
@@ -70,6 +70,7 @@ export default {
       shisc: state => state.map.shisc,
       wz: state => state.map.wz,
       jkd: state => state.map.jkd,
+      info: state => state.system.info
     })
   },
   methods: {
@@ -79,7 +80,6 @@ export default {
       const { lon, lat } = center
       ms3dConfig.scene.center.lng = lon
       ms3dConfig.scene.center.lat = lat
-      console.log('ms3dConfig:', ms3dConfig);
       this.map = new mars3d.Map(this.$refs.mapRef, ms3dConfig)
       this.map.on("load", () => {
         Object.keys(mapLayerTypeToPointIcon).forEach(layerType => {
diff --git a/components/smallCommon/ProgressDesc.vue b/components/smallCommon/ProgressDesc.vue
index 07ba0ed..287fd1f 100644
--- a/components/smallCommon/ProgressDesc.vue
+++ b/components/smallCommon/ProgressDesc.vue
@@ -5,7 +5,7 @@
     <div class="progress-item" v-for="(item, index) in rate" :key="index">
       <BFC>
         <div class="percent" slot="right">
-          {{ item.val * 100 }}
+          {{ (item.val * 100).toFixed(0) }}
           <div class="unit">%</div>
         </div>
         <div class="info" slot="center">
diff --git a/layouts/default.vue b/layouts/default.vue
new file mode 100644
index 0000000..dc04802
--- /dev/null
+++ b/layouts/default.vue
@@ -0,0 +1,36 @@
+
+<template>
+  <div>
+    <nuxt />
+  </div>
+</template>
+
+<script>
+import { mapActions, mapState } from 'vuex'
+export default {
+  name: "default",
+  computed: {
+    ...mapState({
+      info: state => state.system.info
+    })
+  },
+  created() {
+    this.getViewData()
+  },
+  methods: {
+    ...mapActions('system',  ['setInfo']),
+    async getViewData () {
+      if (!this.info) {
+        const { data } = await this.$get('/api/Home/view');
+        this.setInfo(data)
+      }
+
+    }
+  }
+}
+</script>
+
+
+<style scoped lang="less">
+
+</style>
diff --git a/layouts/loginLayout.vue b/layouts/loginLayout.vue
new file mode 100644
index 0000000..c8fc5ee
--- /dev/null
+++ b/layouts/loginLayout.vue
@@ -0,0 +1,17 @@
+
+<template>
+  <div>
+    <nuxt />
+  </div>
+</template>
+
+<script>
+export default {
+  name: "LoginLayout"
+}
+</script>
+
+
+<style scoped lang="less">
+
+</style>
diff --git a/pages/cleanTravel/home.vue b/pages/cleanTravel/home.vue
index a60e5fc..28d61fb 100644
--- a/pages/cleanTravel/home.vue
+++ b/pages/cleanTravel/home.vue
@@ -2,7 +2,7 @@
 <template>
   <new-bg>
     <flex-col>
-      <system-title custom-title="清洁运输" show-back  />
+      <system-title show-back  />
       <ModuleContent padding="20px">
         <flex-col>
           <ModuleContent padding="0 20px 20px">
@@ -269,12 +269,6 @@ export default {
     this.getDataSource()
     this.$nextTick(() => {
       const win = window.top
-      this.$get('http://101.43.201.20:5000/api/Home/view').then(({data}) => {
-        win.document.title = data.home.title
-        this.setTitle(data.home.title)
-        this.setInfo(data)
-      })
-
       if (this.$refs.module) {
         const offsetHeight = this.$refs.module.$el.offsetHeight - 40
         this.tableH = offsetHeight
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 7f441f8..e32f00e 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -41,8 +41,8 @@
                   清洁运输比例
                   <template slot="action">
                     <butgroup2 style="height: 20px;line-height: 20px;">
-                      <cus-button4 @click="active = 'Yesterday'" :selected="active === 'Yesterday'">昨日</cus-button4>
-                      <cus-button4 @click="active = 'LastWeek'" :selected="active === 'LastWeek'">上周</cus-button4>
+                      <cus-button4 @click="active = 'yesterday'" :selected="active === 'yesterday'">昨日</cus-button4>
+                      <cus-button4 @click="active = 'lastWeek'" :selected="active === 'lastWeek'">上周</cus-button4>
                     </butgroup2>
                   </template>
                 </web3-title>
@@ -57,10 +57,10 @@
                 <ModuleContent padding="20px 0 0" height="140">
                   <div class="pf">
                     <div class="t">当前VOC的日排放量</div>
-                    <div class="v">{{ todaypf.voc || 0 }}mg/m3</div>
+                    <div class="v">{{ todaypf.today?.voc || 0 }}mg/m3</div>
                   </div><div class="pf">
                   <div class="t">当前CEMS的日排放量</div>
-                  <div class="v">{{ todaypf.cems || 0 }}mg/m3</div>
+                  <div class="v">{{ todaypf.today?.cems || 0 }}mg/m3</div>
                 </div>
 
                 </ModuleContent>
@@ -261,7 +261,7 @@ export default {
   data () {
     return {
       mapTab: 'rl',
-      active: 'Yesterday',
+      active: 'yesterday',
 
       columnsForTable: [
         {
@@ -271,12 +271,12 @@ export default {
         },
         {
           title: '报警时间',
-          dataIndex: 'CreateDateTime',
+          dataIndex: 'time',
           width: '33.333%'
         },
         {
           title: '报警内容',
-          dataIndex: 'AlertContent',
+          dataIndex: 'alarmName',
           width: '33.333%'
         },
       ]
diff --git a/pages/manager/login.vue b/pages/manager/login.vue
index 2a10971..a2f2d98 100644
--- a/pages/manager/login.vue
+++ b/pages/manager/login.vue
@@ -42,6 +42,7 @@ function hasErrors(fieldsError) {
   return Object.keys(fieldsError).some(field => fieldsError[field]);
 }
 export default {
+  layout: 'LoginLayout',
   data() {
     return {
       hasErrors,
diff --git a/pages/wuzuzhi/huanjingzhili.vue b/pages/wuzuzhi/huanjingzhili.vue
index 44a5ad1..0378cef 100644
--- a/pages/wuzuzhi/huanjingzhili.vue
+++ b/pages/wuzuzhi/huanjingzhili.vue
@@ -176,12 +176,6 @@ export default {
   mounted() {
     this.$nextTick(() => {
       const win = window.top
-      this.$get('http://101.43.201.20:5000/api/Home/view').then(({data}) => {
-        win.document.title = data.home.title
-        this.setTitle(data.home.title)
-        this.setInfo(data)
-      })
-
       if (this.$refs.module) {
         const offsetHeight = this.$refs.module.$el.offsetHeight - 40
         this.tableH = offsetHeight
diff --git a/plugins/setup.js b/plugins/setup.js
index 280e82b..5757bf9 100644
--- a/plugins/setup.js
+++ b/plugins/setup.js
@@ -1,4 +1,3 @@
 import Vue from 'vue'
 
-
 Vue.prototype.$evBus = new Vue()
diff --git a/store/system.js b/store/system.js
index 1b507a2..3077f5b 100644
--- a/store/system.js
+++ b/store/system.js
@@ -1,6 +1,6 @@
 export const state = {
   title: '',
-  info: {}
+  info: null
 }
 
 export const mutations = {
@@ -15,8 +15,10 @@ export const mutations = {
 export const actions = {
   setTitle ({ commit }, title) {
     commit('setTitle', title)
+    document.title = title
   },
-  setInfo ({ commit }, info) {
+  setInfo ({ commit, dispatch }, info) {
     commit('setInfo', info)
+    dispatch('setTitle', info.home?.title || '')
   }
 }
diff --git a/webpack.config.js b/webpack.config.js
new file mode 100644
index 0000000..1039330
--- /dev/null
+++ b/webpack.config.js
@@ -0,0 +1,9 @@
+
+const path = require('path');
+module.exports = {
+  resolve: {
+    alias: {
+      '@': path.resolve(__dirname, './'),
+    }
+  }
+};