-
+
-
<%= htmlWebpackPlugin.options.title %>
+
<%= VUE_APP_TITLE %>
diff --git a/ui/src/api/model/common.js b/ui/src/api/model/common.js
index 811ca9f..48cc2be 100644
--- a/ui/src/api/model/common.js
+++ b/ui/src/api/model/common.js
@@ -3,7 +3,7 @@ import http from "@/utils/request"
export default {
upload: {
- url: `${config.API_URL}/upload`,
+ url: `${config.API_URL}file/upload`,
name: "文件上传",
post: async function(data, config={}){
return await http.post(this.url, data, config);
diff --git a/ui/src/api/model/demo.js b/ui/src/api/model/demo.js
new file mode 100644
index 0000000..fa8f712
--- /dev/null
+++ b/ui/src/api/model/demo.js
@@ -0,0 +1,55 @@
+import config from "@/config"
+import http from "@/utils/request"
+
+export default {
+ ver: {
+ url: `${config.API_URL}/demo/ver`,
+ name: "获取最新版本号",
+ get: async function(params){
+ return await http.get(this.url, params);
+ }
+ },
+ post: {
+ url: `${config.API_URL}/demo/post`,
+ name: "分页列表",
+ post: async function(data){
+ return await http.post(this.url, data, {
+ headers: {
+ //'response-status': 401
+ }
+ });
+ }
+ },
+ page: {
+ url: `${config.API_URL}/demo/page`,
+ name: "分页列表",
+ get: async function(params){
+ return await http.get(this.url, params);
+ }
+ },
+ list: {
+ url: `${config.API_URL}/demo/list`,
+ name: "数据列表",
+ get: async function(params){
+ return await http.get(this.url, params);
+ }
+ },
+ menu: {
+ url: `${config.API_URL}/demo/menu`,
+ name: "普通用户菜单",
+ get: async function(){
+ return await http.get(this.url);
+ }
+ },
+ status: {
+ url: `${config.API_URL}/demo/status`,
+ name: "模拟无权限",
+ get: async function(code){
+ return await http.get(this.url, {}, {
+ headers: {
+ "response-status": code
+ }
+ });
+ }
+ }
+}
diff --git a/ui/src/api/model/system.js b/ui/src/api/model/system.js
index 3dc813a..5507ef0 100644
--- a/ui/src/api/model/system.js
+++ b/ui/src/api/model/system.js
@@ -34,21 +34,21 @@ export default {
}
},
add: {
- url: `${config.API_URL}/system/menu/add`,
+ url: `${config.API_URL}system/menu/add`,
name: "添加菜单",
post: async function(data){
return await http.post(this.url, data);
}
},
edit: {
- url: `${config.API_URL}/system/menu/edit`,
+ url: `${config.API_URL}system/menu/edit`,
name: "编辑菜单",
post: async function(data){
return await http.post(this.url, data);
}
},
delete: {
- url: `${config.API_URL}/system/menu/delete`,
+ url: `${config.API_URL}system/menu/delete`,
name: "删除菜单",
post: async function(data){
return await http.post(this.url, data);
@@ -129,7 +129,7 @@ export default {
},
app: {
list: {
- url: `${config.API_URL}/system/app/list`,
+ url: `${config.API_URL}system/app/list`,
name: "应用列表",
get: async function(){
return await http.get(this.url);
@@ -138,23 +138,30 @@ export default {
},
log: {
list: {
- url: `${config.API_URL}/system/log/index`,
+ url: `${config.API_URL}system/log/index`,
name: "日志列表",
get: async function(params){
return await http.get(this.url, params);
}
+ },
+ my: {
+ url: `${config.API_URL}system/log/my`,
+ name: "我的日志",
+ get: async function(params){
+ return await http.get(this.url, params);
+ }
}
},
table: {
list: {
- url: `${config.API_URL}/system/table/list`,
+ url: `${config.API_URL}system/table/list`,
name: "表格列管理列表",
get: async function(params){
return await http.get(this.url, params);
}
},
info: {
- url: `${config.API_URL}/system/table/info`,
+ url: `${config.API_URL}system/table/info`,
name: "表格列管理详情",
get: async function(params){
return await http.get(this.url, params);
diff --git a/ui/src/api/model/tools.js b/ui/src/api/model/tools.js
new file mode 100644
index 0000000..cedfd24
--- /dev/null
+++ b/ui/src/api/model/tools.js
@@ -0,0 +1,123 @@
+import config from "@/config"
+import http from "@/utils/request"
+
+export default {
+ filter: {
+ list: {
+ url: `${config.API_URL}/tools/filter/index`,
+ name: "获得过滤数据",
+ get: async function(params){
+ return await http.get(this.url, params);
+ }
+ },
+ insert:{
+ url: `${config.API_URL}/tools/filter/insert`,
+ name: "导入过滤数据",
+ post: async function(data={}){
+ return await http.post(this.url, data);
+ }
+ },
+ search: {
+ url: `${config.API_URL}/tools/filter/search`,
+ name: "过滤数据",
+ get: async function(params){
+ return await http.get(this.url, params);
+ }
+ },
+ delete:{
+ url: `${config.API_URL}/tools/filter/delete`,
+ name: "删除过滤数据",
+ post: async function(data={}){
+ return await http.post(this.url, data);
+ }
+ },
+ edit:{
+ url: `${config.API_URL}/tools/filter/edit`,
+ name: "更新过滤数据",
+ post: async function(data={}){
+ return await http.post(this.url, data);
+ }
+ },
+ task: {
+ url: `${config.API_URL}/tools/filter/task`,
+ name: "任务单数据",
+ get: async function(params){
+ return await http.get(this.url, params);
+ }
+ },
+ batch:{
+ url: `${config.API_URL}/tools/filter/batch`,
+ name: "条件删除",
+ post: async function(data={}){
+ return await http.post(this.url, data);
+ }
+ }
+ },
+ inspect:{
+ list: {
+ url: `${config.API_URL}/tools/inspect/index`,
+ name: "获得质检数据",
+ get: async function(data){
+ let params = Object.assign({}, data);
+ let users = params.user || {}, uids = [];
+ if(users.length > 0){
+ users.map((item) => {
+ uids.push(item.uid);
+ })
+ }
+ params.user = uids;
+ return await http.get(this.url, params);
+ }
+ },
+ insert:{
+ url: `${config.API_URL}/tools/inspect/insert`,
+ name: "导入质检数据",
+ post: async function(data={}){
+ return await http.post(this.url, data);
+ }
+ },
+ edit:{
+ url: `${config.API_URL}/tools/inspect/edit`,
+ name: "质检数据操作",
+ post: async function(data={}){
+ return await http.post(this.url, data);
+ }
+ },
+ delete:{
+ url: `${config.API_URL}/tools/inspect/delete`,
+ name: "删除过滤数据",
+ post: async function(data={}){
+ let params = Object.assign({}, data);
+ let users = params.user || {}, uids = [];
+ if(users.length > 0){
+ users.map((item) => {
+ uids.push(item.uid);
+ })
+ }
+ params.user = uids;
+ return await http.post(this.url, params);
+ }
+ },
+ average:{
+ url: `${config.API_URL}/tools/inspect/average`,
+ name: "质检数据操作",
+ post: async function(data={}){
+ let params = Object.assign({}, data);
+ let users = params.users || {}, uids = [], user = params.user || {}, uid = [];
+ if(users.length > 0){
+ users.map((item) => {
+ uids.push(item.uid);
+ })
+ }
+ if(user.length > 0){
+ user.map((item) => {
+ uid.push(item.uid);
+ })
+ }
+ params.users = uids;
+ params.user = uid;
+ return await http.post(this.url, params);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/ui/src/api/model/user.js b/ui/src/api/model/user.js
index 87f6934..e870e90 100644
--- a/ui/src/api/model/user.js
+++ b/ui/src/api/model/user.js
@@ -23,6 +23,20 @@ export default {
return await http.post(this.url, params);
}
},
+ uppasswd:{
+ url: `${config.API_URL}/auth/user/passwd`,
+ name: "修改密码",
+ post: async function(params){
+ return await http.post(this.url, params);
+ }
+ },
+ uprole: {
+ url: `${config.API_URL}/auth/user/auth`,
+ name: "编辑用户",
+ post: async function(params){
+ return await http.post(this.url, params);
+ }
+ },
role: {
list: {
url: `${config.API_URL}/auth/role/index`,
@@ -37,6 +51,13 @@ export default {
post: async function(params){
return await http.post(this.url, params);
}
+ },
+ auth: {
+ url: `${config.API_URL}/auth/role/auth`,
+ name: "编辑角色",
+ post: async function(params){
+ return await http.post(this.url, params);
+ }
}
},
department: {
@@ -57,7 +78,7 @@ export default {
},
userinfo:{
url: `${config.API_URL}/auth/user/info`,
- name: "获得部门列表",
+ name: "获得用户信息",
get: async function(params){
return await http.get(this.url, params);
}
diff --git a/ui/src/assets/icons/BugFill.vue b/ui/src/assets/icons/BugFill.vue
new file mode 100644
index 0000000..35a6edc
--- /dev/null
+++ b/ui/src/assets/icons/BugFill.vue
@@ -0,0 +1,3 @@
+
+
+
diff --git a/ui/src/assets/icons/BugLine.vue b/ui/src/assets/icons/BugLine.vue
new file mode 100644
index 0000000..b1cb9ad
--- /dev/null
+++ b/ui/src/assets/icons/BugLine.vue
@@ -0,0 +1,3 @@
+
+
+
diff --git a/ui/src/assets/icons/Code.vue b/ui/src/assets/icons/Code.vue
new file mode 100644
index 0000000..9d1581c
--- /dev/null
+++ b/ui/src/assets/icons/Code.vue
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/ui/src/assets/icons/Download.vue b/ui/src/assets/icons/Download.vue
new file mode 100644
index 0000000..3b139da
--- /dev/null
+++ b/ui/src/assets/icons/Download.vue
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/ui/src/assets/icons/FileExcel.vue b/ui/src/assets/icons/FileExcel.vue
new file mode 100644
index 0000000..c6d5fdf
--- /dev/null
+++ b/ui/src/assets/icons/FileExcel.vue
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/ui/src/assets/icons/FilePpt.vue b/ui/src/assets/icons/FilePpt.vue
new file mode 100644
index 0000000..9fcf2a2
--- /dev/null
+++ b/ui/src/assets/icons/FilePpt.vue
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/ui/src/assets/icons/FileWord.vue b/ui/src/assets/icons/FileWord.vue
new file mode 100644
index 0000000..cfd035a
--- /dev/null
+++ b/ui/src/assets/icons/FileWord.vue
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/ui/src/assets/icons/Organization.vue b/ui/src/assets/icons/Organization.vue
new file mode 100644
index 0000000..a666d76
--- /dev/null
+++ b/ui/src/assets/icons/Organization.vue
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/ui/src/assets/icons/Upload.vue b/ui/src/assets/icons/Upload.vue
new file mode 100644
index 0000000..c0bf5e6
--- /dev/null
+++ b/ui/src/assets/icons/Upload.vue
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/ui/src/assets/icons/Vue.vue b/ui/src/assets/icons/Vue.vue
new file mode 100644
index 0000000..5253d61
--- /dev/null
+++ b/ui/src/assets/icons/Vue.vue
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/ui/src/assets/icons/Wechat.vue b/ui/src/assets/icons/Wechat.vue
new file mode 100644
index 0000000..a572f7b
--- /dev/null
+++ b/ui/src/assets/icons/Wechat.vue
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/ui/src/static/icons/index.js b/ui/src/assets/icons/index.js
similarity index 61%
rename from ui/src/static/icons/index.js
rename to ui/src/assets/icons/index.js
index c5139c1..7d60d7a 100644
--- a/ui/src/static/icons/index.js
+++ b/ui/src/assets/icons/index.js
@@ -5,4 +5,7 @@ export { default as BugFill } from './BugFill.vue'
export { default as BugLine } from './BugLine.vue'
export { default as FileWord } from './FileWord.vue'
export { default as FileExcel } from './FileExcel.vue'
-export { default as FilePpt } from './FilePpt.vue'
\ No newline at end of file
+export { default as FilePpt } from './FilePpt.vue'
+export { default as Organization } from './Organization.vue'
+export { default as Upload } from './Upload.vue'
+export { default as Download } from './Download.vue'
\ No newline at end of file
diff --git a/ui/src/components/scCodeEditor/index.vue b/ui/src/components/scCodeEditor/index.vue
new file mode 100644
index 0000000..4a9c29e
--- /dev/null
+++ b/ui/src/components/scCodeEditor/index.vue
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ui/src/components/scContextmenu/index.vue b/ui/src/components/scContextmenu/index.vue
index 8e1c8f0..7f0a72e 100644
--- a/ui/src/components/scContextmenu/index.vue
+++ b/ui/src/components/scContextmenu/index.vue
@@ -1,10 +1,10 @@
@@ -34,17 +34,10 @@
},
watch: {
visible(value) {
- var _this = this;
- var cm = function(e){
- let sp = _this.$refs.contextmenu
- if(sp&&!sp.contains(e.target)){
- _this.closeMenu()
- }
- }
if (value) {
- document.body.addEventListener('click', e=>cm(e))
+ document.body.addEventListener('click', this.cm, true)
}else{
- document.body.removeEventListener('click', e=>cm(e))
+ document.body.removeEventListener('click', this.cm, true)
}
}
},
@@ -52,6 +45,12 @@
},
methods: {
+ cm(e){
+ let sp = this.$refs.contextmenu
+ if(sp&&!sp.contains(e.target)){
+ this.closeMenu()
+ }
+ },
menuClick(command){
this.closeMenu()
this.$emit('command', command)
@@ -89,7 +88,7 @@
diff --git a/ui/src/components/scFileImport/index.vue b/ui/src/components/scFileImport/index.vue
new file mode 100644
index 0000000..0cb6f3d
--- /dev/null
+++ b/ui/src/components/scFileImport/index.vue
@@ -0,0 +1,133 @@
+
+
+
+
+ 导入
+
+
+
+
+
+
+
+
+ 将文件拖到此处或 点击选择文件上传
+
+
+
+
+
{{tip}}
+
请上传小于或等于 {{maxSize}}M 的 {{accept}} 格式文件
+
+ 下载导入模板
+
+
+
+
+
+
+
+
+
+
diff --git a/ui/src/components/scFilterBar/index.vue b/ui/src/components/scFilterBar/index.vue
index 136cb34..4e3653b 100644
--- a/ui/src/components/scFilterBar/index.vue
+++ b/ui/src/components/scFilterBar/index.vue
@@ -1,10 +1,10 @@
@@ -76,7 +76,7 @@
- 增加过滤项
+ 增加过滤项
@@ -302,9 +302,9 @@
.root:deep(.el-tabs__content) {flex: 1;background: #f6f8f9;}
.root:deep(.el-tabs__content) .el-tab-pane{overflow: auto;height:100%;}
- [data-theme='dark'] .root:deep(.el-tabs__content) {background: none;}
- [data-theme='dark'] .sc-filter-main {background: none;border-color:var(--el-border-color-base);}
- [data-theme='dark'] .sc-filter-main table td .del {background: none;}
- [data-theme='dark'] .sc-filter-main table td .del:hover {background: #F56C6C;}
- [data-theme='dark'] .nodata {border-color:var(--el-border-color-base);}
+ .dark .root:deep(.el-tabs__content) {background: var(--el-bg-color-overlay);}
+ .dark .sc-filter-main {background: var(--el-bg-color);border-color:var(--el-border-color-light);}
+ .dark .sc-filter-main table td .del {background: none;}
+ .dark .sc-filter-main table td .del:hover {background: #F56C6C;}
+ .dark .nodata {border-color:var(--el-border-color-light);}
diff --git a/ui/src/components/scFormTable/index.vue b/ui/src/components/scFormTable/index.vue
index 2f292b3..682a06e 100644
--- a/ui/src/components/scFormTable/index.vue
+++ b/ui/src/components/scFormTable/index.vue
@@ -18,7 +18,6 @@
+
+## 支持
+如果觉得本项目还不错或在工作中有所启发，请在Gitee(码云)帮开发者点亮星星，这是对开发者最大的支持和鼓励！
diff --git a/ui/jsconfig.json b/ui/jsconfig.json
new file mode 100644
index 0000000..654309e
--- /dev/null
+++ b/ui/jsconfig.json
@@ -0,0 +1,17 @@
+{
+ "compilerOptions": {
+ "target": "es5",
+ "module": "esnext",
+ "baseUrl": "./",
+ "moduleResolution": "node",
+ "paths": {
+ "@/*": ["src/*"]
+ },
+ "lib": [
+ "esnext",
+ "dom",
+ "dom.iterable",
+ "scripthost"
+ ]
+ }
+}
diff --git a/ui/package.json b/ui/package.json
index b6226d9..e6ec76c 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -1,6 +1,6 @@
{
- "name": "thinkvue-admin",
- "version": "1.5.0",
+ "name": "scui",
+ "version": "1.6.6",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
@@ -8,34 +8,36 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
- "@element-plus/icons": "0.0.11",
- "@tinymce/tinymce-vue": "4.0.5",
- "axios": "0.25.0",
- "core-js": "3.21.0",
+ "@element-plus/icons-vue": "2.0.6",
+ "@tinymce/tinymce-vue": "5.0.0",
+ "axios": "0.27.2",
+ "codemirror": "5.65.5",
+ "core-js": "3.24.1",
"cropperjs": "1.5.12",
"crypto-js": "4.1.1",
- "echarts": "5.3.0",
- "element-plus": "2.0.2",
+ "echarts": "5.3.3",
+ "element-plus": "2.2.12",
"nprogress": "0.2.0",
"qrcodejs2": "0.0.2",
- "sortablejs": "1.14.0",
- "tinymce": "5.10.2",
- "vue": "3.2.30",
- "vue-i18n": "9.1.9",
- "vue-router": "4.0.12",
+ "sortablejs": "1.15.0",
+ "tinymce": "6.1.2",
+ "vue": "3.2.37",
+ "vue-i18n": "9.2.2",
+ "vue-router": "4.1.3",
"vuedraggable": "4.0.3",
"vuex": "4.0.2",
- "xgplayer": "2.31.4",
- "xgplayer-hls": "2.5.1"
+ "xgplayer": "2.31.7",
+ "xgplayer-hls": "2.5.2",
+ "xlsx": "^0.18.5"
},
"devDependencies": {
- "@vue/cli-plugin-babel": "4.5.15",
- "@vue/cli-plugin-eslint": "4.5.15",
- "@vue/cli-service": "4.5.15",
- "@vue/compiler-sfc": "3.2.30",
- "babel-eslint": "10.1.0",
- "eslint": "6.8.0",
- "eslint-plugin-vue": "7.19.1",
+ "@babel/core": "7.18.9",
+ "@babel/eslint-parser": "7.18.9",
+ "@vue/cli-plugin-babel": "5.0.8",
+ "@vue/cli-plugin-eslint": "5.0.8",
+ "@vue/cli-service": "5.0.8",
+ "eslint": "8.21.0",
+ "eslint-plugin-vue": "9.3.0",
"sass": "1.37.5",
"sass-loader": "10.1.1"
},
@@ -52,18 +54,20 @@
"eslint:recommended"
],
"parserOptions": {
- "parser": "babel-eslint"
+ "parser": "@babel/eslint-parser"
},
"rules": {
"indent": 0,
"no-tabs": 0,
"no-mixed-spaces-and-tabs": 0,
- "vue/no-unused-components": "off"
+ "vue/no-unused-components": 0,
+ "vue/multi-word-component-names": 0
}
},
"browserslist": [
"> 1%",
"last 2 versions",
- "not dead"
+ "not dead",
+ "not ie 11"
]
}
diff --git a/ui/public/code/list/index.vue b/ui/public/code/list/index.vue
deleted file mode 100644
index 6576c71..0000000
--- a/ui/public/code/list/index.vue
+++ /dev/null
@@ -1,166 +0,0 @@
-
-
-
- 
+ 
- 
+ 
+ 
+