102102 @click =" Run()"
103103 >Run</ButtonComponent
104104 >
105- </div >
106- <div data-v-step =" 6" >
107- <ButtonComponent
108- classname =" primarywh"
109- BackgroundColor =" #ffffff"
110- Color =" #475447"
111- Padding =" 0.4rem 1.3rem"
112- MinWidth =" 100px"
113- FontSize =" 15px"
114- @click =" showPointOutputTable()"
115- >Point Output Table</ButtonComponent
116- >
105+ <div v-show =" isModal" >
106+ <ModalComponent
107+ :toggle ="
108+ () => {
109+ isModal = !isModal
110+ }
111+ "
112+ >
113+ <CardComponent >
114+ <h2 style =" font-size : larger " >Pool values are same as the last run!</h2 >
115+ <p style =" font-size : medium " >Click continue to run if this is intentional</p >
116+ <ButtonComponent
117+ class =" modal"
118+ @click =" toggle()"
119+ classname =" primary hovered round"
120+ BackgroundColor =" #ffffff"
121+ Color =" #475447"
122+ Padding =" 0.4rem 1.3rem"
123+ MinWidth =" 100px"
124+ FontSize =" 15px"
125+ >Continue</ButtonComponent
126+ >
127+ </CardComponent >
128+ </ModalComponent >
129+ </div >
117130 </div >
118131 </div >
132+ <div data-v-step =" 6" >
133+ <ButtonComponent
134+ classname =" primarywh"
135+ BackgroundColor =" #ffffff"
136+ Color =" #475447"
137+ Padding =" 0.4rem 1.3rem"
138+ MinWidth =" 100px"
139+ FontSize =" 15px"
140+ @click =" showPointOutputTable()"
141+ >Point Output Table</ButtonComponent
142+ >
143+ </div >
119144 </div >
120- <v-tour name =" MyTour" :steps =" steps" :options =" myOptions" ></v-tour >
121- <PointOuterTable v-if =" showTable" />
122- <ToastComponent />
123145 </div >
146+ <v-tour name =" MyTour" :steps =" steps" :options =" myOptions" ></v-tour >
147+ <PointOuterTable v-if =" showTable" />
148+ <ToastComponent />
124149 </div >
125150</template >
126151
@@ -131,10 +156,8 @@ import Maptest from '@/components/Vuelayers/Maptest.vue'
131156import Slider from ' @/components/Slider/Slider.vue'
132157import PointOuterTable from ' ./PointOuterTable.vue'
133158import { ModalComponent , CardComponent } from ' @moja-global/mojaglobal-ui'
134- import { ref , onMounted , getCurrentInstance , createVNode } from ' vue'
159+ import { ref , onMounted , getCurrentInstance } from ' vue'
135160import { useStore } from ' vuex'
136- import { Modal } from ' ant-design-vue'
137- import { ExclamationCircleOutlined } from ' @ant-design/icons-vue'
138161import { useToast } from ' @moja-global/mojaglobal-ui'
139162import { ToastComponent } from ' @moja-global/mojaglobal-ui'
140163
@@ -153,6 +176,7 @@ export default {
153176 setup () {
154177 const isShow = ref (false )
155178 const showTable = ref (false )
179+ const isModal = ref (false )
156180
157181 const store = useStore ()
158182
@@ -266,15 +290,7 @@ export default {
266290 }
267291
268292 if (poolValuesNotChanged (slider_values)) {
269- Modal .confirm ({
270- title: ' Pool values are same as the last run!' ,
271- content: ' Click OK to run if this is intentional' ,
272- icon: createVNode (ExclamationCircleOutlined),
273- onOk () {
274- store .dispatch (' send_pointConfig' )
275- },
276- onCancel () {}
277- })
293+ isModal .value = true
278294
279295 return
280296 } else {
@@ -286,6 +302,11 @@ export default {
286302 }
287303 }
288304
305+ function toggle () {
306+ store .dispatch (' send_pointConfig' )
307+ isModal .value = false
308+ }
309+
289310 function Run () {
290311 finalPoolValues ()
291312 showTable .value = false
@@ -319,15 +340,24 @@ export default {
319340 return {
320341 isShow,
321342 showTable,
343+ isModal,
322344 pool1,
323345 pool2,
324346 pool3,
325347 myOptions,
326348 steps,
327349 finalPoolValues,
328350 Run,
329- showPointOutputTable
351+ showPointOutputTable,
352+ toggle
330353 }
331354 }
332355}
333356 </script >
357+
358+ <style >
359+ .modal {
360+ margin-left : 30% ;
361+ margin-top : 5% ;
362+ }
363+ </style >
0 commit comments