zouling 2 周之前
父節點
當前提交
d42fbae308

+ 1 - 1
gongchangdaping/.env.development

@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # 潜山市云数据中心/开发环境/dev-api /prod-api
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = ''
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

+ 7 - 7
gongchangdaping/package-lock.json

@@ -13,7 +13,7 @@
         "countup.js": "^2.3.2",
         "echarts": "^5.4.1",
         "echarts-gl": "^2.0.9",
-        "element-ui": "^2.14.1",
+        "element-ui": "^2.15.14",
         "flv.js": "^1.6.2",
         "js-cookie": "2.2.1",
         "mqtt": "^2.18.8",
@@ -6649,9 +6649,9 @@
       "license": "ISC"
     },
     "node_modules/element-ui": {
-      "version": "2.15.13",
-      "resolved": "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.13.tgz",
-      "integrity": "sha512-LJoatEYX6WV74FqXBss8Xfho9fh9rjDSzrDrTyREdGb1h1R3uRvmLh5jqp2JU137aj4/BgqA3K06RQpQBX33Bg==",
+      "version": "2.15.14",
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.14.tgz",
+      "integrity": "sha512-2v9fHL0ZGINotOlRIAJD5YuVB8V7WKxrE9Qy7dXhRipa035+kF7WuU/z+tEmLVPBcJ0zt8mOu1DKpWcVzBK8IA==",
       "license": "MIT",
       "dependencies": {
         "async-validator": "~1.8.1",
@@ -22007,9 +22007,9 @@
       "dev": true
     },
     "element-ui": {
-      "version": "2.15.13",
-      "resolved": "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.13.tgz",
-      "integrity": "sha512-LJoatEYX6WV74FqXBss8Xfho9fh9rjDSzrDrTyREdGb1h1R3uRvmLh5jqp2JU137aj4/BgqA3K06RQpQBX33Bg==",
+      "version": "2.15.14",
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.14.tgz",
+      "integrity": "sha512-2v9fHL0ZGINotOlRIAJD5YuVB8V7WKxrE9Qy7dXhRipa035+kF7WuU/z+tEmLVPBcJ0zt8mOu1DKpWcVzBK8IA==",
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",

+ 1 - 1
gongchangdaping/package.json

@@ -12,7 +12,7 @@
     "countup.js": "^2.3.2",
     "echarts": "^5.4.1",
     "echarts-gl": "^2.0.9",
-    "element-ui": "^2.14.1",
+    "element-ui": "^2.15.14",
     "flv.js": "^1.6.2",
     "js-cookie": "2.2.1",
     "mqtt": "^2.18.8",

+ 5 - 3
gongchangdaping/src/main.js

@@ -1,14 +1,16 @@
 import Vue from 'vue'
+import Element from 'element-ui'
+import 'element-ui/lib/theme-chalk/index.css';
+// import './assets/styles/element-variables.scss'
 import App from './App.vue'
 import router from './router'
 import store from './store'
 import * as echarts from "echarts";
 // import * as mqtt from "mqtt";
 import { selectDictLabel,parseTime} from "@/utils/ruoyi";
-
 import utils from './utils/index';
 import './utils/ui/index'
-// import Element from 'element-ui'
+
 import './router/permission'
 
 import '@/assets/styles/app.less'
@@ -24,7 +26,7 @@ Vue.component('ControlRoom', ControlRoom)
 Vue.component('Record', Record)
 
 Vue.use(utils)
-
+Vue.use(Element)
 Vue.prototype.$echarts = echarts
 // Vue.prototype.$mqtt = mqtt
 

+ 1 - 1
gongchangdaping/src/settings.js

@@ -3,7 +3,7 @@ module.exports = {
   // urls: `http://114.99.127.243:52002`,
   // baseurls: `http://114.99.127.243:52002/prod-api`,
   // urls: `https://vue.ruoyi.vip`,
-  urls: `http://10.90.90.201:8085`,
+  urls: `http://10.90.90.201:8080`,
    // baseurls: `https://vue.ruoyi.vip/prod-api`,
    // baseurls: `http://192.168.101.168:8089`,