Merge branch 'dev' into dev_tides

Crunchy

2025-04-29 e5454b769d44a34af423bf87ac8a740bf8c20341

 src/views/system/menu/index.vue

@@ -11,8 +11,8 @@
        </el-select>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查 询</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重 置</el-button>
        <el-button type="primary" size="mini" @click="handleQuery">查询</el-button>
        <el-button size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>

@@ -223,8 +223,8 @@
                </el-tooltip>
                只看我按钮
              </span>
              <el-switch v-model="form.isRersonalButton" inactive-text="不显示" active-text="显示" inactive-value="0"
                active-value="1">
              <el-switch v-model="form.isRersonalButton" inactive-text="不显示" active-text="显示" :inactive-value="0"
                :active-value="1">
              </el-switch>
            </el-form-item>
          </el-col>
@@ -340,7 +340,8 @@
        isFrame: "1",
        isCache: "0",
        visible: "0",
        status: "0"
        status: "0",
        isRersonalButton: 0
      };
      this.resetForm("form");
    },
@@ -379,6 +380,7 @@
      this.getTreeselect();
      getMenu(row.menuId).then(response => {
        this.form = response.data;
        this.form.isRersonalButton = Number(this.form.isRersonalButton)
        this.open = true;
        this.title = "修改菜单";
      });