Merge remote-tracking branch 'origin/StableVersion' into localDevelop
This commit is contained in:
@@ -27,12 +27,15 @@
|
||||
<!-- 有图状态 start-->
|
||||
<div class="home_left_info" v-show="isHaveReviewCollection">
|
||||
<div class="left_info_top">
|
||||
<div class="button_second" @click="startNewCollection()">
|
||||
<!-- <div class="button_second" @click="startNewCollection()">
|
||||
{{ $t('HomeView.Start') }}
|
||||
</div>
|
||||
</div> -->
|
||||
<div class="button_first button_margin" @click="recollection()">
|
||||
{{ $t('HomeView.Edit') }}
|
||||
</div>
|
||||
<div class="button_first button_margin" @click="resetCollection()">
|
||||
{{ $t('HomeView.Reset') }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="left_info_content scroll_style">
|
||||
<div class="left_info_content_body" ref="collection_canvas">
|
||||
@@ -234,7 +237,7 @@ import { useStore } from "vuex";
|
||||
import { Https } from "@/tool/https";
|
||||
import { rgbToHsv, dataURLtoBlob } from "@/tool/util";
|
||||
import { openGuide,driverObj__ } from "@/tool/guide";
|
||||
import { LoadingOutlined } from "@ant-design/icons-vue";
|
||||
import { LoadingOutlined ,ExclamationCircleOutlined} from "@ant-design/icons-vue";
|
||||
import draggable from 'vuedraggable'
|
||||
// import JSZip, { forEach } from "jszip";
|
||||
import { setCookie, getCookie, WriteCookie } from "@/tool/cookie";
|
||||
@@ -560,6 +563,24 @@ export default defineComponent({
|
||||
collectionModal.recollection();
|
||||
},
|
||||
|
||||
resetCollection(){
|
||||
let _this = this
|
||||
Modal.confirm({
|
||||
title: this.t('HomeView.jsContent9'),
|
||||
icon: createVNode(ExclamationCircleOutlined),
|
||||
okText: 'Yes',
|
||||
cancelText: 'No',
|
||||
mask:false,
|
||||
centered:true,
|
||||
onOk() {
|
||||
_this.store.commit("clearAllData");
|
||||
_this.store.commit("clearAllCollection");
|
||||
_this.store.commit("setAllBoardDataChoose",{});
|
||||
_this.store.commit("clearShowSketchboard",{});
|
||||
_this.isHaveReviewCollection = false
|
||||
}
|
||||
});
|
||||
},
|
||||
//完成设计
|
||||
finishCollection() {
|
||||
let _this = this;
|
||||
|
||||
Reference in New Issue
Block a user