Browse Source

修改ota升级包信息显示对应的签名信息

Xiahai 1 year ago
parent
commit
8e401bb842

+ 1 - 1
src/views/iot/device/instance/detail.vue

@@ -724,7 +724,7 @@ export default defineComponent({
 
 
     //打开添加属性弹窗
     //打开添加属性弹窗
     const onOpenEditAttr = () => {
     const onOpenEditAttr = () => {
-      editAttrRef.value.openDialog({ productKey: state.productKey, id: 0, accessMode: 0 });
+      editAttrRef.value.openDialog({ productKey: state.productKey, id: 0, accessMode: 0, deviceKey: state.detail.key});
     };
     };
 
 
     //打开添加功能弹窗
     //打开添加功能弹窗

+ 5 - 2
src/views/iot/device/product/component/editAttr.vue

@@ -200,6 +200,7 @@ import { validateNoSpace } from '/@/utils/validator';
 interface RuleFormState {
 interface RuleFormState {
 	id: number;
 	id: number;
 	productKey: string;
 	productKey: string;
+  deviceKey: string;
 	name: string;
 	name: string;
 	dictType: string;
 	dictType: string;
 	valueType: Object;
 	valueType: Object;
@@ -248,6 +249,7 @@ export default defineComponent({
 			ruleForm: {
 			ruleForm: {
 				id: 0,
 				id: 0,
 				productKey: '',
 				productKey: '',
+        deviceKey: '',
 				name: '',
 				name: '',
 				key: '',
 				key: '',
 				transportProtocol: '',
 				transportProtocol: '',
@@ -269,7 +271,7 @@ export default defineComponent({
 
 
 		// 打开弹窗
 		// 打开弹窗
 		const openDialog = (row: RuleFormState | null, productKey: string | null) => {
 		const openDialog = (row: RuleFormState | null, productKey: string | null) => {
-			resetForm();
+      resetForm();
 
 
 			api.product.getDataType({ status: -1 }).then((res: any) => {
 			api.product.getDataType({ status: -1 }).then((res: any) => {
 				const datat = Object.values(res.dataType);
 				const datat = Object.values(res.dataType);
@@ -289,7 +291,8 @@ export default defineComponent({
 				state.ruleForm = row;
 				state.ruleForm = row;
 
 
 				state.productKey = productKey;
 				state.productKey = productKey;
-				state.valueType = row.valueType;
+        state.deviceKey = row.deviceKey;
+        state.valueType = row.valueType;
 				state.ruleForm.valueType.type = row.valueType.type;
 				state.ruleForm.valueType.type = row.valueType.type;
 				state.ruleForm.type = row.valueType.type;
 				state.ruleForm.type = row.valueType.type;
 				state.type = row.valueType.type;
 				state.type = row.valueType.type;

+ 1 - 1
src/views/iot/ota-update/update/component/info.vue

@@ -6,7 +6,7 @@
 			<div class="item">所属产品:{{ detail.productName }}</div>
 			<div class="item">所属产品:{{ detail.productName }}</div>
 		</div>
 		</div>
 		<div class="container">
 		<div class="container">
-			<div class="item">升级包签名:d52b637c5eaf2bc9c24008bc4b723600</div>
+			<div class="item">升级包签名:{{ detail.sign }}</div>
 			<div class="item">升级包版本号:{{ detail.version }}</div>
 			<div class="item">升级包版本号:{{ detail.version }}</div>
 			<div class="item">创建时间:{{ detail.createdAt }}</div>
 			<div class="item">创建时间:{{ detail.createdAt }}</div>
 		</div>
 		</div>

+ 2 - 1
src/views/iot/ota-update/update/detail.vue

@@ -7,7 +7,7 @@
       </div>
       </div>
       <div class="container mt-2">
       <div class="container mt-2">
         <div class="item">升级包类型:{{ detail.types == 1 ? '整包' : '差分' }}</div>
         <div class="item">升级包类型:{{ detail.types == 1 ? '整包' : '差分' }}</div>
-        <div class="item">升级包签名:d52b637c5eaf2bc9c24008bc4b723600</div>
+        <div class="item">升级包签名:{{ detail.sign }}</div>
       </div>
       </div>
       <div class="container mb-2">
       <div class="container mb-2">
         <div class="item">签名算法:{{ detail.are }}</div>
         <div class="item">签名算法:{{ detail.are }}</div>
@@ -50,6 +50,7 @@ export default defineComponent({
         are: '',
         are: '',
         moduleName: '',
         moduleName: '',
         checkres: 0,
         checkres: 0,
+        sign: '',
       },
       },
     });
     });
     const getDetail = () => {
     const getDetail = () => {