dev_202412
yujialong 1 year ago
parent f11ef0d40a
commit f5c0e5325e
  1. 9
      package-lock.json
  2. 2
      package.json
  3. 8
      src/pages/course/list/index.vue
  4. 3
      src/pages/screen/index.vue
  5. 1
      src/pages/station/preview/index.vue
  6. 5
      src/setting.js

9
package-lock.json generated

@ -1229,12 +1229,9 @@
} }
}, },
"@tinymce/tinymce-vue": { "@tinymce/tinymce-vue": {
"version": "5.1.1", "version": "3.2.8",
"resolved": "https://registry.npmjs.org/@tinymce/tinymce-vue/-/tinymce-vue-5.1.1.tgz", "resolved": "https://registry.npmjs.org/@tinymce/tinymce-vue/-/tinymce-vue-3.2.8.tgz",
"integrity": "sha512-iO57HOWesFOhsaqjA5Ea6sDvQBmJJH3/dq00Uvg7metlct2kLF+ctRgoDsetLt6gmeZ7COPftr814/XzqnJ/dg==", "integrity": "sha512-jEz+NZ0g+FZFz273OEUWz9QkwPMyjc5AJYyxOgu51O1Y5UaJ/6IUddXTX6A20mwCleEv5ebwNYdalviafx4fnA=="
"requires": {
"tinymce": "^6.0.0 || ^5.5.1"
}
}, },
"@types/glob": { "@types/glob": {
"version": "7.2.0", "version": "7.2.0",

@ -8,7 +8,7 @@
"build": "vue-cli-service build" "build": "vue-cli-service build"
}, },
"dependencies": { "dependencies": {
"@tinymce/tinymce-vue": "^5.1.1", "@tinymce/tinymce-vue": "^3.2.8",
"ali-oss": "^6.18.1", "ali-oss": "^6.18.1",
"axios": "^0.26.1", "axios": "^0.26.1",
"babel-polyfill": "^6.26.0", "babel-polyfill": "^6.26.0",

@ -194,10 +194,10 @@ export default {
getData () { getData () {
this.loadIns = Loading.service() this.loadIns = Loading.service()
this.getList() this.getList()
if (!Setting.isDev) { // if (!Setting.isDev) {
clearInterval(this.timer) // clearInterval(this.timer)
this.timer = setInterval(this.getRedis, 1000) // this.timer = setInterval(this.getRedis, 1000)
} // }
}, },
initData () { initData () {
this.page = 1; this.page = 1;

@ -1063,6 +1063,8 @@ export default {
}], }],
yAxis: [{ yAxis: [{
type: 'value', type: 'value',
minInterval: 1,
min: 0,
axisTick: { axisTick: {
show: false show: false
}, },
@ -1072,6 +1074,7 @@ export default {
} }
}, },
axisLabel: { axisLabel: {
// interval: 5,
margin: 10, margin: 10,
textStyle: { textStyle: {
fontSize: 12, fontSize: 12,

@ -1012,6 +1012,7 @@ $height: 700px;
} }
.page { .page {
/deep/.des { /deep/.des {
overflow: auto;
div, div,
p, p,
span { span {

@ -34,9 +34,8 @@ if (isPro) {
sandPath = `http://${location.hostname}:9520` sandPath = `http://${location.hostname}:9520`
uploadURL = `http://121.37.12.51/` uploadURL = `http://121.37.12.51/`
host = "http://121.37.12.51/"; // 测试服 host = "http://121.37.12.51/"; // 测试服
// host = 'https://www.occupationlab.com/' // 正式服 host = 'https://www.occupationlab.com/' // 正式服
host = "http://192.168.31.217:9000/"; // 榕 host = "http://192.168.31.217:9000/";
// host = "http://192.168.31.51:9000/"; // 赓
} else if (isSq) { } else if (isSq) {
zcPath = `10.20.100.204:8883` zcPath = `10.20.100.204:8883`
} }

Loading…
Cancel
Save