From 2591e298a3fd1332ad0ca33059f6ba0b7d426f51 Mon Sep 17 00:00:00 2001
From: pengwei <2071057782@qq.com>
Date: 星期四, 20 三月 2025 10:08:00 +0800
Subject: [PATCH] 最新代码提交

---
 项目代码/client/src/views/tts/DataLogging/Datalogging.vue |   53 +++++++++++++++++++++++------------------------------
 1 files changed, 23 insertions(+), 30 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..a2d7d4c 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"
@@ -59,7 +59,7 @@
             size="small"
           />
         </div>
-        <!-- <div class="serch_box">
+        <div class="serch_box">
           <div class="serchb">
             <el-select
               v-model="queryForm.selectType"
@@ -80,7 +80,7 @@
             placeholder="璇疯緭鍏ュ叧閿瘝鎼滅储"
             style="border-left: 0.06rem solid #e2e2e2"
           />
-        </div> -->
+        </div>
         <el-button
           @click="handleQuery"
           type="primary"
@@ -249,7 +249,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
@@ -985,7 +985,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 +1000,7 @@
   ExportApi2,
   ExportApi3,
 } from "@/api/newapi/Datalogging";
+import { login } from "@/api/login";
 const obj = {
   selectName: "",
   selectTime: [], // 鏃堕棿鑼冨洿
@@ -1007,13 +1008,7 @@
   selectInput: "",
   value: "",
 };
-const queryForm = ref({
-  selectName: "",
-  selectTime: [], // 鏃堕棿鑼冨洿
-  selectType: "",
-  selectInput: "",
-  value: "",
-});
+const queryForm = toRef({ ...obj });
 
 const tableData = ref([]);
 const options = ref([
@@ -1028,7 +1023,6 @@
 ]);
 const props = { multiple: true };
 
-const table = ref(false);
 const form = reactive({});
 const isactive = ref(1);
 const claimdialogVisible = ref(false);
@@ -1042,7 +1036,7 @@
   page: 1, //褰撳墠椤甸潰
   rows: 10, //姣忛〉鏄剧ず鏉℃暟
   order: "desc", //鎺掑簭鏂瑰紡
-  sort: "createTime", //鎺掑簭瀛楁
+  sort: "", //鎺掑簭瀛楁
   wheres: "", //鏉′欢鏌ヨ
 });
 const datildata = ref({});
@@ -1092,17 +1086,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) => {
@@ -1331,6 +1314,7 @@
   } else if (isactive.value == 2) {
     WorkinitData();
   } else {
+    LogininitData();
   }
 };
 
@@ -1342,6 +1326,7 @@
   } else if (isactive.value == 2) {
     WorkinitData();
   } else {
+    LogininitData();
   }
 };
 //浠诲姟璁板綍
@@ -1358,7 +1343,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 +1413,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 +1463,11 @@
     });
   }
 };
-
+const roleINFO = ref();
 onMounted(() => {
   initData();
+  roleINFO.value = JSON.parse(localStorage.getItem("user"));
+  console.log(roleINFO.value);
 });
 </script>
 <style lang="scss" scoped>

--
Gitblit v1.9.3