Compare commits

..

No commits in common. "20240620-RELEASE" and "master" have entirely different histories.

4 changed files with 215 additions and 1049 deletions

10
Jenkinsfile vendored
View File

@ -1,8 +1,10 @@
@Library('jgpl') _ @Library('jgpl') _
webPipeline([ webPipeline([
onBuildInstallShell:{-> onBuildInstallShell:{->
return """ return """
pnpm install --no-prefer-frozen-lockfile npm install url-loader --userconfig ${env.NPM_CONFIG_USERCONFIG} --no-package-lock
pnpm run build || echo 'Ignore build error !!!' pnpm install -no-frozen-lockfile
"""} pnpm run build || echo 'Ignore build error !!!'
"""
},
]) ])

View File

@ -1,98 +1,103 @@
{ {
"name": "cop-web", "name": "cop-web",
"version": "5.6.0", "version": "5.6.0",
"private": true, "private": true,
"author": "Haijun Zhang <zhanghaijun@beyondcent.com>", "author": "Haijun Zhang <zhanghaijun@beyondcent.com>",
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "dev": "vite",
"build": "vue-cli-service build" "serve": "vue-cli-service serve",
}, "build": "vue-cli-service build",
"dependencies": { "lint": "vue-cli-service lint",
"@vue/composition-api": "^1.0.0-rc.2", "fix": "vue-cli-service lint --fix",
"axios": "^0.21.1", "fix-memory-limit": "cross-env LIMIT=4096 increase-memory-limit",
"clipboard": "^2.0.6", "precommit": "lint-staged",
"cmp-echarts": "2.0.0-5.6-release", "upload": "node upload.js",
"cmp-element": "1.0.0-5.6-release", "deploy": "yarn build && yarn upload"
"cmp-graph-editor": "1.0.0-5.6-release", },
"cmp-socket": "1.0.0", "dependencies": {
"codemirror": "5.60", "@vue/composition-api": "^1.0.0-rc.2",
"core-js": "^3.3.2", "axios": "^0.21.1",
"crypto-js": "^3.1.9-1", "clipboard": "^2.0.6",
"dayjs": "^1.10.4", "cmp-echarts": "2.0.0-5.6-release",
"element-ui": "2.13.0", "cmp-element": "1.0.0-5.6-release",
"jquery": "^3.6.0", "cmp-graph-editor": "1.0.0-5.6-release",
"js-cookie": "^2.2.0", "cmp-socket": "1.0.0",
"lodash-es": "^4.17.21", "core-js": "^3.3.2",
"mergely": "4.0.15", "crypto-js": "^3.1.9-1",
"nprogress": "^0.2.0", "dayjs": "^1.10.4",
"qs": "^6.7.0", "element-ui": "2.13.0",
"sortablejs": "^1.8.4", "jquery": "^3.6.0",
"url-loader": "^4.1.1", "js-cookie": "^2.2.0",
"vue": "2.6.14", "lodash-es": "^4.17.21",
"vue-class-component": "^7.0.2", "mergely": "4.0.15",
"vue-code-diff": "^0.0.4", "nprogress": "^0.2.0",
"vue-i18n": "^8.15.0", "qs": "^6.7.0",
"vue-property-decorator": "^8.3.0", "sortablejs": "^1.8.4",
"vue-router": "^3.3.4", "vue": "2.6.14",
"vue2-animate": "^1.0.4", "vue-class-component": "^7.0.2",
"vuex": "^3.0.1" "vue-code-diff": "^0.0.4",
}, "vue-i18n": "^8.15.0",
"devDependencies": { "vue-property-decorator": "^8.3.0",
"@commitlint/cli": "^11.0.0", "vue-router": "^3.3.4",
"@commitlint/config-conventional": "^11.0.0", "vue2-animate": "^1.0.4",
"@types/js-cookie": "^2.2.4", "vuex": "^3.0.1"
"@types/lodash-es": "^4.17.5", },
"@types/nprogress": "^0.2.0", "devDependencies": {
"@types/qs": "^6.5.3", "@commitlint/cli": "^11.0.0",
"@typescript-eslint/eslint-plugin": "^2.18.0", "@commitlint/config-conventional": "^11.0.0",
"@typescript-eslint/parser": "^2.18.0", "@types/js-cookie": "^2.2.4",
"@vue/cli-plugin-babel": "~4.4.1", "@types/lodash-es": "^4.17.5",
"@vue/cli-plugin-eslint": "~4.4.1", "@types/nprogress": "^0.2.0",
"@vue/cli-plugin-router": "~4.4.1", "@types/qs": "^6.5.3",
"@vue/cli-plugin-typescript": "~4.4.1", "@typescript-eslint/eslint-plugin": "^2.18.0",
"@vue/cli-plugin-vuex": "~4.4.1", "@typescript-eslint/parser": "^2.18.0",
"@vue/cli-service": "~4.4.1", "@vue/cli-plugin-babel": "~4.4.1",
"@vue/eslint-config-standard": "^5.1.0", "@vue/cli-plugin-eslint": "~4.4.1",
"@vue/eslint-config-typescript": "^5.0.1", "@vue/cli-plugin-router": "~4.4.1",
"autoprefixer": "9.8.6", "@vue/cli-plugin-typescript": "~4.4.1",
"babel-plugin-transform-vite-meta-glob": "^1.0.3", "@vue/cli-plugin-vuex": "~4.4.1",
"chalk": "^4.1.1", "@vue/cli-service": "~4.4.1",
"compress-webpack-plugin": "^1.0.6", "@vue/eslint-config-standard": "^5.1.0",
"cross-env": "^5.2.0", "@vue/eslint-config-typescript": "^5.0.1",
"eslint": "^6.7.2", "autoprefixer": "9.8.6",
"eslint-plugin-import": "^2.20.1", "babel-plugin-transform-vite-meta-glob": "^1.0.3",
"eslint-plugin-node": "^11.0.0", "chalk": "^4.1.1",
"eslint-plugin-promise": "^4.2.1", "compress-webpack-plugin": "^1.0.6",
"eslint-plugin-standard": "^4.0.0", "cross-env": "^5.2.0",
"eslint-plugin-vue": "^6.1.2", "eslint": "^6.7.2",
"husky": "^1.3.1", "eslint-plugin-import": "^2.20.1",
"increase-memory-limit": "^1.0.6", "eslint-plugin-node": "^11.0.0",
"lint-staged": "^8.1.5", "eslint-plugin-promise": "^4.2.1",
"ora": "^5.4.0", "eslint-plugin-standard": "^4.0.0",
"sass": "^1.19.0", "eslint-plugin-vue": "^6.1.2",
"sass-loader": "^8.0.0", "husky": "^1.3.1",
"svg-sprite-loader": "^6.0.2", "increase-memory-limit": "^1.0.6",
"typescript": "^4.4.4", "lint-staged": "^8.1.5",
"unplugin-auto-import": "^0.6.1", "ora": "^5.4.0",
"unplugin-vue-components": "^0.17.21", "sass": "^1.19.0",
"vue-template-compiler": "2.6.14", "sass-loader": "^8.0.0",
"webpack-cli": "^4.9.2" "svg-sprite-loader": "^6.0.2",
}, "typescript": "^4.4.4",
"eslintConfig": { "unplugin-auto-import": "^0.6.1",
"parserOptions": { "unplugin-vue-components": "^0.17.21",
"parser": "@typescript-eslint/parser" "vue-template-compiler": "2.6.14",
"webpack-cli": "^4.9.2"
},
"eslintConfig": {
"parserOptions": {
"parser": "@typescript-eslint/parser"
}
},
"lint-staged": {
"src/**/*.{js,vue}": [
"eslint --fix",
"git add"
]
},
"husky": {
"hooks": {
"pre-commit": "lint-staged",
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
}
} }
}, }
"lint-staged": {
"src/**/*.{js,vue}": [
"eslint --fix",
"git add"
]
},
"husky": {
"hooks": {
"pre-commit": "lint-staged",
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
}
}
}

File diff suppressed because it is too large Load Diff

View File

@ -14,7 +14,7 @@ function resolve(dir) {
} }
const httpType = 'https://' const httpType = 'https://'
// const proxyUrl = 'develop.cmp56.com:60006/' // 代理地址设置 // const proxyUrl = 'develop.cmp56.com:60006/' // 代理地址设置
const proxyUrl = '23.33.3.22:60006/' // 代理地址设置 const proxyUrl = '10.20.12.56:60006/' // 代理地址设置
// const publicPath = process.env.NODE_ENV === 'production' ? '/cop-web/' : '/cop-web/'; // const publicPath = process.env.NODE_ENV === 'production' ? '/cop-web/' : '/cop-web/';
const publicPath = '/cop-web/' const publicPath = '/cop-web/'
module.exports = { module.exports = {