diff --git a/psdc-ui/src/api/emonitor/api.js b/psdc-ui/src/api/emonitor/api.js
index ca2a1e9..2a1aaca 100644
--- a/psdc-ui/src/api/emonitor/api.js
+++ b/psdc-ui/src/api/emonitor/api.js
@@ -112,7 +112,24 @@ export function setKey(data) {
 export function getKey() {
     return request.get('system/key/selAll')
 }
-//修改私钥
+//生成密钥
 export function resultKey(data) {
     return request.post('system/key/getKey',data)
-}
\ No newline at end of file
+}
+
+
+//密钥管理
+//密钥分页查询
+export function getKeyList2(data) {
+    return request.post('system/secret/key/byPage',data)
+}
+
+//删除密钥
+export function deleteKey2(data) {
+    return request.post('system/secret/key/delById',data)
+}
+//修改密钥
+export function setKey2(data) {
+    return request.post('system/secret/key/upKeyData',data)
+}
+
diff --git a/psdc-ui/src/views/bigview/index.vue b/psdc-ui/src/views/bigview/index.vue
index b87e0f2..cc2d602 100644
--- a/psdc-ui/src/views/bigview/index.vue
+++ b/psdc-ui/src/views/bigview/index.vue
@@ -8,24 +8,14 @@
          <div class="inp1">
              <div class="inp2">
                <div class="tex">私钥：</div>
-               <el-select v-model="value" placeholder="请选择"   style="margin-right: 1vh;width: 31vh">
-                 <el-option
-                     v-for="item in keyList"
-                     :key="item.key"
-                     :label="item.key"
-                     :value="item.key">
-                 </el-option>
-               </el-select>
+               <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">
 
                    <el-input v-model="input1" placeholder="请输入cpuid" style="width: 25vh;margin-top: 1vh"></el-input>
-
-
-                   <el-input v-model="input2" placeholder="请输入cpuid" style="width: 25vh;margin-top: 1vh"></el-input>
-
                    <el-input v-for="(input, index) in inputs" :key="index" v-model="input.value" placeholder="请输入cpuid" style="width: 25vh;margin-top: 1vh" ></el-input>
 
 
@@ -73,14 +63,12 @@ import { ElMessage } from 'element-plus'
 import {ref, onMounted, watch,reactive} from 'vue'
 import {useRouter} from "vue-router";
 const router = useRouter();
-const input1 = ref('BFEBFBFF00090672')
-const input2 = ref('BFEBFBFF000806EA')
+const input1 = ref('')
 const value1 = ref('')
 const value2 = ref('')
 const value = ref('')
 const result = ref('')
-const inputs = ref([
-])
+const inputs = ref([])
 const keyList = ref([])
 
 
@@ -112,8 +100,8 @@ onMounted(()=>{
 })
 function addInput() {
   if(inputs.value.length==0){
-    if(input1.value && input2.value){
-      if(inputs.value.length<3){
+    if(input1.value){
+      if(inputs.value.length<4){
         inputs.value.push({ value: '' });
       }else {
         ElMessage({
@@ -128,8 +116,8 @@ function addInput() {
       })
     }
   }else if (inputs.value.length==1){
-    if(input1.value && input2.value && inputs.value[0].value){
-      if(inputs.value.length<3){
+    if(input1.value && inputs.value[0].value){
+      if(inputs.value.length<4){
         inputs.value.push({ value: '' });
       }else {
         ElMessage({
@@ -145,8 +133,8 @@ function addInput() {
     }
   }
   else if (inputs.value.length==2){
-    if(input1.value && input2.value && inputs.value[0].value && inputs.value[1].value){
-      if(inputs.value.length<3){
+    if(input1.value && inputs.value[0].value && inputs.value[1].value){
+      if(inputs.value.length<4){
         inputs.value.push({ value: '' });
       }else {
         ElMessage({
@@ -162,8 +150,25 @@ function addInput() {
     }
   }
   else if (inputs.value.length==3){
-    if(input1.value && input2.value && inputs.value[0].value && inputs.value[1].value && inputs.value[2].value){
-      if(inputs.value.length<3){
+    if(input1.value && inputs.value[0].value && inputs.value[1].value && inputs.value[2].value){
+      if(inputs.value.length<4){
+        inputs.value.push({ value: '' });
+      }else {
+        ElMessage({
+          message: 'cpuId最多可添加5个',
+          type: 'warning',
+        })
+      }
+    }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){
+      if(inputs.value.length<4){
         inputs.value.push({ value: '' });
       }else {
         ElMessage({
@@ -196,12 +201,11 @@ function toResult(){
     second: '2-digit'
   });
   if(inputs.value.length==0){
-    if(input1.value && input2.value){
+    if(input1.value){
       resultKey(
           {
             "cpuIds": [
               input1.value,
-              input2.value,
             ],
             "key": value.value,
             "expiration": formattedDate,
@@ -220,12 +224,11 @@ function toResult(){
 
 
   }else if (inputs.value.length==1){
-    if(input1.value && input2.value && inputs.value[0].value){
+    if(input1.value  && inputs.value[0].value){
       resultKey(
           {
             "cpuIds": [
               input1.value,
-              input2.value,
               inputs.value[0].value,
             ],
             "key": value.value,
@@ -244,12 +247,11 @@ function toResult(){
     }
   }
   else if (inputs.value.length==2){
-    if(input1.value && input2.value && inputs.value[0].value && inputs.value[1].value){
+    if(input1.value && inputs.value[0].value && inputs.value[1].value){
       resultKey(
           {
             "cpuIds": [
               input1.value,
-              input2.value,
               inputs.value[0].value,
               inputs.value[1].value,
             ],
@@ -269,15 +271,40 @@ function toResult(){
     }
   }
   else if (inputs.value.length==3){
-    if(input1.value && input2.value && inputs.value[0].value && inputs.value[1].value && inputs.value[2].value){
+    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,
-              input2.value,
               inputs.value[0].value,
               inputs.value[1].value,
               inputs.value[2].value,
+              inputs.value[3].value,
             ],
             "key": value.value,
             "expiration": formattedDate,
diff --git a/psdc-ui/src/views/system/cl/index.vue b/psdc-ui/src/views/system/cl/index.vue
index 287dd5b..59413b5 100644
--- a/psdc-ui/src/views/system/cl/index.vue
+++ b/psdc-ui/src/views/system/cl/index.vue
@@ -19,7 +19,7 @@
           </el-col>
         </el-row>
         <div class="dev_control_table">
-          <el-table :data="data.timingList" height="500px">
+          <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="keyUnit" width="300"/>
@@ -32,17 +32,14 @@
               </template>
             </el-table-column>
           </el-table>
-          <el-pagination
-              v-model:current-page="currentPage"
-              v-model:page-size="pageSize"
-              :page-sizes="[5, 10, 20, 50]"
-              :small="small"
-              :disabled="disabled"
-              :background="background"
-              layout="total, sizes, prev, pager, next, jumper"
+          <pagination
+              class="pag"
+              v-show="data.total > 0"
               :total="data.total"
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"/>
+              v-model:page="currentPage"
+              v-model:limit="pageSize"
+              @pagination="KeyList"
+          />
         </div>
       </el-col>
     </el-row>
@@ -156,10 +153,11 @@ function  handleCheckedCitiesChange(value) {
 function KeyList(){
   getKeyList({
     "keyUnit": data.sceneCode,
-    "pageCurrent": 1,
-    "pageSize": 10
+    "pageCurrent": currentPage.value,
+    "pageSize": pageSize.value
   }).then((res)=>{
      data.timingList=res.data
+    data.total=res.page.pageTotalRow
   })
 }
 /** 数据表格处理 */
@@ -170,32 +168,10 @@ const small = ref(false)
 const background = ref(false)
 const disabled = ref(false)
 const handleSizeChange = (val) => {
-  console.log(`${val}`)
-  getTb({
-    "sceneCode": data.sceneCode,
-
-    "pageNum": currentPage.value,
-
-    "pageSize": pageSize.value
-  }).then((res)=>{
-    console.log(res)
-    data.timingList=res.rows
-    data.total=res.total
-  })
+  KeyList()
 }
 const handleCurrentChange = (val) => {
-  console.log(`${val}`)
-  getTb({
-    "sceneCode": data.sceneCode,
-
-    "pageNum": currentPage.value,
-
-    "pageSize": pageSize.value
-  }).then((res)=>{
-    console.log(res)
-    data.timingList=res.rows
-    data.total=res.total
-  })
+  KeyList()
 }
 
 
@@ -373,7 +349,7 @@ const { queryParams } = toRefs(data);
 .dev_control_table{
   position: relative;
   width: 100%;
-  min-height: 745px;
+  min-height: 730px;
   background-color: #2F3D8A;
 }
 .taber{
@@ -393,10 +369,7 @@ const { queryParams } = toRefs(data);
   border-radius: 2px;
 }
 ::v-deep .el-pagination{
-  position: absolute;
-  bottom: 10px;
-  left: 50%;
-  transform: translateX(-50%);
+  transform: translateX(-10%);
 }
 ::v-deep .el-pagination__total{
   color: #f3ffff;
@@ -416,8 +389,6 @@ const { queryParams } = toRefs(data);
 ::v-deep .el-checkbox {
   width: 560px;
 }
-//::v-deep .el-dialog:not(.is-fullscreen){
-//  width: auto;
-//}
+
 </style>
 
diff --git a/psdc-ui/src/views/system/device/index.vue b/psdc-ui/src/views/system/device/index.vue
index 0a088d0..02e92bc 100644
--- a/psdc-ui/src/views/system/device/index.vue
+++ b/psdc-ui/src/views/system/device/index.vue
@@ -3,162 +3,63 @@
     <el-row :gutter="20">
       <el-col :span="24" :xs="24">
         <el-form :model="queryParams" ref="queryRef" :inline="true" label-width="88px">
-          <el-form-item label="模型名称:" prop="name">
-            <el-select v-model="data.sceneCode" placeholder="请选择" style="width: 240px" @change="changeSl">
-              <el-option label='所有' :value='null'  />
-              <el-option :label='item.label' :value='item.value'  :key="item.value" v-for="item in queryParams"/>
-            </el-select>
+          <el-form-item label="授权单位:" prop="name">
+            <el-input v-model="data.sceneCode" placeholder="请输入" style="width: 240px" >
+            </el-input>
           </el-form-item>
           <el-form-item>
+
             <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
             <el-button icon="Refresh" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" icon="Plus" @click="handleAdd">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-                type="info"
-                plain
-                icon="Upload"
-                @click="handleImport"
-                v-hasPermi="['system:user:import']"
-            >导入</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-                type="warning"
-                plain
-                icon="Download"
-                @click="handleExport"
-                v-hasPermi="['system:user:export']"
-            >导出</el-button>
+<!--            <el-button type="primary" icon="Plus" @click="handleAdd">生成</el-button>-->
           </el-col>
         </el-row>
         <div class="dev_control_table">
-          <el-table :data="data.timingList" height="500px">
-            <el-table-column label="序号" align="center" prop="deviceId" width="50"/>
-            <el-table-column label="设备名称" align="center" prop="deviceName"/>
-            <el-table-column label="是否可控" align="center" prop="isControl" />
-            <el-table-column label="设备位置" align="center" prop="deviceAddress"/>
-            <el-table-column label="设备状态" align="center" prop="devStatus"/>
-            <el-table-column label="设备Sn" align="center" prop="deviceSn"/>
-            <el-table-column label="当前功率(kW)" align="center" prop="totp"/>
-            <el-table-column label="总用电量(kWh)" align="center" prop="totWh"/>
-            <el-table-column label="温度(℃)" align="center" prop="temp"/>
-            <el-table-column label="进水温度(℃)" align="center" prop="tempIn"/>
-            <el-table-column label="出水温度(℃)" align="center" prop="tempOut"/>
-            <el-table-column label="操作" align="center" prop="handle" width="380">
-              <template v-slot="scope" style="display: flex">
-                <el-upload
-                    class="upload-demo"
-                    :action="data.url"
-                    :headers="data.headers"
-                    :on-preview="handlePreview1"
-                    :on-remove="handleRemove1"
-                    :before-remove="beforeRemove1"
-                    :data="data.getId"
-                    :on-success="success"
-                    multiple
-                    :limit="3"
-                    :on-exceed="handleExceed1"
-                    :file-list="data.fileList1">
-                  <el-button size="small" type="info" @click="getId(scope.row.deviceId)">点击上传图片</el-button>
-<!--                  <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>-->
-                </el-upload>
+          <el-table :data="data.timingList" height="600px">
+            <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="exportDate" width="200"/>
+            <el-table-column label="创建时间" align="center" prop="createTime"/>
+            <el-table-column label="更新时间" align="center" prop="updateTime"/>
+            <el-table-column label="操作" align="center" prop="handle">
+              <template v-slot="scope">
                 <el-button type="primary" size="small" icon="Edit" v-hasPermi="['system:cl:edit']" @click="handleXg(scope.row)">修改</el-button>
-                <el-button type="danger" size="small" :icon="Delete" @click="handleDel(scope.row.deviceId)">删除</el-button>
+                <el-button type="danger" size="small" :icon="Delete" @click="handleDel(scope.row.id)">删除</el-button>
               </template>
             </el-table-column>
           </el-table>
-          <el-pagination
-              v-model:current-page="currentPage"
-              v-model:page-size="pageSize"
-              :page-sizes="[5, 10, 20, 50]"
-              :small="small"
-              :disabled="disabled"
-              :background="background"
-              layout="total, sizes, prev, pager, next, jumper"
+          <pagination
+              class="pag"
+              v-show="data.total > 0"
               :total="data.total"
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"/>
+              v-model:page="currentPage"
+              v-model:limit="pageSize"
+              @pagination="KeyList"
+          />
         </div>
       </el-col>
     </el-row>
 
-    <el-dialog :title="data.upload.title" v-model="data.upload.open" width="400px" append-to-body>
-      <el-upload
-          ref="uploadRef"
-          :limit="1"
-          accept=".xlsx, .xls"
-          :headers="data.upload.headers"
-          :action="data.upload.url"
-          :disabled="data.upload.isUploading"
-          :on-progress="handleFileUploadProgress"
-          :on-success="handleFileSuccess"
-          :auto-upload="false"
-          drag
-      >
-        <el-icon class="el-icon--upload"><upload-filled /></el-icon>
-        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-        <template #tip>
-          <div class="el-upload__tip text-center">
-            <div class="el-upload__tip">
-              <el-checkbox v-model="data.upload.updateSupport" />是否更新已经存在的设备数据
-            </div>
-            <span>仅允许导入xls、xlsx格式文件。</span>
-            <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
-          </div>
-        </template>
-      </el-upload>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitFileForm">确 定</el-button>
-          <el-button @click="cancel2">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
+
 
     <!-- 新增对话框 -->
-    <el-dialog :title="title" v-model="open" width="600px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="800" append-to-body>
       <el-form :model="timingForm"  ref="userRef" label-width="88px">
         <el-row>
-          <el-col :span="24">
-            <el-form-item label="设备名称:" prop="deviceName" >
-              <el-input v-model="timingForm.deviceName" placeholder="请输入设备名称"  />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="模型列表:"  >
-              <el-select v-model="timingForm.deviceModel" placeholder="模型列表">
-                <el-option v-for="item in data.queryParams" :key="item.value" :label="item.label" :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="是否可控:"  >
-              <el-select v-model="timingForm.isControl" placeholder="是否可控">
-                <el-option label="可控" :value=2></el-option>
-                <el-option label="不可控" :value=1></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="设备Sn:" prop="deviceSn" >
-              <el-input v-model="timingForm.deviceSn" placeholder="请输入设备Sn" />
+          <el-col :span="18">
+            <el-form-item label="授权单位:" prop="sceneName" >
+              <el-input v-model="addForm.strategyName" placeholder="请输入授权单位"  />
             </el-form-item>
           </el-col>
-<!--          <el-col :span="24">-->
-<!--            <el-form-item label="开始时间:" prop="startTime" >-->
-<!--              <el-input v-model="timingForm.startTime" placeholder="示例：2023-05-11 10:40:29" />-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-          <el-col :span="24">
-            <el-form-item label="设备地址:" prop="deviceAddress">
-              <el-input v-model="timingForm.deviceAddress" placeholder="请输入设备地址"  />
+          <el-col :span="8">
+            <el-form-item label="授权单位:" prop="sceneName" >
+              <el-input v-model="addForm.strategyName" placeholder="请输入授权单位"  />
             </el-form-item>
           </el-col>
         </el-row>
@@ -174,40 +75,49 @@
     <el-dialog :title="title1" v-model="open1" width="600px" append-to-body>
       <el-form :model="timingForm1"  ref="userRef" label-width="88px">
         <el-row>
-          <el-col :span="24">
-            <el-form-item label="设备名称:" prop="deviceName" >
-              <el-input v-model="timingForm1.deviceName" placeholder="请输入设备名称"  />
+          <el-col :span="16">
+            <el-form-item label="私钥:" >
+              <el-input v-model="addForm1.key" placeholder="请输入私钥" maxlength="11" disabled/>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="模型列表:"  >
-              <el-select v-model="timingForm1.deviceModel" placeholder="模型列表">
-                <el-option v-for="item in data.queryParams" :key="item.value" :label="item.label" :value="item.value">
+        </el-row>
+        <el-row>
+          <el-col :span="16">
+            <el-form-item label="授权单位:" >
+              <el-select v-model="addForm1.strategyName" placeholder="请输入授权单位" maxlength="11" >
+                <el-option
+                    v-for="item in keyList"
+                    :key="item.unit"
+                    :label="item.unit"
+                    :value="item.unit">
                 </el-option>
-              </el-select>
+                </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="是否可控:"  >
-              <el-select v-model="timingForm1.isControl" placeholder="是否可控">
-                <el-option label="可控" :value=2></el-option>
-                <el-option label="不可控" :value=1></el-option>
-              </el-select>
+        </el-row>
+        <el-row>
+          <el-col :span="16">
+            <el-form-item label="有效期至:" >
+              <el-date-picker
+                  v-model="addForm1.time"
+                  type="date"
+                  placeholder="选择日期">
+              </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="设备Sn:" prop="deviceSn" >
-              <el-input v-model="timingForm1.deviceSn" placeholder="请输入设备Sn" />
+        </el-row>
+        <el-row>
+          <el-col :span="16">
+            <el-form-item label="cpuId:" >
+              <el-input v-for="(item, index) in addForm1.cpuId" :key="index" v-model="item.value" placeholder="请输入cpuid" ></el-input>
             </el-form-item>
           </el-col>
-          <!--          <el-col :span="24">-->
-          <!--            <el-form-item label="开始时间:" prop="startTime" >-->
-          <!--              <el-input v-model="timingForm.startTime" placeholder="示例：2023-05-11 10:40:29" />-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
-          <el-col :span="24">
-            <el-form-item label="设备地址:" prop="deviceAddress">
-              <el-input v-model="timingForm1.deviceAddress" placeholder="请输入设备地址"  />
+        </el-row>
+        <el-row>
+          <el-col :span="16">
+            <el-form-item  >
+              <el-button @click="addInput">添加</el-button>
+              <el-button @click="delInput">删除</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -225,161 +135,142 @@
 <script setup name="Index">
 import {ElMessage,ElMessageBox} from 'element-plus'
 import {Delete} from '@element-plus/icons-vue'
-import {ref,reactive,watch,onMounted,} from "vue";
-import {getXl, getSbTab, postNew1, getSb, postXg1, postDel1, getYh, getMx,} from '../../../api/emonitor/api'
-import {getToken} from "@/utils/auth";
+import {ref,reactive,watch,onMounted} from "vue";
+import {getKeyList2, getKey, deleteKey2,setKey2} from '../../../api/emonitor/api'
 onMounted(()=>{
-  // getSb().then((res)=>{
-  //   var arr = []
-  //   for(var i in res.data){
-  //     arr=arr.concat(res.data[i].children)
-  //   }
-  //   console.log('sblb',arr)
-  //   data.sblb=arr
-  // })
-  getMx().then((res)=>{
-    console.log(res)
-    data.queryParams=res.data
-  })
-  // getYh().then((res)=>{
-  //   console.log(res)
-  //   data.queryParams=res.data
-  // })
-  getSbTab({
-    "deviceId":0,
-
-    "deviceModel":data.sceneCode,
-
-    "pageNum": currentPage.value,
-
-    "pageSize": pageSize.value
-  }).then((res)=>{
-    console.log(res)
-    data.timingList=res.rows
-    data.total=res.total
-    for(let i in res.rows){
-      if(res.rows[i].isControl==2){
-        res.rows[i].isControl='可控'
-      }else if(res.rows[i].isControl==1){
-        res.rows[i].isControl='不可控'
-      }
-    }
-  })
-  // postNew().then((res)=>{
-  //   console.log(res)
-  // })
+  KeyList()
+  getSyList()
 })
-
 /** 筛选处理 */
 const data = reactive({
-
-  url:import.meta.env.VITE_APP_BASE_API + "/system/device/index/daoruDevTuPian",
-  headers: { Authorization: "Bearer " + getToken() },
-  getId:{
-    deviceId:1
-  },
-  fileList1:[],
-  form:{},
-  upload:{
-    // 是否显示弹出层（用户导入）
-    open: false,
-    // 弹出层标题（用户导入）
-    title: "",
-    // 是否禁用上传
-    isUploading: false,
-    // 是否更新已经存在的用户数据
-    updateSupport: 0,
-    // 设置上传的请求头部
-    headers: { Authorization: "Bearer " + getToken() },
-    // 上传的地址
-    url: import.meta.env.VITE_APP_BASE_API + "/system/device/index/daoruDevData"
-  },
-  MxList:[],
-  sblb:[],
+  items:[
+    { id: 1, title: '第1步', content: `步骤1的内容`,
+      sblb:[],
+      isIndeterminate:false,
+      checkedSblb: [],
+      checkAll:false,
+      sceneName:'',
+      sceneRemark:'',
+      deviceVos:[],
+      isJudge:null,
+      judgeDevice:null,
+      judgeElement:null,
+      judgeData:null }
+  ],
+  items1:[],
+  num:1,
+  activeNames:0,
+  checkAll: false,
+  checkedSblb: [],
+  checkAll1: false,
+  checkedSblb1: [],
+  sblb: [],
+  allsblb:[],
+  AllName:[],
+  isIndeterminate: false,
+  isIndeterminate1: false,
   total:'',
   timingList:[],
   queryParams: '',
-  queryParams1: {
-    "deviceModel": null
-  },
   sceneCode:null,
   dateRange:[],
+  postData:[],
 });
-const { queryParams1, form, rules } = toRefs(data);
-function success(response){
-  proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "上传结果", { dangerouslyUseHTMLString: true });
-}
-function getId(Id){
-  console.log(Id)
-  data.getId.deviceId=Id
-}
-function handleRemove1(file, fileList) {
-  console.log(file, fileList);
-}
-function handlePreview1(file) {
-  console.log(file);
-}
-function handleExceed1(files, fileList) {
-  this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+
+function addInput() {
+  if(addForm1.cpuId.length==0){
+    addForm1.cpuId.push({ value: '' });
+  }else if (addForm1.cpuId.length==1){
+    if(addForm1.cpuId[0].value){
+      addForm1.cpuId.push({ value: '' });
+    }else {
+      ElMessage({
+        message: 'cpuId输入框不能为空',
+        type: 'error',
+      })
+    }
+  }
+  else if (addForm1.cpuId.length==2){
+    if(addForm1.cpuId[0].value && addForm1.cpuId[1].value){
+      addForm1.cpuId.push({ value: '' });
+    }else {
+      ElMessage({
+        message: 'cpuId输入框不能为空',
+        type: 'error',
+      })
+    }
+  }
+  else if (addForm1.cpuId.length==3){
+    if(addForm1.cpuId[0].value && addForm1.cpuId[1].value && addForm1.cpuId[2].value){
+      addForm1.cpuId.push({ value: '' });
+    }else {
+      ElMessage({
+        message: 'cpuId输入框不能为空',
+        type: 'error',
+      })
+    }
+  }
+  else if (addForm1.cpuId.length==4){
+    if(addForm1.cpuId[0].value && addForm1.cpuId[1].value && addForm1.cpuId[2].value && addForm1.cpuId[3].value){
+      addForm1.cpuId.push({ value: '' });
+    }else {
+      ElMessage({
+        message: 'cpuId输入框不能为空',
+        type: 'error',
+      })
+    }
+  }
+  else if (addForm1.cpuId.length==5){
+    if(addForm1.cpuId[0].value && addForm1.cpuId[1].value && addForm1.cpuId[2].value && addForm1.cpuId[3].value && addForm1.cpuId[4].value){
+      ElMessage({
+        message: 'cpuId最多可添加5个',
+        type: 'warning',
+      })
+    }else {
+      ElMessage({
+        message: 'cpuId输入框不能为空',
+        type: 'error',
+      })
+    }
+  }
 }
-function beforeRemove1(file, fileList) {
-  return this.$confirm(`确定移除 ${ file.name }？`);
+
+function delInput() {
+  addForm1.cpuId.pop()
 }
-//改变
+
 function changeSl(){
   console.log(data.sceneCode)
 }
 //搜索按钮
 function handleQuery(){
-  getSbTab({
-    "deviceId":0,
-
-    "deviceModel":data.sceneCode,
-
-    "pageNum": currentPage.value,
-
-    "pageSize": pageSize.value
-  }).then((res)=>{
-    console.log(res)
-    data.timingList=res.rows
-    data.total=res.total
-    for(let i in res.rows){
-      if(res.rows[i].isControl==2){
-        res.rows[i].isControl='可控'
-      }else if(res.rows[i].isControl==1){
-        res.rows[i].isControl='不可控'
-      }
-    }
-  })
+  KeyList()
 }
 //重置按钮
 function resetQuery(){
   data.sceneCode=null
   currentPage.value=1
   pageSize.value=10
-  getSbTab({
-    "deviceId":0,
-
-    "deviceModel":null,
-
-    "pageNum": currentPage.value,
+  KeyList()
+}
 
+function  handleCheckedCitiesChange(value) {
+  let checkedCount = value.length;
+  data.checkAll = checkedCount === data.sblb.length;
+  data.isIndeterminate = checkedCount > 0 && checkedCount < data.sblb.length;
+}
+//分页查询密钥
+function KeyList(){
+  getKeyList2({
+    "keyUnit": data.sceneCode,
+    "pageCurrent": currentPage.value,
     "pageSize": pageSize.value
   }).then((res)=>{
     console.log(res)
-    data.timingList=res.rows
-    data.total=res.total
-    for(let i in res.rows){
-      if(res.rows[i].isControl==2){
-        res.rows[i].isControl='可控'
-      }else if(res.rows[i].isControl==1){
-        res.rows[i].isControl='不可控'
-      }
-    }
+    data.timingList=res.data
+    data.total=res.page.pageTotalRow
   })
 }
-
-
 /** 数据表格处理 */
 
 const currentPage = ref(1)
@@ -387,297 +278,230 @@ const pageSize = ref(10)
 const small = ref(false)
 const background = ref(false)
 const disabled = ref(false)
-const handleSizeChange = (val) => {
-  console.log(`${val}`)
-  getSbTab({
-    "deviceId":0,
-
-    "deviceModel":data.sceneCode,
-
-    "pageNum": currentPage.value,
-
-    "pageSize": pageSize.value
-  }).then((res)=>{
-    console.log(res)
-    data.timingList=res.rows
-    data.total=res.total
-    for(let i in res.rows){
-      if(res.rows[i].isControl==2){
-        res.rows[i].isControl='可控'
-      }else if(res.rows[i].isControl==1){
-        res.rows[i].isControl='不可控'
-      }
-    }
-  })
-}
-const handleCurrentChange = (val) => {
-  console.log(`${val}`)
-  getSbTab({
-    "deviceId":0,
-
-    "deviceModel":data.sceneCode,
-
-    "pageNum": currentPage.value,
-
-    "pageSize": pageSize.value
-  }).then((res)=>{
-    console.log(res)
-    data.timingList=res.rows
-    data.total=res.total
-    for(let i in res.rows){
-      if(res.rows[i].isControl==2){
-        res.rows[i].isControl='可控'
-      }else if(res.rows[i].isControl==1){
-        res.rows[i].isControl='不可控'
-      }
-    }
-  })
-}
-const { proxy } = getCurrentInstance();
-function handleImport() {
-  data.upload.title = "设备导入";
-  data.upload.open = true;
-};
-/** 下载模板操作 */
-function importTemplate() {
-  proxy.download("system/device/index/downloadDevTemplate",{
-  }, `device_template_${new Date().getTime()}.xlsx`);
-};
-/**文件上传中处理 */
-const handleFileUploadProgress = (event, file, fileList) => {
-  data.upload.isUploading = true;
-};
-/** 文件上传成功处理 */
-const handleFileSuccess = (response, file, fileList) => {
-  data.upload.open = false;
-  data.upload.isUploading = false;
-  proxy.$refs["uploadRef"].handleRemove(file);
-  proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
-  getSbTab({
-    "deviceId":0,
-
-    "deviceModel":data.sceneCode,
-
-    "pageNum": currentPage.value,
-
-    "pageSize": pageSize.value
-  }).then((res)=>{
-    console.log(res)
-    data.timingList=res.rows
-    data.total=res.total
-    for(let i in res.rows){
-      if(res.rows[i].isControl==2){
-        res.rows[i].isControl='可控'
-      }else if(res.rows[i].isControl==1){
-        res.rows[i].isControl='不可控'
-      }
-    }
-  })
-};
-/** 提交上传文件 */
-function submitFileForm() {
-  proxy.$refs["uploadRef"].submit();
-};
-/** 重置操作表单 */
-function reset() {
-  data.form = {
-    userId: undefined,
-    userName: undefined,
-    nickName: undefined,
-    password: undefined,
-    phonenumber: undefined,
-    email: undefined,
-    sex: undefined,
-    status: "0",
-    remark: undefined,
-    roleIds: []
-  };
-  proxy.resetForm("userRef");
-};
-/** 取消按钮 */
-function cancel2() {
-  data.upload.open = false;
-  reset();
-};
-
-/** 导出按钮操作 */
-function handleExport() {
-  data.queryParams1.deviceModel = data.sceneCode
-  proxy.download("system/device/index/daochuDevs",{
-    ...queryParams1.value
-  },`device_${new Date().getTime()}.xlsx`);
-};
-/** 新增策略处理 */
+const keyList = ref([])
+/** 新增密钥处理 */
 const open = ref(false);
 const title = ref();
 const open1 = ref(false);
 const title1= ref();
 const activeName = ref('1')
+const addForm = reactive({
+  strategyName:'',
+})
+const addForm1 = reactive({
+  strategyName:'',
+  id:'',
+  time:'',
+  key:'',
+  cpuId:[]
+})
 const timingForm = reactive({
-  "parentId": 0,
-  "userId": 1,
-  "isControl":'',
-  "deviceType": 2,
-  "deviceSn": "",
-  "deviceName": "",
-  "hardVersion": "2.23",
-  "softVersion": "2.24",
-  "deviceAddress": '',
-  "startTime": null,
-  "deviceModel": "",
-  "photoUrl": null
+  sceneName:'',
 })
 const timingForm1 = reactive({
-  "deviceId":'',
-  "parentId": 0,
-  "userId": 1,
-  "isControl": '',
-  "deviceType": 2,
-  "deviceSn": "",
-  "deviceName": "",
-  "hardVersion": "2.23",
-  "softVersion": "2.24",
-  "deviceAddress": '',
-  "startTime": null,
-  "deviceModel": "",
-  "photoUrl": null
-
+  sceneName:'',
+  sceneRemark:'',
+  sceneCode:'',
+  deviceVos:[],
+  isJudge:null,
+  judgeDevice:null,
+  judgeElement:null,
+  judgeData:null
+  // deviceId:'',
+  // temp:'',
+  // intemp:'',
+  // outtemp:''
 })
 
-// const watchTime = watch(()=> timingForm.executeTime, (val) => {
-//   // console.log(val.toLocaleString())
-//   let date = new Date(val)
-//   let hours = date.getHours()
-//   let minutes = date.getMinutes()
-//   let seconds = date.getSeconds()
-//   console.log(`${hours}:${minutes}:${seconds}`)
-// })
-
-
-
+watch(() => addForm1.strategyName,(newVale,oldValue) => {
+  for(let i in keyList.value){
+    if(newVale === keyList.value[i].unit){
+      addForm1.key=keyList.value[i].key
+    }
+  }
+})
 function handleAdd() {
+  addForm.strategyName=''
   open.value = true;
-  title.value = "新增设备";
+  title.value = "生成密钥";
+
 };
-function submitForm() {
-  open.value = false;
-  console.log(timingForm)
-  postNew1(timingForm).then((res)=>{
-    console.log(res)
-    ElMessage({type:"success",message:'新增成功！'})
-    handleQuery()
-        timingForm.isControl='',
-        timingForm.deviceSn='',
-        timingForm.deviceName='',
-        timingForm.deviceAddress='',
-        timingForm.deviceModel=''
+function getSyList (){
+  getKey().then((res)=>{
+    keyList.value= res.data
+    console.log(keyList.value)
   })
+}
+function submitForm() {
+
 };
 function cancel() {
   open.value = false;
-      timingForm.isControl='',
-      timingForm.deviceSn='',
-      timingForm.deviceName='',
-      timingForm.deviceAddress='',
-      timingForm.deviceModel=''
 };
-function handleXg(data) {
+function handleXg(dat) {
+  addForm1.id=dat.id
+  addForm1.strategyName=dat.keyUnit
+  addForm1.time=dat.exportDate
+  addForm1.cpuId=JSON.parse(dat.cpuIds)
+  for (let i in addForm1.cpuId){
+    addForm1.cpuId[i]={value:addForm1.cpuId[i]}
+  }
+  title1.value = "修改密钥";
   open1.value = true;
-  title1.value = "修改设备";
-  console.log(data)
-  timingForm1.isControl=data.isControl
-  timingForm1.deviceSn=data.deviceSn
-  timingForm1.deviceName=data.deviceName
-  timingForm1.deviceAddress=data.deviceAddress
-  timingForm1.deviceModel=data.deviceModel
-  timingForm1.deviceId = data.deviceId
-  // if(sceneContext=='出水温度'){
-  //   timingForm1.outtemp=sceneValue
-  // }else if (sceneContext=='进水温度'){
-  //   timingForm1.intemp=sceneValue
-  // }else{
-  //   timingForm1.temp=sceneValue
-  // }
 };
 function submitForm1() {
-  open1.value = false;
-  if(timingForm1.isControl=='可控'){
-    timingForm1.isControl=2
-  }else if (timingForm1.isControl=='不可控'){
-    timingForm1.isControl=1
+  for (let i in addForm1.cpuId){
+    addForm1.cpuId[i]=addForm1.cpuId[i].value
   }
-  console.log(timingForm1)
-  postXg1({
-    "deviceId": timingForm1.deviceId,
-    "parentId": 0,
-    "userId": 1,
-    "deviceType": 2,
-    "deviceSn": timingForm1.deviceSn,
-    "deviceModel": timingForm1.deviceModel,
-    "deviceName": timingForm1.deviceName,
-    "deviceAddress": timingForm1.deviceAddress,
-    "isControl":timingForm1.isControl,
-    "photoUrl": null,
-    "createBy": null,
-    "createTime": null,
+  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'
+  });
+  setKey2({
+    "id": addForm1.id,
+    "cpuIds": addForm1.cpuId,
+    "key": addForm1.key,
+    "expiration": formattedDate,
+    "companyname": addForm1.strategyName
   }).then((res)=>{
     console.log(res)
     ElMessage({type:"success",message:'修改成功！'})
-    handleQuery()
-    timingForm1.isControl=''
-    timingForm1.deviceSn=''
-    timingForm1.deviceName=''
-    timingForm1.deviceAddress=''
-    timingForm1.deviceModel=''
-    timingForm1.deviceId=''
+    KeyList()
+    open1.value = false;
   })
 };
 function cancel1() {
   open1.value = false;
-  timingForm1.isControl=''
-  timingForm1.deviceSn=''
-  timingForm1.deviceName=''
-  timingForm1.deviceAddress=''
-  timingForm1.deviceModel=''
-  timingForm1.deviceId=''
 };
-function handleDel(data) {
-  ElMessageBox.confirm("是否确认删除此设备？", "提示",{
+function handleDel(strategyCode) {
+  ElMessageBox.confirm("是否确认删除此密钥？", "提示",{
     confirmButtonText: "确认",
     cancelButtonText: "取消",
     type: "warning"
   }).then(() => {
-    console.log(data)
-    postDel1([data]).then((res) => {
+    console.log(strategyCode)
+    deleteKey2(
+        {
+          "id": strategyCode
+        }
+    ).then((res) => {
       console.log(res)
       ElMessage({type:"success",message:'删除成功！'})
-      handleQuery()
+      KeyList()
     });
   })
 }
 
 
+//添加步骤
+const activeNames =reactive([1])
+const addStep = () => {
+  getSb1().then((res)=>{
+    console.log('222',res)
+    var arr = []
+    for(var i in res.data){
+      arr=arr.concat(res.data[i].children)
+    }
+    console.log('sblb',arr)
+    data.sblb=arr
+    const newId = data.items.length + 1
+    data.items.push({ id: newId, title: `第${newId}步`, content: `步骤${newId}的内容`,
+      sblb:data.sblb,
+      isIndeterminate:false,
+      checkedSblb: [],
+      checkAll:false,
+      sceneName:'',
+      sceneRemark:'',
+      deviceVos:[],
+      isJudge:null,
+      judgeDevice:null,
+      judgeElement:null,
+      judgeData:null})
+    activeNames.push(`${newId}`)
+  })
+}
+const removeStep = (id) => {
+  const index = data.items.findIndex(item => item.id === id)
+  if (index !== -1) {
+    data.items.splice(index, 1)
+    activeNames.splice(activeNames.indexOf(`${id}`), 1)
+  }
+  console.log(data.items)
+  console.log(activeNames)
+}
 
 
+//修改步骤
+const activeNames1 =reactive([1])
+const addStep1 = () => {
+  getSb1().then((res)=>{
+    console.log('222',res)
+    var arr = []
+    for(var i in res.data){
+      arr=arr.concat(res.data[i].children)
+    }
+    console.log('sblb',arr)
+    data.sblb=arr
+    const newId1 = data.items1.length + 1
+    data.items1.push({ id: newId1, title: `第${newId1}步`, content: `步骤${newId1}的内容`,
+      sblb:data.sblb,
+      isIndeterminate:false,
+      checkedSblb: [],
+      checkAll:false,
+      sceneName:'',
+      sceneRemark:'',
+      deviceVos:[],
+      isJudge:null,
+      judgeDevice:null,
+      judgeElement:null,
+      judgeData:null})
+    activeNames1.push(`${newId1}`)
+  })
+}
+const removeStep1 = (id) => {
+  const index = data.items1.findIndex(item => item.id === id)
+  if (index !== -1) {
+    data.items1.splice(index, 1)
+    activeNames1.splice(activeNames1.indexOf(`${id}`), 1)
+  }
+  console.log(data.items1)
+  console.log(activeNames1)
+}
 const { queryParams } = toRefs(data);
 </script>
 
 <style scoped lang="scss">
+
 .dev_control_table{
   position: relative;
   width: 100%;
-  min-height: 745px;
+  min-height: 730px;
   background-color: #2F3D8A;
 }
-
+.taber{
+  width: 400px;
+  margin-left: 52px;
+  display: flex;
+  justify-content: flex-start;
+  line-height: 32px;
+  span{
+    width: 120px;
+    &:nth-child(2),&:nth-child(3){
+      margin-left: 20px;
+    }
+  }
+}
 ::v-deep .el-button{
   border-radius: 2px;
 }
 ::v-deep .el-pagination{
-  position: absolute;
-  bottom: 10px;
-  left: 50%;
-  transform: translateX(-50%);
+  transform: translateX(-10%);
 }
 ::v-deep .el-pagination__total{
   color: #f3ffff;
@@ -694,10 +518,9 @@ const { queryParams } = toRefs(data);
 ::v-deep .el-form-item__content{
   //display: flex;
 }
-.upload-demo{
-  width: 10px;
-  height: 0px;
-  align-items: center;
-  position: center;
+::v-deep .el-checkbox {
+  width: 560px;
 }
-</style>
\ No newline at end of file
+
+</style>
+
diff --git a/psdc-ui/src/views/system/model/index.vue b/psdc-ui/src/views/system/model/index.vue
new file mode 100644
index 0000000..df921dd
--- /dev/null
+++ b/psdc-ui/src/views/system/model/index.vue
@@ -0,0 +1,340 @@
+<template>
+<div class="bod">
+  <div class="inp">
+    <el-form :model="timingForm"  ref="userRef" label-width="88px">
+      <el-row>
+        <el-col :span="4">
+          <el-form-item label="授权单位:" prop="sceneName" >
+            <el-input v-model="addForm.strategyName" placeholder="请输入授权单位"  />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="授权单位:" prop="sceneName" >
+            <el-input v-model="addForm.strategyName" placeholder="请输入授权单位"  />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="授权单位:" prop="sceneName" >
+            <el-input v-model="addForm.strategyName" placeholder="请输入授权单位"  />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="授权单位:" prop="sceneName" >
+            <el-input v-model="addForm.strategyName" placeholder="请输入授权单位"  />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="授权单位:" prop="sceneName" >
+            <el-input v-model="addForm.strategyName" placeholder="请输入授权单位"  />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="授权单位:" prop="sceneName" >
+            <el-input v-model="addForm.strategyName" placeholder="请输入授权单位"  />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="授权单位:" prop="sceneName" >
+            <el-input v-model="addForm.strategyName" placeholder="请输入授权单位"  />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="授权单位:" prop="sceneName" >
+            <el-input v-model="addForm.strategyName" placeholder="请输入授权单位"  />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="授权单位:" prop="sceneName" >
+            <el-input v-model="addForm.strategyName" placeholder="请输入授权单位"  />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="授权单位:" prop="sceneName" >
+            <el-input v-model="addForm.strategyName" placeholder="请输入授权单位"  />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="授权单位:" prop="sceneName" >
+            <el-input v-model="addForm.strategyName" placeholder="请输入授权单位"  />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="授权单位:" prop="sceneName" >
+            <el-input v-model="addForm.strategyName" placeholder="请输入授权单位"  />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="授权单位:" prop="sceneName" >
+            <el-input v-model="addForm.strategyName" placeholder="请输入授权单位"  />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="授权单位:" prop="sceneName" >
+            <el-input v-model="addForm.strategyName" placeholder="请输入授权单位"  />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="授权单位:" prop="sceneName" >
+            <el-input v-model="addForm.strategyName" placeholder="请输入授权单位"  />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="授权单位:" prop="sceneName" >
+            <el-input v-model="addForm.strategyName" placeholder="请输入授权单位"  />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="授权单位:" prop="sceneName" >
+            <el-input v-model="addForm.strategyName" placeholder="请输入授权单位"  />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="4">
+          <el-form-item  >
+            <el-button type="primary" @click="submitForm">计 算</el-button>
+            <el-button @click="cancel">重 置</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+  <div class="result" v-if="show1">
+     <div class="point">
+       <el-form :model="timingForm"  ref="userRef" label-width="88px">
+         <el-row>
+           <el-col :span="4">
+             <el-form-item label="方案1:"  >
+               <el-rate
+                   v-model="point"
+                   disabled
+                   show-score
+                   :score-template="point1"
+                   text-color="#ffffff"
+                   class="rate"
+               />
+             </el-form-item>
+           </el-col>
+           <el-col :span="4">
+             <el-form-item label="方案2:"  >
+               <el-rate
+                   v-model="point"
+                   disabled
+                   show-score
+                   :score-template="point1"
+                   text-color="#ffffff"
+                   class="rate"
+               />
+             </el-form-item>
+           </el-col>
+           <el-col :span="4">
+             <el-form-item label="方案3:"  >
+               <el-rate
+                   v-model="point"
+                   disabled
+                   show-score
+                   :score-template="point1"
+                   text-color="#ffffff"
+                   class="rate"
+               />
+             </el-form-item>
+           </el-col>
+           <el-col :span="4">
+             <el-form-item label="方案4:"  >
+               <el-rate
+                   v-model="point"
+                   disabled
+                   show-score
+                   :score-template="point1"
+                   text-color="#ffffff"
+                   class="rate"
+               />
+             </el-form-item>
+           </el-col>
+           <el-col :span="4">
+             <el-form-item label="方案5:"  >
+               <el-rate
+                   v-model="point"
+                   disabled
+                   show-score
+                   :score-template="point1"
+                   text-color="#ffffff"
+                   class="rate"
+               />
+             </el-form-item>
+           </el-col>
+           <el-col :span="4">
+             <el-form-item label="方案6:"  >
+               <el-rate
+                   v-model="point"
+                   disabled
+                   show-score
+                   :score-template="point1"
+                   text-color="#ffffff"
+                   class="rate"
+               />
+             </el-form-item>
+           </el-col>
+         </el-row>
+       </el-form>
+     </div>
+  </div>
+  <div class="result" v-if="show1">
+    <div class="til">
+      最佳方案：方案一
+    </div>
+    <div class="info">
+      <div class="card">
+        一、整体情况
+      </div>
+      <div class="card">
+        <el-form :model="timingForm"  ref="userRef" label-width="140px">
+        <el-row>
+          <el-col :span="4">
+            <el-form-item label="初次投资费用(万元):" prop="sceneName" >
+              <el-input v-model="addForm.strategyName" placeholder=""  />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="年运行费用(万元):" prop="sceneName" >
+              <el-input v-model="addForm.strategyName" placeholder=""  />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="年总费用(万元):" prop="sceneName" >
+              <el-input v-model="addForm.strategyName" placeholder=""  />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="年减碳量(吨):" prop="sceneName" >
+              <el-input v-model="addForm.strategyName" placeholder=""  />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="替代电量(千瓦时):" prop="sceneName" >
+              <el-input v-model="addForm.strategyName" placeholder=""  />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        </el-form>
+      </div>
+      <div class="card">
+        二、需配置设备情况
+      </div>
+      <div class="card">
+        <el-form :model="timingForm"  ref="userRef" label-width="140px">
+          <el-row>
+            <el-col :span="4">
+              <el-form-item label="方案详情:" prop="sceneName" >
+                <el-input v-model="addForm.strategyName" placeholder=""  />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="设备类型:" prop="sceneName" >
+                <el-input v-model="addForm.strategyName" placeholder=""  />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="设备规格:" prop="sceneName" >
+                <el-input v-model="addForm.strategyName" placeholder=""  />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="数量(台/套):" prop="sceneName" >
+                <el-input v-model="addForm.strategyName" placeholder=""  />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="单位(元/台、元/套):" prop="sceneName" >
+                <el-input v-model="addForm.strategyName" placeholder=""  />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="总价(万元):" prop="sceneName" >
+                <el-input v-model="addForm.strategyName" placeholder=""  />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <div class="card">
+        三、方案优势
+      </div>
+      <div class="card">
+        <el-form :model="timingForm"  ref="userRef" label-width="140px">
+          <el-row>
+            <el-col :span="4">
+              <el-form-item label="安全性:" prop="sceneName" >
+                <el-input v-model="addForm.strategyName" placeholder=""  />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="经济性:" prop="sceneName" >
+                <el-input v-model="addForm.strategyName" placeholder=""  />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="智能性:" prop="sceneName" >
+                <el-input v-model="addForm.strategyName" placeholder=""  />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</div>
+</template>
+
+<script setup>
+import {ElMessage,ElMessageBox} from 'element-plus'
+import {ref,reactive,watch,onMounted} from "vue";
+const open = ref(true)
+const point = ref(3.7)
+const point1 = ref('78')
+const show1 = ref(false)
+const timingForm = reactive({
+  sceneName:'',
+})
+const addForm = reactive({
+  strategyName:'',
+})
+function submitForm() {
+  show1.value=true
+};
+function cancel() {
+  show1.value=false
+  addForm.strategyName=''
+};
+</script>
+
+<style scoped lang="scss">
+.rate{
+   --el-rate-text-color: #ff9900;
+}
+
+.bod{
+   padding: 20px;
+   .inp{
+     border: 1px solid white;
+     padding: 20px;
+   }
+   .result{
+     margin-top: 20px;
+     border: 1px solid white;
+     padding: 20px;
+     .point{
+
+     }
+     .til{
+       font-size: 16px;
+       color:#ff9900 ;
+     }
+     .info{
+        height: 400px;
+       .card{
+         margin-top: 20px;
+       }
+     }
+   }
+ }
+</style>
\ No newline at end of file