From 9589551b14312503db038f50c15b9271729cea55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Thu, 4 May 2023 14:45:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/baseurl.js | 3 - src/views/system/OperateGoodsInfo/indexjs.js | 15 +- src/views/system/goodsCategory/index.vue | 4 +- .../system/goodsCategoryAcatar/index.vue | 7 +- src/views/system/goodsInfo/goodsInfojs.js | 17 +- src/views/system/goodsOrder/index.vue | 4 +- src/views/system/order/index.vue | 4 +- src/views/system/person/personjs.js | 44 ++- src/views/system/poser/index.vue | 5 +- src/views/system/stationAvatar/index.vue | 17 +- src/views/system/trainingAvatar/index.vue | 305 +++++++++++++++ src/views/system/trainingItem/index.vue | 347 ++++++------------ src/views/system/trainingOrder/index.vue | 330 +++++------------ 13 files changed, 578 insertions(+), 524 deletions(-) delete mode 100644 src/api/baseurl.js create mode 100644 src/views/system/trainingAvatar/index.vue diff --git a/src/api/baseurl.js b/src/api/baseurl.js deleted file mode 100644 index 8998a23..0000000 --- a/src/api/baseurl.js +++ /dev/null @@ -1,3 +0,0 @@ -var baseurl = "http://192.168.16.30:8080"; - -export default baseurl \ No newline at end of file diff --git a/src/views/system/OperateGoodsInfo/indexjs.js b/src/views/system/OperateGoodsInfo/indexjs.js index 10d0428..c4ede37 100644 --- a/src/views/system/OperateGoodsInfo/indexjs.js +++ b/src/views/system/OperateGoodsInfo/indexjs.js @@ -14,7 +14,6 @@ import { } from "@/api/system/goodsCategory"; import editor from "@/components/Editor"; import stationAcatar from "../stationAvatar/index.vue"; -import baseurl from "@/api/baseurl.js"; let id = 0; export default { @@ -415,9 +414,9 @@ export default { updatePicture(obj).then((res) => {}); } if (response.code == 200) { - this.$modal.msgSuccess("修改成功"); - this.open = false; - this.getList(); + this.$modal.msgSuccess("修改成功"); + this.open = false; + this.getList(); } }); } else { @@ -427,10 +426,10 @@ export default { // this.nurseStationId=this.form.nurseStationId addGoodsInfo(this.form).then((response) => { if (response.code == 200) { - this.$modal.msgSuccess("新增成功"); - this.StationName = "请选择所属护理站"; - this.open = false; - this.getList(); + this.$modal.msgSuccess("新增成功"); + this.StationName = "请选择所属护理站"; + this.open = false; + this.getList(); } }); } diff --git a/src/views/system/goodsCategory/index.vue b/src/views/system/goodsCategory/index.vue index 674ae69..2d7940f 100644 --- a/src/views/system/goodsCategory/index.vue +++ b/src/views/system/goodsCategory/index.vue @@ -234,7 +234,6 @@ import { getStationCategoryList } from "@/api/system/goodsCategory"; import stationAcatar from "../stationAvatar/index.vue"; -import baseurl from "@/api/baseurl"; let id = 0; export default { name: "GoodsCategory", @@ -266,7 +265,7 @@ export default { } }, imgone: "", - baseurl: "", + baseurl: process.env.VUE_APP_BASE_API, // 遮罩层 loading: true, // 选中数组 @@ -328,7 +327,6 @@ export default { watch: {}, created() { - this.baseurl = baseurl; this.getList(); this.info(); }, diff --git a/src/views/system/goodsCategoryAcatar/index.vue b/src/views/system/goodsCategoryAcatar/index.vue index 744a190..8c399e3 100644 --- a/src/views/system/goodsCategoryAcatar/index.vue +++ b/src/views/system/goodsCategoryAcatar/index.vue @@ -106,7 +106,6 @@ + diff --git a/src/views/system/trainingItem/index.vue b/src/views/system/trainingItem/index.vue index 6248ba9..e6f96e2 100644 --- a/src/views/system/trainingItem/index.vue +++ b/src/views/system/trainingItem/index.vue @@ -40,16 +40,8 @@ - 搜索 - 重置 + 搜索 + 重置 @@ -62,8 +54,7 @@ size="mini" @click="handleAdd" v-hasPermi="['system:trainingItem:add']" - >新增 + >新增 修改 + >修改 删除 + >删除 - + --> + - - - + + + - - + + @@ -162,8 +128,7 @@ active-color="#13ce66" inactive-color="#ff4949" @change="uptrainingShelfFlag(scope.row)" - > - + > - - + --> + + @@ -245,22 +200,14 @@ label-width="80px" :inline="true" > - + - + - 搜索 - 重置 + 搜索 + 重置 @@ -308,20 +247,9 @@ label="培训课程组名称" align="center" :show-overflow-tooltip="true" - > - - - - - + > + + + --> - --> + --> - + {{ form.trainingParentName }} + >{{ form.trainingParentName }} {{ form.trainingParentName }} + >{{ form.trainingParentName }} + --> - + --> + />--> --> + />--> --> + />--> - + > - + > - + > - + - + - @@ -898,15 +795,15 @@ import { delTrainingItem, addTrainingItem, updateTrainingItem, - updateTrainingShelfFlag, + updateTrainingShelfFlag } from "@/api/system/trainingItem"; import stationAcatar from "../stationAvatar/index.vue"; +import trainingAvatar from "../trainingAvatar/index.vue"; import editor from "@/components/Editor"; -import baseurl from "@/api/baseurl.js"; import { updatePicture } from "@/api/system/station"; export default { name: "TrainingItem", - components: { stationAcatar, editor }, + components: { stationAcatar, editor, trainingAvatar }, data() { return { @@ -920,38 +817,38 @@ export default { pageNum: 1, pageSize: 10, trainingItemCode: "", - trainingParentName: "", + trainingParentName: "" }, trainingCategoryqueryParams: { pageNum: 1, pageSize: 10, trainingCategoryCode: "", - trainingCategoryName: "", + trainingCategoryName: "" }, option: [ { value: 0, - label: "是", + label: "是" }, { value: 1, - label: "否", - }, + label: "否" + } ], value: "", options: [ { value: "GRAPHIC_LEARNING", - label: "图文学习", + label: "图文学习" }, { value: "LEARNING_ITEM_GROUP", - label: "学习培训课程组", + label: "学习培训课程组" }, { value: "VIDEO_LEARNING", - label: "视频学习", - }, + label: "视频学习" + } // { // value: "LIVE_COURSES", // label: "直播课程", @@ -997,7 +894,7 @@ export default { trainingItemEndTime: null, trainingItemAddress: null, trainingItemNotes: null, - trainingItemSort: null, + trainingItemSort: null }, // 表单参数 form: { @@ -1007,9 +904,9 @@ export default { itemDirectoryTitle: null, itemDirectoryUrl: null, itemDirectoryIntroduce: null, - itemDirectorySort: null, - }, - ], + itemDirectorySort: null + } + ] }, imgtwo: "", imgone: "", @@ -1026,7 +923,7 @@ export default { // { required: true, message: "请选择培训分类", trigger: "blur" }, // ], trainingItemTitle: [ - { required: true, message: "请输入培训课程名称", trigger: "blur" }, + { required: true, message: "请输入培训课程名称", trigger: "blur" } ], // trainingItemPrice: [ // { required: true, message: "请输入培训课程价格", trigger: "blur" }, @@ -1046,38 +943,38 @@ export default { // }, // ], trainingItemType: [ - { required: true, message: "请选择培训课程类型", trigger: "blur" }, + { required: true, message: "请选择培训课程类型", trigger: "blur" } ], trainingItemDetails: [ - { required: true, message: "请输入培训课程详情", trigger: "blur" }, + { required: true, message: "请输入培训课程详情", trigger: "blur" } ], trainingItemContent: [ - { required: true, message: "请输入培训课程内容", trigger: "blur" }, + { required: true, message: "请输入培训课程内容", trigger: "blur" } ], trainingItemDate: [ - { required: true, message: "请输入培训课程日期", trigger: "blur" }, + { required: true, message: "请输入培训课程日期", trigger: "blur" } ], trainingItemStartTime: [ { required: true, message: "请输入培训课程开始时间", - trigger: "blur", - }, + trigger: "blur" + } ], trainingItemEndTime: [ { required: true, message: "请输入培训课程结束时间", - trigger: "blur", - }, + trigger: "blur" + } ], trainingItemAddress: [ - { required: true, message: "请输入培训课程地址", trigger: "blur" }, - ], + { required: true, message: "请输入培训课程地址", trigger: "blur" } + ] // trainingItemSort: [ // { required: true, message: "请输入培训课程排序", trigger: "blur" }, // ], - }, + } }; }, created() { @@ -1112,7 +1009,7 @@ export default { itemDirectoryUrl: null, itemDirectoryIntroduce: null, itemDirectorySort: null, - idd: this.idd, + idd: this.idd }; if (this.form.trainingItemDirectoryList.length >= 5) { this.$message.error("最多新增5条"); @@ -1127,19 +1024,17 @@ export default { if (this.form.trainingItemDirectoryList.length == 1) { this.$message.error("最后一条不可删除"); } else { - this.form.trainingItemDirectoryList = - this.form.trainingItemDirectoryList.filter( - (e) => e.idd != item.idd - ); + this.form.trainingItemDirectoryList = this.form.trainingItemDirectoryList.filter( + e => e.idd != item.idd + ); } } else if (!item.idd && item.trainingItemDirectoryId) { if (this.form.trainingItemDirectoryList.length == 1) { this.$message.error("最后一条不可删除"); } else { - this.form.trainingItemDirectoryList = - this.form.trainingItemDirectoryList.filter( - (e) => e.trainingItemDirectoryId != item.trainingItemDirectoryId - ); + this.form.trainingItemDirectoryList = this.form.trainingItemDirectoryList.filter( + e => e.trainingItemDirectoryId != item.trainingItemDirectoryId + ); } } }, @@ -1148,20 +1043,19 @@ export default { itemDirectoryUrl(item) { let items = JSON.parse(item); if (items.idd && !items.trainingItemDirectoryId) { - this.form.trainingItemDirectoryList.forEach((e) => { + this.form.trainingItemDirectoryList.forEach(e => { if (e.idd == items.idd) { e.itemDirectoryUrl = items.itemDirectoryUrl; } }); } else if (!items.idd && items.attributeDetailsId) { - this.form.trainingItemDirectoryList.forEach((e) => { + this.form.trainingItemDirectoryList.forEach(e => { if (e.attributeDetailsId == items.attributeDetailsId) { e.itemDirectoryUrl = items.itemDirectoryUrl; } }); } }, - imgUrl4(imgUrl) {}, imgs(item) { console.log(item); this.imgsurl.pictureUrlList.push(item); @@ -1182,7 +1076,7 @@ export default { pageNum: 1, pageSize: 10, trainingCategoryCode: "", - trainingParentName: "", + trainingParentName: "" }; this.trainingParentinfo(); }, @@ -1226,7 +1120,7 @@ export default { // 父级课程组 trainingParentinfo() { this.loading = true; - selectTrainingParent(this.trainingParentqueryParams).then((response) => { + selectTrainingParent(this.trainingParentqueryParams).then(response => { console.log(response); this.trainingParentlist = response.rows; this.total3 = response.total; @@ -1250,15 +1144,15 @@ export default { if (row.trainingShelfFlag == false) { var obj = { id: row.id, - trainingShelfFlag: 1, + trainingShelfFlag: 1 }; } else if (row.trainingShelfFlag == true) { var obj = { id: row.id, - trainingShelfFlag: 0, + trainingShelfFlag: 0 }; } - updateTrainingShelfFlag(obj).then((res) => { + updateTrainingShelfFlag(obj).then(res => { if (obj.trainingShelfFlag == 0) { this.$modal.msgSuccess("已修改上架状态为上架"); } else { @@ -1270,9 +1164,9 @@ export default { /** 查询学习培训课程信息列表 */ getList() { this.loading = true; - listTrainingItem(this.queryParams).then((response) => { + listTrainingItem(this.queryParams).then(response => { this.trainingItemList = response.rows; - response.rows.forEach((e) => { + response.rows.forEach(e => { if (e.trainingShelfFlag == 0) { e.trainingShelfFlag = true; } else if (e.trainingShelfFlag == 1) { @@ -1293,10 +1187,10 @@ export default { obj.pictureUrlList.push(this.form.trainingItemPosterUrl); } if (obj.pictureUrlList.length > 0) { - updatePicture(obj).then((res) => {}); + updatePicture(obj).then(res => {}); } if (this.imgsurl.pictureUrlList.length > 0) { - updatePicture(this.imgsurl).then((res) => {}); + updatePicture(this.imgsurl).then(res => {}); } this.imgsurl = { pictureUrlList: [] }; @@ -1313,8 +1207,8 @@ export default { itemDirectoryUrl: null, itemDirectoryIntroduce: null, itemDirectorySort: null, - idd: this.idd, - }, + idd: this.idd + } ], trainingParentId: "", id: null, @@ -1340,7 +1234,7 @@ export default { createBy: null, createTime: null, updateBy: null, - updateTime: null, + updateTime: null }; this.resetForm("form"); }, @@ -1357,7 +1251,7 @@ export default { }, // 多选框选中数据 handleSelectionChange(selection) { - this.ids = selection.map((item) => item.id); + this.ids = selection.map(item => item.id); this.single = selection.length !== 1; this.multiple = !selection.length; }, @@ -1371,9 +1265,9 @@ export default { itemDirectoryTitle: null, itemDirectoryUrl: null, itemDirectoryIntroduce: null, - itemDirectorySort: null, - }, - ], + itemDirectorySort: null + } + ] }; this.reset(); this.open = true; @@ -1384,13 +1278,13 @@ export default { handleUpdate(row) { this.reset(); const id = row.id || this.ids; - getTrainingItem(id).then((response) => { + getTrainingItem(id).then(response => { var obj = { itemDirectoryName: null, itemDirectoryTitle: null, itemDirectoryUrl: null, itemDirectoryIntroduce: null, - itemDirectorySort: null, + itemDirectorySort: null }; if (response.data.trainingItemDirectoryList.length == 0) { response.data.trainingItemDirectoryList.push(obj); @@ -1413,11 +1307,10 @@ export default { if (!this.form.trainingItemSort) { this.form.trainingItemSort = null; } - this.$refs["form"].validate((valid) => { + this.$refs["form"].validate(valid => { if (valid) { if (this.form.trainingItemStartTime) { - this.form.trainingItemStartTimeStr = - this.form.trainingItemStartTime; + this.form.trainingItemStartTimeStr = this.form.trainingItemStartTime; } else { this.form.trainingItemStartTimeStr = "00:00:00"; } @@ -1428,7 +1321,7 @@ export default { this.form.trainingItemDirectoryList = []; } if (this.form.trainingItemId != null) { - updateTrainingItem(this.form).then((response) => { + updateTrainingItem(this.form).then(response => { var obj = { pictureUrlList: [] }; if (this.imgone != this.form.trainingItemCoverUrl) { obj.pictureUrlList.push(this.imgone); @@ -1438,20 +1331,20 @@ export default { } this.imgsurl = { pictureUrlList: [] }; if (obj.pictureUrlList.length > 0) { - updatePicture(obj).then((res) => {}); + updatePicture(obj).then(res => {}); } if (response.code == 200) { - this.$modal.msgSuccess("修改成功"); - this.open = false; - this.getList(); + this.$modal.msgSuccess("修改成功"); + this.open = false; + this.getList(); } }); } else { - addTrainingItem(this.form).then((response) => { + addTrainingItem(this.form).then(response => { if (response.code == 200) { - this.$modal.msgSuccess("新增成功"); - this.open = false; - this.getList(); + this.$modal.msgSuccess("新增成功"); + this.open = false; + this.getList(); } }); } @@ -1468,7 +1361,7 @@ export default { .confirm( '是否确认删除培训课程名称为"' + trainingItemTitles + '"的数据项?' ) - .then(function () { + .then(function() { return delTrainingItem(ids); }) .then(() => { @@ -1482,12 +1375,12 @@ export default { this.download( "system/trainingItem/export", { - ...this.queryParams, + ...this.queryParams }, `trainingItem_${new Date().getTime()}.xlsx` ); - }, - }, + } + } };