From a6ed23b018343a68f9fd276647cc4af817398d1b Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期四, 01 二月 2024 15:21:26 +0800
Subject: [PATCH] feat:修改部分问题
---
src/views/your/sign-manage/signManage.vue | 842 +++++++++++--------------------------------------------
1 files changed, 179 insertions(+), 663 deletions(-)
diff --git a/src/views/your/sign-manage/signManage.vue b/src/views/your/sign-manage/signManage.vue
index 22e811a..b4ef75c 100644
--- a/src/views/your/sign-manage/signManage.vue
+++ b/src/views/your/sign-manage/signManage.vue
@@ -8,52 +8,37 @@
<Card>
<Row class="operation">
<Date-picker v-model="value" @on-change="getDataByDate" value-format="yyyy-MM-dd" type="daterange"
- placement="bottom-start" placeholder="璇烽�夋嫨鏃ユ湡" style="width: 240px;padding-left: 20px">
+ placement="bottom-start" placeholder="璇烽�夋嫨鏃ユ湡"
+ style="width: 240px;padding-left: 20px;margin-right: 20px">
</Date-picker>
+ <Input v-model="carNo" suffix="ios-search" @on-change="getSign" placeholder="杈撳叆杞︾墝鍙锋悳绱�" clearable
+ style="width: 250px;margin-right: 20px"/>
+ <Input v-model="line" suffix="ios-search" @on-change="getSign" placeholder="杈撳叆鍖哄煙鎼滅储" clearable
+ style="width: 250px"/>
+ <Button @click="exportExcel" class="init-button export-button">瀵煎嚭鏁版嵁</Button>
+ <!-- <Button @click="exportAllExcel" class="init-button export-button">瀵煎嚭鍏ㄩ儴鏁版嵁</Button> -->
<Button @click="init" icon="md-refresh" class="init-button">鍒锋柊</Button>
<Button type="dashed" @click="openTip = !openTip">{{
openTip ? "鍏抽棴鎻愮ず" : "寮�鍚彁绀�"
- }}
+ }}
</Button>
- <Input v-model="carNo" suffix="ios-search" @on-change="getSign" placeholder="杈撳叆杞︾墝鍙锋悳绱�" clearable
- style="width: 250px" />
- <Button @click="exportExcel" class="init-button export-button">瀵煎嚭鏈〉鏁版嵁</Button>
- <!-- <Button @click="exportAllExcel" class="init-button export-button">瀵煎嚭鍏ㄩ儴鏁版嵁</Button> -->
- <div @click="switchnum = 1">
- <Button class="init-button export-button">鏃ョ鏀剁巼</Button>
- </div>
- <div @click="switchnum = 2">
- <Button class="init-button export-button">鏈堢鏀剁巼</Button>
- </div>
</Row>
<Alert show-icon v-show="openTip">
宸查�夋嫨
<span class="select-count">{{ selectList.length }}</span> 椤�
<a class="select-clear" @click="clearSelectAll">娓呯┖</a>
</Alert>
- <!-- 鏃ョ鏀剁巼鐨勮〃 -->
- <div v-show="switchnum === 1">
+ <!-- 绛炬敹鐜囩殑琛� -->
+ <div>
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
- :span-method="handleSpan" @on-sort-change="changeSort" @on-selection-change="changeSelect" height="600"></Table>
+ :span-method="handleSpan" @on-sort-change="changeSort" @on-selection-change="changeSelect"
+ height="615"></Table>
</div>
- <!-- 鏈堢鏀剁巼鐨勮〃 -->
- <div v-show="switchnum === 2">
- <Table :loading="loading" border :columns="columnsMonth" :data="monthData" sortable="custom"
- :span-method="handleSpan" @on-sort-change="changeSort" @on-selection-change="changeSelect" height="600">
- </Table>
- </div>
- <div v-show="switchnum === 1">
+ <div>
<Row type="flex" justify="end" class="page">
<Page :current="pageNum" :total="total" :page-size="pageSize" @on-change="changePage"
- @on-page-size-change="changePageSize" :page-size-opts="[18, 36]" size="small" show-total show-elevator
- show-sizer></Page>
- </Row>
- </div>
- <div v-show="switchnum === 2">
- <Row type="flex" justify="end" class="page">
- <Page :current="pageNum" :total="totalmonth" :page-size="pageSize" @on-change="changePage"
- @on-page-size-change="changePageSize" :page-size-opts="[18, 36]" size="small" show-total show-elevator
- show-sizer></Page>
+ @on-page-size-change="changePageSize" :page-size-opts="[60, 120]" size="small" show-total show-elevator
+ show-sizer></Page>
</Row>
</div>
</Card>
@@ -62,30 +47,30 @@
<Modal :title="modalTitle" v-model="roleModalVisible" :mask-closable="false" :width="500">
<Form ref="carForm" :model="carForm" :label-width="80" :rules="carFormValidate">
<FormItem label="鍝佺墝" prop="brand">
- <Input v-model="carForm.brand" />
+ <Input v-model="carForm.brand"/>
</FormItem>
<FormItem label="鍨嬪彿" prop="model">
- <Input v-model="carForm.model" />
+ <Input v-model="carForm.model"/>
</FormItem>
<FormItem label="鎺掗噺" prop="displacement">
- <Input v-model="carForm.displacement" />
+ <Input v-model="carForm.displacement"/>
</FormItem>
<Form-item label="璐疆骞翠唤">
<Row>
<Col span="11">
- <Date-picker @on-change="change1" type="date" value="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡"
- v-model="carForm.buyYear"></Date-picker>
+ <Date-picker @on-change="change1" type="date" value="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡"
+ v-model="carForm.buyYear"></Date-picker>
</Col>
</Row>
</Form-item>
<FormItem label="鐗岀収" prop="carNo">
- <Input v-model="carForm.carNo" />
+ <Input v-model="carForm.carNo"/>
</FormItem>
<FormItem label="鍔犳补鍗″彿" prop="addOilCode">
- <Input v-model="carForm.addOilCode" />
+ <Input v-model="carForm.addOilCode"/>
</FormItem>
<FormItem label="杞﹁締缂栧彿" prop="code">
- <Input v-model="carForm.code" />
+ <Input v-model="carForm.code"/>
</FormItem>
<FormItem label="鍙告満" prop="userId">
<Select v-model="carForm.userId" filterable>
@@ -112,7 +97,7 @@
<Button @click="init" icon="md-refresh">鍒锋柊</Button>
</Row>
<Table :loading="loading" border :columns="columns2" :data="data2" ref="table" sortable="custom"
- @on-sort-change="changeSort" @on-selection-change="changeSelect">
+ @on-sort-change="changeSort" @on-selection-change="changeSelect">
</Table>
@@ -134,13 +119,13 @@
</Select>
</FormItem>
<FormItem label="缂栧彿" prop="code">
- <Input v-model="equipmentForm.code" />
+ <Input v-model="equipmentForm.code"/>
</FormItem>
<FormItem label="ip鍦板潃" prop="ip">
- <Input v-model="equipmentForm.ip" />
+ <Input v-model="equipmentForm.ip"/>
</FormItem>
<FormItem label="绔彛鍙�" prop="port">
- <Input v-model="equipmentForm.port" />
+ <Input v-model="equipmentForm.port"/>
</FormItem>
</Form>
@@ -175,13 +160,13 @@
<Modal :title="modalTitle" v-model="carModalVisible" :mask-closable="false" :width="500" class="depModal">
<Form :label-width="85" ref="removeForm" :model="removeForm">
<FormItem label="绉婚櫎鍘熷洜" prop="removeReason">
- <Input v-model="removeForm.removeReason" />
+ <Input v-model="removeForm.removeReason"/>
</FormItem>
</Form>
<div v-show="dataType == 1" style="margin-top: 15px">
<div style="position: relative">
<Tree ref="depTree" :data="depData" :load-data="loadData" @on-toggle-expand="expandCheckDep" multiple
- style="margin-top: 15px"></Tree>
+ style="margin-top: 15px"></Tree>
<Spin size="large" fix v-if="depTreeLoading"></Spin>
</div>
</div>
@@ -195,34 +180,21 @@
</template>
<script>
-import {
- getAllPermissionList,
- setDefaultRole,
- editRolePerm,
- initDepartment,
- loadDepartment,
- editRoleDep,
-} from "@/api/index";
+import {editRoleDep, editRolePerm, getAllPermissionList, loadDepartment, setDefaultRole,} from "@/api/index";
import {
- getAll,
addCar,
- getCarList,
- editCar,
- deleteCar,
- getEquipment,
addEquipment,
- getUser,
- getDriver,
+ deleteCar,
deleteEquipment,
- getSignList,
- getLicense,
- getSignByMonth,
+ editCar,
+ getDriver,
+ getEquipment,
+ getNewSignList,
outExcel
} from "@/api/open";
import util from "@/libs/util.js";
-import { childColumn, childData, childDataTwo, childColumnTwo, childColumnthree } from "./exportColumn"
-import Vue from "vue"
+
export default {
name: "car-manage",
data() {
@@ -249,7 +221,7 @@
searchForm: {
// 鎼滅储妗嗗垵濮嬪寲瀵硅薄
pageNumber: 1, // 褰撳墠椤垫暟
- pageSize: 10, // 椤甸潰澶у皬
+ pageSize: 60, // 椤甸潰澶у皬
sort: "createTime", // 榛樿鎺掑簭瀛楁
order: "desc", // 榛樿鎺掑簭鏂瑰紡
key: "",
@@ -268,7 +240,7 @@
},
carFormValidate: {
name: [
- { required: true, message: "瑙掕壊鍚嶇О涓嶈兘涓虹┖", trigger: "change" },
+ {required: true, message: "瑙掕壊鍚嶇О涓嶈兘涓虹┖", trigger: "change"},
],
},
submitLoading: false,
@@ -298,148 +270,29 @@
align: "center",
},
{
- title: "閰嶉�佸憳",
- key: "name",
+ title: "鍖哄煙",
+ key: "line",
width: 100,
align: "center",
},
- // {
- // title: "骞存湀",
- // key: "sendMonth",
- // minWidth: 120,
- // align: "center",
- // },
{
title: "01娈�",
- // key: "oneBatch",
+ key: "oneBatch",
minWidth: 140,
align: "center",
- children: [
- {
- title: '鏃ユ湡',
- align: 'center',
- key: 'sendDate',
- minWidth: 120,
- className: 'no_border',
- render: (h, params) => {
- return h("div", [
- h("Table", {
- props: {
- columns: childColumn,
- "show-header": false,
- data: params.row.childone,
- align: 'center',
- },
- }),
- ])
- },
- },
- {
- title: '鏃ョ鏀剁巼',
- align: 'center',
- className: 'no_border',
- minWidth: 120,
- render: (h, params) => {
- return h("div", [
- h("Table", {
- props: {
- columns: childColumnTwo,
- data: params.row.childone,
- "show-header": false,
- },
- }),
- ])
- },
- },
- ]
+
},
{
title: "02娈�",
key: "twoBatch",
minWidth: 140,
align: "center",
- children: [
- {
- title: '鏃ユ湡',
- align: 'center',
- key: 'model',
- minWidth: 120,
- className: 'no_border',
- render: (h, params) => {
- return h("div", [
- h("Table", {
- props: {
- columns: childColumn,
- data: params.row.childtwo,
- "show-header": false,
- },
- }),
- ])
- },
- },
- {
- title: '鏃ョ鏀剁巼',
- align: 'center',
- key: 'model',
- minWidth: 120,
- className: 'no_border',
- render: (h, params) => {
- return h("div", [
- h("Table", {
- props: {
- columns: childColumnTwo,
- data: params.row.childtwo,
- "show-header": false,
- },
- }),
- ])
- },
- },
- ]
},
{
title: "03娈�",
key: "threeBatch",
minWidth: 140,
align: "center",
- children: [
- {
- title: '鏃ユ湡',
- align: 'center',
- key: 'model',
- minWidth: 120,
- className: 'no_border',
- render: (h, params) => {
- return h("div", [
- h("Table", {
- props: {
- columns: childColumn,
- data: params.row.childthree,
- "show-header": false,
- },
- }),
- ])
- },
- },
- {
- title: '鏃ョ鏀剁巼',
- align: 'center',
- key: 'model',
- minWidth: 120,
- className: 'no_border',
- render: (h, params) => {
- return h("div", [
- h("Table", {
- props: {
- columns: childColumnTwo,
- data: params.row.childthree,
- "show-header": false,
- },
- }),
- ])
- },
- },
- ],
},
{
title: "04娈�",
@@ -447,348 +300,19 @@
minWidth: 140,
align: "center",
tooltip: true,
- children: [
- {
- title: '鏃ユ湡',
- align: 'center',
- key: 'model',
- minWidth: 120,
- className: 'no_border',
- render: (h, params) => {
- return h("div", [
- h("Table", {
- props: {
- columns: childColumn,
- data: params.row.childfour,
- "show-header": false,
- },
- }),
- ])
- },
- },
- {
- title: '鏃ョ鏀剁巼',
- align: 'center',
- key: 'model',
- minWidth: 120,
- className: 'no_border',
- render: (h, params) => {
- return h("div", [
- h("Table", {
- props: {
- columns: childColumnTwo,
- data: params.row.childfour,
- "show-header": false,
- },
- }),
- ])
- },
- },
- ]
},
{
title: "05娈�",
key: "fiveBatch",
minWidth: 140,
align: "center",
- children: [
- {
- title: '鏃ユ湡',
- align: 'center',
- key: 'model',
- minWidth: 120,
- className: 'no_border',
- render: (h, params) => {
- return h("div", [
- h("Table", {
- props: {
- columns: childColumn,
- data: params.row.childfive,
- "show-header": false,
- },
- }),
- ])
- },
- },
- {
- title: '鏃ョ鏀剁巼',
- align: 'center',
- key: 'model',
- minWidth: 120,
- className: 'no_border',
- render: (h, params) => {
- return h("div", [
- h("Table", {
- props: {
- columns: childColumnTwo,
- data: params.row.childfive,
- "show-header": false,
- },
- }),
- ])
- },
- },
- ]
- },
- ],
- columnsMonth: [
- {
- type: "selection",
- width: 60,
- align: "center",
},
{
- type: "index",
- title: "搴忓彿",
- width: 80,
- align: "center",
- },
- {
- title: "杞︾墝鍙�",
- key: "carName",
- width: 140,
- align: "center",
- },
- {
- title: "鍙告満",
- key: "userName",
- width: 140,
- align: "center",
- },
- // {
- // title: "閰嶉�佸憳",
- // key: "name",
- // width: 100,
- // align: "center",
- // },
- // {
- // title: "骞存湀",
- // key: "sendMonth",
- // minWidth: 120,
- // align: "center",
- // },
- {
- title: "01娈�",
- width: 140,
- align: "center",
- children: [
- {
- title: '鏈堜唤',
- align: 'center',
- key: 'sendDate',
- width: 120,
- className: 'no_border',
- render: (h, params) => {
- console.log(params.row.childone);
- return h("div", [
- h("Table", {
- props: {
- columns: childColumn,
- "show-header": false,
- data: params.row.childone,
- align: 'center',
- },
- }),
- ])
- },
- },
- {
- title: '鏈堢鏀剁巼',
- align: 'center',
- key: 'proportion',
- width: 120,
- className: 'no_border Sign',
- render: (h, params) => {
- return h("div", [
- h("Table", {
- props: {
- columns: childColumnthree,
- data: params.row.childone,
- "show-header": false,
- },
- }),
- ])
- },
- }
- ]
- },
- {
- title: "02娈�",
- key: "twoBatch",
+ title: "鎬�(骞冲潎)绛炬敹鐜�",
+ key: "sendMonth",
minWidth: 140,
align: "center",
- children: [
- {
- title: '鏈堜唤',
- align: 'center',
- key: 'model',
- width: 120,
- className: 'no_border',
- render: (h, params) => {
- return h("div", [
- h("Table", {
- props: {
- columns: childColumn,
- data: params.row.childtwo,
- "show-header": false,
- },
- }),
- ])
- },
- },
- {
- title: '鏈堢鏀剁巼',
- align: 'center',
- // key: 'proportion',
- width: 120,
- className: 'no_border Sign',
- render: (h, params) => {
- return h("div", [
- h("Table", {
- props: {
- columns: childColumnthree,
- data: params.row.childtwo,
- "show-header": false,
- },
- }),
- ])
- },
- }
- ]
- },
- {
- title: "03娈�",
- key: "threeBatch",
- minWidth: 140,
- align: "center",
- children: [
- {
- title: '鏈堜唤',
- align: 'center',
- key: 'model',
- width: 120,
- className: 'no_border',
- render: (h, params) => {
- return h("div", [
- h("Table", {
- props: {
- columns: childColumn,
- data: params.row.childthree,
- "show-header": false,
- },
- }),
- ])
- },
- },
- {
- title: '鏈堢鏀剁巼',
- align: 'center',
- // key: 'model',
- width: 120,
- className: 'no_border Sign',
- render: (h, params) => {
- return h("div", [
- h("Table", {
- props: {
- columns: childColumnthree,
- data: params.row.childthree,
- "show-header": false,
- },
- }),
- ])
- },
- }
- ],
- },
- {
- title: "04娈�",
- key: "fourBatch",
- minWidth: 140,
- align: "center",
- tooltip: true,
- children: [
- {
- title: '鏈堜唤',
- align: 'center',
- key: 'model',
- width: 120,
- className: 'no_border',
- render: (h, params) => {
- return h("div", [
- h("Table", {
- props: {
- columns: childColumn,
- data: params.row.childfour,
- "show-header": false,
- },
- }),
- ])
- },
- },
- {
- title: '鏈堢鏀剁巼',
- align: 'center',
- // key: 'model',
- width: 120,
- className: 'no_border Sign',
- render: (h, params) => {
- return h("div", [
- h("Table", {
- props: {
- columns: childColumnthree,
- data: params.row.childfour,
- "show-header": false,
- },
- }),
- ])
- },
- }
- ]
- },
- {
- title: "05娈�",
- key: "fiveBatch",
- minWidth: 140,
- align: "center",
- children: [
- {
- title: '鏈堜唤',
- align: 'center',
- key: 'model',
- width: 120,
- className: 'no_border',
- render: (h, params) => {
- return h("div", [
- h("Table", {
- props: {
- columns: childColumn,
- data: params.row.childfive,
- "show-header": false,
- },
- }),
- ])
- },
- },
- {
- title: '鏈堢鏀剁巼',
- align: 'center',
- // key: 'model',
- width: 120,
- className: 'no_border Sign',
- render: (h, params) => {
- return h("div", [
- h("Table", {
- props: {
- columns: childColumnthree,
- data: params.row.childfive,
- "show-header": false,
- },
- }),
- ])
- },
- }
- ]
- },
+ }
],
columns2: [
{
@@ -895,15 +419,15 @@
render: (h, params) => {
return h("div", [
h(
- "a",
- {
- on: {
- click: () => {
- this.editEquipment(params.row);
+ "a",
+ {
+ on: {
+ click: () => {
+ this.editEquipment(params.row);
+ },
},
},
- },
- "缂栬緫"
+ "缂栬緫"
),
h("Divider", {
props: {
@@ -911,15 +435,15 @@
},
}),
h(
- "a",
- {
- on: {
- click: () => {
- this.removeEquipment(params.row);
+ "a",
+ {
+ on: {
+ click: () => {
+ this.removeEquipment(params.row);
+ },
},
},
- },
- "鍒犻櫎"
+ "鍒犻櫎"
),
]);
},
@@ -945,99 +469,108 @@
// 椤电爜
pageNum: 1,
// 姣忛〉鏉℃暟
- pageSize: 36,
+ pageSize: 60,
// 杞︾墝鍙�
carNo: "",
+ // 绾胯矾
+ line: "",
// 寮�濮嬫棩鏈�
beginTime: "",
// 缁撴潫鏃ユ湡
endTime: "",
// 鎸夋湀鏌ヨ鐨刣ata
- monthData: [],
+ // monthData: [],
// 瀵煎嚭鐨勬暟鎹�
exportData: "",
- // 鏃� 鏈堢鏀剁巼涓ゅ紶琛ㄧ殑鍒囨崲
- switchnum: 1
+ dateOption: {
+ disabledDate(date) {
+ const now = new Date();
+ const year = now.getFullYear();
+ const month = now.getMonth();
+ return date.getFullYear() !== year || date.getMonth() !== month;
+ }
+ }
};
},
+ computed: {
+ firstDate() {
+ let y = new Date().getFullYear(); //鑾峰彇骞翠唤
+ let m = new Date().getMonth() + 1; //鑾峰彇鏈堜唤
+ let d = '01';
+ m = m < 10 ? '0' + m : m; //鏈堜唤琛� 0
+ return [y, m, d].join('-')
+ },
+ lastDate() {
+ let y = new Date().getFullYear(); //鑾峰彇骞翠唤
+ let m = new Date().getMonth() + 1; //鑾峰彇鏈堜唤
+ let d = new Date(y, m, 0).getDate(); //鑾峰彇褰撴湀鏈�鍚庝竴鏃�
+ m = m < 10 ? '0' + m : m; //鏈堜唤琛� 0
+ d = d < 10 ? '0' + d : d; //鏃ユ暟琛� 0
+ return [y, m, d].join('-')
+ },
+ },
created() {
+ this.beginTime = this.firstDate
+ this.endTime = this.lastDate
+ this.value = [this.firstDate, this.lastDate]
//璇锋眰鏁版嵁
this.getSign()
- // 鎸夋湀璇锋眰鐨勬暟鎹�
- this.getSignByMonthList()
},
methods: {
getSign() {
- getSignList(this.pageNum, this.pageSize, this.carNo, this.beginTime, this.endTime).then(result => {
+ this.loading = true;
+ getNewSignList(this.pageNum, this.pageSize, this.carNo, this.beginTime, this.endTime, this.line, '', '', '').then(result => {
this.loading = false;
if (result.success) {
- this.data = result.result.records;
+ let reg = /\d/g;
+ this.data = result.result.records.map(v => {
+ return {
+ ...v,
+ sendMonth: v.sendMonth.length >= 6 ? v.sendMonth.slice(0, 5) + '%' : v.sendMonth,
+ proportion: v.proportion.length >= 6 ? v.proportion.slice(0, 5) + '%' : v.proportion,
+ line: v.line.replace(reg, '').replace('杞�', '')
+ }
+ })
this.total = result.result.total;
this.data = this.merge(this.data)
- // console.log(this.data);
+
}
})
},
- getSignByMonthList() {
- getSignByMonth(this.pageNum, this.pageSize, this.carNo, 3).then(result => {
- this.loading = false;
- if (result.success) {
- this.dataMonth = result.result.records
- this.totalmonth = result.result.total;
- this.monthData = this.merge(this.dataMonth)
- // console.log(this.monthData);
+ merge(data) {
+ return Object.values(data.reduce((acc, cur) => {
+ if (!acc[cur.userName]) {
+ acc[cur.userName] = [cur];
+ } else {
+ acc[cur.userName].push(cur);
}
- })
- },
- merge(index) {
- let dataInfo = {};
- index.forEach((item, index) => {
- let { userName, carName, sendMonth, name } = item;
- if (!dataInfo[userName]) {
- dataInfo[userName] = {
- userName,
- carName,
- sendMonth,
- name,
- childone: [],
- childtwo: [],
- childthree: [],
- childfour: [],
- childfive: []
+ return acc;
+ }, {})).map(group => {
+ return group.reduce((acc, cur) => {
+ acc.sendMonth = cur.sendMonth;
+ acc.carName = cur.carName;
+ acc.line = cur.line
+ if (cur.oneBatch) {
+ acc.oneBatch = cur.proportion;
}
- }
- if (item.batch === "01娈�") {
- dataInfo[userName].childone.push(item);
- }
- if (item.batch === "02娈�") {
- dataInfo[userName].childtwo.push(item);
- }
- if (item.batch === "03娈�") {
- dataInfo[userName].childthree.push(item);
- }
- if (item.batch === "04娈�") {
- dataInfo[userName].childfour.push(item);
- }
- if (item.batch === "05娈�") {
- dataInfo[userName].childfive.push(item);
- }
+ if (cur.twoBatch) {
+ acc.twoBatch = cur.proportion;
+ }
+ if (cur.threeBatch) {
+ acc.threeBatch = cur.proportion;
+ }
+ if (cur.fourBatch) {
+ acc.fourBatch = cur.proportion;
+ }
+ if (cur.fiveBatch) {
+ acc.fiveBatch = cur.proportion;
+ }
+ return acc;
+ }, {userName: group[0].userName});
});
- let list = Object.values(dataInfo);
- list.forEach(item => {
- let arr = new Array(5 - item.childone.length).fill({ proportion: "" })
- let arr1 = new Array(5 - item.childtwo.length).fill({ proportion: "" })
- let arr2 = new Array(5 - item.childthree.length).fill({ proportion: "" })
- let arr3 = new Array(5 - item.childfour.length).fill({ proportion: "" })
- let arr4 = new Array(5 - item.childfive.length).fill({ proportion: "" })
- item.childone = [...item.childone, ...arr]
- item.childtwo = [...item.childtwo, ...arr1]
- item.childthree = [...item.childthree, ...arr2]
- item.childfour = [...item.childfour, ...arr3]
- item.childfive = [...item.childfive, ...arr4]
- })
- return list
+
},
- handleSummary({ columns, data }) {
+ handleSummary({columns, data}) {
const sums = {};
columns.forEach((column, index) => {
const key = column.key;
@@ -1074,8 +607,8 @@
},
// 瀵煎嚭涓篹xcel
exportExcel() {
- outExcel(this.pageNum, this.pageSize, this.carNo, this.beginTime, this.endTime).then((res) => {
- let blob = new Blob([res], { type: 'application/vnd.ms-excel' });
+ outExcel(this.pageNum, this.pageSize, this.carNo, this.beginTime, this.endTime, this.line).then((res) => {
+ let blob = new Blob([res], {type: 'application/vnd.ms-excel'});
let url = URL.createObjectURL(blob);
const link = document.createElement('a'); //鍒涘缓a鏍囩
link.href = url;
@@ -1084,18 +617,7 @@
URL.revokeObjectURL(url);
})
},
- exportAllExcel() {
- outExcel().then(res => {
- let blob = new Blob([res], { type: 'application/vnd.ms-excel' });
- let url = URL.createObjectURL(blob);
- const link = document.createElement('a'); //鍒涘缓a鏍囩
- link.href = url;
- link.download = '鍏ㄩ儴閰嶉�佷俊鎭�.xlsx'; //閲嶅懡鍚嶆枃浠�
- link.click();
- URL.revokeObjectURL(url);
- })
- },
- handleSpan({ row, column, rowIndex, columnIndex }) {
+ handleSpan({row, column, rowIndex, columnIndex}) {
if (rowIndex || !rowIndex) {
return {}
}
@@ -1107,7 +629,7 @@
this.getDataList();
// 鑾峰彇鎵�鏈夎彍鍗曟潈闄愭爲
},
- renderContent(h, { root, node, data }) {
+ renderContent(h, {root, node, data}) {
let icon = "";
if (data.level == 0) {
icon = "ios-navigate";
@@ -1121,57 +643,57 @@
icon = "md-radio-button-off";
}
return h(
- "span",
- {
- style: {
- display: "inline-block",
- cursor: "pointer",
- },
- on: {
- click: () => {
- if (data.status == -1) {
- return;
- }
- data.checked = !data.checked;
+ "span",
+ {
+ style: {
+ display: "inline-block",
+ cursor: "pointer",
+ },
+ on: {
+ click: () => {
+ if (data.status == -1) {
+ return;
+ }
+ data.checked = !data.checked;
+ },
},
},
- },
- [
- h("span", [
- h("Icon", {
- props: {
- type: icon,
- size: "16",
- },
- style: {
- "margin-right": "8px",
- "margin-bottom": "3px",
- },
- }),
- h("span", data.title),
- ]),
- ]
+ [
+ h("span", [
+ h("Icon", {
+ props: {
+ type: icon,
+ size: "16",
+ },
+ style: {
+ "margin-right": "8px",
+ "margin-bottom": "3px",
+ },
+ }),
+ h("span", data.title),
+ ]),
+ ]
);
},
changePage(v) {
+ this.loading = true;
this.pageNum = v
this.getSign();
- this.getSignByMonthList()
this.clearSelectAll();
},
changePageSize(v) {
+ this.loading = true;
this.pageSize = v;
this.getSign();
- this.getSignByMonthList()
},
getAllUser() {
- getDriver({ type: 0 }).then((res) => {
+ getDriver({type: 0}).then((res) => {
if (res.success) {
this.userList = res.result;
}
});
//this.type.type=1;
- getDriver({ type: 1 }).then((res) => {
+ getDriver({type: 1}).then((res) => {
if (res.success) {
this.driverList = res.result;
}
@@ -1196,25 +718,19 @@
m = m < 10 ? ('0' + m) : m
let d = date.getDate()
d = d < 10 ? ('0' + d) : d
- const time = y + '-' + m + '-' + d;
- return time
+ return y + '-' + m + '-' + d
},
//鏍规嵁閫夋嫨鐨勬棩鏈熻繑鍥炴暟鎹�
getDataByDate() {
this.loading = true;
if (this.value[0] != "" && this.value[1] != "") {
+ console.log(this.value)
this.beginTime = this.selectDate(this.value[0]);
this.endTime = this.selectDate(this.value[1]);
- this.page = false;
} else {
- // var date = new Date();
- // this.endTime = this.selectDate(date);
- // this.value[1] = this.endTime;
- // date.setDate(1);
- // this.value[0] = date;
- // this.beginTime = this.selectDate(date);
- this.beginTime = "";
- this.endTime = ""
+ this.beginTime = this.firstDate;
+ this.endTime = this.lastDate;
+ this.value = [this.firstDate, this.lastDate]
}
this.getSign();
},
@@ -1429,7 +945,7 @@
content: "鎮ㄧ‘璁よ鍒犻櫎鍚� ",
loading: true,
onOk: () => {
- deleteCar({ ids: v.id }).then((res) => {
+ deleteCar({ids: v.id}).then((res) => {
this.$Modal.remove();
if (res.success) {
this.clearSelectAll();
@@ -1446,7 +962,7 @@
content: "鎮ㄧ‘璁よ鍒犻櫎鍚� ",
loading: true,
onOk: () => {
- deleteEquipment({ ids: v.id }).then((res) => {
+ deleteEquipment({ids: v.id}).then((res) => {
this.$Modal.remove();
if (res.success) {
this.clearSelectAll();
@@ -1506,7 +1022,7 @@
ids += e.id + ",";
});
ids = ids.substring(0, ids.length - 1);
- deleteCar({ ids: ids }).then((res) => {
+ deleteCar({ids: ids}).then((res) => {
this.$Modal.remove();
if (res.success) {
this.$Message.success("鍒犻櫎鎴愬姛");
@@ -1601,7 +1117,7 @@
this.permModalVisible = false;
},
loadData(item, callback) {
- loadDepartment(item.id, { openDataFilter: false }).then((res) => {
+ loadDepartment(item.id, {openDataFilter: false}).then((res) => {
if (res.success) {
res.result.forEach(function (e) {
e.selected = false;
--
Gitblit v1.9.1