แก้ assess เป็น evaluate
This commit is contained in:
parent
5f97ee9377
commit
d71b2a172f
25 changed files with 83 additions and 75 deletions
|
|
@ -1,7 +0,0 @@
|
|||
import env from "../index";
|
||||
|
||||
const assess = `${env.API_GEN_REPORT}`;
|
||||
|
||||
export default {
|
||||
reportTemplate: () => `${assess}/report-template/docx`,
|
||||
};
|
||||
7
src/api/evaluate/api.evaluate.ts
Normal file
7
src/api/evaluate/api.evaluate.ts
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
import env from "../index";
|
||||
|
||||
const report = `${env.API_GEN_REPORT}`;
|
||||
|
||||
export default {
|
||||
reportTemplate: () => `${report}/report-template/docx`,
|
||||
};
|
||||
|
|
@ -5,14 +5,14 @@ import testtest from "./api/test/api.test";
|
|||
import retirementResign from "./api/leave/api.leave";
|
||||
import placementTransfer from "./api/transfer/api.transfer";
|
||||
import message from "./api/api.message";
|
||||
import assess from "./api/assess/api.assess";
|
||||
import evaluate from "./api/evaluate/api.evaluate";
|
||||
|
||||
const API = {
|
||||
...testtest,
|
||||
...retirementResign,
|
||||
...placementTransfer,
|
||||
...message,
|
||||
...assess,
|
||||
...evaluate,
|
||||
};
|
||||
|
||||
export default {
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ const items = ref<any>([
|
|||
title: "ประเมินผล",
|
||||
sub: "ข้อมูลการประเมินผลการปฏิบัติราชการ",
|
||||
color: "lime-4",
|
||||
path: "/assess",
|
||||
path: "/evaluate",
|
||||
active: false,
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
const assessMain = () => import("@/modules/06_assess/views/AssessMain.vue");
|
||||
|
||||
export default [
|
||||
{
|
||||
path: "/assess",
|
||||
name: "assess",
|
||||
component: assessMain,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: [7],
|
||||
},
|
||||
},
|
||||
];
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
<script setup lang="ts">
|
||||
import { ref } from "vue";
|
||||
|
||||
import { useAssessStore } from "@/modules/06_assess/store";
|
||||
import { useEvaluateStore } from "@/modules/06_evaluate/store";
|
||||
|
||||
const store = useAssessStore();
|
||||
const store = useEvaluateStore();
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
|
@ -2,25 +2,25 @@
|
|||
import { onMounted } from "vue";
|
||||
import { useQuasar } from "quasar";
|
||||
|
||||
import Stepper from "@/modules/06_assess/components/Stepper.vue";
|
||||
import Step1 from "@/modules/06_assess/components/step/step1.vue";
|
||||
import Step2 from "@/modules/06_assess/components/step/step2.vue";
|
||||
import Step3 from "@/modules/06_assess/components/step/step3.vue";
|
||||
import Step4 from "@/modules/06_assess/components/step/step4.vue";
|
||||
import Step5 from "@/modules/06_assess/components/step/step5.vue";
|
||||
import Step6 from "@/modules/06_assess/components/step/step6.vue";
|
||||
import Step7 from "@/modules/06_assess/components/step/step7.vue";
|
||||
import Step8 from "@/modules/06_assess/components/step/step8.vue";
|
||||
import Step9 from "@/modules/06_assess/components/step/step9.vue";
|
||||
import Stepper from "@/modules/06_evaluate/components/Stepper.vue";
|
||||
import Step1 from "@/modules/06_evaluate/components/step/step1.vue";
|
||||
import Step2 from "@/modules/06_evaluate/components/step/step2.vue";
|
||||
import Step3 from "@/modules/06_evaluate/components/step/step3.vue";
|
||||
import Step4 from "@/modules/06_evaluate/components/step/step4.vue";
|
||||
import Step5 from "@/modules/06_evaluate/components/step/step5.vue";
|
||||
import Step6 from "@/modules/06_evaluate/components/step/step6.vue";
|
||||
import Step7 from "@/modules/06_evaluate/components/step/step7.vue";
|
||||
import Step8 from "@/modules/06_evaluate/components/step/step8.vue";
|
||||
import Step9 from "@/modules/06_evaluate/components/step/step9.vue";
|
||||
|
||||
import ViewStep1 from "@/modules/06_assess/components/viewstep/viewStep1.vue";
|
||||
import ViewStep3 from "@/modules/06_assess/components/viewstep/viewStep3.vue";
|
||||
import ViewStep7 from "@/modules/06_assess/components/viewstep/viewStep7.vue";
|
||||
import ViewStep1 from "@/modules/06_evaluate/components/viewstep/viewStep1.vue";
|
||||
import ViewStep3 from "@/modules/06_evaluate/components/viewstep/viewStep3.vue";
|
||||
import ViewStep7 from "@/modules/06_evaluate/components/viewstep/viewStep7.vue";
|
||||
|
||||
import { useAssessStore } from "@/modules/06_assess/store";
|
||||
import { useEvaluateStore } from "@/modules/06_evaluate/store";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
|
||||
const store = useAssessStore();
|
||||
const store = useEvaluateStore();
|
||||
const mixin = useCounterMixin();
|
||||
const { dialogConfirm } = mixin;
|
||||
|
||||
|
|
@ -117,9 +117,17 @@ onMounted(() => {
|
|||
</div>
|
||||
|
||||
<div class="col-xs-12 col-sm-9">
|
||||
<div class="toptitle">
|
||||
{{ store.step }}.{{ store.titel[store.step - 1] }}
|
||||
<div class="col-12 row">
|
||||
<div class="col-9">
|
||||
<div class="toptitle">
|
||||
{{ store.step }}.{{ store.titel[store.step - 1] }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-3 text-right">
|
||||
<router-link to="https://accreditation.ocsc.go.th/accreditation/search/curriculum">ไปยัง ก.พ. เพื่อตรวจสอบข้อมูล</router-link>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row q-col-gutter-md col-12">
|
||||
<div
|
||||
:class="
|
||||
|
|
@ -2,25 +2,25 @@
|
|||
import { ref, onMounted } from "vue";
|
||||
import { useQuasar } from "quasar";
|
||||
|
||||
import Stepper from "@/modules/06_assess/components/Stepper.vue";
|
||||
import Step1 from "@/modules/06_assess/components/step/step1.vue";
|
||||
import Step2 from "@/modules/06_assess/components/step/step2.vue";
|
||||
import Step3 from "@/modules/06_assess/components/step/step3.vue";
|
||||
import Step4 from "@/modules/06_assess/components/step/step4.vue";
|
||||
import Step5 from "@/modules/06_assess/components/step/step5.vue";
|
||||
import Step6 from "@/modules/06_assess/components/step/step6.vue";
|
||||
import Step7 from "@/modules/06_assess/components/step/step7.vue";
|
||||
import Step8 from "@/modules/06_assess/components/step/step8.vue";
|
||||
import Step9 from "@/modules/06_assess/components/step/step9.vue";
|
||||
import Stepper from "@/modules/06_evaluate/components/Stepper.vue";
|
||||
import Step1 from "@/modules/06_evaluate/components/step/step1.vue";
|
||||
import Step2 from "@/modules/06_evaluate/components/step/step2.vue";
|
||||
import Step3 from "@/modules/06_evaluate/components/step/step3.vue";
|
||||
import Step4 from "@/modules/06_evaluate/components/step/step4.vue";
|
||||
import Step5 from "@/modules/06_evaluate/components/step/step5.vue";
|
||||
import Step6 from "@/modules/06_evaluate/components/step/step6.vue";
|
||||
import Step7 from "@/modules/06_evaluate/components/step/step7.vue";
|
||||
import Step8 from "@/modules/06_evaluate/components/step/step8.vue";
|
||||
import Step9 from "@/modules/06_evaluate/components/step/step9.vue";
|
||||
|
||||
import ViewStep1 from "@/modules/06_assess/components/viewstep/viewStep1.vue";
|
||||
import ViewStep3 from "@/modules/06_assess/components/viewstep/viewStep3.vue";
|
||||
import ViewStep7 from "@/modules/06_assess/components/viewstep/viewStep7.vue";
|
||||
import ViewStep1 from "@/modules/06_evaluate/components/viewstep/viewStep1.vue";
|
||||
import ViewStep3 from "@/modules/06_evaluate/components/viewstep/viewStep3.vue";
|
||||
import ViewStep7 from "@/modules/06_evaluate/components/viewstep/viewStep7.vue";
|
||||
|
||||
import { useAssessStore } from "@/modules/06_assess/store";
|
||||
import { useEvaluateStore } from "@/modules/06_evaluate/store";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
|
||||
const store = useAssessStore();
|
||||
const store = useEvaluateStore();
|
||||
const mixin = useCounterMixin();
|
||||
const { dialogConfirm } = mixin;
|
||||
|
||||
|
|
@ -2,9 +2,9 @@
|
|||
import { reactive, ref } from "vue";
|
||||
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useAssessStore } from "@/modules/06_assess/store";
|
||||
import { useEvaluateStore } from "@/modules/06_evaluate/store";
|
||||
|
||||
const store = useAssessStore();
|
||||
const store = useEvaluateStore();
|
||||
const mixin = useCounterMixin();
|
||||
const { date2Thai } = mixin;
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<script setup lang="ts">
|
||||
import { ref } from "vue";
|
||||
import ViewPDF from "@/modules/06_assess/components/viewstep/viewPDF.vue";
|
||||
import ViewPDF from "@/modules/06_evaluate/components/viewstep/viewPDF.vue";
|
||||
|
||||
const fileEvaluation1 = ref<any>();
|
||||
|
||||
|
|
@ -2,9 +2,9 @@
|
|||
import { reactive, ref } from "vue";
|
||||
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useAssessStore } from "@/modules/06_assess/store";
|
||||
import { useEvaluateStore } from "@/modules/06_evaluate/store";
|
||||
|
||||
const store = useAssessStore();
|
||||
const store = useEvaluateStore();
|
||||
const mixin = useCounterMixin();
|
||||
const { date2Thai } = mixin;
|
||||
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
<script setup lang="ts">
|
||||
import ViewPDF from "@/modules/06_assess/components/viewstep/viewPDF.vue";
|
||||
import ViewPDF from "@/modules/06_evaluate/components/viewstep/viewPDF.vue";
|
||||
|
||||
import { useAssessStore } from "@/modules/06_assess/store";
|
||||
import { useEvaluateStore } from "@/modules/06_evaluate/store";
|
||||
|
||||
const store = useAssessStore();
|
||||
const store = useEvaluateStore();
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
<script setup lang="ts">
|
||||
import ViewPDF from "@/modules/06_assess/components/viewstep/viewPDF.vue";
|
||||
import ViewPDF from "@/modules/06_evaluate/components/viewstep/viewPDF.vue";
|
||||
|
||||
import { useAssessStore } from "@/modules/06_assess/store";
|
||||
import { useEvaluateStore } from "@/modules/06_evaluate/store";
|
||||
|
||||
const store = useAssessStore();
|
||||
const store = useEvaluateStore();
|
||||
</script>
|
||||
|
||||
<template>
|
||||
13
src/modules/06_evaluate/router.ts
Normal file
13
src/modules/06_evaluate/router.ts
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
const evaluateMain = () => import("@/modules/06_evaluate/views/EvaluateMain.vue");
|
||||
|
||||
export default [
|
||||
{
|
||||
path: "/evaluate",
|
||||
name: "evaluate",
|
||||
component: evaluateMain,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: [7],
|
||||
},
|
||||
},
|
||||
];
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
import { defineStore } from "pinia";
|
||||
import { ref } from "vue";
|
||||
|
||||
export const useAssessStore = defineStore("asses", () => {
|
||||
export const useEvaluateStore = defineStore("evaluateStore", () => {
|
||||
const tabMenu = ref<string>("1");
|
||||
const step = ref<number>(1);
|
||||
const titel = ref<string[]>([
|
||||
|
|
@ -5,12 +5,12 @@ import { useRouter } from "vue-router";
|
|||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
||||
import Tab1 from "@/modules/06_assess/components/Tab1.vue"; // ชำนาญการ
|
||||
import Tab2 from "@/modules/06_assess/components/Tab2.vue"; // ชำนาญการพิเศษ
|
||||
import Tab1 from "@/modules/06_evaluate/components/Tab1.vue"; // ชำนาญการ
|
||||
import Tab2 from "@/modules/06_evaluate/components/Tab2.vue"; // ชำนาญการพิเศษ
|
||||
|
||||
import { useAssessStore } from "@/modules/06_assess/store";
|
||||
import { useEvaluateStore } from "@/modules/06_evaluate/store";
|
||||
|
||||
const store = useAssessStore();
|
||||
const store = useEvaluateStore();
|
||||
const router = useRouter();
|
||||
const $q = useQuasar();
|
||||
</script>
|
||||
|
|
@ -7,7 +7,7 @@ import ModuleTransfer from "@/modules/02_transfer/router";
|
|||
import ModuleRetire from "@/modules/03_retire/router";
|
||||
import ModuleCheckin from "@/modules/04_checkin/router";
|
||||
import ModuleLeave from "@/modules/05_leave/router";
|
||||
import ModuAssesss from "@/modules/06_assess/router";
|
||||
import ModuEvaluate from "@/modules/06_evaluate/router";
|
||||
import ModuAppealComplain from "@/modules/07_appealComplain/router";
|
||||
// TODO: ใช้หรือไม่?
|
||||
import keycloak from "@/plugins/keycloak";
|
||||
|
|
@ -33,7 +33,7 @@ const router = createRouter({
|
|||
...ModuleRetire,
|
||||
...ModuleCheckin,
|
||||
...ModuleLeave,
|
||||
...ModuAssesss,
|
||||
...ModuEvaluate,
|
||||
...ModuAppealComplain,
|
||||
],
|
||||
},
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue