diff --git a/src/App.vue b/src/App.vue index 73e614f..3f5641d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,14 +1,18 @@ diff --git a/src/components/common/WgyWork copy.vue b/src/components/common/DdyWork.vue similarity index 89% rename from src/components/common/WgyWork copy.vue rename to src/components/common/DdyWork.vue index 77dca79..09a5b9a 100644 --- a/src/components/common/WgyWork copy.vue +++ b/src/components/common/DdyWork.vue @@ -16,7 +16,7 @@ import { } from 'naive-ui'; export default { - name: 'WgyWork', + name: 'DdyWork', components: { NSpace, NDataTable, @@ -55,12 +55,6 @@ export default { key: 'signOut', width: 60, }, - { - align: 'center', - title: '轨迹', - key: 'distance', - width: 60, - }, { align: 'center', title: '总分', @@ -91,7 +85,6 @@ export default { day: 1, signIn: 1, signOut: 1, - distance: 1, remark: '123' }) } diff --git a/src/components/common/Scoring.vue b/src/components/common/Scoring.vue index f79069a..51a7dcc 100644 --- a/src/components/common/Scoring.vue +++ b/src/components/common/Scoring.vue @@ -68,7 +68,6 @@ export default { }, data() { let vueSelf = this; - console.log(vueSelf.maxScore) return { message: useMessage(), form: { diff --git a/src/components/common/ZfGaWork.vue b/src/components/common/ZfGaWork.vue new file mode 100644 index 0000000..86a11d1 --- /dev/null +++ b/src/components/common/ZfGaWork.vue @@ -0,0 +1,98 @@ + + + + + \ No newline at end of file diff --git a/src/components/ddy/Ddy.vue b/src/components/ddy/Ddy.vue deleted file mode 100644 index 929e499..0000000 --- a/src/components/ddy/Ddy.vue +++ /dev/null @@ -1,135 +0,0 @@ - - - - - diff --git a/src/components/table/Ddy.vue b/src/components/table/Ddy.vue new file mode 100644 index 0000000..4e57a3b --- /dev/null +++ b/src/components/table/Ddy.vue @@ -0,0 +1,440 @@ + + + + + diff --git a/src/components/wgy/Wgy.vue b/src/components/table/Wgy.vue similarity index 99% rename from src/components/wgy/Wgy.vue rename to src/components/table/Wgy.vue index 1041016..64a95a0 100644 --- a/src/components/wgy/Wgy.vue +++ b/src/components/table/Wgy.vue @@ -80,7 +80,7 @@ import WgyReportDay from '../common/WgyReportDay.vue' import Scoring from '../common/Scoring.vue'; export default { - name: 'Wgy.vue', + name: 'Wgy', components: { NSpace, NGrid, @@ -971,8 +971,8 @@ export default { AF: d.shouldPay, AG: d.actualPay, }); - this.table.data = data; } + this.table.data = data; } }, computed() { diff --git a/src/components/table/Wgy3.vue b/src/components/table/Wgy3.vue new file mode 100644 index 0000000..cab330b --- /dev/null +++ b/src/components/table/Wgy3.vue @@ -0,0 +1,308 @@ + + + + + + \ No newline at end of file diff --git a/src/components/table/ZfGa.vue b/src/components/table/ZfGa.vue new file mode 100644 index 0000000..108664b --- /dev/null +++ b/src/components/table/ZfGa.vue @@ -0,0 +1,501 @@ + + + + + \ No newline at end of file