Merge branch 'master' of D:\qianhe\project\dizhen\dizhen-ui with conflicts.

package.json

@@ -5,7 +5,7 @@
   "author": "若依",
   "author": "若依",
   "license": "MIT",
   "license": "MIT",
   "scripts": {
   "scripts": {
-    "dev": "vue-cli-service serve",
+    "dev": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
     "build:prod": "vue-cli-service build",
     "build:prod": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
     "build:stage": "vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",
     "preview": "node build/index.js --preview",
@@ -36,7 +36,8 @@
     "url": "https://gitee.com/y_project/RuoYi-Vue.git"
     "url": "https://gitee.com/y_project/RuoYi-Vue.git"
   },
   },
   "dependencies": {
   "dependencies": {
-    "@mdi/font": "^7.4.47",
+    "@jsonforms/core": "^3.6.0",
+    "@jsonforms/vue": "^3.6.0",
     "@riophae/vue-treeselect": "0.4.0",
     "@riophae/vue-treeselect": "0.4.0",
     "axios": "0.28.1",
     "axios": "0.28.1",
     "clipboard": "2.0.8",
     "clipboard": "2.0.8",

src/views/plots/index.vue

@@ -445,6 +445,7 @@ export default {
   },
   },
   methods: {
   methods: {
     init() {
     init() {
+
       //创建
       //创建
       seismicPlot = new SeismicPlot({
       seismicPlot = new SeismicPlot({
         'canvas': this.$refs.plot,
         'canvas': this.$refs.plot,

vue.config.js

@@ -38,10 +38,7 @@ module.exports = {
     proxy: {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://localhost:8999`,
-        // target: `http://192.168.31.108:8999`,
-        target: `http://192.168.31.12:8999`,
-        // target: `http://192.168.31.12:8999`,
+        target: `http://127.0.0.1:8999`, //井测试
         changeOrigin: true,
         changeOrigin: true,
         pathRewrite: {
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: '',
           ['^' + process.env.VUE_APP_BASE_API]: '',