From e3f08837b1bc999c73aabae4708b2f714a4f614e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E5=B3=A5=E5=82=B2?=
 <13203204+he-zhengao@user.noreply.gitee.com>
Date: Tue, 12 Dec 2023 23:06:36 +0800
Subject: [PATCH] 12/12 23:06

---
 src/views/Login/index.vue                     |  19 +-
 src/views/buildUse/index.vue                  |   2 +-
 .../sensingDevice/components/carLarge.vue     |  39 +-
 .../components/mancarStatistics.vue           |   7 +-
 .../sensingDevice/components/peopleLarge.vue  |  32 +-
 .../sensingDevice/components/personCatch.vue  |   4 +-
 src/views/sensingDevice/utils/initEcharts.js  | 390 +++++++++---------
 7 files changed, 256 insertions(+), 237 deletions(-)

diff --git a/src/views/Login/index.vue b/src/views/Login/index.vue
index 32f411d..6e9bbb6 100644
--- a/src/views/Login/index.vue
+++ b/src/views/Login/index.vue
@@ -16,12 +16,12 @@
         <div class="title_text">{{ title_text }}</div>
       </div>
       <div class="time_body">
-        <div class="box_all">
+        <div class="box_all" v-if="play">
           <div class="time_item">{{ timeArr.timeText }}</div>
           <div class="time_item">{{ timeArr.week }}</div>
           <div class="time">{{ timeArr.timeTime }}</div>
         </div>
-        <div class="box_all_right">
+        <div class="box_all_right" v-if="play">
           <div class="box_all_right_pic"></div>
           <div class="box_all_right_name">{{ userName }}</div>
         </div>
@@ -35,7 +35,7 @@
         <div class="text2" @click="change2">数字证书登录</div>
       </div>
       <!-- 账号密码 -->
-      <div class="username" v-show="show">
+      <div class="username" v-if="show">
         <div class="username_box">
           <div class="username_icon"></div>
           <div class="name">
@@ -55,6 +55,7 @@
               placeholder="请输入密码"
               v-model="formValue.password"
               onkeyup="value=value.replace(/[^\x00-\xff]/g, '')"
+              type="password"
             ></el-input>
           </div>
         </div>
@@ -71,11 +72,11 @@
           <img class="codeImg" :src="picUrl" alt="" />
         </div>
         <div class="uselogin">
-          <el-button @click="onLogin" class="loginbtn">登录</el-button>
+          <el-button @click="onLogin">登录</el-button>
         </div>
       </div>
       <!-- 证书登录 -->
-      <div class="username" v-show="show1">
+      <div class="username" v-if="show1">
         <div class="book">
           <div class="bookname">请输入电子数字证书</div>
           <div class="bookicon"></div>
@@ -374,7 +375,7 @@ export default {
       .book {
         width: 23vw;
         height: 15vh;
-        margin-bottom: 5.8vh;
+        margin-bottom: 7.7vh;
         color: #ecf4f9;
         border: 1px solid #1ceadf;
         text-align: center;
@@ -415,6 +416,7 @@ export default {
           // margin-bottom: 2vh;
           .el-input__inner {
             width: 21.5vw;
+            height: 5vh;
             // border: 1px solid #1ceadf;
             background-color: #0a3762;
             // background-color: #0b2f59;
@@ -444,6 +446,7 @@ export default {
         .word {
           .el-input__inner {
             width: 21.5vw;
+            height: 5vh;
             // border: 1px solid #1ceadf;
             background-color: #0a3762;
             // background-color: #0b2f59;
@@ -471,6 +474,7 @@ export default {
         }
         .el-input__inner {
           width: 14vw;
+          height: 5vh;
           // border: 1px solid #1ceadf;
           background-color: #0a3762;
           // background-color: #0b2f59;
@@ -479,7 +483,7 @@ export default {
         }
         .codeImg {
           width: 14vw;
-          height: 4.5vh;
+          height: 5vh;
           border: 1px solid #1ceadf;
           border-radius: 5%;
           margin-left: 0.5vw;
@@ -489,6 +493,7 @@ export default {
         margin-top: 3vh;
         .el-button {
           width: 23vw;
+          height: 5vh;
           background-image: url(../../assets/login/loginbtn.png);
           background-size: 100% 100%;
           border: none;
diff --git a/src/views/buildUse/index.vue b/src/views/buildUse/index.vue
index a6054e6..be5e418 100644
--- a/src/views/buildUse/index.vue
+++ b/src/views/buildUse/index.vue
@@ -57,7 +57,7 @@ export default {
       roll_list: [
         {
           id: '1',
-          name: '非法捕猎',
+          name: '非法狩猎',
           route: '/hunting'
         },
         {
diff --git a/src/views/sensingDevice/components/carLarge.vue b/src/views/sensingDevice/components/carLarge.vue
index ec28941..bce5724 100644
--- a/src/views/sensingDevice/components/carLarge.vue
+++ b/src/views/sensingDevice/components/carLarge.vue
@@ -24,7 +24,7 @@ export default {
   mounted() {
     setTimeout(() => {
       this.init_charts()
-    }, 500)
+    }, 2000)
   },
   created() {
     this.onvehicleTrafficStatistics()
@@ -35,7 +35,7 @@ export default {
       const res = await vehicleTrafficStatistics()
       this.list = Object.keys(res.data)
       this.list1 = Object.values(res.data)
-      console.log(this.list, 'kkk')
+      
     },
     init_charts() {
       console.log(123)
@@ -57,33 +57,44 @@ export default {
           {
             type: 'category',
             data: this.list,
+                 textStyle: {
+                fontSize: '4',
+                color:'#fff'
+              },
             axisPointer: {
               type: 'shadow'
+
             }
           }
         ],
         grid: {
           // 让图表占满容器
           top: '20px',
-          right: '10px'
+          right: '9px',
+          left:'50px',
+          bottom:'60px'
+          
         },
         yAxis: [
           {
             type: 'value',
 
-            min: 100,
-            max: 700,
-            interval: 100
+            min: 10000,
+            max: 70000,
+            interval: 5000,
+              //   textStyle: {
+              //   color:'#fff'
+              // }
           },
           {
-            show: false,
+            // show: false,
             type: 'value',
 
-            min: 0,
-            max: 25,
-            interval: 5,
+          min: 10000,
+            max: 70000,
+            interval: 5000,
             axisLabel: {
-              formatter: '{value} °C'
+              formatter: '{value} '
             }
           }
         ],
@@ -99,11 +110,11 @@ export default {
             data: this.list1
           },
 
-          {
-            // name: 'Temperature',
+       
+              {
+            name: '准确车流量',
             type: 'line',
             yAxisIndex: 1,
-
             data: this.list1
           }
         ]
diff --git a/src/views/sensingDevice/components/mancarStatistics.vue b/src/views/sensingDevice/components/mancarStatistics.vue
index d913eb5..14303ac 100644
--- a/src/views/sensingDevice/components/mancarStatistics.vue
+++ b/src/views/sensingDevice/components/mancarStatistics.vue
@@ -25,8 +25,11 @@ export default {
     }
   },
   mounted() {
+    setTimeout(()=>{
     this.init_charts()
     this.init_car_charts()
+    },1500)
+
   },
   created() {
     this.onhumanVehicleStatistics()
@@ -34,8 +37,8 @@ export default {
   methods: {
     async onhumanVehicleStatistics() {
       const res = await humanVehicleStatistics()
-      this.list = res.data
-      console.log(this.list, 'aaa')
+      this.list = res.data 
+   
     },
     //
     init_charts() {
diff --git a/src/views/sensingDevice/components/peopleLarge.vue b/src/views/sensingDevice/components/peopleLarge.vue
index 922f518..5603c1f 100644
--- a/src/views/sensingDevice/components/peopleLarge.vue
+++ b/src/views/sensingDevice/components/peopleLarge.vue
@@ -25,7 +25,7 @@ export default {
   mounted() {
     setTimeout(() => {
       this.echarts_icon()
-    }, 500)
+    }, 1500)
   },
   created() {
     this.onhumanTrafficStatistics()
@@ -35,11 +35,10 @@ export default {
       const res = await humanTrafficStatistics()
       this.list = Object.keys(res.data)
       this.list1 = Object.values(res.data)
-      console.log(this.list, 'iiiii')
+
     },
     //
     echarts_icon() {
-      console.log(this.list, 'haha')
       console.log('hza')
       var chartDom = document.getElementById('people_chart')
       var myChart = echarts.init(chartDom)
@@ -57,15 +56,12 @@ export default {
           }
         },
 
-        // legend: {
-        //   itemGap: 24 // 修改间距
-        // },
-
+    
         grid: {
           top: '10%',
-          left: '3%',
-          right: '4%',
-          bottom: '3%',
+          left: '0%',
+          right: '7%',
+          bottom: '1%',
           containLabel: true
         },
         xAxis: [
@@ -75,17 +71,21 @@ export default {
             //X轴日期
             data: this.list,
             axisLabel: {
-              textStyle: {
-                fontSize: '7'
+              Interval:'0'
+,              textStyle: {
+               width:'1',
+                fontSize: '7',
+                color:'#fff'
               }
             }
           }
         ],
         yAxis: [
           {
-            min: 100,
-            max: 600,
-            interval: 100,
+            min: 1000,
+            max: 10000,
+            interval: 1000,
+             data: this.list1,
             type: 'value'
           }
         ],
@@ -97,7 +97,7 @@ export default {
             smooth: true,
             lineStyle: {
               borderColor: '#464646',
-              width: 0
+             
             },
             showSymbol: false,
             areaStyle: {
diff --git a/src/views/sensingDevice/components/personCatch.vue b/src/views/sensingDevice/components/personCatch.vue
index bb5bdb7..6b44275 100644
--- a/src/views/sensingDevice/components/personCatch.vue
+++ b/src/views/sensingDevice/components/personCatch.vue
@@ -56,7 +56,7 @@
 </template>
 
 <script>
-import { getTransitUserAPI } from '@/api/sensingDevice/resource'
+import { transitUserRecord } from '@/api/sensingDevice/resource'
 export default {
   name: 'PersonCatch',
   props: {
@@ -188,7 +188,7 @@ export default {
       }, 500)
     },
     async ontransitUserRecord() {
-      const res = await getTransitUserAPI()
+      const res = await transitUserRecord()
       this.roll_list = res.rows
       console.log(res, 'oop')
     }
diff --git a/src/views/sensingDevice/utils/initEcharts.js b/src/views/sensingDevice/utils/initEcharts.js
index c15518b..a35b687 100644
--- a/src/views/sensingDevice/utils/initEcharts.js
+++ b/src/views/sensingDevice/utils/initEcharts.js
@@ -1,195 +1,195 @@
-// * echarts 初始化方法
-import * as echarts from 'echarts'
-import EleResize from '@/utils/esresize'
-export const init_echarts = () => {
-  // * echarts 实例
-  const myChart = echarts.init(document.getElementById('people_chart'))
-  let resize_div = document.getElementById('people_chart')
-  // *echarts表自适应
-  EleResize.on(resize_div, () => {
-    myChart.resize()
-  })
-  // * echarts 选项
-  myChart.setOption({
-    color: ['#80ffa5', '#00ddff', '#37a2ff', '#ffbf00'],
-    title: {
-      // text: '标题'
-    },
-    tooitip: {
-      trigger: 'axis',
-      axisPointer: {
-        type: 'cross',
-        label: {
-          backgroundColor: '#6a7985'
-        }
-      }
-    },
-    legend: {
-      // data: ['Line 1', 'Line 2', 'Line 3', 'Line 4', 'Line 5']
-    },
-    toolbox: {
-      feature: {
-        saveAsImage: {}
-      }
-    },
-    grid: {
-      left: '3%',
-      right: '4%',
-      bottom: '3%',
-      containLabel: true
-    },
-    xAxis: [
-      {
-        type: 'category',
-        boundaryGap: false,
-        data: ['11-26', '11-27', '11-28', '11-29', '11-30', '12-01', '12-02']
-      }
-    ],
-    yAxis: [
-      {
-        type: 'value'
-      }
-    ],
-    series: [
-      {
-        // name: 'Line 1',
-        type: 'line',
-        stack: 'Total',
-        smooth: true,
-        lineStyle: {
-          width: 0
-        },
-        showSymbol: false,
-        areaStyle: {
-          opacity: 0.8,
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            {
-              offset: 0,
-              color: 'rgb(128, 255, 165)'
-            },
-            {
-              offset: 1,
-              color: 'rgb(1, 191, 236)'
-            }
-          ])
-        },
-        emphasis: {
-          focus: 'series'
-        },
-        data: [140, 232, 101, 264, 90, 340, 250]
-      },
-      {
-        // name: 'Line 2',
-        type: 'line',
-        stack: 'Total',
-        smooth: true,
-        lineStyle: {
-          width: 0
-        },
-        showSymbol: false,
-        areaStyle: {
-          opacity: 0.8,
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            {
-              offset: 0,
-              color: 'rgb(0, 221, 255)'
-            },
-            {
-              offset: 1,
-              color: 'rgb(77, 119, 255)'
-            }
-          ])
-        },
-        emphasis: {
-          focus: 'series'
-        },
-        data: [120, 282, 111, 234, 220, 340, 310]
-      },
-      {
-        // name: 'Line 3',
-        type: 'line',
-        stack: 'Total',
-        smooth: true,
-        lineStyle: {
-          width: 0
-        },
-        showSymbol: false,
-        areaStyle: {
-          opacity: 0.8,
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            {
-              offset: 0,
-              color: 'rgb(55, 162, 255)'
-            },
-            {
-              offset: 1,
-              color: 'rgb(116, 21, 219)'
-            }
-          ])
-        },
-        emphasis: {
-          focus: 'series'
-        },
-        data: [320, 132, 201, 334, 190, 130, 220]
-      },
-      {
-        // name: 'Line 4',
-        type: 'line',
-        stack: 'Total',
-        smooth: true,
-        lineStyle: {
-          width: 0
-        },
-        showSymbol: false,
-        areaStyle: {
-          opacity: 0.8,
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            {
-              offset: 0,
-              color: 'rgb(255, 0, 135)'
-            },
-            {
-              offset: 1,
-              color: 'rgb(135, 0, 157)'
-            }
-          ])
-        },
-        emphasis: {
-          focus: 'series'
-        },
-        data: [220, 402, 231, 134, 190, 230, 120]
-      },
-      {
-        // name: 'Line 5',
-        type: 'line',
-        stack: 'Total',
-        smooth: true,
-        lineStyle: {
-          width: 0
-        },
-        showSymbol: false,
-        label: {
-          show: true,
-          position: 'top'
-        },
-        areaStyle: {
-          opacity: 0.8,
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            {
-              offset: 0,
-              color: 'rgb(255, 191, 0)'
-            },
-            {
-              offset: 1,
-              color: 'rgb(224, 62, 76)'
-            }
-          ])
-        },
-        emphasis: {
-          focus: 'series'
-        },
-        data: [220, 302, 181, 234, 210, 290, 150]
-      }
-    ]
-  })
-}
+// // * echarts 初始化方法
+// import * as echarts from 'echarts'
+// import EleResize from '@/utils/esresize'
+// export const init_echarts = () => {
+//   // * echarts 实例
+//   const myChart = echarts.init(document.getElementById('people_chart'))
+//   let resize_div = document.getElementById('people_chart')
+//   // *echarts表自适应
+//   EleResize.on(resize_div, () => {
+//     myChart.resize()
+//   })
+//   // * echarts 选项
+//   myChart.setOption({
+//     color: ['#80ffa5', '#00ddff', '#37a2ff', '#ffbf00'],
+//     title: {
+//       // text: '标题'
+//     },
+//     tooitip: {
+//       trigger: 'axis',
+//       axisPointer: {
+//         type: 'cross',
+//         label: {
+//           backgroundColor: '#6a7985'
+//         }
+//       }
+//     },
+//     legend: {
+//       // data: ['Line 1', 'Line 2', 'Line 3', 'Line 4', 'Line 5']
+//     },
+//     toolbox: {
+//       feature: {
+//         saveAsImage: {}
+//       }
+//     },
+//     grid: {
+//       left: '3%',
+//       right: '4%',
+//       bottom: '3%',
+//       containLabel: true
+//     },
+//     xAxis: [
+//       {
+//         type: 'category',
+//         boundaryGap: false,
+//         data: ['11-26', '11-27', '11-28', '11-29', '11-30', '12-01', '12-02']
+//       }
+//     ],
+//     yAxis: [
+//       {
+//         type: 'value'
+//       }
+//     ],
+//     series: [
+//       {
+//         // name: 'Line 1',
+//         type: 'line',
+//         stack: 'Total',
+//         smooth: true,
+//         lineStyle: {
+//           width: 0
+//         },
+//         showSymbol: false,
+//         areaStyle: {
+//           opacity: 0.8,
+//           color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+//             {
+//               offset: 0,
+//               color: 'rgb(128, 255, 165)'
+//             },
+//             {
+//               offset: 1,
+//               color: 'rgb(1, 191, 236)'
+//             }
+//           ])
+//         },
+//         emphasis: {
+//           focus: 'series'
+//         },
+//         data: [140, 232, 101, 264, 90, 340, 250]
+//       },
+//       {
+//         // name: 'Line 2',
+//         type: 'line',
+//         stack: 'Total',
+//         smooth: true,
+//         lineStyle: {
+//           width: 0
+//         },
+//         showSymbol: false,
+//         areaStyle: {
+//           opacity: 0.8,
+//           color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+//             {
+//               offset: 0,
+//               color: 'rgb(0, 221, 255)'
+//             },
+//             {
+//               offset: 1,
+//               color: 'rgb(77, 119, 255)'
+//             }
+//           ])
+//         },
+//         emphasis: {
+//           focus: 'series'
+//         },
+//         data: [120, 282, 111, 234, 220, 340, 310]
+//       },
+//       {
+//         // name: 'Line 3',
+//         type: 'line',
+//         stack: 'Total',
+//         smooth: true,
+//         lineStyle: {
+//           width: 0
+//         },
+//         showSymbol: false,
+//         areaStyle: {
+//           opacity: 0.8,
+//           color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+//             {
+//               offset: 0,
+//               color: 'rgb(55, 162, 255)'
+//             },
+//             {
+//               offset: 1,
+//               color: 'rgb(116, 21, 219)'
+//             }
+//           ])
+//         },
+//         emphasis: {
+//           focus: 'series'
+//         },
+//         data: [320, 132, 201, 334, 190, 130, 220]
+//       },
+//       {
+//         // name: 'Line 4',
+//         type: 'line',
+//         stack: 'Total',
+//         smooth: true,
+//         lineStyle: {
+//           width: 0
+//         },
+//         showSymbol: false,
+//         areaStyle: {
+//           opacity: 0.8,
+//           color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+//             {
+//               offset: 0,
+//               color: 'rgb(255, 0, 135)'
+//             },
+//             {
+//               offset: 1,
+//               color: 'rgb(135, 0, 157)'
+//             }
+//           ])
+//         },
+//         emphasis: {
+//           focus: 'series'
+//         },
+//         data: [220, 402, 231, 134, 190, 230, 120]
+//       },
+//       {
+//         // name: 'Line 5',
+//         type: 'line',
+//         stack: 'Total',
+//         smooth: true,
+//         lineStyle: {
+//           width: 0
+//         },
+//         showSymbol: false,
+//         label: {
+//           show: true,
+//           position: 'top'
+//         },
+//         areaStyle: {
+//           opacity: 0.8,
+//           color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+//             {
+//               offset: 0,
+//               color: 'rgb(255, 191, 0)'
+//             },
+//             {
+//               offset: 1,
+//               color: 'rgb(224, 62, 76)'
+//             }
+//           ])
+//         },
+//         emphasis: {
+//           focus: 'series'
+//         },
+//         data: [220, 302, 181, 234, 210, 290, 150]
+//       }
+//     ]
+//   })
+// }