From f5c0e5325ed0d80521e8ea047d044450c9afef6a Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 5 Feb 2024 17:03:05 +0800
Subject: [PATCH] fix

---
 package-lock.json                   | 9 +++------
 package.json                        | 2 +-
 src/pages/course/list/index.vue     | 8 ++++----
 src/pages/screen/index.vue          | 3 +++
 src/pages/station/preview/index.vue | 1 +
 src/setting.js                      | 5 ++---
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a3724ea..dd94dda 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1229,12 +1229,9 @@
       }
     },
     "@tinymce/tinymce-vue": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/@tinymce/tinymce-vue/-/tinymce-vue-5.1.1.tgz",
-      "integrity": "sha512-iO57HOWesFOhsaqjA5Ea6sDvQBmJJH3/dq00Uvg7metlct2kLF+ctRgoDsetLt6gmeZ7COPftr814/XzqnJ/dg==",
-      "requires": {
-        "tinymce": "^6.0.0 || ^5.5.1"
-      }
+      "version": "3.2.8",
+      "resolved": "https://registry.npmjs.org/@tinymce/tinymce-vue/-/tinymce-vue-3.2.8.tgz",
+      "integrity": "sha512-jEz+NZ0g+FZFz273OEUWz9QkwPMyjc5AJYyxOgu51O1Y5UaJ/6IUddXTX6A20mwCleEv5ebwNYdalviafx4fnA=="
     },
     "@types/glob": {
       "version": "7.2.0",
diff --git a/package.json b/package.json
index 3236599..e4a42f8 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "build": "vue-cli-service build"
   },
   "dependencies": {
-    "@tinymce/tinymce-vue": "^5.1.1",
+    "@tinymce/tinymce-vue": "^3.2.8",
     "ali-oss": "^6.18.1",
     "axios": "^0.26.1",
     "babel-polyfill": "^6.26.0",
diff --git a/src/pages/course/list/index.vue b/src/pages/course/list/index.vue
index 8b2a653..3736eab 100644
--- a/src/pages/course/list/index.vue
+++ b/src/pages/course/list/index.vue
@@ -194,10 +194,10 @@ export default {
     getData () {
       this.loadIns = Loading.service()
       this.getList()
-      if (!Setting.isDev) {
-        clearInterval(this.timer)
-        this.timer = setInterval(this.getRedis, 1000)
-      }
+      // if (!Setting.isDev) {
+      //   clearInterval(this.timer)
+      //   this.timer = setInterval(this.getRedis, 1000)
+      // }
     },
     initData () {
       this.page = 1;
diff --git a/src/pages/screen/index.vue b/src/pages/screen/index.vue
index f995223..7e44446 100644
--- a/src/pages/screen/index.vue
+++ b/src/pages/screen/index.vue
@@ -1063,6 +1063,8 @@ export default {
           }],
           yAxis: [{
             type: 'value',
+            minInterval: 1,
+            min: 0,
             axisTick: {
               show: false
             },
@@ -1072,6 +1074,7 @@ export default {
               }
             },
             axisLabel: {
+              // interval: 5,
               margin: 10,
               textStyle: {
                 fontSize: 12,
diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue
index f3ef8a0..54b0c9f 100644
--- a/src/pages/station/preview/index.vue
+++ b/src/pages/station/preview/index.vue
@@ -1012,6 +1012,7 @@ $height: 700px;
 }
 .page {
     /deep/.des {
+        overflow: auto;
         div,
         p,
         span {
diff --git a/src/setting.js b/src/setting.js
index 8c56d72..5b0b626 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -34,9 +34,8 @@ if (isPro) {
     sandPath = `http://${location.hostname}:9520`
     uploadURL = `http://121.37.12.51/`
     host = "http://121.37.12.51/"; // 测试服
-    // host = 'https://www.occupationlab.com/' // 正式服
-    host = "http://192.168.31.217:9000/"; // 榕
-    // host = "http://192.168.31.51:9000/"; // 赓
+    host = 'https://www.occupationlab.com/' // 正式服
+    host = "http://192.168.31.217:9000/";
 } else if (isSq) {
 	zcPath = `10.20.100.204:8883`
 }