Merge branch 'main' into new-1.0

zjk

2026-04-10 790cc3c38f5e94ba41ea8d2819bfa43cc7600c45

Merge branch 'main' into new-1.0

 src/router/routes.static.ts

@@ -460,7 +460,7 @@
    menuType: 'page',
    componentPath: '/businessOperations/geofenceManagement/index.vue',
    id: 402,
    keepAlive: true,
    keepAlive: false,
    pid: 4,
  },
  {

 src/views/system/accountPermission/accountManagement/index.vue

@@ -243,16 +243,24 @@
          <span
            class="cursor-pointer text-primary"
            v-permission="20112"
            style={{ color: '#0068FF' }}
            onClick={() => handleEdit(row)}
            style={{ color: isSuperAdmin(row) ? '#bfbfbf' : '#0068FF', cursor: isSuperAdmin(row) ? 'not-allowed' : 'pointer' }}
            onClick={() => {
              if (isSuperAdmin(row))
                return
              handleEdit(row)
            }}
          >
            {t('accountManagement.buttons.edit')}
          </span>
          <span
            class="cursor-pointer text-primary"
            v-permission="20114"
            style={{ color: '#0068FF' }}
            onClick={() => handleResetPassword(row)}
            style={{ color: isSuperAdmin(row) ? '#bfbfbf' : '#0068FF', cursor: isSuperAdmin(row) ? 'not-allowed' : 'pointer' }}
            onClick={() => {
              if (isSuperAdmin(row))
                return
              handleResetPassword(row)
            }}
          >
            {t('accountManagement.buttons.resetPassword')}
          </span>
@@ -271,6 +279,7 @@
          </span>
          <NSwitch
            v-permission="20113"
            disabled={isSuperAdmin(row)}
            value={row.status === 0}
            onUpdateValue={val => handleSwitchChange(val, row)}
          >