From 3e60db98fdf6c5b59768ffc81576da3679fafbea Mon Sep 17 00:00:00 2001
From: pengwei <2071057782@qq.com>
Date: 星期一, 14 四月 2025 10:04:42 +0800
Subject: [PATCH] 优化
---
项目代码/client/src/views/tts/DataLogging/Datalogging.vue | 1618 ++++++++++++++++++++++++++---------------------------------
1 files changed, 726 insertions(+), 892 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..99343fd 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"
@@ -1,47 +1,25 @@
<template>
<div class="Datalogging">
<div class="content">
- <div class="checkbox">
- <div
- :class="['item', isactive == 1 ? 'isactive' : '']"
- @click="changeactive(1)"
- >
+ <div class="checkbox" :style="{ width: roleINFO == 1 ? '16rem' : '11rem' }">
+ <div :class="['item', isactive == 1 ? 'isactive' : '']" @click="changeactive(1)">
浠诲姟璁板綍
</div>
- <div
- :class="['item', isactive == 2 ? 'isactive' : '']"
- @click="changeactive(2)"
- >
+ <div :class="['item', isactive == 2 ? 'isactive' : '']" @click="changeactive(2)">
浣滀笟鍗曡褰�
</div>
- <div
- :class="['item', isactive == 3 ? 'isactive' : '']"
- @click="changeactive(3)"
- >
+ <div v-if="roleINFO == 1" :class="['item', isactive == 3 ? 'isactive' : '']" @click="changeactive(3)">
鐧诲綍璁板綍
</div>
</div>
<div class="serch">
<div class="time_box">
- <el-select
- v-model="value"
- placeholder="璇烽�夋嫨"
- size="small"
- style="width: 6.19rem; height: 2rem; margin-right: 0.98rem"
- >
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
+ <el-select v-if="isactive == 1" v-model="queryForm.value" placeholder="璇烽�夋嫨" size="small"
+ style="width: 8rem; height: 2rem; margin-right: 0.98rem">
+ <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
- <div class="time">娲惧伐鏃ユ湡</div>
- <el-date-picker
- v-model="queryForm.selectTime"
- prefix-icon="none"
- clear-icon="none"
- style="
+ <div class="time">鍒涘缓鏃ユ湡</div>
+ <el-date-picker v-model="queryForm.selectTime" prefix-icon="none" clear-icon="none" style="
font-size: 0.75rem !important;
border: 0.06rem solid rgba(222, 222, 222, 1);
border-radius: 0 0.25rem 0.25rem 0;
@@ -49,1129 +27,581 @@
width: 19rem;
height: 2rem;
border-left: 0;
- "
- format="YYYY-MM-DD HH:mm:ss"
- type="datetimerange"
- range-separator="~"
- start-placeholder="璧峰鏃ユ湡"
- end-placeholder="鎴鏃ユ湡"
- size="small"
- />
+ " format="YYYY-MM-DD HH:mm:ss" type="datetimerange" range-separator="~" start-placeholder="璧峰鏃ユ湡"
+ end-placeholder="鎴鏃ユ湡" size="small" />
</div>
<div class="serch_box">
- <div class="serchb">鍏ㄥ眬鎼滅储</div>
- <input
- v-model="queryForm.selectName"
- placeholder="璇疯緭鍏ュ叧閿瘝鎼滅储"
- style="border-left: 0.06rem solid #e2e2e2"
- />
+ <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.selectInput" placeholder="璇疯緭鍏ュ叧閿瘝鎼滅储" style="border-left: 0.06rem solid #e2e2e2" />
</div>
- <el-button
- type="primary"
- size="small"
- style="margin-left: 0.98rem; height: 2rem"
- >鏌ヨ</el-button
- >
- <el-button size="small" style="height: 2rem">閲嶇疆</el-button>
+ <el-button @click="handleQuery" type="primary" size="small"
+ style="margin-left: 0.98rem; 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"
- >鎵归噺瀵煎嚭</el-button
- >
+ <el-button size="small" style="width: 5.5rem; height: 2rem; font-size: 0.88rem"
+ @click="printExcel">鎵归噺瀵煎嚭</el-button>
</div>
</div>
<div style="margin-top: 1rem; height: 100%">
<!-- 浠诲姟璁板綍 -->
- <el-table
- v-if="isactive == 1"
- :data="tableData"
- style="width: 100%"
+ <el-table empty-text="鏆傛棤鏁版嵁" v-if="isactive == 1" :data="tableData" height="450" style="width: 100%"
:header-cell-style="{
background: 'rgba(250,250,250,1)',
color: '#101010',
fontSize: '0.88rem',
height: '3rem',
border: 'none',
- }"
- :row-style="{
+ }" :row-style="{
color: '#101010',
fontSize: '0.88rem',
height: '3rem',
- }"
- >
+ }">
<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-button
- >
+ <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>
</el-table-column>
</el-table>
<!-- 浣滀笟鍗曡褰� -->
- <el-table
- v-if="isactive == 2"
- :data="tableData"
- style="width: 100%"
+ <el-table empty-text="鏆傛棤鏁版嵁" v-if="isactive == 2" :data="tableData" height="450" style="width: 100%"
:header-cell-style="{
background: 'rgba(250,250,250,1)',
color: '#101010',
fontSize: '0.88rem',
height: '3rem',
border: 'none',
- }"
- :row-style="{
+ }" :row-style="{
color: '#101010',
fontSize: '0.88rem',
height: '3rem',
- }"
- >
+ }">
<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="">
- <span
- style="color: blue; font-size: 0.88rem; cursor: pointer"
- @click="Findtorque"
- >鏌ョ湅</span
- >
- </template></el-table-column
- >
+ <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="LcFindtorque(scope.row.nJtaskID)">鏌ョ湅</span>
+ </template></el-table-column>
<el-table-column prop="address" label="鐢垫皵鍔涚煩鍊兼槑缁�" align="center">
- <template #default="">
- <span
- style="color: blue; font-size: 0.88rem; cursor: pointer"
- @click="Findtorque"
- >鏌ョ湅</span
- >
+ <template #default="scope">
+ <span style="color: blue; font-size: 0.88rem; cursor: pointer"
+ @click="DqFindtorque(scope.row.nJtaskID)">鏌ョ湅</span>
</template>
</el-table-column>
- <el-table-column prop="address" label="鐢垫皵鍔涚煩鍊兼槑缁�" align="center">
- <template #default="">
- <span
- style="color: blue; font-size: 0.88rem; cursor: pointer"
- @click="Findtorque"
- >鏌ョ湅</span
- >
- </template></el-table-column
- >
+ <el-table-column prop="address" label="鍦版矡鍔涚煩鍊兼槑缁�" align="center">
+ <template #default="scope">
+ <span style="color: blue; font-size: 0.88rem; cursor: pointer"
+ @click="DgFindtorque(scope.row.nJtaskID)">鏌ョ湅</span>
+ </template></el-table-column>
</el-table>
<!-- 鐧诲綍璁板綍 -->
- <el-table
- v-if="isactive == 3"
- :data="tableData"
- style="width: 100%"
+ <el-table empty-text="鏆傛棤鏁版嵁" v-if="isactive == 3" :data="tableData" height="450" style="width: 100%"
:header-cell-style="{
background: 'rgba(250,250,250,1)',
color: '#101010',
fontSize: '0.88rem',
height: '3rem',
border: 'none',
- }"
- :row-style="{
+ }" :row-style="{
color: '#101010',
fontSize: '0.88rem',
height: '3rem',
- }"
- >
+ }">
<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
- style="
+ <div style="
display: flex;
justify-content: right;
align-self: flex-end;
margin-bottom: 1.19rem;
margin-right: 1.25rem;
- "
- >
- <el-pagination
- size="small"
- background
- layout="prev, pager, next"
- :total="1"
- />
+ ">
+ <el-pagination size="small" background layout="prev, pager, next" :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
- v-model="dialogVisible"
- title=""
- width="90%"
- :before-close="handleClose"
- :show-close="false"
- >
+ <el-dialog v-model="dialogVisible" title="" width="90%" :before-close="handleClose" :show-close="false">
<template #header="{ close, titleId, titleClass }">
<div class="my-header">
- <h4
- :id="titleId"
- :class="titleClass"
- style="color: rgb(16, 16, 16); font-size: 1rem; font-weight: bold"
- >
+ <h4 :id="titleId" :class="titleClass" style="color: rgb(16, 16, 16); font-size: 1rem; font-weight: bold">
鏌ョ湅璇︽儏
</h4>
- <el-icon @click="close" size="15"><CloseBold /></el-icon>
+ <el-icon @click="close" size="15">
+ <CloseBold />
+ </el-icon>
</div>
</template>
<div>
<el-row>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
height: 3.49rem;
background-color: rgba(190, 199, 209, 0.53);
padding-left: 0.5rem;
border: 1px solid #bec7d1;
- "
- >
- <span style="color: #000; font-size: 0.88rem; font-weight: bold"
- >鍩虹淇℃伅</span
- >
+ ">
+ <span style="color: #000; font-size: 0.88rem; font-weight: bold">鍩虹淇℃伅</span>
</el-col>
</el-row>
<el-row>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="3"
- >
- <span style="font-size: 0.88rem; color: #000">杞﹀瀷锛欱Y</span>
+ " :span="3">
+ <span style="font-size: 0.88rem; color: #000">杞﹀瀷锛歿{ datildata.trainKind }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="3"
- >
- <span style="font-size: 0.88rem; color: #000">杞︾粍鍙凤細123</span>
+ " :span="3">
+ <span style="font-size: 0.88rem; color: #000">杞︾粍鍙凤細{{ datildata.trainNum }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="3"
- >
- <span style="font-size: 0.88rem; color: #000">鑲￠亾锛�2</span>
+ " :span="3">
+ <span style="font-size: 0.88rem; color: #000">鑲￠亾锛歿{ datildata.track }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="3"
- >
- <span style="font-size: 0.88rem; color: #000">杞﹀帰鍙凤細1</span>
+ " :span="3">
+ <span style="font-size: 0.88rem; color: #000">杞﹀帰鍙凤細{{ datildata.coachNum }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="4"
- >
- <span style="font-size: 0.88rem; color: #000">杞悜鏋讹細G</span>
+ " :span="4">
+ <span style="font-size: 0.88rem; color: #000">杞悜鏋讹細{{ datildata.bogie }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="4"
- >
- <span style="font-size: 0.88rem; color: #000">妫�淇彮缁勶細A</span>
+ " :span="4">
+ <span style="font-size: 0.88rem; color: #000">妫�淇彮缁勶細{{ datildata.processDept }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="4"
- >
- <span style="font-size: 0.88rem; color: #000">鎶�鏈憳锛氬紶瀹�</span>
+ " :span="4">
+ <span style="font-size: 0.88rem; color: #000">鎶�鏈憳锛歿{ datildata.jiShuYuan }}</span>
</el-col>
</el-row>
<el-row>
- <el-col
- style="
+ <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>
+ " :span="6">
+ <span style="font-size: 0.88rem; color: #000">鍒涘缓鏃堕棿锛歿{ datildata.createTime }}</span>
</el-col>
- <el-col
- style="
+ <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>
+ " :span="6">
+ <span style="font-size: 0.88rem; color: #000">娲惧伐鏃堕棿锛歿{ datildata.dispatchTime }}</span>
</el-col>
- <el-col
- style="
+ <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
- >
+ " :span="12">
+ <span style="font-size: 0.88rem; color: #000">鎶�鏈憳纭鏃堕棿锛歿{ datildata.confirmTime_JS }}</span>
</el-col>
- <el-col
- style="
+ <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>
+ " :span="6">
+ <span style="font-size: 0.88rem; color: #000">寮�濮嬫椂闂达細{{ datildata.startTime }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="18"
- >
- <span style="font-size: 0.88rem; color: #000">缁撴潫鏃堕棿锛�</span>
+ " :span="18">
+ <span style="font-size: 0.88rem; color: #000">缁撴潫鏃堕棿锛歿{ datildata.endTime }}</span>
</el-col>
</el-row>
- <el-row
- ><el-col
- style="
+ <el-row><el-col style="
display: flex;
align-items: center;
height: 3.49rem;
background-color: rgba(190, 199, 209, 0.53);
padding-left: 0.5rem;
border: 1px solid #bec7d1;
- "
- >
- <span style="color: #000; font-size: 0.88rem; font-weight: bold"
- >璐ㄦ淇℃伅</span
- >
- </el-col></el-row
- >
- <el-row
- ><el-col
- style="
+ ">
+ <span style="color: #000; font-size: 0.88rem; font-weight: bold">璐ㄦ淇℃伅</span>
+ </el-col></el-row>
+ <el-row><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
- >
+ " :span="6">
+ <span style="font-size: 0.88rem; color: #000">鏈烘璐ㄦ鍛橈細{{ datildata.zhiJianYuan_LC }}</span>
</el-col>
- <el-col
- style="
+ <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
- >
+ " :span="6">
+ <span style="font-size: 0.88rem; color: #000">鍦版矡璐ㄦ鍛橈細{{ datildata.zhiJianYuan_DG }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="8"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鐢垫皵璐ㄦ鍛橈細鐜嬩簲</span
- >
+ " :span="8">
+ <span style="font-size: 0.88rem; color: #000">鐢垫皵璐ㄦ鍛橈細{{ datildata.zhiJianYuan_DQ }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="4"
- >
- <span style="font-size: 0.88rem; color: #000">妫�淇伐闀匡細灏忎竷</span>
+ " :span="4">
+ <span style="font-size: 0.88rem; color: #000">妫�淇伐闀匡細{{ datildata.gongZhang }}</span>
</el-col>
- <el-col
- style="
+ <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
- >
+ " :span="6">
+ <span style="font-size: 0.88rem; color: #000">鏈烘璐ㄦ鍛樼‘璁ゆ椂闂达細{{ datildata.confirmTime_LC }}</span>
</el-col>
- <el-col
- style="
+ <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
- >
+ " :span="6">
+ <span style="font-size: 0.88rem; color: #000">鍦版矡璐ㄦ鍛樼‘璁ゆ椂闂达細{{ datildata.confirmTime_DG }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="8"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鐢垫皵璐ㄦ鍛樼‘璁ゆ椂闂达細</span
- >
+ " :span="8">
+ <span style="font-size: 0.88rem; color: #000">鐢垫皵璐ㄦ鍛樼‘璁ゆ椂闂达細{{ datildata.confirmTime_DQ }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="4"
- >
- <span style="font-size: 0.88rem; color: #000"
- >妫�淇伐闀跨‘璁ゆ椂闂达細</span
- >
+ " :span="4">
+ <span style="font-size: 0.88rem; color: #000">妫�淇伐闀跨‘璁ゆ椂闂达細{{ datildata.confirmTime_GZ }}</span>
</el-col>
</el-row>
- <el-row
- ><el-col
- style="
+ <el-row><el-col style="
display: flex;
align-items: center;
height: 3.49rem;
background-color: rgba(190, 199, 209, 0.53);
padding-left: 0.5rem;
border: 1px solid #bec7d1;
- "
- >
- <span style="color: #000; font-size: 0.88rem; font-weight: bold"
- >浣滀笟淇℃伅</span
- >
- </el-col></el-row
- >
- <el-row
- ><el-col
- style="
+ ">
+ <span style="color: #000; font-size: 0.88rem; font-weight: bold">浣滀笟淇℃伅</span>
+ </el-col></el-row>
+ <el-row><el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="3"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鏈烘鍔涚煩浣滀笟鍛橈細鏉庡洓</span
- >
+ " :span="3">
+ <span style="font-size: 0.88rem; color: #000">鏈烘鍔涚煩浣滀笟鍛橈細{{ datildata.liJu_LC }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="3"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鏈烘杈呭姪鍛橈細寮犱笁</span
- >
+ " :span="3">
+ <span style="font-size: 0.88rem; color: #000">鏈烘杈呭姪鍛橈細{{ datildata.fuZhu_LC }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="3"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鍦版矡鍔涚煩浣滀笟鍛橈細鏉庡洓</span
- >
+ " :span="3">
+ <span style="font-size: 0.88rem; color: #000">鍦版矡鍔涚煩浣滀笟鍛橈細{{ datildata.liJu_DG }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="3"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鍦版矡杈呭姪鍛橈細寮犱笁</span
- >
+ " :span="3">
+ <span style="font-size: 0.88rem; color: #000">鍦版矡杈呭姪鍛橈細{{ datildata.fuZhu_DG }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="4"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鐢垫皵鍔涚煩浣滀笟鍛橈細鐜嬩簲</span
- >
+ " :span="4">
+ <span style="font-size: 0.88rem; color: #000">鐢垫皵鍔涚煩浣滀笟鍛橈細{{ datildata.liJu_DQ }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="8"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鐢垫皵杈呭姪鍛橈細鏉庡姏</span
- >
+ " :span="8">
+ <span style="font-size: 0.88rem; color: #000">鐢垫皵杈呭姪鍛橈細{{ datildata.fuZhu_DQ }}</span>
</el-col>
</el-row>
<el-row>
- <el-col
- style="
+ <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>
+ " :span="6">
+ <span style="font-size: 0.88rem; color: #000">鏈烘寮�濮嬫椂闂达細{{ datildata.startTime_LC }}</span>
</el-col>
- <el-col
- style="
+ <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>
+ " :span="6">
+ <span style="font-size: 0.88rem; color: #000">鍦版矡寮�濮嬫椂闂达細{{ datildata.startTime_DG }}</span>
</el-col>
- <el-col
- style="
+ <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>
+ " :span="12">
+ <span style="font-size: 0.88rem; color: #000">鐢垫皵寮�濮嬫椂闂达細{{ datildata.startTime_DQ }}</span>
</el-col>
- <el-col
- style="
+ <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>
+ " :span="6">
+ <span style="font-size: 0.88rem; color: #000">鏈烘缁撴潫鏃堕棿锛歿{ datildata.endTime_LC }}</span>
</el-col>
- <el-col
- style="
+ <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>
+ " :span="6">
+ <span style="font-size: 0.88rem; color: #000">鍦版矡缁撴潫鏃堕棿锛歿{ datildata.endTime_DG }}</span>
</el-col>
- <el-col
- style="
+ <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>
+ " :span="12">
+ <span style="font-size: 0.88rem; color: #000">鐢垫皵缁撴潫鏃堕棿锛歿{ datildata.endTime_DQ }}</span>
</el-col>
</el-row>
</div>
</el-dialog>
<!-- 鍔涚煩鍊兼煡鐪� -->
- <el-dialog
- v-model="TorquedialogVisible"
- title=""
- width="55%"
- :before-close="handleClose"
- :show-close="false"
- top="5%"
- >
+ <el-dialog v-model="TorquedialogVisible" title="" width="55%" :before-close="handleClose" :show-close="false"
+ top="5%">
<template #header="{ close, titleId, titleClass }">
<div class="my-header">
- <h4
- :id="titleId"
- :class="titleClass"
- style="color: rgb(16, 16, 16); font-size: 1rem; font-weight: bold"
- >
- 鍔涚煩鍊兼槑缁嗭紙鐢垫皵锛�
+ <h4 :id="titleId" :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>
+ <el-icon @click="close" size="15">
+ <CloseBold />
+ </el-icon>
</div>
</template>
<div style="height: 500px; display: flex; align-items: center">
<div style="height: 100%; width: 13.5rem">
- <div
- style="
- width: 13.5rem;
+ <div style="
+ width: 17rem;
padding: 0.8rem 2rem;
box-sizing: border-box;
background-color: rgba(247, 247, 247, 1);
- "
- >
- <div
- style="
+ ">
+ <div style="
color: rgba(16, 16, 16, 1);
font-size: 0.88rem;
display: flex;
margin-top: 0.5rem;
- "
- >
- <span style="width: 6rem; text-align: right; display: block"
- >浠诲姟鍚嶇О锛�</span
- ><span>杞悜鏋�</span>
+ ">
+ <span style="width: 6rem; text-align: right; display: block">浠诲姟鍚嶇О锛�</span><span>{{
+ pesonData.length != 0 ? pesonData[0].takename : ""
+ }}</span>
</div>
- <div
- style="
+ <div style="
color: rgba(16, 16, 16, 1);
font-size: 0.88rem;
display: flex;
margin-top: 0.5rem;
- "
- >
- <span style="width: 6rem; text-align: right; display: block"
- >鎶�鏈憳锛�</span
- ><span>寮犱笁</span>
+ ">
+ <span style="width: 6rem; text-align: right; display: block">鎶�鏈憳锛�</span><span>{{
+ pesonData.length != 0 ? pesonData[0].jishuyuan : ""
+ }}</span>
</div>
- <div
- style="
+ <div style="
color: rgba(16, 16, 16, 1);
font-size: 0.88rem;
display: flex;
margin-top: 0.5rem;
- "
- >
- <span style="width: 6rem; text-align: right; display: block"
- >妫�淇伐鍘傦細</span
- ><span>鏉庡洓</span>
+ ">
+ <span style="width: 6rem; text-align: right; display: block">妫�淇伐闀匡細</span><span>{{
+ pesonData.length != 0 ? pesonData[0].gonzhang : ""
+ }}</span>
</div>
- <div
- style="
+ <div style="
color: rgba(16, 16, 16, 1);
font-size: 0.88rem;
display: flex;
margin-top: 0.5rem;
- "
- >
- <span style="width: 6rem; text-align: right; display: block"
- >璐ㄦ鍛橈細</span
- ><span>涓冧竷</span>
+ ">
+ <span style="width: 6rem; text-align: right; display: block">璐ㄦ鍛橈細</span><span>{{
+ pesonData.length != 0 ? pesonData[0].zhijianyuan : ""
+ }}</span>
</div>
- <div
- style="
+ <div style="
color: rgba(16, 16, 16, 1);
font-size: 0.88rem;
display: flex;
margin-top: 0.5rem;
- "
- >
- <span style="width: 6rem; text-align: right; display: block"
- >鍔涚煩浣滀笟鍛橈細</span
- ><span>鐜嬩簲</span>
+ ">
+ <span style="width: 6rem; text-align: right; display: block">鍔涚煩浣滀笟鍛橈細</span><span>{{
+ pesonData.length != 0 ? pesonData[0].lijuzouyeyuan : ""
+ }}</span>
</div>
- <div
- style="
+ <div style="
color: rgba(16, 16, 16, 1);
font-size: 0.88rem;
display: flex;
margin-top: 0.5rem;
- "
- >
- <span style="width: 6rem; text-align: right; display: block"
- >杈呭姪鍛橈細</span
- ><span>灏忓垬</span>
+ ">
+ <span style="width: 6rem; text-align: right; display: block">杈呭姪鍛橈細</span><span>{{
+ pesonData.length != 0 ? pesonData[0].fuzyuan : ""
+ }}</span>
</div>
- <div
- style="
+ <div style="
color: rgba(16, 16, 16, 1);
font-size: 0.88rem;
display: flex;
margin-top: 0.5rem;
- "
- >
- <span style="width: 6rem; text-align: right; display: block"
- >浠诲姟璇︽儏锛�</span
- >
- <el-popover placement="bottom" :width="600" trigger="click">
+ ">
+ <span style="width: 6rem; text-align: right; display: block">浠诲姟璇︽儏锛�</span>
+ <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
- >
+ <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>
@@ -1180,33 +610,22 @@
<el-scrollbar height="400px" style="margin-left: 5rem; width: 100%">
<el-timeline>
- <el-timeline-item
- v-for="(activity, index) in activities"
- :key="index"
- :timestamp="'鍔涚煩鍊硷細' + activity.timestamp"
- >
- {{ activity.content }}
- <el-popover
- placement="bottom"
- :width="600"
- trigger="click"
- style="margin-left: 0.8rem"
- >
+ <el-timeline-item v-for="(activity, index) in activities" :key="index" :timestamp="'鍔涚煩鍊硷細' + activity.torqueOne + '----' + activity.torqueTwo
+ ">
+ {{ activity.craftsStep }}
+ <el-popover placement="bottom" :width="800" trigger="click" style="margin-left: 0.8rem">
<template #reference>
- <span
- style="
+ <span @click="checkcontent(activity.craftID)" style="
color: blue;
font-size: 0.88rem;
cursor: pointer;
border-bottom: 1px solid #4386ff;
- "
- >鏌ョ湅</span
- >
+ ">鏌ョ湅</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,103 +636,510 @@
</div>
</template>
<script setup>
-import { ref, reactive } from "vue";
+import { ref, reactive, onMounted, toRef } 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";
+import { login } from "@/api/login";
+const obj = {
selectName: "",
selectTime: [], // 鏃堕棿鑼冨洿
-});
+ selectType: "",
+ selectInput: "",
+ value: "",
+};
+const queryForm = toRef({ ...obj });
const tableData = ref([]);
-
-const options = ref([]);
+const options = ref([
+ {
+ value: 1,
+ label: "宸叉淳宸�",
+ },
+ {
+ value: 0,
+ label: "寰呮淳宸�",
+ },
+]);
const props = { multiple: true };
-const table = ref(false);
const form = reactive({});
const isactive = ref(1);
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: "", //鎺掑簭瀛楁
+ 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([]);
+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;
+ console.log(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 {
+ LogininitData();
+ }
+};
+
+//鍒嗛〉椤甸潰鏀瑰彉
+const handleCurrentChange = (val) => {
+ pageQuery.value.page = val;
+ if (isactive.value == 1) {
+ initData();
+ } else if (isactive.value == 2) {
+ WorkinitData();
+ } else {
+ LogininitData();
+ }
+};
+//浠诲姟璁板綍
+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: "like",
+ },
+ { 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 = Object.assign({}, obj);
+ pageQuery.value.page = 1;
+ if (isactive.value == 1) {
+ initData();
+ } else if (isactive.value == 2) {
+ WorkinitData();
+ } else {
+ LogininitData();
+ }
+};
+//鎵撳嵃鏂规硶
+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,
+ });
+ }
+};
+const roleINFO = ref();
+onMounted(() => {
+ initData();
+ roleINFO.value = JSON.parse(localStorage.getItem("user")).roleId;
+ console.log(roleINFO.value);
+});
</script>
<style lang="scss" scoped>
.Datalogging {
display: flex;
background-color: #fff;
+
.content {
width: 100%;
display: flex;
flex-direction: column;
+
.checkbox {
width: 16rem;
display: flex;
justify-content: space-between;
margin-top: 1rem;
margin-left: 1.31rem;
+
.item {
width: 5rem;
height: 1.88rem;
@@ -1325,20 +1151,24 @@
line-height: 1.88rem;
cursor: pointer;
}
+
.isactive {
background-color: rgba(16, 16, 16, 1);
color: rgba(255, 255, 255, 1);
}
}
+
.serch {
display: flex;
margin-top: 1.31rem;
align-items: center;
+
.time_box {
display: flex;
align-items: center;
text-align: center;
margin-left: 0.98rem;
+
.time {
box-sizing: border-box;
width: 6.88rem;
@@ -1352,24 +1182,25 @@
justify-content: center;
}
}
+
.serch_box {
display: flex;
align-items: center;
text-align: center;
margin-left: 0.98rem;
border-radius: 0.38rem;
+
.serchb {
box-sizing: border-box;
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;
justify-content: center;
}
+
input {
box-sizing: border-box;
outline: none;
@@ -1382,6 +1213,7 @@
}
}
}
+
.btns {
display: flex;
justify-content: space-between;
@@ -1392,6 +1224,7 @@
box-sizing: border-box;
}
}
+
.my-header {
height: 3.84rem;
display: flex;
@@ -1404,6 +1237,7 @@
.confirmButtonClass {
margin-right: 10px;
}
+
.el-message-box .el-message-box__btns {
flex-direction: row-reverse !important;
justify-content: normal !important;
--
Gitblit v1.9.3