From 772190e7b2e3f6ef0695ba54d9209324acdcb30a Mon Sep 17 00:00:00 2001
From: 艺术家 <10819716+q100102@user.noreply.gitee.com>
Date: 星期三, 04 六月 2025 13:57:17 +0800
Subject: [PATCH] 伸缩杆代码提交
---
项目代码/伸缩杆/client/src/views/tts/DataLogging/Datalogging.vue | 399 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 316 insertions(+), 83 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/DataLogging/Datalogging.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/DataLogging/Datalogging.vue"
index 684ee01..1f932ae 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/DataLogging/Datalogging.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\344\274\270\347\274\251\346\235\206/client/src/views/tts/DataLogging/Datalogging.vue"
@@ -1,146 +1,258 @@
<template>
<div class="Datalogging">
<div class="content">
- <div class="checkbox" :style="{ width: roleINFO == 1 ? '22rem' : '15rem' }">
- <div :class="['item', isactive == 1 ? 'isactive' : '']" @click="changeactive(1)">
+ <div
+ class="checkbox"
+ :style="{ width: roleINFO == 1 ? '22rem' : '15rem' }"
+ >
+ <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 v-if="roleINFO == 1" :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">
<div class="time">{{ isactive == 1 ? "鍒嗛厤鏃堕棿" : "鎿嶄綔鏃堕棿" }}</div>
- <el-date-picker v-model="queryForm.selectTime" prefix-icon="none" clear-icon="none" style="
+ <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;
box-shadow: none;
width: 19rem;
- height: 2rem;
border-left: 0;
- " format="YYYY-MM-DD HH:mm:ss" type="datetimerange" range-separator="~" start-placeholder="璧峰鏃ユ湡"
- end-placeholder="鎴鏃ユ湡" size="small" />
+ "
+ class="time_picker"
+ 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.selectInput" placeholder="璇疯緭鍏ュ叧閿瘝鎼滅储" style="border-left: 0.06rem solid #e2e2e2" />
+ <input
+ @focus="focusInput"
+ v-model="queryForm.selectInput"
+ placeholder="璇疯緭鍏ュ叧閿瘝鎼滅储"
+ style="border-left: 0.06rem solid #e2e2e2"
+ ref="inputRef"
+ />
</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" @click="resetQuery">閲嶇疆</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"
- @click="printExcel">鎵归噺瀵煎嚭</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 empty-text="鏆傛棤鏁版嵁" v-if="isactive == 1" :data="tableData" height="450" 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',
+ fontSize: '1.25rem',
height: '3rem',
border: 'none',
- }" :row-style="{
+ }"
+ :row-style="{
color: '#101010',
- fontSize: '0.88rem',
+ fontSize: '1.25rem',
height: '3rem',
- }">
+ WWWW,
+ }"
+ >
<el-table-column type="selection" align="center" />
<el-table-column prop="operatorName" label="濮撳悕" align="center" />
- <el-table-column prop="teamName" label="鐝粍" align="center" />
- <el-table-column prop="headImageUrl" label="浜鸿劯" align="center">
+ <!-- <el-table-column prop="teamName" label="缁勫埆" align="center" /> -->
+ <el-table-column prop="" label="缁勫憳绫诲瀷" align="center">
<template #default="scope">
- <el-image style="width: 5rem; height: 5rem" :src="'http://192.168.0.80:1598' + scope.row.headImageUrl"
- show-progress :initial-index="4" fit="cover" />
+ <span v-if="scope.row.isLeader == 0">缁勫憳</span>
+ <span v-else-if="scope.row.isLeader == 1">缁勯暱</span>
</template>
</el-table-column>
- <el-table-column prop="distributionTime" label="鍒嗛厤鏃堕棿" align="center" />
- <el-table-column prop="" label="鍒嗛厤妫�淇憳" align="center">
- <template #default> {{ userName }} </template>
+ <el-table-column prop="dept_Id" label="妫�淇亾" align="center">
+ <template #default="scope">
+ <div>{{ scope.row.dept_Id }}</div>
+ </template></el-table-column
+ >
+ <el-table-column prop="headImageUrl" label="浜鸿劯" align="center">
+ <template #default="scope">
+ <el-image
+ style="width: 5rem; height: 5rem"
+ :src="'http://192.168.1.103:9093' + scope.row.headImageUrl"
+ show-progress
+ :initial-index="4"
+ fit="cover"
+ />
+ </template>
</el-table-column>
+ <el-table-column
+ prop="distributionTime"
+ label="鍒嗛厤鏃堕棿"
+ align="center"
+ />
+ <!-- <el-table-column prop="Creater" label="鍒嗛厤妫�淇憳" align="center">
+ </el-table-column> -->
+ <el-table-column
+ prop="ipAddress"
+ label="璁惧IP"
+ align="center"
+ ></el-table-column>
</el-table>
-
- <!-- 妫�淇搷浣滆褰曡褰� -->
- <el-table empty-text="鏆傛棤鏁版嵁" v-if="isactive == 2" :data="tableData" height="450" style="width: 100%"
+ <!-- 濮撳悕 userName锛屽崟浣� uerUnit锛岀彮缁� userTeam锛屾搷浣滀汉 modifier锛屽惎鐢ㄦ椂闂� enableTime锛屽仠鐢ㄦ椂闂� disableTime-->
+ <!-- 鎺堟潈璁板綍 -->
+ <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',
+ fontSize: '1.25rem',
height: '3rem',
border: 'none',
- }" :row-style="{
+ }"
+ :row-style="{
color: '#101010',
- fontSize: '0.88rem',
+ fontSize: '1.25rem',
height: '3rem',
- }">
+ }"
+ >
<el-table-column type="selection" align="center" />
- <el-table-column prop="userTrueName" label="濮撳悕" align="center" />
+ <el-table-column prop="userName" label="濮撳悕" align="center" />
+ <el-table-column prop="uerUnit" label="鍗曚綅" align="center" />
<el-table-column prop="userteam" label="鐝粍" align="center" />
- <el-table-column prop="headImageUrl" label="浜鸿劯" align="center">
- <template #default="scope">
- <el-image style="width: 5rem; height: 5rem" :src="'http://192.168.0.80:1598' + scope.row.headImageUrl"
- show-progress :initial-index="4" fit="cover" />
- </template>
- </el-table-column>
- <el-table-column prop="maintenancStartTime" label="杩涘叆妫�淇椂闂�" align="center" />
- <el-table-column prop="maintenancEendTime" label="閫�鍑烘淇椂闂�" align="center" />
- <el-table-column prop="" label="妫�淇亾鍙�" align="center">
+ <el-table-column prop="enableTime" label="鍚敤鏃堕棿" align="center" />
+ <el-table-column prop="disableTime" label="绂佺敤鏃堕棿" align="center" />
+ <el-table-column prop="modifier" label="鎿嶄綔浜�" align="center">
</el-table-column>
</el-table>
<!-- 鐧诲綍璁板綍 -->
- <el-table empty-text="鏆傛棤鏁版嵁" v-if="isactive == 3" :data="tableData" height="450" 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',
+ fontSize: '1.25rem',
height: '3rem',
border: 'none',
- }" :row-style="{
+ }"
+ :row-style="{
color: '#101010',
- fontSize: '0.88rem',
+ fontSize: '1.25rem',
height: '3rem',
- }">
+ }"
+ >
<el-table-column type="selection" align="center" />
<el-table-column prop="userTrueName" label="濮撳悕" align="center" />
- <el-table-column prop="opCenten" label="鍗曚綅" align="center" />
- <el-table-column prop="userteam" label="鐝粍" align="center" />
+ <!-- <el-table-column prop="opCenten" label="鍗曚綅" align="center" /> -->
+ <!-- <el-table-column prop="userteam" label="缁勫埆" align="center" /> -->
<el-table-column prop="headImageUrl" label="浜鸿劯" align="center">
<template #default="scope">
- <el-image style="width: 5rem; height: 5rem" :src="'http://192.168.0.80:1598' + scope.row.headImageUrl"
- show-progress :initial-index="4" fit="cover" />
+ <el-image
+ style="width: 5rem; height: 5rem"
+ :src="'http://192.168.1.103:9093' + scope.row.headImageUrl"
+ show-progress
+ :initial-index="4"
+ fit="cover"
+ />
</template>
</el-table-column>
<el-table-column prop="loginTiem" label="鐧诲綍鏃堕棿" align="center" />
- <el-table-column prop="outTiem" label="閫�鍑烘椂闂�" align="center" />
- <el-table-column label="鎿嶄綔鍐呭" align="center" />
+ <!-- <el-table-column prop="outTiem" label="閫�鍑烘椂闂�" align="center" /> -->
+ <!-- <el-table-column 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 v-if="isactive == 1" size="small" background layout="prev, pager, next"
- :current-page="pageQuery.page" :page-size="pageQuery.rows" :total="pageTotal" @size-change="handleSizeChange"
- @current-change="handleCurrentChange" />
- <el-pagination v-if="isactive == 2" size="small" background layout="prev, pager, next"
- :current-page="pageQuery1.page" :page-size="pageQuery1.rows" :total="pageTotal1"
- @size-change="handleSizeChange" @current-change="handleCurrentChange" />
- <el-pagination v-if="isactive == 3" size="small" background layout="prev, pager, next"
- :current-page="pageQuery2.page" :page-size="pageQuery2.rows" :total="pageTotal2"
- @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+ "
+ >
+ <el-pagination
+ v-if="isactive == 1"
+ size="small"
+ background
+ layout="prev, pager, next"
+ :current-page="pageQuery.page"
+ :page-size="pageQuery.rows"
+ :total="pageTotal"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ />
+ <el-pagination
+ v-if="isactive == 2"
+ size="small"
+ background
+ layout="prev, pager, next"
+ :current-page="pageQuery1.page"
+ :page-size="pageQuery1.rows"
+ :total="pageTotal1"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ />
+ <el-pagination
+ v-if="isactive == 3"
+ size="small"
+ background
+ layout="prev, pager, next"
+ :current-page="pageQuery2.page"
+ :page-size="pageQuery2.rows"
+ :total="pageTotal2"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ />
</div>
</div>
</div>
@@ -156,7 +268,7 @@
} from "@/api/newapi/Datalogging";
import {
MaintenanceSettingRecord,
- MaintenanceOperationRecord,
+ AuthGetPageData,
} from "@/api/newapi/MaintenanceTeam";
const obj = {
selectTime: [], // 鏃堕棿鑼冨洿
@@ -172,6 +284,21 @@
const pageTotal = ref(0);
const pageTotal1 = ref(0);
const pageTotal2 = ref(0);
+const inputRef = ref(null);
+const focusInput = () => {
+ if (typeof Windows !== "undefined") {
+ const textInputPane =
+ Windows.UI.ViewManagement.InputPane.getForCurrentView();
+
+ // 鏄剧ず铏氭嫙閿洏
+ textInputPane.show();
+
+ // 闅愯棌铏氭嫙閿洏
+ textInputPane.hide();
+ }
+ inputRef.value?.focus();
+ console.log("focusInput called", inputRef.value);
+};
//鍒嗛〉璇锋眰鍙傛暟
const pageQuery = ref({
page: 1, //褰撳墠椤甸潰
@@ -240,6 +367,9 @@
},
];
const selectoptions = ref([]);
+const account = localStorage.getItem("user")
+ ? JSON.parse(localStorage.getItem("user")).userName
+ : ""; //鑾峰彇璐﹀彿
selectoptions.value = tasklogging;
const changeactive = (index) => {
@@ -317,6 +447,7 @@
: "",
sortField: "distributionTime",
sortOrder: "desc",
+ account: account,
}).then((res) => {
tableData.value = res.data.items;
pageTotal.value = res.data.totalCount;
@@ -336,23 +467,12 @@
{ name: "createTime", value: startTime, displayType: "ThanOrEqual" },
{ name: "createTime", value: endTime, displayType: "LessOrEqual" },
];
- MaintenanceOperationRecord({
- pageIndex: pageQuery1.value.page,
- pageSize: pageQuery1.value.rows,
- searchKeyword: queryForm.value.selectInput,
- startDate:
- queryForm.value.selectTime.length != 0
- ? queryForm.value.selectTime[0]
- : "",
- endDate:
- queryForm.value.selectTime.length != 0
- ? queryForm.value.selectTime[1]
- : "",
- sortField: "maintenancStartTime",
- sortOrder: "desc",
+ AuthGetPageData({
+ ...pageQuery.value,
+ filter,
}).then((res) => {
- tableData.value = res.data.items;
- pageTotal1.value = res.data.totalCount;
+ tableData.value = res.rows;
+ pageTotal1.value = res.total;
});
};
//鐧诲綍璁板綍
@@ -383,6 +503,7 @@
: "",
sortField: "loginTime",
sortOrder: "desc",
+ account: account,
}).then((res) => {
tableData.value = res.data.items;
pageTotal2.value = res.data.totalCount;
@@ -570,6 +691,118 @@
border-bottom: 0.06rem solid rgba(233, 233, 233, 1);
}
}
+
+@media screen and (max-width: 1080px) {
+ .Datalogging {
+ display: flex;
+ background-color: #fff;
+
+ .content {
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+
+ .checkbox {
+ width: 40rem !important;
+ display: flex;
+ justify-content: space-between;
+ margin-top: 1rem;
+ margin-left: 1.31rem;
+
+ .item {
+ width: 12rem;
+ height: 2.88rem;
+ border-radius: 0.25rem;
+ background-color: rgba(190, 199, 209, 1);
+ color: rgba(255, 255, 255, 1);
+ font-size: 1.25rem;
+ text-align: center;
+ line-height: 2.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: 7rem;
+ height: 2.5rem;
+ text-align: center;
+ border: 0.06rem solid rgba(222, 222, 222, 1);
+ border-radius: 0.25rem 0 0 0.25rem;
+ font-size: 1.25rem;
+ display: flex;
+ align-items: center;
+ 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: 2.5rem;
+ text-align: center;
+ font-size: 1.25rem;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border: 0.06rem solid rgba(222, 222, 222, 1);
+ }
+
+ input {
+ box-sizing: border-box;
+ outline: none;
+ width: 19rem;
+ height: 2.5rem;
+ border: 0.06rem solid rgba(222, 222, 222, 1);
+ border-radius: 0 0.25rem 0.25rem 0;
+ padding-left: 0.3125rem;
+ font-size: 1rem;
+ }
+ }
+ }
+
+ .btns {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin-top: 1.31rem;
+ margin-left: 1.13rem;
+ padding-right: 2rem;
+ box-sizing: border-box;
+ }
+ }
+
+ .my-header {
+ height: 3.84rem;
+ display: flex;
+ justify-content: space-between;
+ border-bottom: 0.06rem solid rgba(233, 233, 233, 1);
+ }
+ }
+}
</style>
<style>
.confirmButtonClass {
--
Gitblit v1.9.3