+ @selection-change="handleSelectionChange" default-expand-all :header-cell-style="{background:'rgb(250 250 250)', color: '#383838',height:'50px'}" >
diff --git a/web/src/views/system/dict/index.vue b/web/src/views/system/dict/index.vue
index 0eb8a16..5f061eb 100644
--- a/web/src/views/system/dict/index.vue
+++ b/web/src/views/system/dict/index.vue
@@ -445,7 +445,7 @@ const total = ref()
+ :header-cell-style="{ background: 'rgb(250 250 250)', color: '#383838', height: '50px' }">
diff --git a/web/src/views/system/record/index.vue b/web/src/views/system/record/index.vue
index a1e603e..2907253 100644
--- a/web/src/views/system/record/index.vue
+++ b/web/src/views/system/record/index.vue
@@ -145,7 +145,7 @@ function handleClose(){
+ :header-cell-style="{ background: 'rgb(250 250 250)', color: '#383838', height: '50px' }">
@@ -173,7 +173,7 @@ function handleClose(){
+ :header-cell-style="{ background: 'rgb(250 250 250)', color: '#383838', height: '50px' }">
diff --git a/web/src/views/system/user/visionInstitution.vue b/web/src/views/system/user/visionInstitution.vue
index ce4e3d8..3233e60 100644
--- a/web/src/views/system/user/visionInstitution.vue
+++ b/web/src/views/system/user/visionInstitution.vue
@@ -149,7 +149,7 @@ function Submit(row){
diff --git a/web/src/views/testdata/datamanagement/index.vue b/web/src/views/testdata/datamanagement/index.vue
index ffb6962..dca61f9 100644
--- a/web/src/views/testdata/datamanagement/index.vue
+++ b/web/src/views/testdata/datamanagement/index.vue
@@ -1504,6 +1504,8 @@ function openMap(row: any) {
}
function mapClose() {
mapTrajectory.value = false
+ lineData.value.length = 0
+ dynamicCoordinates.value.length = 0
closeSSE()
// index = 0
}
@@ -1513,26 +1515,14 @@ const options = ref([
name: '1秒'
, id: 1
},
- {
- name: '10秒'
- , id: 10
- },
- {
- name: '30秒'
- , id: 30
- },
- {
- name: '1分钟'
- , id: 60
- },
- {
- name: '2分钟'
- , id: 120
- },
{
name: '5分钟'
, id: 300
},
+ {
+ name: '10分钟'
+ , id: 600
+ },
])
const maptime: any = ref(1)
//频率
@@ -1704,13 +1694,13 @@ function repstring(row: any) {
- {{ scope.row.fileName }}
+ {{ scope.row.fileName }}
{{ scope.row.fileName }}
@@ -1833,7 +1823,7 @@ function repstring(row: any) {
}})
@@ -2192,6 +2182,10 @@ function repstring(row: any) {
.tableweight {
font-size: 16px;
background: #dbf500;
+ cursor: pointer;
+}
+.tableweight:hover{
+ color: #409eff;
}
//差异性对比
diff --git a/web/src/views/testdata/fileSynchronization/index.vue b/web/src/views/testdata/fileSynchronization/index.vue
index a970331..de5b88e 100644
--- a/web/src/views/testdata/fileSynchronization/index.vue
+++ b/web/src/views/testdata/fileSynchronization/index.vue
@@ -1190,7 +1190,7 @@ const tabs = ref(1)
@click="moretableBeifen()">备份
@@ -1232,7 +1232,7 @@ const tabs = ref(1)
@@ -1276,7 +1276,7 @@ const tabs = ref(1)
diff --git a/web/src/views/testdata/testtask/index.vue b/web/src/views/testdata/testtask/index.vue
index 9974371..2e53b06 100644
--- a/web/src/views/testdata/testtask/index.vue
+++ b/web/src/views/testdata/testtask/index.vue
@@ -8,7 +8,7 @@ export default {
import { onMounted, ref } from "vue";
import { ElMessage, ElMessageBox } from 'element-plus'
import Page from '@/components/Pagination/page.vue'
-import { tstaskPage, addtsTask, updatetsTask, deleteTsTaskById, deleteTsTaskByIds,confirmDeleteTask } from "@/api/testtask";
+import { tstaskPage, addtsTask, updatetsTask, deleteTsTaskById, deleteTsTaskByIds, confirmDeleteTask } from "@/api/testtask";
import { getDict } from '@/api/dict'
//定义表格数据
const tableData: any = ref([]);
@@ -60,6 +60,15 @@ function getdata() {
queryParams.value.current = res.data.current
queryParams.value.size = res.data.size
total.value = res.data.total
+ let arr = []
+ tableData.value.forEach((item: any) => {
+ if (item.taskProps) {
+ arr = JSON.parse(item.taskProps)
+ } else {
+ arr = []
+ }
+ item.taskProps = arr
+ });
})
}
//弹框命名
@@ -83,11 +92,16 @@ function addproject() {
taskType: "",
testDescribe: "",// 试验描述
sensorDescribe: "",// 传感器描述
+ taskProps: "",//信息
+ localStorageId: '1',
+ backupStorageId: '2'
}
+ formitemarr.value.length = 0
}
//修改项目弹框
function editproject(row: any) {
projectForme.value = JSON.parse(JSON.stringify(row))
+ formitemarr.value = projectForme.value.taskProps
projectForme.value.taskDate = [projectForme.value.taskStartdate, projectForme.value.taskEnddate]
title.value = "修改试验任务"
frame.value = true
@@ -185,12 +199,20 @@ const projectForme: any = ref({
, taskType: "",
testDescribe: "",// 试验描述
sensorDescribe: "",// 传感器描述
+ taskProps: "",//信息
+ localStorageId: '1',
+ backupStorageId: '2'
})
//表单确定
async function submitForm(formEl: any) {
if (!formEl) return
await formEl.validate((valid: any, fields: any) => {
if (valid) {
+ if (formitemarr.value.length > 0) {
+ projectForme.value.taskProps = JSON.stringify(formitemarr.value)
+ } else {
+ projectForme.value.taskProps = '[]'
+ }
if (projectForme.value.taskDate.length > 0) {
projectForme.value.taskStartdate = projectForme.value.taskDate[0]
projectForme.value.taskEnddate = projectForme.value.taskDate[1]
@@ -256,6 +278,63 @@ function Loglist(row: any, title1: any) {
function handleClose1() {
logqing.value = false
}
+//添加属性
+const formitemarr = ref([])
+const dataname = ref('')
+const labledone = ref(false)
+function addformItem() {
+ labledone.value = true
+ dataname.value = ''
+
+}
+function labledoneclose() {
+ labledone.value = false
+}
+function labledsure() {
+ if (!dataname.value) {
+ ElMessage.warning('请输入属性名称')
+ return
+ }
+ generateUniqueId
+ formitemarr.value.push({ name: dataname.value, data: '', id: generateUniqueId(8) })
+ labledone.value = false
+}
+function generateUniqueId(length: any) {
+ const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+ let result = '';
+
+ // 添加时间戳部分(转换为36进制并取字母部分)
+ const timePart = Date.now().toString(36).toUpperCase().replace(/[0-9]/g, '');
+ result += timePart;
+
+ // 补充随机字符
+ for (let i = result.length; i < length; i++) {
+ result += chars.charAt(Math.floor(Math.random() * chars.length));
+ }
+
+ return result.substring(0, length);
+}
+function dellable(index: any) {
+ formitemarr.value.splice(index, 1)
+}
+let result1 = ref([])
+let result2 = ref([])
+const attloading = ref(false)
+const attbute = ref(false)
+function attribute(input: any) {
+ result2.value = input
+ result1.value.length = 0
+ let inoutarr = JSON.parse(JSON.stringify(input))
+ result1.value = [inoutarr.reduce((acc: any, item: any) => {
+ acc[item.id] = item.data;
+ return acc;
+ }, {})];
+ attbute.value = true
+ console.log(result1.value)
+}
+function attributeclose() {
+ attbute.value = false
+}
@@ -297,7 +376,7 @@ function handleClose1() {
@@ -313,6 +392,14 @@ function handleClose1() {
scope.row.taskEnddate : '' }}