From 18fcb8ad28f583e3e1b99b23e4f7d9e1833dcd83 Mon Sep 17 00:00:00 2001
From: pengwei <2071057782@qq.com>
Date: 星期三, 12 三月 2025 14:16:30 +0800
Subject: [PATCH] 最新提交
---
项目代码/client/src/views/tts/DataLogging/Datalogging.vue | 1205 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 690 insertions(+), 515 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/client/src/views/tts/DataLogging/Datalogging.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/client/src/views/tts/DataLogging/Datalogging.vue"
index 4d41abd..fc44ee6 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/client/src/views/tts/DataLogging/Datalogging.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/client/src/views/tts/DataLogging/Datalogging.vue"
@@ -24,7 +24,8 @@
<div class="serch">
<div class="time_box">
<el-select
- v-model="value"
+ v-if="isactive == 1"
+ v-model="queryForm.value"
placeholder="璇烽�夋嫨"
size="small"
style="width: 6.19rem; height: 2rem; margin-right: 0.98rem"
@@ -36,7 +37,7 @@
:value="item.value"
/>
</el-select>
- <div class="time">娲惧伐鏃ユ湡</div>
+ <div class="time">鍒涘缓鏃ユ湡</div>
<el-date-picker
v-model="queryForm.selectTime"
prefix-icon="none"
@@ -58,27 +59,45 @@
size="small"
/>
</div>
- <div class="serch_box">
- <div class="serchb">鍏ㄥ眬鎼滅储</div>
+ <!-- <div class="serch_box">
+ <div class="serchb">
+ <el-select
+ v-model="queryForm.selectType"
+ placeholder="璇烽�夋嫨"
+ size="small"
+ style="width: 100%; height: 100%; font-size: 0.15rem"
+ >
+ <el-option
+ v-for="item in selectoptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </div>
<input
- v-model="queryForm.selectName"
+ v-model="queryForm.selectInput"
placeholder="璇疯緭鍏ュ叧閿瘝鎼滅储"
style="border-left: 0.06rem solid #e2e2e2"
/>
- </div>
+ </div> -->
<el-button
+ @click="handleQuery"
type="primary"
size="small"
style="margin-left: 0.98rem; height: 2rem"
>鏌ヨ</el-button
>
- <el-button size="small" style="height: 2rem">閲嶇疆</el-button>
+ <el-button size="small" style="height: 2rem" @click="resetQuery"
+ >閲嶇疆</el-button
+ >
</div>
<div class="btns">
<div style="display: flex; align-items: center">
<el-button
size="small"
style="width: 5.5rem; height: 2rem; font-size: 0.88rem"
+ @click="printExcel"
>鎵归噺瀵煎嚭</el-button
>
</div>
@@ -88,6 +107,7 @@
<el-table
v-if="isactive == 1"
:data="tableData"
+ height="450"
style="width: 100%"
:header-cell-style="{
background: 'rgba(250,250,250,1)',
@@ -103,21 +123,45 @@
}"
>
<el-table-column type="selection" align="center" />
- <el-table-column prop="address" label="搴忓彿" align="center" />
- <el-table-column prop="name" label="杞︾粍鍙�" align="center" />
- <el-table-column prop="address" label="杞﹀帰鍙�" align="center" />
- <el-table-column prop="address" label="杞悜鏋�" align="center" />
- <el-table-column prop="address" label="妫�淇彮缁�" align="center" />
- <el-table-column prop="address" label="鎶�鏈憳" align="center" />
- <el-table-column prop="address" label="鏈烘璐ㄦ鍛�" align="center" />
- <el-table-column prop="address" label="鍦版矡璐ㄦ鍛�" align="center" />
- <el-table-column prop="address" label="鐢垫皵璐ㄦ鍛�" align="center" />
- <el-table-column prop="address" label="妫�淇伐闀�" align="center" />
- <el-table-column prop="address" label="鍒涘缓鏃堕棿" align="center" />
- <el-table-column prop="address" label="浠诲姟鐘舵��" align="center" />
- <el-table-column prop="address" label="鎿嶄綔" align="center">
- <template #default="">
- <el-button size="small" type="text" @click="Findmore"
+ <el-table-column prop="id" label="搴忓彿" align="center" />
+ <el-table-column prop="trainNum" label="杞︾粍鍙�" align="center" />
+ <el-table-column prop="coachNum" label="杞﹀帰鍙�" align="center" />
+ <el-table-column prop="bogie" label="杞悜鏋�" align="center" />
+ <el-table-column prop="processDept" label="妫�淇彮缁�" align="center" />
+ <el-table-column prop="jiShuYuan" label="鎶�鏈憳" align="center" />
+ <el-table-column
+ prop="zhiJianYuan_LC"
+ label="鏈烘璐ㄦ鍛�"
+ align="center"
+ />
+ <el-table-column
+ prop="zhiJianYuan_DG"
+ label="鍦版矡璐ㄦ鍛�"
+ align="center"
+ />
+ <el-table-column
+ prop="zhiJianYuan_DQ"
+ label="鐢垫皵璐ㄦ鍛�"
+ align="center"
+ />
+ <el-table-column prop="gongZhang" label="妫�淇伐闀�" align="center" />
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" align="center" />
+ <el-table-column prop="taskstatus" label="浠诲姟鐘舵��" align="center">
+ <template #default="scope">
+ <span style="color: #ff651a" v-if="scope.row.taskstatus == 0"
+ >寰呮淳宸�</span
+ >
+ <span style="color: #c4ccd5" v-if="scope.row.taskstatus == 1"
+ >宸叉淳宸�</span
+ >
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" align="center">
+ <template #default="scope">
+ <el-button
+ size="small"
+ type="text"
+ @click="Findmore(scope.row.nJtaskID)"
>鏌ョ湅璇︽儏</el-button
>
</template>
@@ -128,6 +172,7 @@
<el-table
v-if="isactive == 2"
:data="tableData"
+ height="450"
style="width: 100%"
:header-cell-style="{
background: 'rgba(250,250,250,1)',
@@ -143,34 +188,38 @@
}"
>
<el-table-column type="selection" align="center" />
- <el-table-column prop="address" label="浠诲姟鍚嶇О" align="center" />
- <el-table-column prop="name" label="鎶�鏈憳" align="center" />
- <el-table-column prop="address" label="妫�淇伐闀�" align="center" />
- <el-table-column prop="address" label="娲惧伐鏃ユ湡" align="center" />
- <el-table-column prop="address" label="瀹屾垚鏃ユ湡" align="center" />
- <el-table-column prop="address" label="鏈烘鍔涚煩鍊兼槑缁�" align="center">
- <template #default="">
+ <el-table-column prop="takeName" label="浠诲姟鍚嶇О" align="center" />
+ <el-table-column prop="jiShuYuan" label="鎶�鏈憳" align="center" />
+ <el-table-column prop="gongZhang" label="妫�淇伐闀�" align="center" />
+ <el-table-column
+ prop="dispatchTime"
+ label="娲惧伐鏃ユ湡"
+ align="center"
+ />
+ <el-table-column prop="endTime" label="瀹屾垚鏃ユ湡" align="center" />
+ <el-table-column label="鏈烘鍔涚煩鍊兼槑缁�" align="center">
+ <template #default="scope">
<span
style="color: blue; font-size: 0.88rem; cursor: pointer"
- @click="Findtorque"
+ @click="LcFindtorque(scope.row.nJtaskID)"
>鏌ョ湅</span
>
</template></el-table-column
>
<el-table-column prop="address" label="鐢垫皵鍔涚煩鍊兼槑缁�" align="center">
- <template #default="">
+ <template #default="scope">
<span
style="color: blue; font-size: 0.88rem; cursor: pointer"
- @click="Findtorque"
+ @click="DqFindtorque(scope.row.nJtaskID)"
>鏌ョ湅</span
>
</template>
</el-table-column>
- <el-table-column prop="address" label="鐢垫皵鍔涚煩鍊兼槑缁�" align="center">
- <template #default="">
+ <el-table-column prop="address" label="鍦版矡鍔涚煩鍊兼槑缁�" align="center">
+ <template #default="scope">
<span
style="color: blue; font-size: 0.88rem; cursor: pointer"
- @click="Findtorque"
+ @click="DgFindtorque(scope.row.nJtaskID)"
>鏌ョ湅</span
>
</template></el-table-column
@@ -181,6 +230,7 @@
<el-table
v-if="isactive == 3"
:data="tableData"
+ height="450"
style="width: 100%"
:header-cell-style="{
background: 'rgba(250,250,250,1)',
@@ -196,10 +246,10 @@
}"
>
<el-table-column type="selection" align="center" />
- <el-table-column prop="address" label="鐧诲綍璐﹀彿" align="center" />
- <el-table-column prop="name" label="鐪熷疄濮撳悕" align="center" />
- <el-table-column prop="address" label="鐧诲綍IP" align="center" />
- <el-table-column prop="address" label="鐧诲綍鏃堕棿" align="center" />
+ <el-table-column prop="account" label="鐧诲綍璐﹀彿" align="center" />
+ <el-table-column prop="trurName" label="鐪熷疄濮撳悕" align="center" />
+ <el-table-column prop="logIP" label="鐧诲綍IP" align="center" />
+ <el-table-column prop="createdate" label="鐧诲綍鏃堕棿" align="center" />
</el-table>
</div>
<div
@@ -215,340 +265,14 @@
size="small"
background
layout="prev, pager, next"
- :total="1"
+ :current-page="pageQuery.page"
+ :page-size="pageQuery.rows"
+ :total="pageTotal"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
/>
</div>
</div>
-
- <!-- 鏂板缓缂栬緫寮瑰嚭妗� -->
- <!-- <el-dialog
- v-model="dialogVisible"
- title=""
- width="60%"
- :before-close="handleClose"
- top="2%"
- >
- <template #title>
- <div
- style="
- height: 3.63rem;
- display: flex;
- border-bottom: 1px solid #e6e6e6;
- "
- >
- <span
- style="color: rgb(16, 16, 16); font-size: 1rem; font-weight: bold"
- >娲句换鍔�</span
- >
- </div>
- </template>
- <el-form :model="form" label-width="auto" label-position="top">
- <el-row :gutter="20">
- <el-col :span="8">
- <el-form-item>
- <template #label>
- <div style="display: flex; align-items: flex-end">
- <span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >浠诲姟鍚嶇О</span
- >
- </div>
- </template>
- <el-input size="small" v-model="form.name" placeholder="璇疯緭鍏�" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item>
- <template #label>
- <div style="display: flex; align-items: flex-end">
- <span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >鎶�鏈憳</span
- >
- </div>
- </template>
- <el-input size="small" v-model="form.name" placeholder="璇疯緭鍏�" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item>
- <template #label>
- <div style="display: flex; align-items: flex-end">
- <span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >妫�淇伐闀�</span
- >
- </div>
- </template>
- <el-input size="small" v-model="form.name" placeholder="璇疯緭鍏�" />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <span
- style="
- color: rgb(16, 16, 16);
- font-size: 1rem;
- font-weight: bold;
- margin-bottom: 1.25rem;
- "
- >璐ㄦ缁�</span
- >
- </el-row>
- <el-row :gutter="20">
- <el-col :span="8">
- <el-form-item>
- <template #label>
- <div style="display: flex; align-items: flex-end">
- <span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >鐢垫皵璐ㄦ</span
- >
- </div>
- </template>
- <el-select v-model="value" placeholder="璇烽�夋嫨" size="small">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item>
- <template #label>
- <div style="display: flex; align-items: flex-end">
- <span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >鏈烘璐ㄦ</span
- >
- </div>
- </template>
- <el-select v-model="value" placeholder="璇烽�夋嫨" size="small">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item>
- <template #label>
- <div style="display: flex; align-items: flex-end">
- <span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >鍦版矡璐ㄦ</span
- >
- </div>
- </template>
- <el-select v-model="value" placeholder="璇烽�夋嫨" size="small">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <span
- style="
- color: rgb(16, 16, 16);
- font-size: 1rem;
- font-weight: bold;
- margin-bottom: 1.25rem;
- "
- >鐢垫皵缁�</span
- >
- </el-row>
- <el-row :gutter="20">
- <el-col :span="8">
- <el-form-item>
- <template #label>
- <div style="display: flex; align-items: flex-end">
- <span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >鐢垫皵鍔涚煩浣滀笟鍛�</span
- >
- </div>
- </template>
- <el-select v-model="value" placeholder="璇烽�夋嫨" size="small">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item>
- <template #label>
- <div style="display: flex; align-items: flex-end">
- <span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >鐢垫皵杈呭姪鍛�</span
- >
- </div>
- </template>
- <el-select v-model="value" placeholder="璇烽�夋嫨" size="small">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <span
- style="
- color: rgb(16, 16, 16);
- font-size: 1rem;
- font-weight: bold;
- margin-bottom: 1.25rem;
- "
- >鏈烘缁�</span
- >
- </el-row>
- <el-row :gutter="20">
- <el-col :span="8">
- <el-form-item>
- <template #label>
- <div style="display: flex; align-items: flex-end">
- <span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >鏈烘鍔涚煩浣滀笟鍛�</span
- >
- </div>
- </template>
- <el-select v-model="value" placeholder="璇烽�夋嫨" size="small">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item>
- <template #label>
- <div style="display: flex; align-items: flex-end">
- <span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >鏈烘杈呭姪鍛�</span
- >
- </div>
- </template>
- <el-select v-model="value" placeholder="璇烽�夋嫨" size="small">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <span
- style="
- color: rgb(16, 16, 16);
- font-size: 1rem;
- font-weight: bold;
- margin-bottom: 1.25rem;
- "
- >鍦版矡缁�</span
- >
- </el-row>
- <el-row :gutter="20">
- <el-col :span="8">
- <el-form-item>
- <template #label>
- <div style="display: flex; align-items: flex-end">
- <span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >鍦版矡鍔涚煩浣滀笟鍛�</span
- >
- </div>
- </template>
- <el-select v-model="value" placeholder="璇烽�夋嫨" size="small">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item>
- <template #label>
- <div style="display: flex; align-items: flex-end">
- <span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >鍦版矡杈呭姪鍛�</span
- >
- </div>
- </template>
- <el-select v-model="value" placeholder="璇烽�夋嫨" size="small">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- <template #footer>
- <div class="dialog-footer" style="text-align: center">
- <el-button
- size="small"
- @click="dialogVisible = false"
- style="height: 2rem; font-size: 0.88rem"
- >鍙栨秷</el-button
- >
-
- <el-button
- size="small"
- type="primary"
- @click="dialogVisible = false"
- style="height: 2rem; font-size: 0.88rem"
- >
- 淇濆瓨
- </el-button>
- </div>
- </template>
- </el-dialog> -->
<!-- 鏌ョ湅璇︽儏寮瑰嚭妗� -->
<el-dialog
@@ -598,7 +322,9 @@
"
:span="3"
>
- <span style="font-size: 0.88rem; color: #000">杞﹀瀷锛欱Y</span>
+ <span style="font-size: 0.88rem; color: #000"
+ >杞﹀瀷锛歿{ datildata.trainKind }}</span
+ >
</el-col>
<el-col
style="
@@ -610,7 +336,9 @@
"
:span="3"
>
- <span style="font-size: 0.88rem; color: #000">杞︾粍鍙凤細123</span>
+ <span style="font-size: 0.88rem; color: #000"
+ >杞︾粍鍙凤細{{ datildata.trainNum }}</span
+ >
</el-col>
<el-col
style="
@@ -622,7 +350,9 @@
"
:span="3"
>
- <span style="font-size: 0.88rem; color: #000">鑲￠亾锛�2</span>
+ <span style="font-size: 0.88rem; color: #000"
+ >鑲￠亾锛歿{ datildata.track }}</span
+ >
</el-col>
<el-col
style="
@@ -634,7 +364,9 @@
"
:span="3"
>
- <span style="font-size: 0.88rem; color: #000">杞﹀帰鍙凤細1</span>
+ <span style="font-size: 0.88rem; color: #000"
+ >杞﹀帰鍙凤細{{ datildata.coachNum }}</span
+ >
</el-col>
<el-col
style="
@@ -646,7 +378,9 @@
"
:span="4"
>
- <span style="font-size: 0.88rem; color: #000">杞悜鏋讹細G</span>
+ <span style="font-size: 0.88rem; color: #000"
+ >杞悜鏋讹細{{ datildata.bogie }}</span
+ >
</el-col>
<el-col
style="
@@ -658,7 +392,9 @@
"
:span="4"
>
- <span style="font-size: 0.88rem; color: #000">妫�淇彮缁勶細A</span>
+ <span style="font-size: 0.88rem; color: #000"
+ >妫�淇彮缁勶細{{ datildata.processDept }}</span
+ >
</el-col>
<el-col
style="
@@ -670,7 +406,9 @@
"
:span="4"
>
- <span style="font-size: 0.88rem; color: #000">鎶�鏈憳锛氬紶瀹�</span>
+ <span style="font-size: 0.88rem; color: #000"
+ >鎶�鏈憳锛歿{ datildata.jiShuYuan }}</span
+ >
</el-col>
</el-row>
<el-row>
@@ -684,32 +422,8 @@
"
:span="6"
>
- <span style="font-size: 0.88rem; color: #000">鍒涘缓鏃堕棿锛�</span>
- </el-col>
- <el-col
- style="
- display: flex;
- align-items: center;
- border: 1px solid #bec7d1;
- height: 3.49rem;
- padding-left: 0.7rem;
- "
- :span="6"
- >
- <span style="font-size: 0.88rem; color: #000">娲惧伐鏃堕棿锛�</span>
- </el-col>
- <el-col
- style="
- display: flex;
- align-items: center;
- border: 1px solid #bec7d1;
- height: 3.49rem;
- padding-left: 0.7rem;
- "
- :span="12"
- >
<span style="font-size: 0.88rem; color: #000"
- >鎶�鏈憳纭鏃堕棿锛�</span
+ >鍒涘缓鏃堕棿锛歿{ datildata.createTime }}</span
>
</el-col>
<el-col
@@ -722,7 +436,37 @@
"
:span="6"
>
- <span style="font-size: 0.88rem; color: #000">寮�濮嬫椂闂达細</span>
+ <span style="font-size: 0.88rem; color: #000"
+ >娲惧伐鏃堕棿锛歿{ datildata.dispatchTime }}</span
+ >
+ </el-col>
+ <el-col
+ style="
+ display: flex;
+ align-items: center;
+ border: 1px solid #bec7d1;
+ height: 3.49rem;
+ padding-left: 0.7rem;
+ "
+ :span="12"
+ >
+ <span style="font-size: 0.88rem; color: #000"
+ >鎶�鏈憳纭鏃堕棿锛歿{ datildata.confirmTime_JS }}</span
+ >
+ </el-col>
+ <el-col
+ style="
+ display: flex;
+ align-items: center;
+ border: 1px solid #bec7d1;
+ height: 3.49rem;
+ padding-left: 0.7rem;
+ "
+ :span="6"
+ >
+ <span style="font-size: 0.88rem; color: #000"
+ >寮�濮嬫椂闂达細{{ datildata.startTime }}</span
+ >
</el-col>
<el-col
style="
@@ -734,7 +478,9 @@
"
:span="18"
>
- <span style="font-size: 0.88rem; color: #000">缁撴潫鏃堕棿锛�</span>
+ <span style="font-size: 0.88rem; color: #000"
+ >缁撴潫鏃堕棿锛歿{ datildata.endTime }}</span
+ >
</el-col>
</el-row>
<el-row
@@ -765,7 +511,7 @@
:span="6"
>
<span style="font-size: 0.88rem; color: #000"
- >鏈烘璐ㄦ鍛橈細寮犲畨</span
+ >鏈烘璐ㄦ鍛橈細{{ datildata.zhiJianYuan_LC }}</span
>
</el-col>
<el-col
@@ -779,7 +525,7 @@
:span="6"
>
<span style="font-size: 0.88rem; color: #000"
- >鍦版矡璐ㄦ鍛橈細鏉庡洓</span
+ >鍦版矡璐ㄦ鍛橈細{{ datildata.zhiJianYuan_DG }}</span
>
</el-col>
<el-col
@@ -793,7 +539,7 @@
:span="8"
>
<span style="font-size: 0.88rem; color: #000"
- >鐢垫皵璐ㄦ鍛橈細鐜嬩簲</span
+ >鐢垫皵璐ㄦ鍛橈細{{ datildata.zhiJianYuan_DQ }}</span
>
</el-col>
<el-col
@@ -806,20 +552,8 @@
"
:span="4"
>
- <span style="font-size: 0.88rem; color: #000">妫�淇伐闀匡細灏忎竷</span>
- </el-col>
- <el-col
- style="
- display: flex;
- align-items: center;
- border: 1px solid #bec7d1;
- height: 3.49rem;
- padding-left: 0.7rem;
- "
- :span="6"
- >
<span style="font-size: 0.88rem; color: #000"
- >鏈烘璐ㄦ鍛樼‘璁ゆ椂闂达細</span
+ >妫�淇伐闀匡細{{ datildata.gongZhang }}</span
>
</el-col>
<el-col
@@ -833,7 +567,21 @@
:span="6"
>
<span style="font-size: 0.88rem; color: #000"
- >鍦版矡璐ㄦ鍛樼‘璁ゆ椂闂达細</span
+ >鏈烘璐ㄦ鍛樼‘璁ゆ椂闂达細{{ datildata.confirmTime_LC }}</span
+ >
+ </el-col>
+ <el-col
+ style="
+ display: flex;
+ align-items: center;
+ border: 1px solid #bec7d1;
+ height: 3.49rem;
+ padding-left: 0.7rem;
+ "
+ :span="6"
+ >
+ <span style="font-size: 0.88rem; color: #000"
+ >鍦版矡璐ㄦ鍛樼‘璁ゆ椂闂达細{{ datildata.confirmTime_DG }}</span
>
</el-col>
<el-col
@@ -847,7 +595,7 @@
:span="8"
>
<span style="font-size: 0.88rem; color: #000"
- >鐢垫皵璐ㄦ鍛樼‘璁ゆ椂闂达細</span
+ >鐢垫皵璐ㄦ鍛樼‘璁ゆ椂闂达細{{ datildata.confirmTime_DQ }}</span
>
</el-col>
<el-col
@@ -861,7 +609,7 @@
:span="4"
>
<span style="font-size: 0.88rem; color: #000"
- >妫�淇伐闀跨‘璁ゆ椂闂达細</span
+ >妫�淇伐闀跨‘璁ゆ椂闂达細{{ datildata.confirmTime_GZ }}</span
>
</el-col>
</el-row>
@@ -893,7 +641,7 @@
:span="3"
>
<span style="font-size: 0.88rem; color: #000"
- >鏈烘鍔涚煩浣滀笟鍛橈細鏉庡洓</span
+ >鏈烘鍔涚煩浣滀笟鍛橈細{{ datildata.liJu_LC }}</span
>
</el-col>
<el-col
@@ -907,7 +655,7 @@
:span="3"
>
<span style="font-size: 0.88rem; color: #000"
- >鏈烘杈呭姪鍛橈細寮犱笁</span
+ >鏈烘杈呭姪鍛橈細{{ datildata.fuZhu_LC }}</span
>
</el-col>
<el-col
@@ -921,7 +669,7 @@
:span="3"
>
<span style="font-size: 0.88rem; color: #000"
- >鍦版矡鍔涚煩浣滀笟鍛橈細鏉庡洓</span
+ >鍦版矡鍔涚煩浣滀笟鍛橈細{{ datildata.liJu_DG }}</span
>
</el-col>
<el-col
@@ -935,7 +683,7 @@
:span="3"
>
<span style="font-size: 0.88rem; color: #000"
- >鍦版矡杈呭姪鍛橈細寮犱笁</span
+ >鍦版矡杈呭姪鍛橈細{{ datildata.fuZhu_DG }}</span
>
</el-col>
<el-col
@@ -949,7 +697,7 @@
:span="4"
>
<span style="font-size: 0.88rem; color: #000"
- >鐢垫皵鍔涚煩浣滀笟鍛橈細鐜嬩簲</span
+ >鐢垫皵鍔涚煩浣滀笟鍛橈細{{ datildata.liJu_DQ }}</span
>
</el-col>
<el-col
@@ -963,7 +711,7 @@
:span="8"
>
<span style="font-size: 0.88rem; color: #000"
- >鐢垫皵杈呭姪鍛橈細鏉庡姏</span
+ >鐢垫皵杈呭姪鍛橈細{{ datildata.fuZhu_DQ }}</span
>
</el-col>
</el-row>
@@ -978,7 +726,9 @@
"
:span="6"
>
- <span style="font-size: 0.88rem; color: #000">鏈烘寮�濮嬫椂闂达細</span>
+ <span style="font-size: 0.88rem; color: #000"
+ >鏈烘寮�濮嬫椂闂达細{{ datildata.startTime_LC }}</span
+ >
</el-col>
<el-col
style="
@@ -990,7 +740,9 @@
"
:span="6"
>
- <span style="font-size: 0.88rem; color: #000">鍦版矡寮�濮嬫椂闂达細</span>
+ <span style="font-size: 0.88rem; color: #000"
+ >鍦版矡寮�濮嬫椂闂达細{{ datildata.startTime_DG }}</span
+ >
</el-col>
<el-col
style="
@@ -1002,7 +754,9 @@
"
:span="12"
>
- <span style="font-size: 0.88rem; color: #000">鐢垫皵寮�濮嬫椂闂达細</span>
+ <span style="font-size: 0.88rem; color: #000"
+ >鐢垫皵寮�濮嬫椂闂达細{{ datildata.startTime_DQ }}</span
+ >
</el-col>
<el-col
style="
@@ -1014,7 +768,9 @@
"
:span="6"
>
- <span style="font-size: 0.88rem; color: #000">鏈烘缁撴潫鏃堕棿锛�</span>
+ <span style="font-size: 0.88rem; color: #000"
+ >鏈烘缁撴潫鏃堕棿锛歿{ datildata.endTime_LC }}</span
+ >
</el-col>
<el-col
style="
@@ -1026,7 +782,9 @@
"
:span="6"
>
- <span style="font-size: 0.88rem; color: #000">鍦版矡缁撴潫鏃堕棿</span>
+ <span style="font-size: 0.88rem; color: #000"
+ >鍦版矡缁撴潫鏃堕棿锛歿{ datildata.endTime_DG }}</span
+ >
</el-col>
<el-col
style="
@@ -1038,7 +796,9 @@
"
:span="12"
>
- <span style="font-size: 0.88rem; color: #000">鐢垫皵缁撴潫鏃堕棿锛�</span>
+ <span style="font-size: 0.88rem; color: #000"
+ >鐢垫皵缁撴潫鏃堕棿锛歿{ datildata.endTime_DQ }}</span
+ >
</el-col>
</el-row>
</div>
@@ -1060,7 +820,7 @@
:class="titleClass"
style="color: rgb(16, 16, 16); font-size: 1rem; font-weight: bold"
>
- 鍔涚煩鍊兼槑缁嗭紙鐢垫皵锛�
+ 鍔涚煩鍊兼槑缁嗭紙{{ title }}锛�
</h4>
<el-icon @click="close" size="15"><CloseBold /></el-icon>
</div>
@@ -1070,7 +830,7 @@
<div style="height: 100%; width: 13.5rem">
<div
style="
- width: 13.5rem;
+ width: 17rem;
padding: 0.8rem 2rem;
box-sizing: border-box;
background-color: rgba(247, 247, 247, 1);
@@ -1086,7 +846,7 @@
>
<span style="width: 6rem; text-align: right; display: block"
>浠诲姟鍚嶇О锛�</span
- ><span>杞悜鏋�</span>
+ ><span>{{ pesonData[0].takename }}</span>
</div>
<div
style="
@@ -1098,7 +858,7 @@
>
<span style="width: 6rem; text-align: right; display: block"
>鎶�鏈憳锛�</span
- ><span>寮犱笁</span>
+ ><span>{{ pesonData[0].jishuyuan }}</span>
</div>
<div
style="
@@ -1109,8 +869,8 @@
"
>
<span style="width: 6rem; text-align: right; display: block"
- >妫�淇伐鍘傦細</span
- ><span>鏉庡洓</span>
+ >妫�淇伐闀匡細</span
+ ><span>{{ pesonData[0].gonzhang }}</span>
</div>
<div
style="
@@ -1122,7 +882,7 @@
>
<span style="width: 6rem; text-align: right; display: block"
>璐ㄦ鍛橈細</span
- ><span>涓冧竷</span>
+ ><span>{{ pesonData[0].zhijianyuan }}</span>
</div>
<div
style="
@@ -1134,7 +894,7 @@
>
<span style="width: 6rem; text-align: right; display: block"
>鍔涚煩浣滀笟鍛橈細</span
- ><span>鐜嬩簲</span>
+ ><span>{{ pesonData[0].lijuzouyeyuan }}</span>
</div>
<div
style="
@@ -1146,7 +906,7 @@
>
<span style="width: 6rem; text-align: right; display: block"
>杈呭姪鍛橈細</span
- ><span>灏忓垬</span>
+ ><span>{{ pesonData[0].fuzyuan }}</span>
</div>
<div
style="
@@ -1159,19 +919,24 @@
<span style="width: 6rem; text-align: right; display: block"
>浠诲姟璇︽儏锛�</span
>
- <el-popover placement="bottom" :width="600" trigger="click">
+ <el-popover
+ placement="bottom"
+ :width="600"
+ trigger="click"
+ @show="checkTask(pesonData[0].njtakeid)"
+ >
<template #reference>
<span style="color: blue; font-size: 0.88rem; cursor: pointer"
>鏌ョ湅</span
>
</template>
- <el-table :data="gridData" width="100%">
- <el-table-column property="date" label="杞﹀瀷" />
- <el-table-column property="name" label="杞︾粍" />
- <el-table-column property="address" label="鑲￠亾" />
- <el-table-column property="address" label="杞﹀帰鍙蜂綅缃�" />
- <el-table-column property="address" label="杞悜鏋朵綅缃�" />
- <el-table-column property="address" label="妫�淇彮缁�" />
+ <el-table :data="taskData" width="100%">
+ <el-table-column property="trainKind" label="杞﹀瀷" />
+ <el-table-column property="trainNum" label="杞︾粍" />
+ <el-table-column property="track" label="鑲￠亾" />
+ <el-table-column property="coachNum" label="杞﹀帰鍙蜂綅缃�" />
+ <el-table-column property="bogie" label="杞悜鏋朵綅缃�" />
+ <el-table-column property="processDept" label="妫�淇彮缁�" />
</el-table>
</el-popover>
</div>
@@ -1183,17 +948,20 @@
<el-timeline-item
v-for="(activity, index) in activities"
:key="index"
- :timestamp="'鍔涚煩鍊硷細' + activity.timestamp"
+ :timestamp="
+ '鍔涚煩鍊硷細' + activity.torqueOne + '----' + activity.torqueTwo
+ "
>
- {{ activity.content }}
+ {{ activity.craftsStep }}
<el-popover
placement="bottom"
- :width="600"
+ :width="800"
trigger="click"
style="margin-left: 0.8rem"
>
<template #reference>
<span
+ @click="checkcontent(activity.craftID)"
style="
color: blue;
font-size: 0.88rem;
@@ -1203,10 +971,10 @@
>鏌ョ湅</span
>
</template>
- <el-table :data="gridData" width="100%">
- <el-table-column property="date" label="宸ヨ壓鍐呭" />
- <el-table-column property="name" label="宸ュ叿" />
- <el-table-column property="name" label="鐗╂枡" />
+ <el-table :data="contentData" width="100%">
+ <el-table-column prop="craftContent" label="宸ヨ壓鍐呭" />
+ <el-table-column prop="tools" label="宸ュ叿" />
+ <el-table-column prop="name" label="鐗╂枡" />
</el-table>
</el-popover>
</el-timeline-item>
@@ -1217,16 +985,47 @@
</div>
</template>
<script setup>
-import { ref, reactive } from "vue";
+import { ref, reactive, onMounted } from "vue";
import { ElMessage, ElMessageBox } from "element-plus";
-const queryForm = reactive({
+import { formatTime } from "@/utils/index.js";
+import {
+ GetPageData,
+ GetDataDetail,
+ GetWorkOrder,
+ GetContent,
+ GetPerson,
+ GetTaskInfo,
+ GetLogin,
+ ExportApi,
+ ExportApi2,
+ ExportApi3,
+} from "@/api/newapi/Datalogging";
+const obj = {
selectName: "",
selectTime: [], // 鏃堕棿鑼冨洿
+ selectType: "",
+ selectInput: "",
+ value: "",
+};
+const queryForm = ref({
+ selectName: "",
+ selectTime: [], // 鏃堕棿鑼冨洿
+ selectType: "",
+ selectInput: "",
+ value: "",
});
const tableData = ref([]);
-
-const options = ref([]);
+const options = ref([
+ {
+ value: 1,
+ label: "宸叉淳宸�",
+ },
+ {
+ value: 0,
+ label: "寰呮淳宸�",
+ },
+]);
const props = { multiple: true };
const table = ref(false);
@@ -1235,70 +1034,448 @@
const claimdialogVisible = ref(false);
const dialogVisible = ref(false);
const TorquedialogVisible = ref(false);
-const activities = [
+const activities = ref([]);
+const pageTotal = ref(0);
+
+//鍒嗛〉璇锋眰鍙傛暟
+const pageQuery = ref({
+ page: 1, //褰撳墠椤甸潰
+ rows: 10, //姣忛〉鏄剧ず鏉℃暟
+ order: "desc", //鎺掑簭鏂瑰紡
+ sort: "createTime", //鎺掑簭瀛楁
+ wheres: "", //鏉′欢鏌ヨ
+});
+const datildata = ref({});
+const title = ref("鏈烘");
+const contentData = ref([]);
+const pesonData = ref([]);
+const taskData = ref([]);
+//浠诲姟璁板綍
+const tasklogging = [
{
- content: "1.1宸ュ墠鍑嗗",
- timestamp: "2018-04-15",
+ value: "takeName",
+ label: "浠诲姟鍚嶇О",
},
{
- content: "2.1鐗靛紩鐢垫満鐢电紗瀹夎锛堜粎鍔ㄨ溅杞悜鏋讹級",
- timestamp: "2018-04-13",
+ value: "trainNum",
+ label: "杞︾粍",
},
{
- content: "2.2鐗靛紩鐢垫満鐢电紗瀹夎锛堜粎鍔ㄨ溅杞悜鏋讹級",
- timestamp: "2018-04-11",
- },
- {
- content: "2.3鐗靛紩鐢垫満鐢电紗瀹夎锛堜粎鍔ㄨ溅杞悜鏋讹級",
- timestamp: "2018-04-11",
- },
- {
- content: "2.4鐗靛紩鐢垫満鐢电紗瀹夎锛堜粎鍔ㄨ溅杞悜鏋讹級",
- timestamp: "2018-04-11",
- },
- {
- content: "2.4鐗靛紩鐢垫満鐢电紗瀹夎锛堜粎鍔ㄨ溅杞悜鏋讹級",
- timestamp: "2018-04-11",
- },
- {
- content: "2.4鐗靛紩鐢垫満鐢电紗瀹夎锛堜粎鍔ㄨ溅杞悜鏋讹級",
- timestamp: "2018-04-11",
- },
- {
- content: "2.4鐗靛紩鐢垫満鐢电紗瀹夎锛堜粎鍔ㄨ溅杞悜鏋讹級",
- timestamp: "2018-04-11",
- },
- {
- content: "2.4鐗靛紩鐢垫満鐢电紗瀹夎锛堜粎鍔ㄨ溅杞悜鏋讹級",
- timestamp: "2018-04-11",
- },
- {
- content: "2.4鐗靛紩鐢垫満鐢电紗瀹夎锛堜粎鍔ㄨ溅杞悜鏋讹級",
- timestamp: "2018-04-11",
- },
- {
- content: "2.4鐗靛紩鐢垫満鐢电紗瀹夎锛堜粎鍔ㄨ溅杞悜鏋讹級",
- timestamp: "2018-04-11",
+ value: "coachNum",
+ label: "杞﹀帰鍙�",
},
];
+//浣滀笟鍗曡褰�
+const worklogging = [
+ {
+ value: "takeName",
+ label: "浠诲姟鍚嶇О",
+ },
+ {
+ value: "jiShuYuan",
+ label: "鎶�鏈憳",
+ },
+ {
+ value: "gongZhang",
+ label: "妫�淇伐闀�",
+ },
+];
+//鐧诲綍璁板綍
+const loginlogging = [
+ {
+ value: "userName",
+ label: "鐢ㄦ埛鍚�",
+ },
+ {
+ value: "trurName",
+ label: "鐪熷疄濮撳悕",
+ },
+];
+const selectoptions = ref([]);
+// 鏌ヨ
+const query = () => {
+ if (isactive.value == 1) {
+ initData();
+ } else if (isactive.value == 2) {
+ WorkinitData();
+ } else {
+ LogininitData();
+ }
+};
+
+selectoptions.value = tasklogging;
const changeactive = (index) => {
isactive.value = index;
+ if (index == 1) {
+ selectoptions.value = tasklogging;
+ initData();
+ } else if (index == 2) {
+ selectoptions.value = worklogging;
+ WorkinitData();
+ } else {
+ selectoptions.value = loginlogging;
+ LogininitData();
+ }
};
-function cancelClick() {
- table.value = false;
-}
-function confirmClick() {
- table.value = false;
-}
// 鏌ョ湅璇︽儏
-const Findmore = () => {
- dialogVisible.value = true;
+const Findmore = (id) => {
+ GetDataDetail(id).then((res) => {
+ datildata.value = res.data;
+ dialogVisible.value = true;
+ });
};
-// 鏌ョ湅鍔涚煩
-const Findtorque = () => {
- TorquedialogVisible.value = true;
+// 鏌ョ湅鏈烘
+const LcFindtorque = (id) => {
+ title.value = "鏈烘";
+ GetContent({
+ page: 1,
+ rows: 10,
+ total: 100,
+ tableName: "",
+ sort: "",
+ order: "",
+ wheres: "",
+ export: true,
+ value: "",
+ filter: [
+ {
+ name: "craftType",
+ value: title.value,
+ displayType: "string",
+ },
+ ],
+ }).then((res) => {
+ activities.value = res.rows;
+ });
+ GetPerson({
+ page: 1,
+ rows: 10,
+ total: 100,
+ tableName: "",
+ sort: "",
+ order: "",
+ wheres: "",
+ export: true,
+ value: "",
+ filter: [
+ {
+ name: "grouptype",
+ value: title.value,
+ displayType: "String",
+ },
+ {
+ name: "njtakeid",
+ value: id,
+ displayType: "String",
+ },
+ ],
+ }).then((res) => {
+ pesonData.value = res.rows;
+ TorquedialogVisible.value = true;
+ });
};
+//鏌ョ湅鐢垫皵
+const DqFindtorque = (id) => {
+ title.value = "鐢垫皵";
+ GetContent({
+ page: 1,
+ rows: 10,
+ total: 100,
+ tableName: "",
+ sort: "",
+ order: "",
+ wheres: "",
+ export: true,
+ value: "",
+ filter: [
+ {
+ name: "craftType",
+ value: title.value,
+ displayType: "string",
+ },
+ ],
+ }).then((res) => {
+ activities.value = res.rows;
+ });
+ GetPerson({
+ page: 1,
+ rows: 10,
+ total: 100,
+ tableName: "",
+ sort: "",
+ order: "",
+ wheres: "",
+ export: true,
+ value: "",
+ filter: [
+ {
+ name: "grouptype",
+ value: title.value,
+ displayType: "String",
+ },
+ {
+ name: "njtakeid",
+ value: id,
+ displayType: "String",
+ },
+ ],
+ }).then((res) => {
+ pesonData.value = res.rows;
+ TorquedialogVisible.value = true;
+ });
+};
+//鏌ョ湅鍦版矡
+const DgFindtorque = (id) => {
+ title.value = "鍦版矡";
+ GetContent({
+ page: 1,
+ rows: 10,
+ total: 100,
+ tableName: "",
+ sort: "",
+ order: "",
+ wheres: "",
+ export: true,
+ value: "",
+ filter: [
+ {
+ name: "craftType",
+ value: title.value,
+ displayType: "string",
+ },
+ ],
+ }).then((res) => {
+ activities.value = res.rows;
+ });
+ GetPerson({
+ page: 1,
+ rows: 10,
+ total: 100,
+ tableName: "",
+ sort: "",
+ order: "",
+ wheres: "",
+ export: true,
+ value: "",
+ filter: [
+ {
+ name: "grouptype",
+ value: title.value,
+ displayType: "String",
+ },
+ {
+ name: "njtakeid",
+ value: id,
+ displayType: "String",
+ },
+ ],
+ }).then((res) => {
+ pesonData.value = res.rows;
+ TorquedialogVisible.value = true;
+ });
+};
+//鏌ョ湅姝ラ鍐呭
+const checkcontent = (id) => {
+ GetContent({
+ page: 1,
+ rows: 10,
+ total: 100,
+ tableName: "",
+ sort: "",
+ order: "",
+ wheres: "",
+ export: true,
+ value: "",
+ filter: [
+ {
+ name: "craftID",
+ value: id,
+ displayType: "string",
+ },
+ ],
+ }).then((res) => {
+ contentData.value = res.rows;
+ });
+};
+
+//鏌ョ湅浠诲姟淇℃伅
+const checkTask = (id) => {
+ GetTaskInfo({
+ page: 1,
+ rows: 10,
+ total: 100,
+ tableName: "",
+ sort: "",
+ order: "",
+ wheres: "",
+ export: true,
+ value: "",
+ filter: [
+ {
+ name: "njtaskid",
+ value: id,
+ displayType: "String",
+ },
+ ],
+ }).then((res) => {
+ taskData.value = res.rows;
+ });
+};
+
+//鍒嗛〉椤甸潰澶у皬鏀瑰彉
+const handleSizeChange = (val) => {
+ pageQuery.value.rows = val;
+ if (isactive.value == 1) {
+ initData();
+ } else if (isactive.value == 2) {
+ WorkinitData();
+ } else {
+ }
+};
+
+//鍒嗛〉椤甸潰鏀瑰彉
+const handleCurrentChange = (val) => {
+ pageQuery.value.page = val;
+ if (isactive.value == 1) {
+ initData();
+ } else if (isactive.value == 2) {
+ WorkinitData();
+ } else {
+ }
+};
+//浠诲姟璁板綍
+const initData = () => {
+ // 鏌ヨ鏉′欢
+ const startTime = formatTime(queryForm.value.selectTime[0]);
+ const endTime = formatTime(queryForm.value.selectTime[1]);
+ const filter = [
+ {
+ name: "taskstatus",
+ value: queryForm.value.value,
+ displayType: "String",
+ },
+ {
+ name: queryForm.value.selectType,
+ value: queryForm.value.selectInput,
+ displayType: "String",
+ },
+ { name: "createTime", value: startTime, displayType: "ThanOrEqual" },
+ { name: "createTime", value: endTime, displayType: "LessOrEqual" },
+ ];
+ GetPageData({
+ ...pageQuery.value,
+ filter,
+ }).then((res) => {
+ tableData.value = res.rows;
+ pageTotal.value = res.total;
+ });
+};
+//浣滀笟鍗曡褰�
+const WorkinitData = () => {
+ // 鏌ヨ鏉′欢
+ const startTime = formatTime(queryForm.value.selectTime[0]);
+ const endTime = formatTime(queryForm.value.selectTime[1]);
+ const filter = [
+ {
+ name: queryForm.value.selectType,
+ value: queryForm.value.selectInput,
+ displayType: "String",
+ },
+ { name: "createTime", value: startTime, displayType: "ThanOrEqual" },
+ { name: "createTime", value: endTime, displayType: "LessOrEqual" },
+ ];
+ GetWorkOrder({
+ ...pageQuery.value,
+ filter,
+ }).then((res) => {
+ tableData.value = res.rows;
+ pageTotal.value = res.total;
+ });
+};
+
+//鐧诲綍璁板綍
+const LogininitData = () => {
+ // 鏌ヨ鏉′欢
+ const startTime = formatTime(queryForm.value.selectTime[0]);
+ const endTime = formatTime(queryForm.value.selectTime[1]);
+ const filter = [
+ {
+ name: queryForm.value.selectType,
+ value: queryForm.value.selectInput,
+ displayType: "String",
+ },
+ { name: "createTime", value: startTime, displayType: "ThanOrEqual" },
+ { name: "createTime", value: endTime, displayType: "LessOrEqual" },
+ ];
+ GetLogin({
+ ...pageQuery.value,
+ filter,
+ }).then((res) => {
+ tableData.value = res.rows;
+ pageTotal.value = res.total;
+ });
+};
+
+//鏁版嵁妫�绱簨浠�
+const handleQuery = () => {
+ pageQuery.value.page = 1;
+ if (isactive.value == 1) {
+ initData();
+ } else if (isactive.value == 2) {
+ WorkinitData();
+ } else {
+ LogininitData();
+ }
+};
+
+const resetQuery = () => {
+ queryForm.value = { selectName: "", selectTime: [] };
+ pageQuery.value.page = 1;
+ initData();
+};
+
+const printExcel = () => {
+ // 鏌ヨ鏉′欢
+ const startTime = formatTime(queryForm.value.selectTime[0]);
+ const endTime = formatTime(queryForm.value.selectTime[1]);
+ const filter = [
+ {
+ name: queryForm.value.selectType,
+ value: queryForm.value.selectInput,
+ displayType: "String",
+ },
+ {
+ name: "pustatus",
+ value: queryForm.value.selectName,
+ displayType: "String",
+ },
+ { name: "createTime", value: startTime, displayType: "ThanOrEqual" },
+ { name: "createTime", value: endTime, displayType: "LessOrEqual" },
+ ];
+ if (isactive.value == 1) {
+ ExportApi({
+ ...pageQuery.value,
+ filter,
+ });
+ }
+ if (isactive.value == 2) {
+ ExportApi2({
+ ...pageQuery.value,
+ filter,
+ });
+ }
+ if (isactive.value == 3) {
+ ExportApi3({
+ ...pageQuery.value,
+ filter,
+ });
+ }
+};
+
+onMounted(() => {
+ initData();
+});
</script>
<style lang="scss" scoped>
.Datalogging {
@@ -1363,8 +1540,6 @@
width: 6.88rem;
height: 2rem;
text-align: center;
- border: 0.06rem solid rgba(222, 222, 222, 1);
- border-radius: 0.25rem 0 0 0.25rem;
font-size: 0.75rem;
display: flex;
align-items: center;
--
Gitblit v1.9.3