heyang

.env.production

@@ -12,8 +12,8 @@ VUE_APP_ENV = 'development'
 # 柴
 #VUE_APP_BASE_API = 'http://192.168.1.9:8080'
 # 暨大
-VUE_APP_BASE_API = 'http://192.168.8.3/labSystem/'
-#VUE_APP_BASE_API = 'http://lab.sxitdlc.com/jndxlabSystem/'
+#VUE_APP_BASE_API = 'http://192.168.8.3/labSystem/'
+VUE_APP_BASE_API = 'http://lab.sxitdlc.com/jndxlabSystem/'
 # 矿大
 #VUE_APP_BASE_API = 'http://192.168.1.248/labSystem/'
 # 矿大-文昌
@@ -21,8 +21,8 @@ VUE_APP_BASE_API = 'http://192.168.8.3/labSystem/'
 
 # 视频地址
 
-#VUE_APP_BASE_VIDEO_API = 'https://lab.sxitdlc.com'
-VUE_APP_BASE_VIDEO_API = 'http://192.168.8.3/labSystem/'
+VUE_APP_BASE_VIDEO_API = 'https://lab.sxitdlc.com'
+#VUE_APP_BASE_VIDEO_API = 'http://192.168.8.3/labSystem/'
 
 
 # ####################MQTT配置####################
@@ -31,8 +31,8 @@ VUE_APP_BASE_VIDEO_API = 'http://192.168.8.3/labSystem/'
 # MQTT地址
 #VUE_APP_BASE_MQTT_API = 'ws://192.168.1.43:1884'
 # 暨大MQTT地址
-VUE_APP_BASE_MQTT_API = 'ws://192.168.8.3:1884'
-#VUE_APP_BASE_MQTT_API = 'wss://lab.sxitdlc.com/jndxmqtt'
+#VUE_APP_BASE_MQTT_API = 'ws://192.168.8.3:1884'
+VUE_APP_BASE_MQTT_API = 'wss://lab.sxitdlc.com/jndxmqtt'
 #矿大
 #VUE_APP_BASE_MQTT_API = 'ws://192.168.1.248:1884'
 #矿大-文昌

package-lock.json

@@ -1427,6 +1427,11 @@
       "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==",
       "dev": true
     },
+    "@popperjs/core": {
+      "version": "npm:@sxzz/popperjs-es@2.11.7",
+      "resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
+      "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
+    },
     "@sideway/address": {
       "version": "4.1.4",
       "resolved": "https://registry.npmmirror.com/@sideway/address/-/address-4.1.4.tgz",
@@ -2034,6 +2039,29 @@
         "webpack-merge": "^5.7.3",
         "webpack-virtual-modules": "^0.4.2",
         "whatwg-fetch": "^3.6.2"
+      },
+      "dependencies": {
+        "@vue/vue-loader-v15": {
+          "version": "npm:vue-loader@15.10.0",
+          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.0.tgz",
+          "integrity": "sha512-VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg==",
+          "dev": true,
+          "requires": {
+            "@vue/component-compiler-utils": "^3.1.0",
+            "hash-sum": "^1.0.2",
+            "loader-utils": "^1.1.0",
+            "vue-hot-reload-api": "^2.3.0",
+            "vue-style-loader": "^4.1.0"
+          },
+          "dependencies": {
+            "hash-sum": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
+              "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+              "dev": true
+            }
+          }
+        }
       }
     },
     "@vue/cli-shared-utils": {
@@ -2277,27 +2305,6 @@
       "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.2.37.tgz",
       "integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw=="
     },
-    "@vue/vue-loader-v15": {
-      "version": "npm:vue-loader@15.10.0",
-      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.0.tgz",
-      "integrity": "sha512-VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg==",
-      "dev": true,
-      "requires": {
-        "@vue/component-compiler-utils": "^3.1.0",
-        "hash-sum": "^1.0.2",
-        "loader-utils": "^1.1.0",
-        "vue-hot-reload-api": "^2.3.0",
-        "vue-style-loader": "^4.1.0"
-      },
-      "dependencies": {
-        "hash-sum": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
-          "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
-          "dev": true
-        }
-      }
-    },
     "@vue/web-component-wrapper": {
       "version": "1.3.0",
       "resolved": "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz",
@@ -4164,22 +4171,6 @@
         "safer-buffer": "^2.1.0"
       }
     },
-    "echarts": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.3.3.tgz",
-      "integrity": "sha512-BRw2serInRwO5SIwRviZ6Xgm5Lb7irgz+sLiFMmy/HOaf4SQ+7oYqxKzRHAKp4xHQ05AuHw1xvoQWJjDQq/FGw==",
-      "requires": {
-        "tslib": "2.3.0",
-        "zrender": "5.3.2"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
-          "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
-        }
-      }
-    },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz",
@@ -4212,13 +4203,6 @@
         "lodash-unified": "^1.0.2",
         "memoize-one": "^6.0.0",
         "normalize-wheel-es": "^1.2.0"
-      },
-      "dependencies": {
-        "@popperjs/core": {
-          "version": "npm:@sxzz/popperjs-es@2.11.7",
-          "resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
-          "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
-        }
       }
     },
     "emoji-regex": {
@@ -10194,21 +10178,6 @@
           "dev": true
         }
       }
-    },
-    "zrender": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.3.2.tgz",
-      "integrity": "sha512-8IiYdfwHj2rx0UeIGZGGU4WEVSDEdeVCaIg/fomejg1Xu6OifAL1GVzIPHg2D+MyUkbNgPWji90t0a8IDk+39w==",
-      "requires": {
-        "tslib": "2.3.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
-          "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
-        }
-      }
     }
   }
 }

package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "axios": "^0.27.2",
     "core-js": "^3.8.3",
-    "echarts": "^5.3.3",
+    "echarts": "^4.9.0",
     "element-plus": "^2.2.14",
     "flv.js": "^1.6.2",
     "jquery": "^3.6.0",

src/assets/js/echarts.js

@@ -0,0 +1,37 @@
+// 引入 echarts 核心模块，核心模块提供了 echarts 使用必须要的接口。
+import * as echarts from "echarts/core";
+
+/** 引入柱状图and折线图图表，图表后缀都为 Chart  */
+import { BarChart, LineChart } from "echarts/charts";
+
+// 引入提示框，标题，直角坐标系，数据集，内置数据转换器组件，组件后缀都为 Component
+import {
+    TitleComponent,
+    TooltipComponent,
+    GridComponent,
+    DatasetComponent,
+    TransformComponent,
+} from "echarts/components";
+
+// 标签自动布局，全局过渡动画等特性
+import { LabelLayout, UniversalTransition } from "echarts/features";
+
+// 引入 Canvas 渲染器，注意引入 CanvasRenderer 或者 SVGRenderer 是必须的一步
+import { CanvasRenderer } from "echarts/renderers";
+
+// 注册必须的组件
+echarts.use([
+    TitleComponent,
+    TooltipComponent,
+    GridComponent,
+    DatasetComponent,
+    TransformComponent,
+    BarChart,
+    LabelLayout,
+    UniversalTransition,
+    CanvasRenderer,
+    LineChart,
+]);
+
+// 导出
+export default echarts;

src/assets/styles/publicEle.css

@@ -53,7 +53,7 @@
       .form-box .el-form-item .el-form-item__content .el-select .el-input__wrapper {
         background-color: rgba(30, 208, 248, 0.1); }
       .form-box .el-form-item .el-form-item__content .el-select .el-input--suffix .el-input__inner {
-        color: #A2A2A2;
+        color: #0E9EED;
         background-color: none;
         border-color: #1ED0F8; }
       .form-box .el-form-item .el-form-item__content .el-select .el-input--suffix input::placeholder {
@@ -87,8 +87,6 @@
     display: none; }
   .select-big-data-time .el-select-dropdown__item {
     color: #0E9EED; }
-  .select-big-data-time .el-picker-panel__icon-btn {
-    color: #fff; }
   .select-big-data-time .el-select-dropdown__item.hover, .select-big-data-time .el-select-dropdown__item:hover {
     background-color: #0E9EED;
     color: #fff; }
@@ -97,23 +95,20 @@
   .select-big-data-time .in-range div, .select-big-data-time .end-date div {
     background-color: rgba(14, 158, 237, 0.5) !important; }
   .select-big-data-time .el-date-table th {
-    color: #C0C4CC;
+    color: #999;
     border-bottom: 1px solid #0E9EED; }
   .select-big-data-time .el-date-table td.next-month, .select-big-data-time .el-date-table td.prev-month {
     color: #606266; }
 
-.select-big-data {
-  background-color: #0F607C;
-  border-color: #0F607C; }
-  .select-big-data .el-select-dropdown__empty {
-    color: #fff; }
-  .select-big-data .popper__arrow {
-    display: none; }
-  .select-big-data .el-select-dropdown__item {
-    color: #0E9EED; }
-  .select-big-data .el-select-dropdown__item.hover, .select-big-data .el-select-dropdown__item:hover {
-    background-color: #0E9EED;
-    color: #fff; }
+.select-big-data .el-select-dropdown__empty {
+  color: #fff; }
+.select-big-data .popper__arrow {
+  display: none; }
+.select-big-data .el-select-dropdown__item {
+  padding: 0 10px; }
+.select-big-data .el-select-dropdown__item.hover, .select-big-data .el-select-dropdown__item:hover {
+  background-color: #0E9EED;
+  color: #fff; }
 
 .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
   border: none; }

src/main.js

@@ -5,10 +5,15 @@ import router from './router'
 import ElementPlus from 'element-plus'
 import 'element-plus/dist/index.css'
 import '@/assets/styles/publicEle.scss'
+
+import  echarts from 'echarts'
+
 const app = createApp(App);
 app.use(router)
     .use(ElementPlus)
     .mount('#app')
 
 app.config.globalProperties.$axios = axios;
+app.config.globalProperties.$echarts = echarts // 全局挂载echarts
+
 

src/utils/request.js

@@ -12,8 +12,8 @@ axios.defaults.withCredentials = false;
 
 // 允许跨域
 axios.defaults.headers.post["Access-Control-Allow-Origin-Type"] = "*";
-//axios.defaults.headers.common["Authorization"] = 'Bearer 7b18686e-0d1f-483b-b3f2-814e4a60e467';//`Bearer ${localStorage.getItem('access_token')`;
-axios.defaults.headers.common["Authorization"] = 'Bearer '+localStorage.getItem('Authorization')+''
+axios.defaults.headers.common["Authorization"] = 'Bearer 336c397f-3e32-44c4-b18e-ca14bf4f9d10';//`Bearer ${localStorage.getItem('access_token')`;
+//axios.defaults.headers.common["Authorization"] = 'Bearer '+localStorage.getItem('Authorization')+''
 
 //设置超时
 axios.defaults.timeout = 15000;

src/views/home.vue

@@ -301,7 +301,6 @@ import {
 } from "../api/http"
 import Swiper from 'swiper'
 import $ from 'jquery'
-import * as echarts from 'echarts'
 import router from "@/router";
 import { useRouter } from 'vue-router'
 import mqtt from 'mqtt/dist/mqtt'

src/views/illegalDetail.vue

@@ -171,6 +171,7 @@ export default {
           let data=res.data;
           let dataLength=0;
           let dataNum=[];
+
           illegalDetailData=data
           illegalDetailData[0].unshift('product')
           dataLength=illegalDetailData[0].length-1