From 264fa2ebd90ba2745d23aed1ad3786d55d838ec6 Mon Sep 17 00:00:00 2001
From: jiminglei <836545853@qq.com>
Date: Wed, 20 Mar 2024 17:13:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=81=E9=92=A5=E4=B8=BA?=
 =?UTF-8?q?=E5=85=AC=E9=92=A5=20cpuid=E4=B8=BA=E6=8E=88=E6=9D=83=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 psdc-ui/src/views/bigview/index.vue       | 283 ++++++++++++----------
 psdc-ui/src/views/system/cl/index.vue     |   3 +-
 psdc-ui/src/views/system/device/index.vue |  14 +-
 psdc-ui/src/views/system/model/index.vue  |   2 +-
 4 files changed, 170 insertions(+), 132 deletions(-)

diff --git a/psdc-ui/src/views/bigview/index.vue b/psdc-ui/src/views/bigview/index.vue
index 25da69b..ceaeed7 100644
--- a/psdc-ui/src/views/bigview/index.vue
+++ b/psdc-ui/src/views/bigview/index.vue
@@ -7,22 +7,31 @@
        <div class="inp">
          <div class="inp1">
              <div class="inp2">
-               <div class="tex">私钥：</div>
+               <div class="tex">公钥：</div>
                <el-input v-model="value" placeholder="请选择"   style="margin-right: 1vh;width: 31vh" disabled>
                </el-input>
              </div>
-             <div class="inp3">
-             <div class="tex">cpuid：</div>
-             <div class="box">
+           <div class="inp2" style="margin-top: 1vh">
+             <div class="tex">授权时间：</div>
+             <el-date-picker
+                 v-model="input1"
+                 type="datetime"
+                 :picker-options="pickerOptions"
+                 placeholder="选择日期">
+             </el-date-picker>
+           </div>
+<!--             <div class="inp3">-->
+<!--             <div class="tex">cpuid：</div>-->
+<!--             <div class="box">-->
 
-                   <el-input v-model="input1" placeholder="请输入cpuid或者Mac地址" style="width: 25vh;margin-top: 1vh"></el-input>
-                   <el-input v-for="(input, index) in inputs" :key="index" v-model="input.value" placeholder="请输入cpuid或者Mac地址" style="width: 25vh;margin-top: 1vh" ></el-input>
+<!--                   <el-input v-model="input1" placeholder="请输入cpuid或者Mac地址" style="width: 25vh;margin-top: 1vh"></el-input>-->
+<!--                   <el-input v-for="(input, index) in inputs" :key="index" v-model="input.value" placeholder="请输入cpuid或者Mac地址" style="width: 25vh;margin-top: 1vh" ></el-input>-->
 
 
-             </div>
-              </div>
-             <el-button @click="addInput">添加</el-button>
-             <el-button @click="delInput">删除</el-button>
+<!--             </div>-->
+<!--              </div>-->
+<!--             <el-button @click="addInput">添加</el-button>-->
+<!--             <el-button @click="delInput">删除</el-button>-->
              <div class="inp2" style="margin-top: 1vh">
              <div class="tex">有效期至：</div>
              <el-date-picker
@@ -43,9 +52,9 @@
                </el-option>
              </el-select>
            </div>
-             <el-button @click="toResult">生成</el-button>
+             <el-button @click="toResult" style="width: 60px">生成</el-button>
          </div>
-         <div class="inp1">
+         <div class="inp4">
            <el-input
                type="textarea"
                :autosize="{ minRows: 1, maxRows: 15}"
@@ -101,6 +110,7 @@ onMounted(()=>{
   console.log(today + " " + time);
 
   value1.value= today+ " " + time
+  input1.value= today+ " " + time
 
   getKey().then((res)=>{
     keyList.value= res.data
@@ -209,129 +219,138 @@ function delInput() {
 }
 
 function toResult(){
-  let formattedDate = convertISODate(value1.value);
-  console.log(formattedDate)
-  if(inputs.value.length==0){
-    if(input1.value){
-      resultKey(
-          {
-            "cpuIds": [
-              input1.value,
-            ],
-            "key": value.value,
-            "expiration": formattedDate,
-            "companyname": value2.value
-          }
-      ).then((res)=>{
-        ElMessage({type:"success",message:'生成成功！'})
-        result.value=res.key
-      })
-    }else {
-      ElMessage({
-        message: 'cpuId输入框不能为空',
-        type: 'error',
-      })
-    }
-
-
-  }else if (inputs.value.length==1){
-    if(input1.value  && inputs.value[0].value){
-      resultKey(
-          {
-            "cpuIds": [
-              input1.value,
-              inputs.value[0].value,
-            ],
-            "key": value.value,
-            "expiration": formattedDate,
-            "companyname": value2.value
-          }
-      ).then((res)=>{
-        ElMessage({type:"success",message:'生成成功！'})
-        result.value=res.key
-      })
-    }else {
-      ElMessage({
-        message: 'cpuId输入框不能为空',
-        type: 'error',
-      })
-    }
-  }
-  else if (inputs.value.length==2){
-    if(input1.value && inputs.value[0].value && inputs.value[1].value){
-      resultKey(
+  let formattedDate1 = convertISODate(input1.value);
+  let formattedDate2 = convertISODate(value1.value);
+  resultKey(
           {
-            "cpuIds": [
-              input1.value,
-              inputs.value[0].value,
-              inputs.value[1].value,
-            ],
+            "cpuIds": formattedDate1,
             "key": value.value,
-            "expiration": formattedDate,
+            "expiration": formattedDate2,
             "companyname": value2.value
           }
       ).then((res)=>{
         ElMessage({type:"success",message:'生成成功！'})
         result.value=res.key
       })
-    }else {
-      ElMessage({
-        message: 'cpuId输入框不能为空',
-        type: 'error',
-      })
-    }
-  }
-  else if (inputs.value.length==3){
-    if(input1.value && inputs.value[0].value && inputs.value[1].value && inputs.value[2].value){
-      resultKey(
-          {
-            "cpuIds": [
-              input1.value,
-              inputs.value[0].value,
-              inputs.value[1].value,
-              inputs.value[2].value,
-            ],
-            "key": value.value,
-            "expiration": formattedDate,
-            "companyname": value2.value
-          }
-      ).then((res)=>{
-        ElMessage({type:"success",message:'生成成功！'})
-        result.value=res.key
-      })
-    }else {
-      ElMessage({
-        message: 'cpuId输入框不能为空',
-        type: 'error',
-      })
-    }
-  }
-  else if (inputs.value.length==4){
-    if(input1.value && inputs.value[0].value && inputs.value[1].value && inputs.value[2].value && inputs.value[3].value){
-      resultKey(
-          {
-            "cpuIds": [
-              input1.value,
-              inputs.value[0].value,
-              inputs.value[1].value,
-              inputs.value[2].value,
-              inputs.value[3].value,
-            ],
-            "key": value.value,
-            "expiration": formattedDate,
-            "companyname": value2.value
-          }
-      ).then((res)=>{
-        ElMessage({type:"success",message:'生成成功！'})
-        result.value=res.key
-      })
-    }else {
-      ElMessage({
-        message: 'cpuId输入框不能为空',
-        type: 'error',
-      })
-    }
-  }
+  // if(inputs.value.length==0){
+  //   if(input1.value){
+  //     resultKey(
+  //         {
+  //           "cpuIds": input1.value,
+  //           "key": value.value,
+  //           "expiration": formattedDate,
+  //           "companyname": value2.value
+  //         }
+  //     ).then((res)=>{
+  //       ElMessage({type:"success",message:'生成成功！'})
+  //       result.value=res.key
+  //     })
+  //   }else {
+  //     ElMessage({
+  //       message: 'cpuId输入框不能为空',
+  //       type: 'error',
+  //     })
+  //   }
+  //
+  //
+  // }else if (inputs.value.length==1){
+  //   if(input1.value  && inputs.value[0].value){
+  //     resultKey(
+  //         {
+  //           "cpuIds": [
+  //             input1.value,
+  //             inputs.value[0].value,
+  //           ],
+  //           "key": value.value,
+  //           "expiration": formattedDate,
+  //           "companyname": value2.value
+  //         }
+  //     ).then((res)=>{
+  //       ElMessage({type:"success",message:'生成成功！'})
+  //       result.value=res.key
+  //     })
+  //   }else {
+  //     ElMessage({
+  //       message: 'cpuId输入框不能为空',
+  //       type: 'error',
+  //     })
+  //   }
+  // }
+  // else if (inputs.value.length==2){
+  //   if(input1.value && inputs.value[0].value && inputs.value[1].value){
+  //     resultKey(
+  //         {
+  //           "cpuIds": [
+  //             input1.value,
+  //             inputs.value[0].value,
+  //             inputs.value[1].value,
+  //           ],
+  //           "key": value.value,
+  //           "expiration": formattedDate,
+  //           "companyname": value2.value
+  //         }
+  //     ).then((res)=>{
+  //       ElMessage({type:"success",message:'生成成功！'})
+  //       result.value=res.key
+  //     })
+  //   }else {
+  //     ElMessage({
+  //       message: 'cpuId输入框不能为空',
+  //       type: 'error',
+  //     })
+  //   }
+  // }
+  // else if (inputs.value.length==3){
+  //   if(input1.value && inputs.value[0].value && inputs.value[1].value && inputs.value[2].value){
+  //     resultKey(
+  //         {
+  //           "cpuIds": [
+  //             input1.value,
+  //             inputs.value[0].value,
+  //             inputs.value[1].value,
+  //             inputs.value[2].value,
+  //           ],
+  //           "key": value.value,
+  //           "expiration": formattedDate,
+  //           "companyname": value2.value
+  //         }
+  //     ).then((res)=>{
+  //       ElMessage({type:"success",message:'生成成功！'})
+  //       result.value=res.key
+  //     })
+  //   }else {
+  //     ElMessage({
+  //       message: 'cpuId输入框不能为空',
+  //       type: 'error',
+  //     })
+  //   }
+  // }
+  // else if (inputs.value.length==4){
+  //   if(input1.value && inputs.value[0].value && inputs.value[1].value && inputs.value[2].value && inputs.value[3].value){
+  //     resultKey(
+  //         {
+  //           "cpuIds": [
+  //             input1.value,
+  //             inputs.value[0].value,
+  //             inputs.value[1].value,
+  //             inputs.value[2].value,
+  //             inputs.value[3].value,
+  //           ],
+  //           "key": value.value,
+  //           "expiration": formattedDate,
+  //           "companyname": value2.value
+  //         }
+  //     ).then((res)=>{
+  //       ElMessage({type:"success",message:'生成成功！'})
+  //       result.value=res.key
+  //     })
+  //   }else {
+  //     ElMessage({
+  //       message: 'cpuId输入框不能为空',
+  //       type: 'error',
+  //     })
+  //   }
+  // }
 }
 
 </script>
@@ -357,13 +376,15 @@ function toResult(){
       width: 100%;
       height: 73%;
       display: flex;
-
       justify-content: space-around;
       .inp1{
         width: 45%;
         height: 90%;
         padding: 2vh;
         border: 1px solid white;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-around;
         .inp2{
           margin-bottom: 1vh;
           display: flex;
@@ -386,6 +407,12 @@ function toResult(){
         }
       }
     }
+    .inp4{
+      width: 45%;
+      height: 90%;
+      padding: 2vh;
+      border: 1px solid white;
+    }
   }
 }
 </style>
diff --git a/psdc-ui/src/views/system/cl/index.vue b/psdc-ui/src/views/system/cl/index.vue
index 59413b5..995099a 100644
--- a/psdc-ui/src/views/system/cl/index.vue
+++ b/psdc-ui/src/views/system/cl/index.vue
@@ -21,7 +21,8 @@
         <div class="dev_control_table">
           <el-table :data="data.timingList" height="450px">
             <el-table-column label="序号" align="center"  width="50"  type="index"/>
-            <el-table-column label="私钥" align="center" prop="keyValue" width="300"/>
+            <el-table-column label="私钥" align="center" prop="privateKey" width="300"/>
+            <el-table-column label="公钥" align="center" prop="publicKey" width="300"/>
             <el-table-column label="授权单位" align="center" prop="keyUnit" width="300"/>
             <el-table-column label="创建时间" align="center" prop="createTime"/>
             <el-table-column label="更新时间" align="center" prop="updateTime"/>
diff --git a/psdc-ui/src/views/system/device/index.vue b/psdc-ui/src/views/system/device/index.vue
index 9cd6e68..b6f3727 100644
--- a/psdc-ui/src/views/system/device/index.vue
+++ b/psdc-ui/src/views/system/device/index.vue
@@ -23,7 +23,7 @@
             <el-table-column label="序号" align="center"  width="50"  type="index"/>
             <el-table-column label="密钥" align="center" prop="keyValue" width="300"/>
             <el-table-column label="授权单位" align="center" prop="keyUnit" width="200"/>
-            <el-table-column label="cpuId" align="center" prop="cpuIds" width="200"/>
+            <el-table-column label="授权时间" align="center" prop="cpuIds" width="200"/>
             <el-table-column label="有效期至" align="center" prop="exportDate" width="200"/>
             <el-table-column label="创建时间" align="center" prop="createTime"/>
             <el-table-column label="更新时间" align="center" prop="updateTime"/>
@@ -348,7 +348,17 @@ function handleXg(dat) {
   addForm1.id=dat.id
   addForm1.strategyName=dat.keyUnit
   addForm1.time=dat.exportDate
-  addForm1.cpuId=JSON.parse(dat.cpuIds)
+  // 移除开头的 "[" 和结尾的 "]"
+  let trimmedString = dat.cpuIds.slice(1, -1);
+
+// 使用 split 方法按照 ',' 分割字符串
+  let array = trimmedString.split(',');
+
+// 去除每个元素的前后空格，并转换为大写（如果需要）
+  let resultArray = array.map(function(item) {
+    return item.trim().toUpperCase();
+  });
+  addForm1.cpuId=resultArray
   for (let i in addForm1.cpuId){
     addForm1.cpuId[i]={value:addForm1.cpuId[i]}
   }
diff --git a/psdc-ui/src/views/system/model/index.vue b/psdc-ui/src/views/system/model/index.vue
index 02a1b8e..4a312dc 100644
--- a/psdc-ui/src/views/system/model/index.vue
+++ b/psdc-ui/src/views/system/model/index.vue
@@ -545,7 +545,7 @@ const rules = reactive({
 })
 const addForm = reactive({
   id: null,
-  key:"0lE4R+SpaJ/eoTXTZWDmSxYF22DKuKHLrIQKLwSQgRaiMSwBEJTC89V1mly7DR3FgpyutYamHKEa11/7GWHRPfE/X4Md4+7oUx7snfSAi58qNb86KAllSUsAM78+JHLM",
+  key:"0lE4R+SpaJ/eoTXTZWDmSxYF22DKuKHLrIQKLwSQgRZ4C5TomOMsyk2/EBxYFqCSOZU6UlfZDBkVtWn1xUqevfE/X4Md4+7oUx7snfSAi58qNb86KAllSUsAM78+JHLM",
   devType: null,//电锅炉or热泵
   devSubType: null,
   devTechType: null,