Skip to content

jml0128 / xrk-bi

Go to a project
Commit 1f0a8abc by web
Options

fix: 完善

1 parent b628da2c
Inline Side-by-side
Showing with 63 additions and 15 deletions
src/App.vue
......@@ -342,6 +342,12 @@ export default {
data: { data: [], message: '操作成功', status: '1' }
};
},
// 获取是否含有照片题
getImageQuestionCount() {
return {
data: { data: 2, message: '操作成功', status: '1' }
};
},
// 当期BI-保持选择的图片
saveBiPicList() {
return {
......@@ -361,6 +367,18 @@ export default {
taskId: 123, //任务记录ID
imageUrl:
'http://yiyang.oss-cn-beijing.aliyuncs.com/WEB/SaaS/images/2103251844.png'
},
{
biInfoId: 123, //BI主键
taskId: 123, //任务记录ID
imageUrl:
'http://yiyang.oss-cn-beijing.aliyuncs.com/WEB/SaaS/images/2103251844.png'
},
{
biInfoId: 123, //BI主键
taskId: 123, //任务记录ID
imageUrl:
'http://yiyang.oss-cn-beijing.aliyuncs.com/WEB/SaaS/images/2103251844.png'
}
]
},
......@@ -374,6 +392,8 @@ export default {
return {
data: {
data: {
has: true,
isDelete: 0,
imageStyle: 1, //展示样式 1 流式 2平铺
imageSize: 2, //图片大小 1 大 2中 3小
imageUrls: [
......@@ -383,6 +403,20 @@ export default {
taskId: 123, //任务记录ID
imageUrl:
'http://yiyang.oss-cn-beijing.aliyuncs.com/WEB/SaaS/images/2103251844.png'
},
{
id: 1,
biInfoId: 123, //BI主键
taskId: 123, //任务记录ID
imageUrl:
'http://yiyang.oss-cn-beijing.aliyuncs.com/WEB/SaaS/images/2103251844.png'
},
{
id: 1,
biInfoId: 123, //BI主键
taskId: 123, //任务记录ID
imageUrl:
'http://yiyang.oss-cn-beijing.aliyuncs.com/WEB/SaaS/images/2103251844.png'
}
]
},
......
src/packages/bi/src/components/catalogue.vue
......@@ -74,7 +74,6 @@ export default {
// return cataloguePageSize;
// }
},
created() {},
watch: {
catalogueArr: {
handler() {
......
src/packages/bi/src/components/photo-wall/images.vue
<template>
<div :style="{ columnCount }">
<img
v-for="(item, index) in taskImageInfo.imageUrls"
:key="index"
:src="setUrl(item.imageUrl)"
/>
</div>
<ul :style="{ columnCount }">
<li v-for="(item, index) in taskImageInfo.imageUrls" :key="index">
<img :src="setUrl(item.imageUrl)" />
</li>
</ul>
</template>
<script>
......@@ -90,7 +88,7 @@ export default {
// }
// }
// }
div {
ul {
padding: 0 30px;
padding-top: 35px;
position: relative;
......
src/packages/bi/src/components/photo-wall/index.vue
......@@ -50,6 +50,7 @@ export default {
value: {
default() {
return {
isDelete: 0, // 1删除
imageStyle: 2, // 1流式 2平铺 流式不限制高度，但是有max-height，平铺为正方形
imageSize: 2, //图片大小 1 大 2中 3小
imageUrls: [
......@@ -86,7 +87,10 @@ export default {
});
},
onDel() {
this.$refs['bi-photo'].style.display = 'none';
this.$emit('input', {
...this.value,
isDelete: 1
});
}
},
watch: {
......
src/packages/bi/src/main.vue
......@@ -2,8 +2,7 @@
* @Description:
* @Author: jml
* @Date: 2021-02-26 15:38:10
* @LastEditors: Please set LastEditors
* @LastEditTime: 2022-05-17 11:46:23
* @LastEditTime: 2022-05-18 18:35:06
-->
<template>
<div class="xrk-components-bi bi" :class="{ 'bi-print': print }">
......@@ -94,6 +93,10 @@ export default {
getImageList: {
type: Function,
default: () => {}
},
getImageQuestionCount: {
type: Function,
default: () => {}
}
},
components: {
......
src/packages/bi/src/project/20-configurable.vue
......@@ -64,6 +64,7 @@
<BiSingleChoiceInfo index="4" name="照片集合"></BiSingleChoiceInfo>
</BiSingleChoice> -->
<BiPhoto
v-if="!hideTaskImage"
class="bi-block"
ref="bi-photo"
name="照片集合"
......@@ -72,7 +73,7 @@
/>
<BiCoverEnd title="奇正藏药医学沙龙推广项目数据报告"></BiCoverEnd>
<BiOperate
:questionData="[...singleChoice, ...singleChoiceMixin]"
:questionData="[...singleChoice, ...singleChoiceMixin, taskImageInfo]"
:saveInfo="saveInfo"
:exportBi="exportBi"
></BiOperate>
......@@ -138,6 +139,11 @@ export default {
textData: [],
biInfo: {},
taskImageInfo: {
title: {
name: '照片墙'
},
has: true,
isDelete: 0,
imageStyle: 2, //展示样式 1 流式 2平铺
imageSize: 2, //图片大小 1 大 2中 3小
imageUrls: [
......@@ -210,6 +216,7 @@ export default {
})
]
},
...(!this.hideTaskImage && [
{
name: '照片集合',
child: [
......@@ -219,6 +226,7 @@ export default {
}
]
}
])
];
},
showSingleChoice() {
......@@ -232,6 +240,9 @@ export default {
},
hideSingleChoiceMixin() {
return this.dealSingleChoice(this.singleChoiceMixin, true);
},
hideTaskImage() {
return !!this.taskImageInfo.isDelete || !this.taskImageInfo.has;
}
},
methods: {
......@@ -495,7 +506,6 @@ export default {
return new Promise(resolve => {
const { biInfoId, styleConfigureId } = this.biInfo;
const { content } = this.$refs['cover'];
console.log(this.$refs['bi-photo']);
Promise.all([
this.Bi.saveInfo({
biInfoId: biInfoId,
......@@ -557,7 +567,7 @@ export default {
this.dealChoice(topicInfo.data.data || []);
this.dealChoiceMixin(topicMixinInfo.data.data || []);
this.coverList = tempaletList.data.data || [];
this.taskImageInfo = taskImageInfo.data.data;
Object.assign(this.taskImageInfo, taskImageInfo.data.data);
this.$nextTick(async () => {
await this.preloadImg(this.coverUrl);
window.status = '1';
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!