Compare commits

..

No commits in common. "13f105faa54b1a115d011cb4ddb19a4bba2f1e78" and "05ab287e81e95fec2e4aa17c5d1176a0770499a5" have entirely different histories.

3 changed files with 55 additions and 57 deletions

View File

@ -44,6 +44,7 @@ Viewer.setDefaults({
'rotatable': true,
'scalable': true,
'transition': true,
'fullscreen': true,
'keyboard': true,
'url': 'data-source'
}

View File

@ -203,30 +203,28 @@
>
<i slot="default" class="el-icon-plus" />
<div slot="file" slot-scope="{file}">
<viewer :images="images" :ref="file.url">
<img
class="el-upload-list__item-thumbnail"
:src="OSSclientConfig.basePath + file.url"
alt=""
crossorigin="anonymous"
<img
class="el-upload-list__item-thumbnail"
:src="OSSclientConfig.basePath + file.url"
alt=""
crossorigin="anonymous"
>
<span class="el-upload-list__item-actions">
<span
class="el-upload-list__item-preview"
@click="handlePictureCardPreview(file)"
>
<span class="el-upload-list__item-actions">
<span
class="el-upload-list__item-preview"
@click="handlePictureCardPreview(file)"
>
<i class="el-icon-zoom-in" />
</span>
<span
v-if="adInfo.ReadingTaskState < 2"
class="el-upload-list__item-delete"
@click="handleRemove(file)"
>
<i class="el-icon-delete" />
</span>
<i class="el-icon-zoom-in" />
</span>
</viewer>
<span
v-if="adInfo.ReadingTaskState < 2"
class="el-upload-list__item-delete"
@click="handleRemove(file)"
>
<i class="el-icon-delete" />
</span>
</span>
</div>
</el-upload>
@ -305,6 +303,9 @@
</div>
<SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
</el-dialog>
<viewer v-if="imgVisible" :images="[imageUrl]" ref="viewer">
<img :src="imageUrl" crossorigin="anonymous" alt="">
</viewer>
</div>
</template>
<script>
@ -387,8 +388,7 @@ export default {
judgeResultArmEnum: '',
criterionType: null,
openWindow: null,
isFixed: false,
images: []
isFixed: false
}
},
// watch: {
@ -707,9 +707,9 @@ export default {
},
//
handlePictureCardPreview(file) {
this.images = this.fileList.map(f => this.OSSclientConfig.basePath + f.url)
// this.imageUrl = this.OSSclientConfig.basePath + file.url
this.$refs[file.url].$viewer.show()
this.imageUrl = this.OSSclientConfig.basePath + file.url
this.imgVisible = true
this.$refs.viewer.$viewer.show()
},
//
handleRemove(file, fileList) {

View File

@ -92,30 +92,28 @@
>
<i slot="default" class="el-icon-plus" />
<div slot="file" slot-scope="{file}">
<viewer :images="images" :ref="file.url">
<img
class="el-upload-list__item-thumbnail"
:src="OSSclientConfig.basePath + file.url"
crossOrigin="anonymous"
alt=""
<img
class="el-upload-list__item-thumbnail"
:src="OSSclientConfig.basePath + file.url"
crossOrigin="anonymous"
alt=""
>
<span class="el-upload-list__item-actions">
<span
class="el-upload-list__item-preview"
@click="handlePictureCardPreview(file)"
>
<span class="el-upload-list__item-actions">
<span
class="el-upload-list__item-preview"
@click="handlePictureCardPreview(file)"
>
<i class="el-icon-zoom-in" />
</span>
<span
v-if="!isSendMessage && auditState!==2"
class="el-upload-list__item-delete"
@click="handleRemove(file)"
>
<i class="el-icon-delete" />
</span>
<i class="el-icon-zoom-in" />
</span>
</viewer>
<span
v-if="!isSendMessage && auditState!==2"
class="el-upload-list__item-delete"
@click="handleRemove(file)"
>
<i class="el-icon-delete" />
</span>
</span>
</div>
</el-upload>
<!-- <el-dialog
@ -132,9 +130,9 @@
</el-form-item>
</el-form>
<!-- <viewer v-if="imgVisible" :images="[imageUrl]" ref="viewer">
<viewer v-if="imgVisible" :images="[imageUrl]" ref="viewer">
<img :src="imageUrl" crossorigin="anonymous" alt="">
</viewer> -->
</viewer>
<el-dialog
v-if="chatVisible"
:visible.sync="chatVisible"
@ -224,8 +222,7 @@ export default {
userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
isClosedDialog: false,
isSendMessage: false,
closeQuestionVisible: false,
images:[]
closeQuestionVisible: false
}
},
mounted() {
@ -385,9 +382,9 @@ export default {
},
//
handlePictureCardPreview(file) {
this.images = this.fileList.map(f => this.OSSclientConfig.basePath + f.url)
// this.imageUrl = this.OSSclientConfig.basePath + file.url
this.$refs[file.url].$viewer.show()
this.imageUrl = this.OSSclientConfig.basePath + file.url
this.imgVisible = true
this.$refs.viewer.$viewer.show()
},
//
handleRemove(file, fileList) {
@ -397,7 +394,7 @@ export default {
},
initializeViewer() {
Viewer.setDefaults({
toolbar: { zoomIn: true, zoomOut: true, rotateLeft: true, rotateRight: true, flipHorizontal: true, flipVertical: true}
toolbar: { zoomIn: true, zoomOut: true, rotateLeft: true, rotateRight: true, flipHorizontal: true, flipVertical: true }
})
}
}