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, 'rotatable': true,
'scalable': true, 'scalable': true,
'transition': true, 'transition': true,
'fullscreen': true,
'keyboard': true, 'keyboard': true,
'url': 'data-source' 'url': 'data-source'
} }

View File

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

View File

@ -92,7 +92,6 @@
> >
<i slot="default" class="el-icon-plus" /> <i slot="default" class="el-icon-plus" />
<div slot="file" slot-scope="{file}"> <div slot="file" slot-scope="{file}">
<viewer :images="images" :ref="file.url">
<img <img
class="el-upload-list__item-thumbnail" class="el-upload-list__item-thumbnail"
:src="OSSclientConfig.basePath + file.url" :src="OSSclientConfig.basePath + file.url"
@ -115,7 +114,6 @@
<i class="el-icon-delete" /> <i class="el-icon-delete" />
</span> </span>
</span> </span>
</viewer>
</div> </div>
</el-upload> </el-upload>
<!-- <el-dialog <!-- <el-dialog
@ -132,9 +130,9 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- <viewer v-if="imgVisible" :images="[imageUrl]" ref="viewer"> <viewer v-if="imgVisible" :images="[imageUrl]" ref="viewer">
<img :src="imageUrl" crossorigin="anonymous" alt=""> <img :src="imageUrl" crossorigin="anonymous" alt="">
</viewer> --> </viewer>
<el-dialog <el-dialog
v-if="chatVisible" v-if="chatVisible"
:visible.sync="chatVisible" :visible.sync="chatVisible"
@ -224,8 +222,7 @@ export default {
userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1, userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
isClosedDialog: false, isClosedDialog: false,
isSendMessage: false, isSendMessage: false,
closeQuestionVisible: false, closeQuestionVisible: false
images:[]
} }
}, },
mounted() { mounted() {
@ -385,9 +382,9 @@ export default {
}, },
// //
handlePictureCardPreview(file) { handlePictureCardPreview(file) {
this.images = this.fileList.map(f => this.OSSclientConfig.basePath + f.url) this.imageUrl = this.OSSclientConfig.basePath + file.url
// this.imageUrl = this.OSSclientConfig.basePath + file.url this.imgVisible = true
this.$refs[file.url].$viewer.show() this.$refs.viewer.$viewer.show()
}, },
// //
handleRemove(file, fileList) { handleRemove(file, fileList) {