From b94ba212f975c2a11c5b43cc407b7d58a3ef24e1 Mon Sep 17 00:00:00 2001
From: sk1551 <15175617877@163.com>
Date: Fri, 29 May 2020 10:14:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=99=E5=B8=88?=
=?UTF-8?q?=E7=8F=AD=E7=BA=A7=E5=90=8D=E7=A7=B0bug&&=E6=A0=87=E5=87=86?=
=?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/views/benyi/dayflow/standard.vue | 88 +++++++++++--------
.../benyi/BySchoolcalendarClassMapper.xml | 4 +-
2 files changed, 56 insertions(+), 36 deletions(-)
diff --git a/ruoyi-ui/src/views/benyi/dayflow/standard.vue b/ruoyi-ui/src/views/benyi/dayflow/standard.vue
index 5bbf41f50..f2909d5db 100644
--- a/ruoyi-ui/src/views/benyi/dayflow/standard.vue
+++ b/ruoyi-ui/src/views/benyi/dayflow/standard.vue
@@ -6,7 +6,7 @@
<el-option
v-for="item in taskOptions"
:key="item.code"
- :label="item.taskLable"
+ :label="item.taskLable"
:value="item.taskLable"
/>
</el-select>
@@ -101,7 +101,7 @@
</template>
</el-table-column>
</el-table>
-
+
<pagination
v-show="total>0"
:total="total"
@@ -137,10 +137,10 @@
:show-file-list="false"
:on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload"
- accept=".jpg,.png"
- >
- <img v-if="imageUrl" :src="imageUrl" class="avatar" >
- <i v-else class="el-icon-plus avatar-uploader-icon" ></i>
+ accept=".jpg, .png"
+ >
+ <img v-if="imageUrl" :src="imageUrl" class="avatar" />
+ <i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</el-form-item>
<el-form-item label="视频" prop="video">
@@ -156,8 +156,18 @@
</template>
<script>
-import { listStandard, getStandard, delStandard, addStandard, updateStandard, exportStandard } from "@/api/benyi/dayflow/biaozhun/standard";
-import { listDayflowtask, getDayflowtask } from "@/api/benyi/dayflow/dayflowtask";
+import {
+ listStandard,
+ getStandard,
+ delStandard,
+ addStandard,
+ updateStandard,
+ exportStandard
+} from "@/api/benyi/dayflow/biaozhun/standard";
+import {
+ listDayflowtask,
+ getDayflowtask
+} from "@/api/benyi/dayflow/dayflowtask";
import { getToken } from "@/utils/auth";
export default {
@@ -167,6 +177,8 @@ export default {
//显示上传的图片，清空
imageUrl: "",
dialogVisible: false,
+ file:"",
+
// 遮罩层
loading: true,
// 选中数组
@@ -182,7 +194,7 @@ export default {
// 任务名称集合
taskOptions: [],
// 默认任务名称
- defaultTaskName: '',
+ defaultTaskName: "",
// 弹出层标题
title: "",
// 是否显示弹出层
@@ -210,7 +222,7 @@ export default {
rules: {
sname: [
{ required: true, message: "标准名称不能为空", trigger: "blur" }
- ],
+ ]
},
// 上传的图片服务器地址
uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload",
@@ -226,7 +238,7 @@ export default {
this.getTaskList();
},
methods: {
- /**上传照片 */
+
handleAvatarSuccess(res, file) {
this.imageUrl = URL.createObjectURL(file.raw);
console.log(res);
@@ -237,24 +249,20 @@ export default {
}
},
beforeAvatarUpload(file) {
- const isJPG = file.type === "image/jpeg";
const isLt2M = file.size / 1024 / 1024 < 2;
-
- if (!isJPG) {
- this.$message.error("上传图片只能是 JPG 格式!");
- }
if (!isLt2M) {
this.$message.error("上传图片大小不能超过 2MB!");
}
- return isJPG && isLt2M;
+ return isLt2M;
},
+
/**查询任务名称详细 */
getDayflowtask(taskId) {
getDayflowtask(taskId).then(response => {
this.queryParams.taskLable = response.data.taskLable;
this.defaultTaskName = response.data.taskLable;
this.getList();
- })
+ });
},
/** 查询一日流程标准列表 */
getList() {
@@ -269,7 +277,7 @@ export default {
getTaskList() {
listDayflowtask().then(response => {
this.taskOptions = response.rows;
- })
+ });
},
// 取消按钮
cancel() {
@@ -308,9 +316,9 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
- this.ids = selection.map(item => item.sid)
- this.single = selection.length!=1
- this.multiple = !selection.length
+ this.ids = selection.map(item => item.sid);
+ this.single = selection.length != 1;
+ this.multiple = !selection.length;
},
/** 新增按钮操作 */
handleAdd() {
@@ -327,10 +335,9 @@ export default {
const sid = row.sid || this.ids;
getStandard(sid).then(response => {
this.form = response.data;
- console.log(process.env.VUE_APP_BASE_API + response.data.picture);
if (response.data.picture) {
this.imageUrl = process.env.VUE_APP_BASE_API + response.data.picture;
- }
+ };
this.open = true;
this.title = "修改标准";
});
@@ -339,6 +346,7 @@ export default {
submitForm: function() {
this.$refs["form"].validate(valid => {
if (valid) {
+ console.log(this.form.imageUrl);
if (this.form.sid != undefined) {
updateStandard(this.form).then(response => {
if (response.code === 200) {
@@ -366,29 +374,39 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const sids = row.sid || this.ids;
- this.$confirm('是否确认删除一日流程标准编号为"' + sids + '"的数据项?', "警告", {
+ this.$confirm(
+ '是否确认删除一日流程标准编号为"' + sids + '"的数据项?',
+ "警告",
+ {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
- }).then(function() {
+ }
+ )
+ .then(function() {
return delStandard(sids);
- }).then(() => {
+ })
+ .then(() => {
this.getList();
this.msgSuccess("删除成功");
- }).catch(function() {});
+ })
+ .catch(function() {});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
- this.$confirm('是否确认导出所有一日流程标准数据项?', "警告", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- }).then(function() {
+ this.$confirm("是否确认导出所有一日流程标准数据项?", "警告", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(function() {
return exportStandard(queryParams);
- }).then(response => {
+ })
+ .then(response => {
this.download(response.msg);
- }).catch(function() {});
+ })
+ .catch(function() {});
}
}
};
diff --git a/ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarClassMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarClassMapper.xml
index 154ad45c2..ca6025aad 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarClassMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarClassMapper.xml
@@ -39,7 +39,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectBySchoolcalendarClassVo">
- select id, name, type, classid, xnxq, deptId, activitytime, activityendtime, stylecolor, createuserid, createtime from by_schoolcalendar_class
+ select s.id, s.name, s.type, s.classid, s.xnxq, s.deptId, s.activitytime, s.activityendtime, s.stylecolor, s.createuserid, s.createtime,
+ c.bjmc
+ from by_schoolcalendar_class s, by_class c
</sql>
<select id="selectBySchoolcalendarClassList" parameterType="BySchoolcalendarClass" resultMap="BySchoolcalendarClassResult">
From 2e09cf9ec46037912b3e60c16c50a2c0cf399871 Mon Sep 17 00:00:00 2001
From: sk1551 <15175617877@163.com>
Date: Fri, 29 May 2020 10:39:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=87=E5=87=86?=
=?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0style?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/views/benyi/dayflow/standard.vue | 37 +++++++++++++++----
1 file changed, 29 insertions(+), 8 deletions(-)
diff --git a/ruoyi-ui/src/views/benyi/dayflow/standard.vue b/ruoyi-ui/src/views/benyi/dayflow/standard.vue
index f2909d5db..0e6a55ec8 100644
--- a/ruoyi-ui/src/views/benyi/dayflow/standard.vue
+++ b/ruoyi-ui/src/views/benyi/dayflow/standard.vue
@@ -139,7 +139,7 @@
:before-upload="beforeAvatarUpload"
accept=".jpg, .png"
>
- <img v-if="imageUrl" :src="imageUrl" class="avatar" />
+ <img width="100%" v-if="imageUrl" :src="imageUrl" class="avatar" />
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</el-form-item>
@@ -176,9 +176,6 @@ export default {
return {
//显示上传的图片，清空
imageUrl: "",
- dialogVisible: false,
- file:"",
-
// 遮罩层
loading: true,
// 选中数组
@@ -238,7 +235,6 @@ export default {
this.getTaskList();
},
methods: {
-
handleAvatarSuccess(res, file) {
this.imageUrl = URL.createObjectURL(file.raw);
console.log(res);
@@ -255,7 +251,6 @@ export default {
}
return isLt2M;
},
-
/**查询任务名称详细 */
getDayflowtask(taskId) {
getDayflowtask(taskId).then(response => {
@@ -337,7 +332,7 @@ export default {
this.form = response.data;
if (response.data.picture) {
this.imageUrl = process.env.VUE_APP_BASE_API + response.data.picture;
- };
+ }
this.open = true;
this.title = "修改标准";
});
@@ -410,4 +405,30 @@ export default {
}
}
};
-</script>
\ No newline at end of file
+</script>
+
+<style>
+.avatar-uploader .el-upload {
+ border: 1px dashed #d9d9d9;
+ border-radius: 6px;
+ cursor: pointer;
+ position: relative;
+ overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+ border-color: #409eff;
+}
+.avatar-uploader-icon {
+ font-size: 28px;
+ color: #8c939d;
+ width: 178px;
+ height: 178px;
+ line-height: 178px;
+ text-align: center;
+}
+.avatar {
+ width: 178px;
+ height: 178px;
+ display: block;
+}
+</style>
\ No newline at end of file