refine confirm disable status of account page
This commit is contained in:
@@ -7,7 +7,7 @@ import Upload from '@/views/Upload/index.vue';
|
|||||||
import Map from '@/views/Discover/Map/Map.vue';
|
import Map from '@/views/Discover/Map/Map.vue';
|
||||||
import Conformance from '@/views/Discover/Conformance/index.vue';
|
import Conformance from '@/views/Discover/Conformance/index.vue';
|
||||||
import Performance from '@/views/Discover/Performance/index.vue';
|
import Performance from '@/views/Discover/Performance/index.vue';
|
||||||
import CompareDashboard from '@/views/Compare/Dashboard/index.vue';
|
import CompareDashboard from '@/views/Compare/Dashboard/Compare.vue';
|
||||||
import AccountAdmin from '@/views/AccountManagement/AccountAdmin/AccountAdmin.vue';
|
import AccountAdmin from '@/views/AccountManagement/AccountAdmin/AccountAdmin.vue';
|
||||||
import MemberArea from '@/views/MemberArea/index.vue';
|
import MemberArea from '@/views/MemberArea/index.vue';
|
||||||
import NotFound404 from '@/views/NotFound404.vue';
|
import NotFound404 from '@/views/NotFound404.vue';
|
||||||
|
|||||||
@@ -42,7 +42,7 @@
|
|||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<input class="w-[454px] rounded p-1 border border-[1px] border-[#64748B] flex items-center h-[40px] outline-none"
|
<input class="w-[454px] rounded p-1 border border-[1px] border-[#64748B] flex items-center h-[40px] outline-none"
|
||||||
v-model="inputName" :readonly="!isEditable" @dblclick="onInputDoubleClick"
|
v-model="inputName" :readonly="!isEditable" @dblclick="onInputDoubleClick" @focus="onInputNameFocus"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div v-show="!isSSO" class="input-row w-full flex py-2 h-[40px] mb-4 items-center
|
<div v-show="!isSSO" class="input-row w-full flex py-2 h-[40px] mb-4 items-center
|
||||||
@@ -294,6 +294,15 @@ export default defineComponent({
|
|||||||
// 之所以要轉回true,是為了讓使用者可以繼續填寫不被阻擋
|
// 之所以要轉回true,是為了讓使用者可以繼續填寫不被阻擋
|
||||||
isAccountUnique.value = true;
|
isAccountUnique.value = true;
|
||||||
}
|
}
|
||||||
|
if(isConfirmDisabled.value){
|
||||||
|
isConfirmDisabled.value = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const onInputNameFocus = () => {
|
||||||
|
if(isConfirmDisabled.value){
|
||||||
|
isConfirmDisabled.value = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
@@ -315,6 +324,7 @@ export default defineComponent({
|
|||||||
inputConfirmPwd,
|
inputConfirmPwd,
|
||||||
onConfirmBtnClick,
|
onConfirmBtnClick,
|
||||||
onInputDoubleClick,
|
onInputDoubleClick,
|
||||||
|
onInputNameFocus,
|
||||||
isSetAsAdminChecked,
|
isSetAsAdminChecked,
|
||||||
isSetActivedChecked,
|
isSetActivedChecked,
|
||||||
toggleIsAdmin,
|
toggleIsAdmin,
|
||||||
|
|||||||
@@ -302,11 +302,11 @@ export default {
|
|||||||
* @returns { [primeVueSetData, primeVueSetOption] } 這兩者為符合 primeVue 圖表格式的數據資料
|
* @returns { [primeVueSetData, primeVueSetOption] } 這兩者為符合 primeVue 圖表格式的數據資料
|
||||||
*/
|
*/
|
||||||
getLineChart(chartData, content, yUnit) {
|
getLineChart(chartData, content, yUnit) {
|
||||||
|
console.log('getLineChart' );
|
||||||
let datasetsPrimary;
|
let datasetsPrimary;
|
||||||
let datasetsSecondary;
|
let datasetsSecondary;
|
||||||
let minX = chartData.x_axis.min;
|
let minX = chartData.x_axis.min;
|
||||||
let maxX = chartData.x_axis.max;
|
let maxX = chartData.x_axis.max;
|
||||||
let maxY = chartData.y_axis.max;
|
|
||||||
let xLabelData;
|
let xLabelData;
|
||||||
let labelPrimary = chartData.data[0].label;
|
let labelPrimary = chartData.data[0].label;
|
||||||
let labelSecondary = chartData.data[1].label;
|
let labelSecondary = chartData.data[1].label;
|
||||||
@@ -316,7 +316,6 @@ export default {
|
|||||||
return this.$moment(time).format('YYYY/M/D hh:mm:ss')
|
return this.$moment(time).format('YYYY/M/D hh:mm:ss')
|
||||||
};
|
};
|
||||||
const getSimpleTimeLabel = simpleTimeLabel;
|
const getSimpleTimeLabel = simpleTimeLabel;
|
||||||
const getFollowTimeLabel = followTimeLabel;
|
|
||||||
|
|
||||||
// fabricate x label according to y unit
|
// fabricate x label according to y unit
|
||||||
switch (yUnit) {
|
switch (yUnit) {
|
||||||
@@ -344,7 +343,7 @@ export default {
|
|||||||
content, ticksOfXAxis,
|
content, ticksOfXAxis,
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
console.log("TODO:", datasetsPrimary, )
|
||||||
primeVueSetData = {
|
primeVueSetData = {
|
||||||
labels: xLabelData,
|
labels: xLabelData,
|
||||||
datasets: [
|
datasets: [
|
||||||
@@ -437,8 +436,6 @@ export default {
|
|||||||
* @param { object } content titles 文字標題
|
* @param { object } content titles 文字標題
|
||||||
*/
|
*/
|
||||||
getBarChart(chartData, content, caller) {
|
getBarChart(chartData, content, caller) {
|
||||||
const maxX = chartData.x_axis.max;
|
|
||||||
const minX = chartData.x_axis.min;
|
|
||||||
const getMoment = (time)=> this.$moment(time).format('YYYY/MM/DD');
|
const getMoment = (time)=> this.$moment(time).format('YYYY/MM/DD');
|
||||||
let datasetsPrimary = chartData.data[0].data;
|
let datasetsPrimary = chartData.data[0].data;
|
||||||
let xDataPrimary;
|
let xDataPrimary;
|
||||||
@@ -1290,6 +1287,7 @@ export default {
|
|||||||
};
|
};
|
||||||
this.casesByTaskHeight = await this.getHorizontalBarHeight(this.compareDashboardData.freq.cases_by_task);
|
this.casesByTaskHeight = await this.getHorizontalBarHeight(this.compareDashboardData.freq.cases_by_task);
|
||||||
// create chart
|
// create chart
|
||||||
|
console.log('TODO:', this.compareDashboardData.time.avg_cycle_time.data[0].data);
|
||||||
[this.avgCycleTimeData, this.avgCycleTimeOptions] = this.getLineChart(
|
[this.avgCycleTimeData, this.avgCycleTimeOptions] = this.getLineChart(
|
||||||
this.compareDashboardData.time.avg_cycle_time, this.contentData.avgCycleTime, 'date');
|
this.compareDashboardData.time.avg_cycle_time, this.contentData.avgCycleTime, 'date');
|
||||||
[this.avgCycleEfficiencyData, this.avgCycleEfficiencyOptions] = this.getBarChart(
|
[this.avgCycleEfficiencyData, this.avgCycleEfficiencyOptions] = this.getBarChart(
|
||||||
Reference in New Issue
Block a user