diff --git a/package-lock.json b/package-lock.json index 2d5c1bb..fee8404 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "0.0.0", "dependencies": { "@element-plus/icons-vue": "^2.3.1", + "axios": "^1.7.2", "element-plus": "^2.7.3", "unplugin-icons": "^0.19.0", "vite-plugin-inspect": "^0.8.4", @@ -991,6 +992,21 @@ "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-4.2.5.tgz", "integrity": "sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==" }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, + "node_modules/axios": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz", + "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==", + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -1070,6 +1086,17 @@ "fsevents": "~2.3.2" } }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/confbox": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.7.tgz", @@ -1151,6 +1178,14 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/element-plus": { "version": "2.7.3", "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.7.3.tgz", @@ -1327,6 +1362,38 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/follow-redirects": { + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fs-extra": { "version": "11.2.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", @@ -1625,6 +1692,25 @@ "node": ">=8.6" } }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/mimic-fn": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", @@ -1857,6 +1943,11 @@ "node": "^10 || ^12 || >=14" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", diff --git a/package.json b/package.json index c2d61dc..e13faad 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ }, "dependencies": { "@element-plus/icons-vue": "^2.3.1", + "axios": "^1.7.2", "element-plus": "^2.7.3", "unplugin-icons": "^0.19.0", "vite-plugin-inspect": "^0.8.4", diff --git a/src/pages/ZooAnimal.vue b/src/pages/ZooAnimal.vue index 39e16ec..bcc0fed 100644 --- a/src/pages/ZooAnimal.vue +++ b/src/pages/ZooAnimal.vue @@ -4,6 +4,7 @@ import {Delete, Document, DocumentAdd, Edit, Search, Tickets} from "@element-plu import ZooAnimalFormDialog from "@/components/ZooAnimalFormDialog.vue"; import {mapActions, mapMutations, mapState} from "vuex"; import ZooArchiveTimeline from "@/components/ZooArchiveTimeline.vue"; +import request, {frontendAnimals} from "@/utils/request.js"; export default { name: "ZooAnimal", @@ -67,13 +68,23 @@ export default { }, methods: { ...mapActions(["getAnimals"]), - ...mapMutations(['updateAnimalsTableData']), + ...mapMutations(['updateAnimals','updateAnimalsTableData']), // 显示详情弹窗 showDetail(data) { console.log('显示详情', data) //从后端获取需要查询的数据,防止数据前后不一致 + request.queryAnimalRequest(data.id).then(response => { + console.log(response.data) + if (response.data.data===null){ + this.refresh(); + return ElMessage({ + message: '该动物不存在,请刷新', + type: 'warning', + }) + } + }) //这里先用假数据代替一下 this.dialog.dialogData = this.animals.find(e => e.id === data.id) @@ -165,32 +176,38 @@ export default { console.log('添加', data) //验证是否为空 - return this.isEmpty(data); - - //先查询用户是否存在 - - //添加失败 - if (false) { + if (this.isEmpty(data)) { return ElMessage({ - message: '该动物已存在', + message: '请输入动物名称', type: 'warning', }) } - //添加成功 - if (false) { - return ElMessage({ - message: '添加成功', - type: 'success', - }) - } - // //从后端重新拉取数据 - // this.getAnimals() - // this.search() - // 刷新数据 - this.refresh() + //先查询动物是否存在 + request.queryAnimalRequest(data.id).then(response => { + if (response.data.data!==null){ + return ElMessage({ + message: '该动物已存在', + type: 'warning', + }) + } + }) - this.dialog.addDialogVisible = false//添加成功关闭窗口 + request.addAnimalRequest(data).then(response => { + if (response.data.code===1){ + //添加成功 + + // 刷新数据 + this.refresh() + + this.dialog.addDialogVisible = false//添加成功关闭窗口 + + return ElMessage({ + message: '添加成功', + type: 'success', + }) + } + }) }, //以时间线的形式查看该动物的所有档案记录 @@ -217,11 +234,7 @@ export default { // 判断表单是否为空 isEmpty(form) { if (!form.name) { - //返回提示 - return ElMessage({ - message: '动物名不能为空', - type: 'warning', - }) + return true } }, @@ -278,18 +291,24 @@ export default { console.log('刷新数据') //先拉取一遍数据 - this.getAnimals() + request.queryAnimalRequest().then(response => { + if (response.data.code === 1) { + this.updateAnimals(frontendAnimals(response.data.data)) + } + //可能输入了搜索关键字,故执行一次搜索 + this.search() - //可能输入了搜索关键字,故执行一次搜索 - this.search() - - //获取结果的分页 - this.getPagesData() + //获取结果的分页 + this.getPagesData() + }) }, }, mounted() { // 加载完成后拉取数据 this.refresh() + // request.queryAnimalRequest(0).then(response => { + // console.log(response.data,"11111111111111111111111111111") + // }) } } @@ -375,7 +394,7 @@ export default { - +