diff --git a/psdc-ui/src/api/emonitor/api.js b/psdc-ui/src/api/emonitor/api.js index 2a1aaca..701cc15 100644 --- a/psdc-ui/src/api/emonitor/api.js +++ b/psdc-ui/src/api/emonitor/api.js @@ -133,3 +133,8 @@ export function setKey2(data) { return request.post('system/secret/key/upKeyData',data) } + +//模型测试 +export function modelTest(data) { + return request.post('system/model/getReport',data) +} \ No newline at end of file diff --git a/psdc-ui/src/views/bigview/index.vue b/psdc-ui/src/views/bigview/index.vue index cc2d602..37fa405 100644 --- a/psdc-ui/src/views/bigview/index.vue +++ b/psdc-ui/src/views/bigview/index.vue @@ -27,7 +27,8 @@
有效期至：
@@ -70,6 +71,11 @@ const value = ref('') const result = ref('') const inputs = ref([]) const keyList = ref([]) +const pickerOptions = ref( + { // 日期时间选择器的选项 + format: 'yyyy-MM-dd HH:mm:ss', // 设置日期时间的格式 + valueStrictly: true, // 严格匹配绑定的值，避免用户选择的日期时间与绑定的值不同步的问题 +}, ) watch(() => value.value,(newVale,oldValue) => { @@ -90,14 +96,27 @@ watch(() => value2.value,(newVale,oldValue) => { onMounted(()=>{ let d = new Date(); let today = d.getFullYear() + "-" + (d.getMonth() + 1) + "-" + d.getDate(); + let time = d.getHours() + ":" + d.getMinutes() + ":" + d.getSeconds(); + + console.log(today + " " + time); + + value1.value= today+ " " + time - value1.value= today - console.log(new Date()) getKey().then((res)=>{ keyList.value= res.data value.value= res.data[0].key }) }) +function convertISODate(isoString) { + let date = new Date(isoString); + let year = date.getFullYear(); + let month = ("0" + (date.getMonth() + 1)).slice(-2); + let day = ("0" + date.getDate()).slice(-2); + let hour = ("0" + date.getHours()).slice(-2); + let minute = ("0" + date.getMinutes()).slice(-2); + let second = ("0" + date.getSeconds()).slice(-2); + return year + "-" + month + "-" + day + " " + hour + ":" + minute + ":" + second; +} function addInput() { if(inputs.value.length==0){ if(input1.value){ @@ -190,16 +209,8 @@ function delInput() { } function toResult(){ - const dateString = value1.value; - const date = new Date(dateString); - const formattedDate = date.toLocaleString('zh-CN', { - year: 'numeric', - month: '2-digit', - day: '2-digit', - hour: '2-digit', - minute: '2-digit', - second: '2-digit' - }); + let formattedDate = convertISODate(value1.value); + console.log(formattedDate) if(inputs.value.length==0){ if(input1.value){ resultKey( diff --git a/psdc-ui/src/views/system/device/index.vue b/psdc-ui/src/views/system/device/index.vue index 02e92bc..9cd6e68 100644 --- a/psdc-ui/src/views/system/device/index.vue +++ b/psdc-ui/src/views/system/device/index.vue @@ -100,7 +100,8 @@ @@ -141,6 +142,11 @@ onMounted(()=>{ KeyList() getSyList() }) +const pickerOptions = ref( + { // 日期时间选择器的选项 + format: 'yyyy-MM-dd HH:mm:ss', // 设置日期时间的格式 + valueStrictly: true, // 严格匹配绑定的值，避免用户选择的日期时间与绑定的值不同步的问题 + }, ) /** 筛选处理 */ const data = reactive({ items:[ @@ -349,20 +355,21 @@ function handleXg(dat) { title1.value = "修改密钥"; open1.value = true; }; +function convertISODate(isoString) { + let date = new Date(isoString); + let year = date.getFullYear(); + let month = ("0" + (date.getMonth() + 1)).slice(-2); + let day = ("0" + date.getDate()).slice(-2); + let hour = ("0" + date.getHours()).slice(-2); + let minute = ("0" + date.getMinutes()).slice(-2); + let second = ("0" + date.getSeconds()).slice(-2); + return year + "-" + month + "-" + day + " " + hour + ":" + minute + ":" + second; +} function submitForm1() { for (let i in addForm1.cpuId){ addForm1.cpuId[i]=addForm1.cpuId[i].value } - const dateString = addForm1.time; - const date = new Date(dateString); - const formattedDate = date.toLocaleString('zh-CN', { - year: 'numeric', - month: '2-digit', - day: '2-digit', - hour: '2-digit', - minute: '2-digit', - second: '2-digit' - }); + let formattedDate = convertISODate(addForm1.time); setKey2({ "id": addForm1.id, "cpuIds": addForm1.cpuId, diff --git a/psdc-ui/src/views/system/model/index.vue b/psdc-ui/src/views/system/model/index.vue index df921dd..42c8efe 100644 --- a/psdc-ui/src/views/system/model/index.vue +++ b/psdc-ui/src/views/system/model/index.vue @@ -1,340 +1,858 @@ \ No newline at end of file