Merge branch 'develop' into devTee
This commit is contained in:
commit
df49f223e7
1 changed files with 13 additions and 6 deletions
|
|
@ -14,7 +14,7 @@ import Competency from "@/modules/08_KPI/components/Tab/Topic/02_Competency.vue"
|
|||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useKpiDataStore } from "@/modules/08_KPI/store";
|
||||
|
||||
const modalCriteria = ref<boolean>(false)
|
||||
const modalCriteria = ref<boolean>(false);
|
||||
const $q = useQuasar();
|
||||
const route = useRoute();
|
||||
const { showLoader, hideLoader, messageError } = useCounterMixin();
|
||||
|
|
@ -108,12 +108,12 @@ function fetchAssigned() {
|
|||
});
|
||||
}
|
||||
|
||||
function onInfo(){
|
||||
modalCriteria.value = true
|
||||
function onInfo() {
|
||||
modalCriteria.value = true;
|
||||
}
|
||||
const resultWork = computed(() => {
|
||||
const total = totalResults1.value + totalResults2.value + totalResults3.value;
|
||||
return (total * 80) / 100;
|
||||
return parseFloat(((total * 80) / 100).toFixed(2));
|
||||
});
|
||||
|
||||
onMounted(() => {
|
||||
|
|
@ -174,7 +174,14 @@ onMounted(() => {
|
|||
<div class="text-weight-bold text-body2 q-mb-sm">
|
||||
<span class="txt-under text-blue-6">องค์ประกอบที่ 2</span>
|
||||
<span class="q-ml-sm"> พฤติกรรมการปฎิบัติราชการ (สมรรถนะ)</span>
|
||||
<q-btn flat icon="info" color="info" round class="q-ml-xs" @click="onInfo">
|
||||
<q-btn
|
||||
flat
|
||||
icon="info"
|
||||
color="info"
|
||||
round
|
||||
class="q-ml-xs"
|
||||
@click="onInfo"
|
||||
>
|
||||
<q-tooltip>เกณฑ์การประเมิน</q-tooltip>
|
||||
</q-btn>
|
||||
</div>
|
||||
|
|
@ -188,7 +195,7 @@ onMounted(() => {
|
|||
</div>
|
||||
</q-scroll-area>
|
||||
|
||||
<DialogListCriteria v-model:modal="modalCriteria"/>
|
||||
<DialogListCriteria v-model:modal="modalCriteria" />
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue