fix

ruoyi-ui/src/baseComponents/f-fileUpload/index.vue

@@ -228,6 +228,10 @@
     display: flex;
     align-items: center;
   }
+  .upload-file{
+    align-items: baseline;
+    flex-direction: column;
+  }
   .upload-file-uploader {
     margin-bottom: 5px;
   }

ruoyi-ui/src/views/base/addBase/blocks/detailDialog.vue

@@ -66,9 +66,9 @@ export default {
         {
           itemType: "input",
           prop: "repeatCode",
-          label:'重复码',
+          label:'重发间隔(ms)',
           attrs: {
-            placeholder: "请输入重复码"
+            placeholder: "请输入重发间隔(ms)"
           },
         },
         {
@@ -107,11 +107,19 @@ export default {
         },
         {
           itemType: "input",
+          prop: "addressCode",
+          label:'地址码',
+          attrs: {
+            placeholder: "请输入地址码"
+          },
+        },
+        {
+          itemType: "input",
           prop: "dateCode",
           label:'数据',
           attrs: {
             placeholder: "请输入数据",
-            span:2,
+            span:1,
             type:'textarea'
           },
         },

ruoyi-ui/src/views/base/addBase/index.vue

@@ -56,7 +56,7 @@ export default {
       tableConfig: [
         { "name": "基础库名" },
         { "bandValue": "波段值" },
-        { "repeatCode": "重复码" },
+        { "repeatCode": "重发间隔(ms)" },
         { "bootCode": "引导码" },
         { "bootCodeSend": "引导码发送次数"},
         { "synchronizeCode": "同步码" },

ruoyi-ui/src/views/template/addButton/blocks/config.js

@@ -59,9 +59,9 @@ const formConfig = function(){
     {
       itemType: "input",
       prop: "repeatCode",
-      label:'重复码',
+      label:'重发间隔(ms)',
       attrs: {
-        placeholder: "请输入重复码"
+        placeholder: "请输入重发间隔(ms)"
       },
     },
     {

ruoyi-ui/src/views/template/addButton/blocks/detailDialog.vue

@@ -61,7 +61,7 @@ export default {
         typeNum:[{required: true, message: '请选择按钮类型'}],
         dictateParameter:[{required: true, message: '请输入命令参数'}],
         defValue:[{required: true, message: '请输入默认值'}],
-        repeatCode:[{required: true, message: '请输入重复码'}]
+        repeatCode:[{required: true, message: '请输入重发间隔(ms)'}]
       },
       // 表单key
       fromKey:0

ruoyi-ui/src/views/template/addButton/index.vue

@@ -68,7 +68,7 @@ export default {
         { "addSubMin": "最小值"},
         { "dictateParameter": "命令参数" },
         { "defValue": "默认值" },
-        { "repeatCode": "重复码" },
+        { "repeatCode": "重发间隔(ms)" },
         { "status": "状态", formatter: row => this.selectDictLabel(useStatus, row.status)},
         { "createTime": "创建时间", formatter:row => this.dayjs(row.createTime).format("YYYY-MM-DD HH:mm")}
       ],

ruoyi-ui/src/views/template/addTemplate/blocks/config.js

@@ -36,8 +36,17 @@ const formConfig = function() {
       btnText: '上传背景图',
       span: '2',
       attrs: {
-        placeholder: '上传背景图',
-        isImage: false
+        placeholder: '上传背景图'
+      }
+    },
+    {
+      itemType: 'fileUpload',
+      prop: 'iconUrl',
+      label: 'logo',
+      btnText: '上传logo',
+      span: '2',
+      attrs: {
+        placeholder: '上传logo'
       }
     }
   ]
@@ -95,9 +104,9 @@ const btnFormConfig = function(type) {
     {
       itemType: 'input',
       prop: 'repeatCode',
-      label: '重复码',
+      label: '重发间隔(ms)',
       attrs: {
-        placeholder: '请输入重复码'
+        placeholder: '请输入重发间隔(ms)'
       }
     },
     {
@@ -135,6 +144,14 @@ const btnFormConfig = function(type) {
     },
     {
       itemType: 'input',
+      prop: 'addressCode',
+      label:'地址码',
+      attrs: {
+        placeholder: '请输入地址码'
+      }
+    },
+    {
+      itemType: 'input',
       prop: 'dateCode',
       label: '数据',
       attrs: {

ruoyi-ui/src/views/template/addTemplate/blocks/detailDialog.vue

@@ -449,9 +449,9 @@ export default {
         this.$message.error('请先选择基础库')
         return
       }
-      const newItem = { w: 2, h: 1, x: 1, y: this.pageArray.map(item => item?.y).sort()[this.pageArray.length-1] || 1, i: this.pageArrayCount, ...item }
+      const newItem = { w: 1, h: 2, x: 1, y: this.pageArray.map(item => item?.y).sort()[this.pageArray.length-1] || 1, i: this.pageArrayCount, ...item }
       if (this.baseItem.id !== undefined) {
-        const { bandValue, bootCode, bootCodeSend, overCode, synchronizeCode, synchronizeCodeSend, dateBinary0, dateBinary1, repeatCode } = this.baseItem
+        const { bandValue, bootCode, bootCodeSend, addressCode, synchronizeCode, synchronizeCodeSend, dateBinary0, dateBinary1, repeatCode } = this.baseItem
         if (item.type === 'button') {
           newItem.bandValue = bandValue
           newItem.repeatCode = repeatCode
@@ -465,6 +465,7 @@ export default {
           newItem.dateBinary1 = dateBinary1
           newItem.addSubMax = ''
           newItem.addSubMin = ''
+          newItem.addressCode = addressCode
         }
       }
       this.pageArray.push(newItem)