Skip to content

C
center-qa
提交 66f28d13 authored 作者: lihuihui's avatar lihuihui
浏览文件
操作

Merge branch 'master' of https://gitlab-pro.ezijing.com/ezijing-web/qbs

上级 84fc7563 8c686846
隐藏空白字符变更
内嵌 并排
正在显示 包含 140 行增加 和 156 行删除
package-lock.json
浏览文件 @ 66f28d13
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
"version": "0.0.0", "version": "0.0.0",
"dependencies": { "dependencies": {
"@tinymce/tinymce-vue": "^3.2.8", "@tinymce/tinymce-vue": "^3.2.8",
"axios": "^0.25.0", "axios": "^0.26.0",
"blueimp-md5": "^2.19.0", "blueimp-md5": "^2.19.0",
"clipboard": "^2.0.8", "clipboard": "^2.0.10",
"element-ui": "^2.15.6", "element-ui": "^2.15.6",
"query-string": "^7.1.1", "query-string": "^7.1.1",
"vue": "^2.6.14", "vue": "^2.6.14",
...@@ -19,17 +19,16 @@ ...@@ -19,17 +19,16 @@
}, },
"devDependencies": { "devDependencies": {
"ali-oss": "^6.17.1", "ali-oss": "^6.17.1",
"chalk": "^5.0.0", "chalk": "^4.1.2",
"cross-env": "^7.0.3",
"eslint": "^8.8.0", "eslint": "^8.8.0",
"eslint-config-standard": "^16.0.3", "eslint-config-standard": "^16.0.3",
"eslint-plugin-import": "^2.25.4", "eslint-plugin-import": "^2.25.4",
"eslint-plugin-node": "^11.1.0", "eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^6.0.0", "eslint-plugin-promise": "^6.0.0",
"eslint-plugin-vue": "^8.4.1", "eslint-plugin-vue": "^8.5.0",
"sass": "1.49.7", "sass": "1.49.9",
"vite": "^2.8.0", "vite": "^2.8.5",
"vite-plugin-checker": "^0.4.0", "vite-plugin-checker": "^0.4.2",
"vite-plugin-vue2": "^1.9.3", "vite-plugin-vue2": "^1.9.3",
"vue-template-compiler": "^2.6.14" "vue-template-compiler": "^2.6.14"
} }
...@@ -1148,10 +1147,11 @@ ...@@ -1148,10 +1147,11 @@
} }
}, },
"node_modules/axios": { "node_modules/axios": {
"version": "0.25.0", "version": "0.26.0",
"license": "MIT", "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.0.tgz",
"integrity": "sha512-lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og==",
"dependencies": { "dependencies": {
"follow-redirects": "^1.14.7" "follow-redirects": "^1.14.8"
} }
}, },
"node_modules/babel-helper-vue-jsx-merge-props": { "node_modules/babel-helper-vue-jsx-merge-props": {
...@@ -1287,11 +1287,16 @@ ...@@ -1287,11 +1287,16 @@
} }
}, },
"node_modules/chalk": { "node_modules/chalk": {
"version": "5.0.0", "version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true, "dev": true,
"license": "MIT", "dependencies": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
},
"engines": { "engines": {
"node": "^12.17.0 || ^14.13 || >=16.0.0" "node": ">=10"
}, },
"funding": { "funding": {
"url": "https://github.com/chalk/chalk?sponsor=1" "url": "https://github.com/chalk/chalk?sponsor=1"
...@@ -1318,10 +1323,9 @@ ...@@ -1318,10 +1323,9 @@
} }
}, },
"node_modules/clipboard": { "node_modules/clipboard": {
"version": "2.0.8", "version": "2.0.10",
"resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.8.tgz", "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.10.tgz",
"integrity": "sha512-Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ==", "integrity": "sha512-cz3m2YVwFz95qSEbCDi2fzLN/epEN9zXBvfgAoGkvGOJZATMl9gtTDVOtBYkx2ODUJl2kvmud7n32sV2BpYR4g==",
"license": "MIT",
"dependencies": { "dependencies": {
"good-listener": "^1.2.2", "good-listener": "^1.2.2",
"select": "^1.1.2", "select": "^1.1.2",
...@@ -1399,23 +1403,6 @@ ...@@ -1399,23 +1403,6 @@
"dev": true, "dev": true,
"license": "MIT" "license": "MIT"
}, },
"node_modules/cross-env": {
"version": "7.0.3",
"dev": true,
"license": "MIT",
"dependencies": {
"cross-spawn": "^7.0.1"
},
"bin": {
"cross-env": "src/bin/cross-env.js",
"cross-env-shell": "src/bin/cross-env-shell.js"
},
"engines": {
"node": ">=10.14",
"npm": ">=6",
"yarn": ">=1"
}
},
"node_modules/cross-spawn": { "node_modules/cross-spawn": {
"version": "7.0.3", "version": "7.0.3",
"dev": true, "dev": true,
...@@ -1974,9 +1961,10 @@ ...@@ -1974,9 +1961,10 @@
} }
}, },
"node_modules/eslint-plugin-vue": { "node_modules/eslint-plugin-vue": {
"version": "8.4.1", "version": "8.5.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.5.0.tgz",
"integrity": "sha512-i1uHCTAKOoEj12RDvdtONWrGzjFm/djkzqfhmQ0d6M/W8KM81mhswd/z+iTZ0jCpdUedW3YRgcVfQ37/J4zoYQ==",
"dev": true, "dev": true,
"license": "MIT",
"dependencies": { "dependencies": {
"eslint-utils": "^3.0.0", "eslint-utils": "^3.0.0",
"natural-compare": "^1.4.0", "natural-compare": "^1.4.0",
...@@ -2095,21 +2083,6 @@ ...@@ -2095,21 +2083,6 @@
"node": "^12.22.0 || ^14.17.0 || >=16.0.0" "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
} }
}, },
"node_modules/eslint/node_modules/chalk": {
"version": "4.1.2",
"dev": true,
"license": "MIT",
"dependencies": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
},
"engines": {
"node": ">=10"
},
"funding": {
"url": "https://github.com/chalk/chalk?sponsor=1"
}
},
"node_modules/eslint/node_modules/escape-string-regexp": { "node_modules/eslint/node_modules/escape-string-regexp": {
"version": "4.0.0", "version": "4.0.0",
"dev": true, "dev": true,
...@@ -2431,14 +2404,15 @@ ...@@ -2431,14 +2404,15 @@
"license": "ISC" "license": "ISC"
}, },
"node_modules/follow-redirects": { "node_modules/follow-redirects": {
"version": "1.14.7", "version": "1.14.9",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
"integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==",
"funding": [ "funding": [
{ {
"type": "individual", "type": "individual",
"url": "https://github.com/sponsors/RubenVerborgh" "url": "https://github.com/sponsors/RubenVerborgh"
} }
], ],
"license": "MIT",
"engines": { "engines": {
"node": ">=4.0" "node": ">=4.0"
}, },
...@@ -3340,9 +3314,10 @@ ...@@ -3340,9 +3314,10 @@
} }
}, },
"node_modules/nanoid": { "node_modules/nanoid": {
"version": "3.2.0", "version": "3.3.1",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz",
"integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==",
"dev": true, "dev": true,
"license": "MIT",
"bin": { "bin": {
"nanoid": "bin/nanoid.cjs" "nanoid": "bin/nanoid.cjs"
}, },
...@@ -3636,13 +3611,14 @@ ...@@ -3636,13 +3611,14 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/postcss": { "node_modules/postcss": {
"version": "8.4.5", "version": "8.4.7",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.7.tgz",
"integrity": "sha512-L9Ye3r6hkkCeOETQX6iOaWZgjp3LL6Lpqm6EtgbKrgqGGteRMNb9vzBfRL96YOSu8o7x3MfIH9Mo5cPJFGrW6A==",
"dev": true, "dev": true,
"license": "MIT",
"dependencies": { "dependencies": {
"nanoid": "^3.1.30", "nanoid": "^3.3.1",
"picocolors": "^1.0.0", "picocolors": "^1.0.0",
"source-map-js": "^1.0.1" "source-map-js": "^1.0.2"
}, },
"engines": { "engines": {
"node": "^10 || ^12 || >=14" "node": "^10 || ^12 || >=14"
...@@ -3938,9 +3914,10 @@ ...@@ -3938,9 +3914,10 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/sass": { "node_modules/sass": {
"version": "1.49.7", "version": "1.49.9",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.49.9.tgz",
"integrity": "sha512-YlYWkkHP9fbwaFRZQRXgDi3mXZShslVmmo+FVK3kHLUELHHEYrCmL1x6IUjC7wLS6VuJSAFXRQS/DxdsC4xL1A==",
"dev": true, "dev": true,
"license": "MIT",
"dependencies": { "dependencies": {
"chokidar": ">=3.0.0 <4.0.0", "chokidar": ">=3.0.0 <4.0.0",
"immutable": "^4.0.0", "immutable": "^4.0.0",
...@@ -4458,12 +4435,13 @@ ...@@ -4458,12 +4435,13 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/vite": { "node_modules/vite": {
"version": "2.8.0", "version": "2.8.5",
"resolved": "https://registry.npmjs.org/vite/-/vite-2.8.5.tgz",
"integrity": "sha512-C/7EGNa1ugWejol6nOcd/0d8PR70Nzd+XXwsPbnNOfzZw0NN2xyXfmw/GNDHgr5fcaTSO4gjxCJCrwNhQUMhmA==",
"dev": true, "dev": true,
"license": "MIT",
"dependencies": { "dependencies": {
"esbuild": "^0.14.14", "esbuild": "^0.14.14",
"postcss": "^8.4.5", "postcss": "^8.4.6",
"resolve": "^1.22.0", "resolve": "^1.22.0",
"rollup": "^2.59.0" "rollup": "^2.59.0"
}, },
...@@ -4494,9 +4472,10 @@ ...@@ -4494,9 +4472,10 @@
} }
}, },
"node_modules/vite-plugin-checker": { "node_modules/vite-plugin-checker": {
"version": "0.4.0", "version": "0.4.2",
"resolved": "https://registry.npmjs.org/vite-plugin-checker/-/vite-plugin-checker-0.4.2.tgz",
"integrity": "sha512-qMre3nYXAv11fZTQt+zQjVvNMweye36vZLnUqCCC7BJXYjHYeBml3zox4N6UiBufKoiF3XX0w/kwTvXHQLvflQ==",
"dev": true, "dev": true,
"license": "MIT",
"dependencies": { "dependencies": {
"@babel/code-frame": "^7.12.13", "@babel/code-frame": "^7.12.13",
"ansi-escapes": "^4.3.0", "ansi-escapes": "^4.3.0",
...@@ -4521,21 +4500,6 @@ ...@@ -4521,21 +4500,6 @@
"vite": "^2.0.0" "vite": "^2.0.0"
} }
}, },
"node_modules/vite-plugin-checker/node_modules/chalk": {
"version": "4.1.2",
"dev": true,
"license": "MIT",
"dependencies": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
},
"engines": {
"node": ">=10"
},
"funding": {
"url": "https://github.com/chalk/chalk?sponsor=1"
}
},
"node_modules/vite-plugin-vue2": { "node_modules/vite-plugin-vue2": {
"version": "1.9.3", "version": "1.9.3",
"dev": true, "dev": true,
...@@ -5584,9 +5548,11 @@ ...@@ -5584,9 +5548,11 @@
"dev": true "dev": true
}, },
"axios": { "axios": {
"version": "0.25.0", "version": "0.26.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.26.0.tgz",
"integrity": "sha512-lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og==",
"requires": { "requires": {
"follow-redirects": "^1.14.7" "follow-redirects": "^1.14.8"
} }
}, },
"babel-helper-vue-jsx-merge-props": { "babel-helper-vue-jsx-merge-props": {
...@@ -5675,8 +5641,14 @@ ...@@ -5675,8 +5641,14 @@
"dev": true "dev": true
}, },
"chalk": { "chalk": {
"version": "5.0.0", "version": "4.1.2",
"dev": true "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
}, },
"chokidar": { "chokidar": {
"version": "3.5.2", "version": "3.5.2",
...@@ -5693,9 +5665,9 @@ ...@@ -5693,9 +5665,9 @@
} }
}, },
"clipboard": { "clipboard": {
"version": "2.0.8", "version": "2.0.10",
"resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.8.tgz", "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.10.tgz",
"integrity": "sha512-Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ==", "integrity": "sha512-cz3m2YVwFz95qSEbCDi2fzLN/epEN9zXBvfgAoGkvGOJZATMl9gtTDVOtBYkx2ODUJl2kvmud7n32sV2BpYR4g==",
"requires": { "requires": {
"good-listener": "^1.2.2", "good-listener": "^1.2.2",
"select": "^1.1.2", "select": "^1.1.2",
...@@ -5750,13 +5722,6 @@ ...@@ -5750,13 +5722,6 @@
"version": "1.0.2", "version": "1.0.2",
"dev": true "dev": true
}, },
"cross-env": {
"version": "7.0.3",
"dev": true,
"requires": {
"cross-spawn": "^7.0.1"
}
},
"cross-spawn": { "cross-spawn": {
"version": "7.0.3", "version": "7.0.3",
"dev": true, "dev": true,
...@@ -6017,14 +5982,6 @@ ...@@ -6017,14 +5982,6 @@
"v8-compile-cache": "^2.0.3" "v8-compile-cache": "^2.0.3"
}, },
"dependencies": { "dependencies": {
"chalk": {
"version": "4.1.2",
"dev": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"escape-string-regexp": { "escape-string-regexp": {
"version": "4.0.0", "version": "4.0.0",
"dev": true "dev": true
...@@ -6193,7 +6150,9 @@ ...@@ -6193,7 +6150,9 @@
"requires": {} "requires": {}
}, },
"eslint-plugin-vue": { "eslint-plugin-vue": {
"version": "8.4.1", "version": "8.5.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.5.0.tgz",
"integrity": "sha512-i1uHCTAKOoEj12RDvdtONWrGzjFm/djkzqfhmQ0d6M/W8KM81mhswd/z+iTZ0jCpdUedW3YRgcVfQ37/J4zoYQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"eslint-utils": "^3.0.0", "eslint-utils": "^3.0.0",
...@@ -6402,7 +6361,9 @@ ...@@ -6402,7 +6361,9 @@
"dev": true "dev": true
}, },
"follow-redirects": { "follow-redirects": {
"version": "1.14.7" "version": "1.14.9",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
"integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w=="
}, },
"formstream": { "formstream": {
"version": "1.1.1", "version": "1.1.1",
...@@ -6988,7 +6949,9 @@ ...@@ -6988,7 +6949,9 @@
} }
}, },
"nanoid": { "nanoid": {
"version": "3.2.0", "version": "3.3.1",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz",
"integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==",
"dev": true "dev": true
}, },
"natural-compare": { "natural-compare": {
...@@ -7167,12 +7130,14 @@ ...@@ -7167,12 +7130,14 @@
"dev": true "dev": true
}, },
"postcss": { "postcss": {
"version": "8.4.5", "version": "8.4.7",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.7.tgz",
"integrity": "sha512-L9Ye3r6hkkCeOETQX6iOaWZgjp3LL6Lpqm6EtgbKrgqGGteRMNb9vzBfRL96YOSu8o7x3MfIH9Mo5cPJFGrW6A==",
"dev": true, "dev": true,
"requires": { "requires": {
"nanoid": "^3.1.30", "nanoid": "^3.3.1",
"picocolors": "^1.0.0", "picocolors": "^1.0.0",
"source-map-js": "^1.0.1" "source-map-js": "^1.0.2"
} }
}, },
"postcss-selector-parser": { "postcss-selector-parser": {
...@@ -7340,7 +7305,9 @@ ...@@ -7340,7 +7305,9 @@
"dev": true "dev": true
}, },
"sass": { "sass": {
"version": "1.49.7", "version": "1.49.9",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.49.9.tgz",
"integrity": "sha512-YlYWkkHP9fbwaFRZQRXgDi3mXZShslVmmo+FVK3kHLUELHHEYrCmL1x6IUjC7wLS6VuJSAFXRQS/DxdsC4xL1A==",
"dev": true, "dev": true,
"requires": { "requires": {
"chokidar": ">=3.0.0 <4.0.0", "chokidar": ">=3.0.0 <4.0.0",
...@@ -7686,18 +7653,22 @@ ...@@ -7686,18 +7653,22 @@
"dev": true "dev": true
}, },
"vite": { "vite": {
"version": "2.8.0", "version": "2.8.5",
"resolved": "https://registry.npmjs.org/vite/-/vite-2.8.5.tgz",
"integrity": "sha512-C/7EGNa1ugWejol6nOcd/0d8PR70Nzd+XXwsPbnNOfzZw0NN2xyXfmw/GNDHgr5fcaTSO4gjxCJCrwNhQUMhmA==",
"dev": true, "dev": true,
"requires": { "requires": {
"esbuild": "^0.14.14", "esbuild": "^0.14.14",
"fsevents": "~2.3.2", "fsevents": "~2.3.2",
"postcss": "^8.4.5", "postcss": "^8.4.6",
"resolve": "^1.22.0", "resolve": "^1.22.0",
"rollup": "^2.59.0" "rollup": "^2.59.0"
} }
}, },
"vite-plugin-checker": { "vite-plugin-checker": {
"version": "0.4.0", "version": "0.4.2",
"resolved": "https://registry.npmjs.org/vite-plugin-checker/-/vite-plugin-checker-0.4.2.tgz",
"integrity": "sha512-qMre3nYXAv11fZTQt+zQjVvNMweye36vZLnUqCCC7BJXYjHYeBml3zox4N6UiBufKoiF3XX0w/kwTvXHQLvflQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/code-frame": "^7.12.13", "@babel/code-frame": "^7.12.13",
...@@ -7715,16 +7686,6 @@ ...@@ -7715,16 +7686,6 @@
"vscode-languageserver": "^7.0.0", "vscode-languageserver": "^7.0.0",
"vscode-languageserver-textdocument": "^1.0.1", "vscode-languageserver-textdocument": "^1.0.1",
"vscode-uri": "^3.0.2" "vscode-uri": "^3.0.2"
},
"dependencies": {
"chalk": {
"version": "4.1.2",
"dev": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
}
} }
}, },
"vite-plugin-vue2": { "vite-plugin-vue2": {
......
package.json
浏览文件 @ 66f28d13
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
}, },
"dependencies": { "dependencies": {
"@tinymce/tinymce-vue": "^3.2.8", "@tinymce/tinymce-vue": "^3.2.8",
"axios": "^0.25.0", "axios": "^0.26.0",
"blueimp-md5": "^2.19.0", "blueimp-md5": "^2.19.0",
"clipboard": "^2.0.8", "clipboard": "^2.0.10",
"element-ui": "^2.15.6", "element-ui": "^2.15.6",
"query-string": "^7.1.1", "query-string": "^7.1.1",
"vue": "^2.6.14", "vue": "^2.6.14",
...@@ -22,17 +22,16 @@ ...@@ -22,17 +22,16 @@
}, },
"devDependencies": { "devDependencies": {
"ali-oss": "^6.17.1", "ali-oss": "^6.17.1",
"chalk": "^5.0.0", "chalk": "^4.1.2",
"cross-env": "^7.0.3",
"eslint": "^8.8.0", "eslint": "^8.8.0",
"eslint-config-standard": "^16.0.3", "eslint-config-standard": "^16.0.3",
"eslint-plugin-import": "^2.25.4", "eslint-plugin-import": "^2.25.4",
"eslint-plugin-node": "^11.1.0", "eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^6.0.0", "eslint-plugin-promise": "^6.0.0",
"eslint-plugin-vue": "^8.4.1", "eslint-plugin-vue": "^8.5.0",
"sass": "1.49.7", "sass": "1.49.9",
"vite": "^2.8.0", "vite": "^2.8.5",
"vite-plugin-checker": "^0.4.0", "vite-plugin-checker": "^0.4.2",
"vite-plugin-vue2": "^1.9.3", "vite-plugin-vue2": "^1.9.3",
"vue-template-compiler": "^2.6.14" "vue-template-compiler": "^2.6.14"
} }
......
src/modules/exam/components/BaseInfo.vue
浏览文件 @ 66f28d13
...@@ -95,7 +95,7 @@ export default { ...@@ -95,7 +95,7 @@ export default {
getExamPaperDetail({ id: this.exam_id }).then(res => { getExamPaperDetail({ id: this.exam_id }).then(res => {
console.log(res) console.log(res)
const detailList = res.data.exam_info const detailList = res.data.exam_info
// this.exam_time = [detailList.start_time, detailList.end_time] this.exam_time = [detailList.start_time, detailList.end_time]
this.name = detailList.name this.name = detailList.name
const config = JSON.parse(detailList.config) const config = JSON.parse(detailList.config)
this.config.enabled_before = config.enabled_before this.config.enabled_before = config.enabled_before
......
src/modules/exam/components/CheckPaper.vue
浏览文件 @ 66f28d13
...@@ -47,6 +47,7 @@ export default { ...@@ -47,6 +47,7 @@ export default {
}, },
methods: { methods: {
// 获取试卷列表
getExamParerList() { getExamParerList() {
const params = { q: '' } const params = { q: '' }
getExamPaperList(params).then(res => { getExamPaperList(params).then(res => {
...@@ -60,9 +61,11 @@ export default { ...@@ -60,9 +61,11 @@ export default {
} }
}) })
}, },
// 上一步
lastStep() { lastStep() {
this.$parent.$parent.lastStep() this.$parent.$parent.lastStep()
}, },
// 下一步
nextStep() { nextStep() {
if (!this.q.length) { if (!this.q.length) {
this.$message.warning('请必须选择试卷才能进行下一步操作') this.$message.warning('请必须选择试卷才能进行下一步操作')
...@@ -82,12 +85,18 @@ export default { ...@@ -82,12 +85,18 @@ export default {
this.$emit('getCheckPaper', qs) this.$emit('getCheckPaper', qs)
this.$emit('getCheckPaperList', this.checkedArrs) this.$emit('getCheckPaperList', this.checkedArrs)
}, },
// 保存
saveExamInfo() { saveExamInfo() {
if (!this.q.length) {
this.$message.warning('请必须选择试卷才能进行下一步操作')
return
}
const params = { id: this.$route.query.exam_id, type: 'paper', exam_paper: this.q.toString() } const params = { id: this.$route.query.exam_id, type: 'paper', exam_paper: this.q.toString() }
updateExam(params).then(res => { updateExam(params).then(res => {
history.go(-1) history.go(-1)
}) })
}, },
// 获取试卷详情
getDetailInfo() { getDetailInfo() {
getExamPaperDetail({ id: this.$route.query.exam_id }).then(res => { getExamPaperDetail({ id: this.$route.query.exam_id }).then(res => {
const parperList = res.data.exam_info.paper_list const parperList = res.data.exam_info.paper_list
...@@ -104,6 +113,7 @@ export default { ...@@ -104,6 +113,7 @@ export default {
} }
}, },
mounted() { mounted() {
// 获取试卷列表
this.getExamParerList() this.getExamParerList()
} }
} }
......
src/modules/paper/components/AddPaper.vue
浏览文件 @ 66f28d13
<template> <template>
<el-drawer title="添加试卷试题" size="70%" v-bind="$attrs" v-on="$listeners"> <el-drawer title="添加试卷试题" size="80%" v-bind="$attrs" v-on="$listeners">
<div style="margin: 0 20px"> <div style="margin: 0 20px">
<!-- 选题组卷添加试卷第一步 --> <!-- 选题组卷添加试卷第一步 -->
<div v-show="step === 1"> <div v-show="step === 1">
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="您此次选择的试题总数：">{{ multipleSelection.length }}</el-form-item> <el-form-item label="您此次选择的试题总数：">{{ multipleSelection.length }}</el-form-item>
<el-form-item label="此次试卷总分：">{{ data.paper_total_score }}</el-form-item> <el-form-item label="此次试卷总分：">{{ data.paper_total_score - addedQuestionsScore }}</el-form-item>
<el-form-item label="已设置试题总分：">{{ addedQuestionsScore }}</el-form-item> <el-form-item label="已设置试题总分：">{{ addedQuestionsScore }}</el-form-item>
<el-divider></el-divider> <el-divider></el-divider>
<template v-if="setMethod === 1"> <template v-if="setMethod === 1">
......
src/modules/paper/components/AutomaticPaper.vue
浏览文件 @ 66f28d13
<template> <template>
<el-drawer title="试卷列表" size="80%" v-bind="$attrs" v-on="$listeners"> <el-drawer title="自动组卷" size="80%" v-bind="$attrs" v-on="$listeners">
<div style="margin: 0 20px"> <div style="margin: 0 20px">
<el-form :model="form"> <el-form :model="form">
<!-- 组卷题库 --> <!-- 组卷题库 -->
...@@ -53,14 +53,14 @@ ...@@ -53,14 +53,14 @@
v-model="row.question_num" v-model="row.question_num"
:min="0" :min="0"
:max="row.max_question_num" :max="row.max_question_num"
:step-strictly="true" step-strictly
></el-input-number> ></el-input-number>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="每题分值"> <el-table-column align="center" label="每题分值">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-input-number v-model="row.question_score" :min="0" :step-strictly="true"></el-input-number> <el-input-number v-model="row.question_score" :min="0" step-strictly></el-input-number>
</template> </template>
</el-table-column> </el-table-column>
...@@ -160,6 +160,19 @@ export default { ...@@ -160,6 +160,19 @@ export default {
questionList: [{ ...defaultItem }] questionList: [{ ...defaultItem }]
} }
}, },
watch: {
data: {
immediate: true,
handler(data) {
if (data.paper_contents) {
this.form = Object.assign({}, this.form, data.paper_contents)
}
if (data.paper_contents && data.paper_contents.rules) {
this.questionList = data.paper_contents.rules
}
}
}
},
computed: { computed: {
// 试题数量总数 // 试题数量总数
questionTotalNum() { questionTotalNum() {
......
src/modules/paper/components/BatchSetting.vue
浏览文件 @ 66f28d13
...@@ -6,15 +6,18 @@ ...@@ -6,15 +6,18 @@
append-to-body append-to-body
:close-on-click-modal="false" :close-on-click-modal="false"
width="400px" width="400px"
center
> >
<el-form :model="form" :rules="rules" ref="form"> <el-form :model="form" :rules="rules" ref="form" hide-required-asterisk label-width="100px" label-suffix=":">
<el-form-item label="单选题"></el-form-item> <el-form-item label="试题类型">{{ data.question_type_name }}</el-form-item>
<el-form-item label="数量">{{ data.total }}</el-form-item> <el-form-item label="数量">{{ data.total }}</el-form-item>
<el-form-item label="每道试题分值" prop="score"><el-input v-model="form.score"></el-input></el-form-item> <el-form-item label="每道试题分值" prop="score">
<el-form-item> <el-input-number v-model="form.score" :min="0" step-strictly :controls="false" />
<el-button type="primary" @click="handleSubmit">保存</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer>
<el-button type="primary" @click="handleSubmit">保存</el-button>
</template>
</el-dialog> </el-dialog>
</template> </template>
......
src/modules/paper/components/QuestionListItem.vue
浏览文件 @ 66f28d13
...@@ -11,7 +11,14 @@ ...@@ -11,7 +11,14 @@
<div class="question-type">{{ questionTypeText }}</div> <div class="question-type">{{ questionTypeText }}</div>
<div class="question-score"> <div class="question-score">
<p>分数：</p> <p>分数：</p>
<el-input v-model="data.score" :disabled="disableScore" style="width: 100px"></el-input> <el-input-number
v-model="data.score"
step-strictly
:controls="false"
:min="0"
:disabled="disableScore"
style="width: 80px"
></el-input-number>
</div> </div>
</div> </div>
<!-- 题干 --> <!-- 题干 -->
...@@ -37,7 +44,7 @@ ...@@ -37,7 +44,7 @@
</template> </template>
<!-- 问答题 --> <!-- 问答题 -->
<template v-if="questionType === 3"> <template v-if="questionType === 3">
<v-editor></v-editor> <v-editor :value="data.question_analysis"></v-editor>
</template> </template>
<!-- 判断题 --> <!-- 判断题 -->
<template v-if="questionType === 6"> <template v-if="questionType === 6">
......
src/modules/paper/views/Update.vue
浏览文件 @ 66f28d13
...@@ -54,7 +54,6 @@ ...@@ -54,7 +54,6 @@
<el-form-item label="试卷总分" prop="paper_total_score"> <el-form-item label="试卷总分" prop="paper_total_score">
<el-input-number <el-input-number
:controls="false" :controls="false"
:step="1"
v-model="form.paper_total_score" v-model="form.paper_total_score"
:min="0" :min="0"
:max="200" :max="200"
...@@ -68,7 +67,6 @@ ...@@ -68,7 +67,6 @@
<el-form-item label="及格分数" prop="pass_score"> <el-form-item label="及格分数" prop="pass_score">
<el-input-number <el-input-number
:controls="false" :controls="false"
:step="1"
v-model="form.pass_score" v-model="form.pass_score"
:min="0" :min="0"
:max="200" :max="200"
...@@ -254,14 +252,7 @@ export default { ...@@ -254,14 +252,7 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
:v-deep .el-input-number .el-input-number__decrease {
display: none;
}
:v-deep .el-input-number .el-input-number__increase {
display: none;
}
::v-deep .el-input-number .el-input__inner { ::v-deep .el-input-number .el-input__inner {
padding-left: 15px;
text-align: left; text-align: left;
} }
</style> </style>
vite.config.js
浏览文件 @ 66f28d13
...@@ -29,8 +29,8 @@ export default defineConfig(({ mode }) => { ...@@ -29,8 +29,8 @@ export default defineConfig(({ mode }) => {
rewrite: path => path.replace(/^\/api\/qbs/, '') rewrite: path => path.replace(/^\/api\/qbs/, '')
}, },
'/api/exam': { '/api/exam': {
// target: 'https://x-exam-admin-api.ezijing.com', target: 'https://x-exam-admin-api.ezijing.com',
target: 'http://localhost-exam-admin.ezijing.com', // target: 'http://localhost-exam-admin.ezijing.com',
changeOrigin: true, changeOrigin: true,
rewrite: path => path.replace(/^\/api\/exam/, '') rewrite: path => path.replace(/^\/api\/exam/, '')
}, },
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论