From 1288a7890deb3b180b1e8df7015b1036514c4e71 Mon Sep 17 00:00:00 2001
From: pengwei <2071057782@qq.com>
Date: 星期四, 27 三月 2025 09:07:12 +0800
Subject: [PATCH] 3.27优化
---
项目代码/client/src/views/tts/DataLogging/Datalogging.vue | 88 +++++++++++++++++++++++++------------------
1 files changed, 51 insertions(+), 37 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 fc44ee6..f2318c7 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,7 +1,10 @@
<template>
<div class="Datalogging">
<div class="content">
- <div class="checkbox">
+ <div
+ class="checkbox"
+ :style="{ width: roleINFO == 1 ? '16rem' : '11rem' }"
+ >
<div
:class="['item', isactive == 1 ? 'isactive' : '']"
@click="changeactive(1)"
@@ -15,6 +18,7 @@
浣滀笟鍗曡褰�
</div>
<div
+ v-if="roleINFO == 1"
:class="['item', isactive == 3 ? 'isactive' : '']"
@click="changeactive(3)"
>
@@ -59,7 +63,7 @@
size="small"
/>
</div>
- <!-- <div class="serch_box">
+ <div class="serch_box">
<div class="serchb">
<el-select
v-model="queryForm.selectType"
@@ -80,7 +84,7 @@
placeholder="璇疯緭鍏ュ叧閿瘝鎼滅储"
style="border-left: 0.06rem solid #e2e2e2"
/>
- </div> -->
+ </div>
<el-button
@click="handleQuery"
type="primary"
@@ -105,6 +109,7 @@
<div style="margin-top: 1rem; height: 100%">
<!-- 浠诲姟璁板綍 -->
<el-table
+ empty-text="鏆傛棤鏁版嵁"
v-if="isactive == 1"
:data="tableData"
height="450"
@@ -170,6 +175,7 @@
<!-- 浣滀笟鍗曡褰� -->
<el-table
+ empty-text="鏆傛棤鏁版嵁"
v-if="isactive == 2"
:data="tableData"
height="450"
@@ -228,6 +234,7 @@
<!-- 鐧诲綍璁板綍 -->
<el-table
+ empty-text="鏆傛棤鏁版嵁"
v-if="isactive == 3"
:data="tableData"
height="450"
@@ -249,7 +256,7 @@
<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-column prop="createDate" label="鐧诲綍鏃堕棿" align="center" />
</el-table>
</div>
<div
@@ -846,7 +853,9 @@
>
<span style="width: 6rem; text-align: right; display: block"
>浠诲姟鍚嶇О锛�</span
- ><span>{{ pesonData[0].takename }}</span>
+ ><span>{{
+ pesonData.length != 0 ? pesonData[0].takename : ""
+ }}</span>
</div>
<div
style="
@@ -858,7 +867,9 @@
>
<span style="width: 6rem; text-align: right; display: block"
>鎶�鏈憳锛�</span
- ><span>{{ pesonData[0].jishuyuan }}</span>
+ ><span>{{
+ pesonData.length != 0 ? pesonData[0].jishuyuan : ""
+ }}</span>
</div>
<div
style="
@@ -870,7 +881,9 @@
>
<span style="width: 6rem; text-align: right; display: block"
>妫�淇伐闀匡細</span
- ><span>{{ pesonData[0].gonzhang }}</span>
+ ><span>{{
+ pesonData.length != 0 ? pesonData[0].gonzhang : ""
+ }}</span>
</div>
<div
style="
@@ -882,7 +895,9 @@
>
<span style="width: 6rem; text-align: right; display: block"
>璐ㄦ鍛橈細</span
- ><span>{{ pesonData[0].zhijianyuan }}</span>
+ ><span>{{
+ pesonData.length != 0 ? pesonData[0].zhijianyuan : ""
+ }}</span>
</div>
<div
style="
@@ -894,7 +909,9 @@
>
<span style="width: 6rem; text-align: right; display: block"
>鍔涚煩浣滀笟鍛橈細</span
- ><span>{{ pesonData[0].lijuzouyeyuan }}</span>
+ ><span>{{
+ pesonData.length != 0 ? pesonData[0].lijuzouyeyuan : ""
+ }}</span>
</div>
<div
style="
@@ -906,7 +923,9 @@
>
<span style="width: 6rem; text-align: right; display: block"
>杈呭姪鍛橈細</span
- ><span>{{ pesonData[0].fuzyuan }}</span>
+ ><span>{{
+ pesonData.length != 0 ? pesonData[0].fuzyuan : ""
+ }}</span>
</div>
<div
style="
@@ -985,7 +1004,7 @@
</div>
</template>
<script setup>
-import { ref, reactive, onMounted } from "vue";
+import { ref, reactive, onMounted, toRef } from "vue";
import { ElMessage, ElMessageBox } from "element-plus";
import { formatTime } from "@/utils/index.js";
import {
@@ -1000,6 +1019,7 @@
ExportApi2,
ExportApi3,
} from "@/api/newapi/Datalogging";
+import { login } from "@/api/login";
const obj = {
selectName: "",
selectTime: [], // 鏃堕棿鑼冨洿
@@ -1007,13 +1027,7 @@
selectInput: "",
value: "",
};
-const queryForm = ref({
- selectName: "",
- selectTime: [], // 鏃堕棿鑼冨洿
- selectType: "",
- selectInput: "",
- value: "",
-});
+const queryForm = toRef({ ...obj });
const tableData = ref([]);
const options = ref([
@@ -1028,7 +1042,6 @@
]);
const props = { multiple: true };
-const table = ref(false);
const form = reactive({});
const isactive = ref(1);
const claimdialogVisible = ref(false);
@@ -1042,7 +1055,7 @@
page: 1, //褰撳墠椤甸潰
rows: 10, //姣忛〉鏄剧ず鏉℃暟
order: "desc", //鎺掑簭鏂瑰紡
- sort: "createTime", //鎺掑簭瀛楁
+ sort: "", //鎺掑簭瀛楁
wheres: "", //鏉′欢鏌ヨ
});
const datildata = ref({});
@@ -1092,17 +1105,6 @@
},
];
const selectoptions = ref([]);
-
-// 鏌ヨ
-const query = () => {
- if (isactive.value == 1) {
- initData();
- } else if (isactive.value == 2) {
- WorkinitData();
- } else {
- LogininitData();
- }
-};
selectoptions.value = tasklogging;
const changeactive = (index) => {
@@ -1172,6 +1174,8 @@
],
}).then((res) => {
pesonData.value = res.rows;
+ console.log(res.rows);
+
TorquedialogVisible.value = true;
});
};
@@ -1331,6 +1335,7 @@
} else if (isactive.value == 2) {
WorkinitData();
} else {
+ LogininitData();
}
};
@@ -1342,6 +1347,7 @@
} else if (isactive.value == 2) {
WorkinitData();
} else {
+ LogininitData();
}
};
//浠诲姟璁板綍
@@ -1358,7 +1364,7 @@
{
name: queryForm.value.selectType,
value: queryForm.value.selectInput,
- displayType: "String",
+ displayType: "like",
},
{ name: "createTime", value: startTime, displayType: "ThanOrEqual" },
{ name: "createTime", value: endTime, displayType: "LessOrEqual" },
@@ -1428,13 +1434,19 @@
LogininitData();
}
};
-
+//閲嶇疆鏂规硶
const resetQuery = () => {
- queryForm.value = { selectName: "", selectTime: [] };
+ queryForm.value = Object.assign({}, obj);
pageQuery.value.page = 1;
- initData();
+ if (isactive.value == 1) {
+ initData();
+ } else if (isactive.value == 2) {
+ WorkinitData();
+ } else {
+ LogininitData();
+ }
};
-
+//鎵撳嵃鏂规硶
const printExcel = () => {
// 鏌ヨ鏉′欢
const startTime = formatTime(queryForm.value.selectTime[0]);
@@ -1472,9 +1484,11 @@
});
}
};
-
+const roleINFO = ref();
onMounted(() => {
initData();
+ roleINFO.value = JSON.parse(localStorage.getItem("user")).roleId;
+ console.log(roleINFO.value);
});
</script>
<style lang="scss" scoped>
--
Gitblit v1.9.3