admin/Mars3D-screen_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 合并冲突

Browse Source
This commit is contained in:
jiayu 2024-09-20 19:00:29 +08:00
commit 217c61f4fa
5 changed files with 2 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@ -4,7 +4,7 @@ NODE_ENV = 'development'
# 本地环境接口地址(/api/index.ts文件中使用) # 本地环境接口地址(/api/index.ts文件中使用)
# VITE_API_URL = 'http://192.168.34.155:6677' # VITE_API_URL = 'http://192.168.34.155:6677'
# VITE_API_URL = 'http://jxjzw.zhgdyun.com:6677' # VITE_API_URL = 'http://jxjzw.zhgdyun.com:6677'
# VITE_API_URL = 'http://jxjzw.zhgdyun.com:6678' # VITE_API_URL = "http://jxjzw.zhgdyun.com:6678"
VITE_API_URL = 'http://222.80.185.228:6080' VITE_API_URL = 'http://222.80.185.228:6080'
VITE_WPAPI_URL = "http://182.90.224.147:8081" VITE_WPAPI_URL = "http://182.90.224.147:8081"
# VITE_API_URL = "http://182.90.224.147:6688" # VITE_API_URL = "http://182.90.224.147:6688"

2
.env.production
View File

@ -3,9 +3,9 @@ NODE_ENV = "production"
# 线上环境接口地址(easymock) # 线上环境接口地址(easymock)
# VITE_API_URL = "http://139.9.66.234:6688" # VITE_API_URL = "http://139.9.66.234:6688"
# VITE_API_URL = "http://jxjzw.zhgdyun.com:6678"
# VITE_API_URL = "http://10.11.13.202:6080" # VITE_API_URL = "http://10.11.13.202:6080"
VITE_API_URL = "http://222.80.185.228:6080" VITE_API_URL = "http://222.80.185.228:6080"
# VITE_API_URL = "http://jxjzw.zhgdyun.com:6678"
# VITE_API_URL = "http://182.90.224.147:9012" # VITE_API_URL = "http://182.90.224.147:9012"
# VITE_API_URL = "http://47.104.132.250:9000" # VITE_API_URL = "http://47.104.132.250:9000"
VITE_WPAPI_URL = "http://jxjzw.zhgdyun.com:8081" VITE_WPAPI_URL = "http://jxjzw.zhgdyun.com:8081"

4
.husky/commit-msg
View File

@ -1,4 +0,0 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"
npx --no-install commitlint --edit $1

14
.vscode/extensions.json vendored
View File

@ -1,14 +0,0 @@
{
"recommendations": [
"vue.volar",
"vue.vscode-typescript-vue-plugin",
"hollowtree.vue-snippets",
"dbaeumer.vscode-eslint",
"stylelint.vscode-stylelint",
"esbenp.prettier-vscode",
"editorconfig.editorconfig",
"streetsidesoftware.code-spell-checker",
"syler.sass-indented",
"mikestead.dotenv"
]
}

132
.vscode/settings.json vendored
View File

@ -1,132 +0,0 @@
{
"editor.formatOnSave": true,
"stylelint.enable": true,
"editor.codeActionsOnSave": {
"source.fixAll.stylelint": "explicit"
},
"stylelint.validate": ["css", "less", "postcss", "scss", "vue", "sass", "html"],
"files.eol": "\n",
"[vue]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[jsonc]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[scss]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[html]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[markdown]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[less]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"cSpell.words": [
"acroutes",
"adcode",
"Alipay",
"AMAP",
"Anglar",
"antd",
"apng",
"Biao",
"bottomleft",
"bottomright",
"breakline",
"browserslist",
"cascader",
"cnpm",
"commitize",
"commitlint",
"contentleft",
"contentright",
"CSDN",
"curveness",
"daterange",
"datetimerange",
"doclock",
"dragover",
"easymock",
"echarts",
"esbuild",
"fangda",
"fastmock",
"Geeker",
"Gitee",
"glgview",
"hexs",
"iconfont",
"Jheng",
"juejin",
"liquidfill",
"liutao",
"loglevel",
"longpress",
"malefemale",
"Mapchart",
"nprogress",
"officedocument",
"openxmlformats",
"pageable",
"Parens",
"persistedstate",
"Pinia",
"pjpeg",
"Prefixs",
"protable",
"singleline",
"sortablejs",
"sousuo",
"spreadsheetml",
"styl",
"stylelint",
"stylelintignore",
"stylelintrc",
"suoxiao",
"sysmbol",
"timerange",
"topleft",
"topright",
"truetype",
"Uncapitalize",
"unplugin",
"unref",
"vite",
"vuedraggable",
"vueuse",
"Vuex",
"wangeditor",
"Wechat",
"xianxingdaoyu",
"xianxingdiqiu",
"xianxingditu",
"xianxingfanchuan",
"xianxingfeiji",
"xianxinglvhangriji",
"xianxingtianqiyubao",
"xianxingxiangjipaizhao",
"xianxingxiarilengyin",
"xianxingyoulun",
"xianxingzijiayou",
"xiaoxi",
"yxxx",
"zhongyingwen",
"zhuti",
"zlevel"
]
}