fix

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

@@ -108,9 +108,9 @@ export default {
         {
           itemType: "input",
           prop: "dateCode",
-          label:'数据码',
+          label:'数据',
           attrs: {
-            placeholder: "请输入数据码",
+            placeholder: "请输入数据",
             span:2,
             type:'textarea'
           },
@@ -126,17 +126,17 @@ export default {
         {
           itemType: "input",
           prop: "dateBinary0",
-          label:'数据码二进制0',
+          label:'数据二进制0',
           attrs: {
-            placeholder: "请输入数据码二进制0"
+            placeholder: "请输入数据二进制0"
           },
         },
         {
           itemType: "input",
           prop: "dateBinary1",
-          label:'数据码二进制1',
+          label:'数据二进制1',
           attrs: {
-            placeholder: "请输入数据码二进制1"
+            placeholder: "请输入数据二进制1"
           },
         }
       ],
@@ -145,10 +145,10 @@ export default {
         name:[{required: true, message: '请输入基础库名'}],
         bootCode:[{required: true, message: '请输入引导码'}],
         bootCodeSend:[{required: true, message: '请输入引导码发送次数'}],
-        dateCode:[{required: true, message: '请输入数据码'}],
+        dateCode:[{required: true, message: '请输入数据'}],
         overCode:[{required: true, message: '请输入结束码'}],
-        dateBinary0:[{required: true, message: '请输入数据码二进制0'}],
-        dateBinary1:[{required: true, message: '请输入数据码二进制1'}]
+        dateBinary0:[{required: true, message: '请输入数据二进制0'}],
+        dateBinary1:[{required: true, message: '请输入数据二进制1'}]
       },
       // 表单key
       fromKey:0

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

@@ -42,8 +42,8 @@ import { addBaseApi } from '@/api/base/addBase'
 
 // 下拉框选项
 const useStatus = [
-  { name: '使用中', value: '1' },
-  { name: '未使用', value: '0' }
+  { name: '启用', value: '0' },
+  { name: '禁用', value: '1' },
 ];
 
 export default {
@@ -61,9 +61,9 @@ export default {
         { "bootCodeSend": "引导码发送次数"},
         { "synchronizeCode": "同步码" },
         { "synchronizeCodeSend": "同步码发送次数"},
-        { "dateCode": "数据码" },
-        { "dateBinary0": "数据码二进制0" },
-        { "dateBinary1": "数据码二进制1" },
+        { "dateCode": "数据" },
+        { "dateBinary0": "数据二进制0" },
+        { "dateBinary1": "数据二进制1" },
         { "overCode": "结束码" },
         { "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/code/index.vue

@@ -42,8 +42,8 @@ import tableList from "@/comComponents/tableList";
 
 // 下拉框选项
 const useStatus = [
-  { name: '使用中', value: '1' },
-  { name: '未使用', value: '0' }
+  { name: '启用', value: '0' },
+  { name: '禁用', value: '1' },
 ];
 
 export default {

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

@@ -45,8 +45,8 @@ import { addBaseApi } from '@/api/base/addBase'
 
 // 下拉框选项
 const useStatus = [
-  { name: '使用中', value: '1' },
-  { name: '未使用', value: '0' }
+  { name: '启用', value: '0' },
+  { name: '禁用', value: '1' },
 ];
 
 const btnType = [

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

@@ -76,14 +76,14 @@ const btnFormConfig = function(type) {
     //   }
     // },
     ...orderList,
-    {
-      itemType: 'input',
-      prop: 'defValue',
-      label:'默认值',
-      attrs: {
-        placeholder: "请输入功能默认值"
-      }
-    },
+    // {
+    //   itemType: 'input',
+    //   prop: 'defValue',
+    //   label:'默认值',
+    //   attrs: {
+    //     placeholder: "请输入功能默认值"
+    //   }
+    // },
     {
       itemType: 'input',
       prop: 'bandValue',
@@ -136,11 +136,11 @@ const btnFormConfig = function(type) {
     {
       itemType: 'input',
       prop: 'dateCode',
-      label:'数据码',
+      label: '数据',
       attrs: {
-          placeholder: '请输入数据码',
-          span: 2,
-          type: 'textarea'
+        placeholder: '请输入数据',
+        span: 2,
+        type: 'textarea'
       }
     },
     {
@@ -148,23 +148,23 @@ const btnFormConfig = function(type) {
       prop: 'overCode',
       label:'结束码',
       attrs: {
-          placeholder: '请输入结束码'
+        placeholder: '请输入结束码'
       }
     },
     {
       itemType: "input",
       prop: "dateBinary0",
-      label:'数据码二进制0',
+      label:'数据二进制0',
       attrs: {
-        placeholder: "请输入数据码二进制0"
+        placeholder: "请输入数据二进制0"
       },
     },
     {
       itemType: "input",
       prop: "dateBinary1",
-      label:'数据码二进制1',
+      label:'数据二进制1',
       attrs: {
-        placeholder: "请输入数据码二进制1"
+        placeholder: "请输入数据二进制1"
       },
     }
     

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

@@ -179,11 +179,11 @@ export default {
       },
       btnRules: {
         typeNum: [{required: true, message: '请选择按钮类型'}],
-        defValue: [{required: true, message: '请输入默认值'}],
+        // defValue: [{required: true, message: '请输入默认值'}],
         bandValue: [{required: true, message: '请输入波段值，默认38000'}],
         bootCode: [{required: true, message: '请输入引导码'}],
         bootCodeSend: [{required: true, message: '请输入引导码发送次数'}],
-        dateCode: [{required: true, message: '请输入数据码'}]
+        dateCode: [{required: true, message: '请输入数据'}]
         // overCode:[{required: true, message: '请输入结束码'}],
       },
       btnFromKey: 0,
@@ -451,14 +451,14 @@ export default {
       }
       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 }
       if (this.baseItem.id !== undefined) {
-        const { bandValue, bootCode, bootCodeSend, dateCode, overCode, synchronizeCode, synchronizeCodeSend, dateBinary0, dateBinary1, repeatCode } = this.baseItem
+        const { bandValue, bootCode, bootCodeSend, overCode, synchronizeCode, synchronizeCodeSend, dateBinary0, dateBinary1, repeatCode } = this.baseItem
         if (item.type === 'button') {
           newItem.bandValue = bandValue
           newItem.repeatCode = repeatCode
           newItem.bootCode = bootCode
           newItem.bootCodeSend = bootCodeSend
-          newItem.dateCode = dateCode
-          newItem.overCode = overCode
+          newItem.dateCode = ''
+          newItem.overCode = ''
           newItem.synchronizeCode = synchronizeCode
           newItem.synchronizeCodeSend = synchronizeCodeSend
           newItem.dateBinary0 = dateBinary0

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

@@ -47,9 +47,8 @@ import { addButtonApi } from '@/api/template/addButton'
 
 // 下拉框选项
 const useStatus = [
-  { name: '使用中', value: '0' },
-  { name: '未使用', value: '1' },
-  { name: '暂停', value: '2' },
+  { name: '启用', value: '0' },
+  { name: '禁用', value: '1' },
 ];
 
 export default {