diff --git a/stdiet-admin/src/main/filters/local/application.yml b/stdiet-admin/src/main/filters/local/application.yml index 731714117..8e012f3d3 100644 --- a/stdiet-admin/src/main/filters/local/application.yml +++ b/stdiet-admin/src/main/filters/local/application.yml @@ -9,8 +9,8 @@ stdiet: # 实例演示开关 demoEnabled: true # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath) - #profile: /Users/wonder/Documents/Workspaces/java/ShengtangManage/running/uploadPath - profile: D:/ruoyi/uploadPath + profile: /Users/wonder/Documents/Workspaces/java/ShengtangManage/running/uploadPath +# profile: D:/ruoyi/uploadPath # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数组计算 char 字符验证 diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/MyApplicationRunner.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/MyApplicationRunner.java index 7e9353e07..949b70455 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/MyApplicationRunner.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/MyApplicationRunner.java @@ -20,8 +20,8 @@ public class MyApplicationRunner implements ApplicationRunner { @Override public void run(ApplicationArguments args) throws Exception { - /* System.out.println("项目启动调用方法"); - String path = AliyunOSSUtils.uploadFileInputSteam(AliyunOSSConfig.casePrefix,"ceshi.png",new File("D:\\ceshi.png")); - System.out.println(path);*/ + System.out.println("项目启动调用方法"); +// String path = AliyunOSSUtils.uploadFileInputSteam(AliyunOSSConfig.casePrefix,"ceshi.png",new File("D:\\ceshi.png")); +// System.out.println(path); } } diff --git a/stdiet-ui/package.json b/stdiet-ui/package.json index e9357aaf0..76287eff4 100644 --- a/stdiet-ui/package.json +++ b/stdiet-ui/package.json @@ -64,6 +64,7 @@ "vue": "2.6.10", "vue-count-to": "1.0.13", "vue-cropper": "0.4.9", + "vue-qr": "^2.3.0", "vue-router": "3.0.2", "vue-scrollto": "^2.20.0", "vue-splitpane": "1.0.4", diff --git a/stdiet-ui/src/components/ContractDrawer/index.vue b/stdiet-ui/src/components/ContractDrawer/index.vue index 2facf1ccf..c315d1e20 100644 --- a/stdiet-ui/src/components/ContractDrawer/index.vue +++ b/stdiet-ui/src/components/ContractDrawer/index.vue @@ -50,21 +50,27 @@ width="200" /> - + @@ -108,15 +114,18 @@ import { delContract, listContract } from "@/api/custom/contract"; import ContractDetail from "@/components/ContractDetail"; import Clipboard from "clipboard"; import ContractAdd from "@/components/ContractAdd"; - +import VueQr from "vue-qr"; +const logo = require("@/assets/logo/logo_b.png"); export default { name: "CustomerContractDrawer", components: { "contract-detail": ContractDetail, "add-contract": ContractAdd, + VueQr, }, data() { return { + logo, visible: false, title: "", data: undefined, diff --git a/stdiet-ui/src/components/HeatStatisticsDrawer/index.vue b/stdiet-ui/src/components/HeatStatisticsDrawer/index.vue index 2f050501e..1e0b4b929 100644 --- a/stdiet-ui/src/components/HeatStatisticsDrawer/index.vue +++ b/stdiet-ui/src/components/HeatStatisticsDrawer/index.vue @@ -10,16 +10,34 @@
- 外食计算器 + 外食计算器 + + + 二维码 + - - + + - - + - + - - - + +
diff --git a/stdiet-ui/src/components/PhysicalSignsDialog/index.vue b/stdiet-ui/src/components/PhysicalSignsDialog/index.vue index d7702d4dd..5c237474e 100644 --- a/stdiet-ui/src/components/PhysicalSignsDialog/index.vue +++ b/stdiet-ui/src/components/PhysicalSignsDialog/index.vue @@ -1,112 +1,267 @@ diff --git a/stdiet-ui/src/store/modules/recipes.js b/stdiet-ui/src/store/modules/recipes.js index ff9381d34..f6a514d2e 100644 --- a/stdiet-ui/src/store/modules/recipes.js +++ b/stdiet-ui/src/store/modules/recipes.js @@ -28,7 +28,9 @@ const oriState = { startNum: 0, endNum: 0, reviewStatus: 0, - templateInfo: undefined + templateInfo: undefined, + copyData: undefined, + fontSize: 12 }; const mutations = { @@ -37,7 +39,10 @@ const mutations = { obj => obj.id === payload.id ); if (tarDishes) { - if (tarDishes.dishesId !== payload.dishesId) { + if ( + payload.dishesId !== tarDishes.dishesId || + payload.type !== undefined + ) { // 替换菜品 Object.keys(payload).forEach(key => { if (key === "num") { @@ -55,6 +60,9 @@ const mutations = { } } }, + updateFontSize(state, payload) { + state.fontSize = payload.fontSize; + }, addRecipesDishes(state, payload) { state.recipesData[payload.num].dishes.push(payload.data); }, @@ -282,6 +290,7 @@ const actions = { // console.log(params); }, async addDishes({ commit, state }, payload) { + console.log(payload); const tarDishesList = state.recipesData[payload.num].dishes.filter( obj => obj.type === payload.data.type ); @@ -367,26 +376,34 @@ const actions = { ); if (tarDishes) { const mTarDishes = JSON.parse(JSON.stringify(tarDishes)); - const tarIgd = mTarDishes.igdList.find(obj => obj.id === payload.igdId); - if (tarIgd) { - payload.weight && (tarIgd.weight = payload.weight); - payload.cusWeight && (tarIgd.cusWeight = payload.cusWeight); - payload.cusUnit && (tarIgd.cusUnit = payload.cusUnit); + let params = { + id: mTarDishes.id + }; + if (payload.type !== undefined) { + // 修改餐类 + params.type = payload.type; + } else { + // 修改食材 + const tarIgd = mTarDishes.igdList.find( + obj => obj.id === payload.igdId + ); + if (tarIgd) { + payload.weight && (tarIgd.weight = payload.weight); + payload.cusWeight && (tarIgd.cusWeight = payload.cusWeight); + payload.cusUnit && (tarIgd.cusUnit = payload.cusUnit); - const params = { - id: mTarDishes.id, - detail: mTarDishes.igdList.map(igd => ({ + params.detail = mTarDishes.igdList.map(igd => ({ id: igd.id, weight: igd.weight, cus_unit: igd.cusUnit, cus_weight: igd.cusWeight - })) - }; - const result = await updateDishesDetailApi(params); - if (result.code === 200) { - commit("updateRecipesDishesDetail", payload); + })); } } + const result = await updateDishesDetailApi(params); + if (result.code === 200) { + commit("updateRecipesDishesDetail", payload); + } } } else { commit("updateRecipesDishesDetail", payload); @@ -408,7 +425,21 @@ const actions = { commit("deleteSomeDayDishes", payload); } }, - async deleteMenu({ commit }, payload) {} + async deleteMenu({ commit }, payload) {}, + async setCopyData({ commit, state }, payload) { + return new Promise((res, rej) => { + const tarDishes = state.recipesData[payload.num].dishes.find( + obj => obj.id === payload.id + ); + if (tarDishes) { + commit("updateStateData", { copyData: tarDishes }); + + res("复制成功"); + } else { + rej("复制失败"); + } + }); + } }; const getters = { diff --git a/stdiet-ui/src/views/custom/contract/index.vue b/stdiet-ui/src/views/custom/contract/index.vue index 7e3551c29..1001ef614 100644 --- a/stdiet-ui/src/views/custom/contract/index.vue +++ b/stdiet-ui/src/views/custom/contract/index.vue @@ -187,7 +187,7 @@ prop="updateTime" width="180" /> - + @@ -320,9 +330,14 @@ import { addContract, delContract, listContract } from "@/api/custom/contract"; import Clipboard from "clipboard"; import { mapGetters } from "vuex"; +import VueQr from "vue-qr"; +const logo = require("@/assets/logo/logo_b.png"); export default { name: "Contract", + components: { + VueQr, + }, data() { const checkServePromise = (rule, value, callback) => { if (this.form.projectId == 0 && !value) { @@ -331,6 +346,7 @@ export default { callback(); }; return { + logo, // 遮罩层 loading: true, // 选中数组 diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue index 8d4d713dd..ac4b465df 100644 --- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue +++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue @@ -4,6 +4,22 @@ :style="`height: ${collapse ? 30 : 200}px`" >
+ + 字体大小: + + + + 返回 @@ -91,16 +107,32 @@ export default { PieChart, }, data() { - return {}; + return { + mFontSize: 12, + fontSizeOpts: [ + { value: 12, label: "12" }, + { value: 14, label: "14" }, + { value: 16, label: "16" }, + { value: 18, label: "18" }, + ], + }; }, updated() { // console.log(this.data); }, props: ["collapse", "data"], computed: { - ...mapState(["recipesId", "reviewStatus", "healthyData"]), + ...mapState(["recipesId", "reviewStatus", "healthyData", "fontSize"]), + }, + watch: { + fontSize(val) { + this.mFontSize = val; + }, }, methods: { + handleOnSizeChange(fontSize) { + this.updateFontSize({ fontSize }); + }, handleCollapseClick() { this.$emit("update:collapse", !this.collapse); }, @@ -121,7 +153,7 @@ export default { this.updateStateData({ recipesData: [] }); }, ...mapActions(["saveRecipes", "updateReviewStatus"]), - ...mapMutations(["updateStateData"]), + ...mapMutations(["updateStateData", "updateFontSize"]), }, }; @@ -138,6 +170,13 @@ export default { transition: all 0.3s; transform-origin: center center; } + + .font_size_style { + display: inline-flex; + align-items: center; + font-size: 12px; + margin-right: 12px; + } } .content { diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/index.vue index 016e098b2..85b55b313 100644 --- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/index.vue +++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/index.vue @@ -92,13 +92,14 @@ export default { data.name }」`; this.id = data.id; + this.type = data.type; } else if (type) { this.title = `添加第${numDay}天${this.typeDict[type]}菜品`; this.type = type; } this.visible = true; this.$nextTick(() => { - this.$refs.dishesRef.getList({ type }); + this.$refs.dishesRef.getList({ type: this.type }); }); }, handleOnClosed(done) { @@ -114,6 +115,7 @@ export default { this.active = 1; this.dishesTypeOptions = (this.type || data.type) .split(",") + .sort((a, b) => a - b) .reduce((arr, cur, idx) => { if (idx === 0) { this.selDishes.type = cur; diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/DishesSettingDialog/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/DishesSettingDialog/index.vue new file mode 100644 index 000000000..a2eaa3fc3 --- /dev/null +++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/DishesSettingDialog/index.vue @@ -0,0 +1,98 @@ + + + diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/EditableUnit/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/EditableUnit/index.vue index 4b90c69d8..08f15f796 100644 --- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/EditableUnit/index.vue +++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/EditableUnit/index.vue @@ -95,6 +95,14 @@ export default { this.mUnit = value; }, }, + watch: { + weight(val) { + this.mWeight = val; + }, + unit(val) { + this.mUnit = val; + }, + }, computed: { unitWeight() { return ( diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/ReuseDialog/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/ReuseDialog/index.vue deleted file mode 100644 index 4446677a8..000000000 --- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/ReuseDialog/index.vue +++ /dev/null @@ -1,20 +0,0 @@ - - diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue index 271333801..339562e89 100644 --- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue +++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue @@ -7,12 +7,28 @@ :cell-style="{ padding: '2px 0' }" :header-cell-style="{ padding: '4px 0', height: 'unset' }" size="mini" - :style="`outline: ${currentDay === num ? '1px solid #d96969' : 'none'}`" + header-row-class-name="recipes_header" + :cell-class-name="cellClassName" + :style="`outline: ${currentDay === num ? '1px solid #d53950' : 'none'}`" >