新增开关

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

@@ -0,0 +1,43 @@
+<!--
+ * @Author: fhj
+ * @LastEditors: 傅豪杰 18516149270@163.com
+ * @Description:
+-->
+<template>
+    <el-switch
+        v-model="currentValue"
+        active-color="#13ce66"
+        inactive-color="#ff4949"
+        @change="handleChange"
+        v-bind="$attrs"
+    >
+    </el-switch>
+</template>
+
+<script>
+import formMixins from '../../mixins/formMixins.js'
+export default {
+  name: 'FSwitch',
+  inheritAttrs: false,
+  mixins: [formMixins],
+  props: {
+    // 绑定的数据
+    value: {},
+  },
+  computed:{
+    currentValue: {
+      get() {
+        return this.value || ''
+      },
+      set(val) {
+        this.$emit('input', val)
+      }
+    },
+  },
+  methods:{
+    handleChange(val) {
+      this.$emit('change', val)
+    }
+  }
+};
+</script>

ruoyi-ui/src/baseComponents/index.js

@@ -2,7 +2,7 @@
  * @Author: 傅豪杰 18516149270@163.com
  * @Date: 2023-07-24 13:57:02
  * @LastEditors: 傅豪杰 18516149270@163.com
- * @LastEditTime: 2023-07-24 15:32:50
+ * @LastEditTime: 2023-08-01 14:53:39
  * @FilePath: /infrared_remote/admin_web/ruoyi-ui/src/baseComponents/index.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -24,4 +24,5 @@ Vue.component('f-select', () => import( /* webpackChunkName: "baseComponents/f-s
 Vue.component('f-table', () => import( /* webpackChunkName: "baseComponents/f-table" */ './f-table/index.vue'));
 Vue.component('f-tabs', () => import( /* webpackChunkName: "baseComponents/f-tabs" */ './f-tabs/index.vue'));
 Vue.component('f-tooltip', () => import( /* webpackChunkName: "baseComponents/f-tooltip" */ './f-tooltip/index.vue'));
-Vue.component('f-color', () => import( /* webpackChunkName: "baseComponents/f-color" */ './f-color/index.vue'));
+Vue.component('f-color', () => import( /* webpackChunkName: "baseComponents/f-color" */ './f-color/index.vue'));
+Vue.component('f-switch', () => import( /* webpackChunkName: "baseComponents/f-switch" */ './f-switch/index.vue'));

ruoyi-ui/src/layout/components/Navbar.vue

@@ -7,22 +7,9 @@
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
-        <search id="header-search" class="right-menu-item" />
-        
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
-          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
-        </el-tooltip>
-
-        <el-tooltip content="文档地址" effect="dark" placement="bottom">
-          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
-        <el-tooltip content="布局大小" effect="dark" placement="bottom">
-          <size-select id="size-select" class="right-menu-item hover-effect" />
-        </el-tooltip>
-
       </template>
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
@@ -31,12 +18,9 @@
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">
-          <router-link to="/user/profile">
+          <!-- <router-link to="/user/profile">
             <el-dropdown-item>个人中心</el-dropdown-item>
-          </router-link>
-          <el-dropdown-item @click.native="setting = true">
-            <span>布局设置</span>
-          </el-dropdown-item>
+          </router-link> -->
           <el-dropdown-item divided @click.native="logout">
             <span>退出登录</span>
           </el-dropdown-item>

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

@@ -146,6 +146,42 @@ export default {
           attrs: {
             placeholder: "请输入数据二进制1"
           },
+        },
+        {
+          itemType: "switch",
+          prop: "bootCodeStatus",
+          label:'是否启用引导码',
+          attrs: {
+            activeValue:'0',
+            inactiveValue:'1'
+          },
+        },
+         {
+          itemType: "switch",
+          prop: "synchronizeCodeStatus",
+          label:'是否启用同步码',
+          attrs: {
+            activeValue:'0',
+            inactiveValue:'1'
+          },
+        },
+        {
+          itemType: "switch",
+          prop: "addressCodeStatus",
+          label:'是否启用地址码',
+          attrs: {
+            activeValue:'0',
+            inactiveValue:'1'
+          },
+        },
+        {
+          itemType: "switch",
+          prop: "dataInverseCodeStatus",
+          label:'是否启用数据反码',
+          attrs: {
+            activeValue:'0',
+            inactiveValue:'1'
+          },
         }
       ],
       // 表单验证
@@ -170,6 +206,10 @@ export default {
     initFormData(fromData){
       this.fromData = {
           content:'',
+          bootCodeStatus:'0',
+          synchronizeCodeStatus: '0',
+          addressCodeStatus: '0',
+          dataInverseCodeStatus: '0',
           ...fromData
       }
       this.fromKey++;

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

@@ -51,7 +51,8 @@ export default {
   data() {
     return {
       form: {
-        label: ''
+        label: '',
+        bootCodeStatus:'0'
       },
       tableConfig: [
         { "name": "基础库名" },
@@ -109,7 +110,7 @@ export default {
       })
     },
     // 编辑状态
-    handleDelete(type, row){
+    handleDelete(type, row) {
       this.$modal.confirm('是否确认删除此配置').then(async ()=> {
         const res = await addBaseApi.configDelete({ id: row.id });
         if(res.code != 200){

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

@@ -183,8 +183,43 @@ const btnFormConfig = function(type) {
       attrs: {
         placeholder: "请输入数据二进制1"
       },
+    },
+    {
+      itemType: "switch",
+      prop: "bootCodeStatus",
+      label:'是否启用引导码',
+      attrs: {
+        activeValue:'0',
+        inactiveValue:'1'
+      },
+    },
+     {
+      itemType: "switch",
+      prop: "synchronizeCodeStatus",
+      label:'是否启用同步码',
+      attrs: {
+        activeValue:'0',
+        inactiveValue:'1'
+      },
+    },
+    {
+      itemType: "switch",
+      prop: "addressCodeStatus",
+      label:'是否启用地址码',
+      attrs: {
+        activeValue:'0',
+        inactiveValue:'1'
+      },
+    },
+    {
+      itemType: "switch",
+      prop: "dataInverseCodeStatus",
+      label:'是否启用数据反码',
+      attrs: {
+        activeValue:'0',
+        inactiveValue:'1'
+      },
     }
-    
   ]
 }
 

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

@@ -451,7 +451,21 @@ export default {
       }
       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, addressCode, synchronizeCode, synchronizeCodeSend, dateBinary0, dateBinary1, repeatCode } = this.baseItem
+        const { 
+          bandValue,
+          bootCode,
+          bootCodeSend,
+          addressCode,
+          synchronizeCode,
+          synchronizeCodeSend,
+          dateBinary0,
+          dateBinary1,
+          repeatCode,
+          bootCodeStatus,
+          synchronizeCodeStatus,
+          addressCodeStatus,
+          dataInverseCodeStatus
+        } = this.baseItem
         if (item.type === 'button') {
           newItem.bandValue = bandValue
           newItem.repeatCode = repeatCode
@@ -466,6 +480,10 @@ export default {
           newItem.addSubMax = ''
           newItem.addSubMin = ''
           newItem.addressCode = addressCode
+          newItem.bootCodeStatus = bootCodeStatus
+          newItem.addressCode = synchronizeCodeStatus
+          newItem.addressCode = addressCodeStatus
+          newItem.addressCode = dataInverseCodeStatus
         }
       }
       this.pageArray.push(newItem)