样式调整

src/views/agent/one_network_shared_proxy/agent.vue

@@ -3,13 +3,13 @@
     <transition name="fade">
       <div v-show="showSearch" class="mb-[10px]">
         <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-          <el-form-item style="width: 200px" label="接口类型：" prop="eventType">
+          <el-form-item style="width: 200px" label="接口类型：" prop="eventType" label-width="auto">
             <el-select v-model="queryParams.eventType" placeholder="全部" clearable>
               <el-option label="全部" value=""></el-option>
               <el-option v-for="item in data.eventTypeSelection" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="发布日期：" prop="publishDate">
+          <el-form-item label="发布日期：" prop="publishDate" label-width="auto">
             <el-date-picker
               v-model="queryParams.publishDate"
               type="daterange"

src/views/riskPrevention/planManage/index.vue

@@ -3,12 +3,12 @@
     <transition name="fade">
       <div v-show="showSearch" class="mb-[10px]">
         <el-form ref="queryFormRef" :model="planForm" :inline="true">
-          <el-form-item style="width: 200px" label="预案类型：" prop="planType">
+          <el-form-item style="width: 200px" label="预案类型：" prop="planType" label-width="auto">
             <el-select v-model="planForm.planType" placeholder="全部" clearable>
               <el-option v-for="item in plan_type" :key="item.value" :label="item.label" :value="item.value"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="发布日期：" prop="publish_date">
+          <el-form-item label="发布日期：" prop="publish_date" label-width="auto">
             <el-date-picker
               v-model="dateRange"
               type="daterange"

src/views/system/role/index.vue

@@ -3,18 +3,18 @@
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[20px]">
         <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-          <el-form-item label="角色名称：" prop="roleName">
+          <el-form-item label="角色名称：" prop="roleName" label-width="auto">
             <el-input v-model="queryParams.roleName" placeholder="请输入角色名称" clearable @keyup.enter="handleQuery" />
           </el-form-item>
-          <el-form-item label="权限字符：" prop="roleKey">
+          <el-form-item label="权限字符：" prop="roleKey" label-width="auto">
             <el-input v-model="queryParams.roleKey" placeholder="请输入权限字符" clearable @keyup.enter="handleQuery" />
           </el-form-item>
-          <el-form-item label="状态：" prop="status">
+          <el-form-item label="状态：" prop="status" label-width="auto">
             <el-select v-model="queryParams.status" placeholder="角色状态" clearable>
               <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="创建时间：" style="width: 308px">
+          <el-form-item label="创建时间：" style="width: 308px" label-width="auto">
             <el-date-picker
               v-model="dateRange"
               value-format="YYYY-MM-DD"
@@ -55,18 +55,18 @@
 
     <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column v-if="false" label="角色编号" prop="roleId" width="120" />
-      <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
+      <el-table-column v-if="false" label="角色编号" prop="roleId" width="200" />
+      <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="200" />
       <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="200" />
-      <el-table-column label="显示顺序" prop="roleSort" width="100" />
-      <el-table-column label="状态" align="center" width="100">
+      <el-table-column label="显示顺序" prop="roleSort" width="200" />
+      <el-table-column label="状态" align="center" width="200">
         <template #default="scope">
           <router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type">
             <span>{{ scope.row.dictType }}</span>
           </router-link>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column label="创建时间" align="center" prop="createTime" width="200">
         <template #default="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>

src/views/system/user/index.vue

@@ -21,19 +21,19 @@
         <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
           <div v-show="showSearch" class="mb-[10px]">
             <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-              <el-form-item label="用户名称：" prop="userName">
+              <el-form-item label="用户名称：" prop="userName" label-width="auto">
                 <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
               </el-form-item>
-              <el-form-item label="手机号码：" prop="phonenumber">
+              <el-form-item label="手机号码：" prop="phonenumber" label-width="auto">
                 <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
               </el-form-item>
 
-              <el-form-item label="状态：" prop="status">
+              <el-form-item label="状态：" prop="status" label-width="auto">
                 <el-select v-model="queryParams.status" placeholder="用户状态" clearable>
                   <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
-              <el-form-item label="创建时间：" style="width: 308px">
+              <el-form-item label="创建时间：" style="width: 308px" label-width="auto">
                 <el-date-picker
                   v-model="dateRange"
                   value-format="YYYY-MM-DD"
@@ -80,19 +80,27 @@
               </template>
             </el-dropdown>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @query-table="getList"></right-toolbar>
+          <!--          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @query-table="getList"></right-toolbar>-->
         </el-row>
 
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column v-if="columns[0].visible" key="userId" label="用户编号" align="center" prop="userId" />
-          <el-table-column v-if="columns[1].visible" key="userName" label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" />
+          <el-table-column
+            v-if="columns[1].visible"
+            key="userName"
+            label="用户名称"
+            align="center"
+            prop="userName"
+            :show-overflow-tooltip="true"
+            width="120"
+          />
           <el-table-column v-if="columns[2].visible" key="nickName" label="用户昵称" align="center" prop="nickName" :show-overflow-tooltip="true" />
           <el-table-column v-if="columns[3].visible" key="deptName" label="部门" align="center" prop="deptName" :show-overflow-tooltip="true" />
           <el-table-column v-if="columns[4].visible" key="phonenumber" label="手机号码" align="center" prop="phonenumber" width="120" />
           <el-table-column v-if="columns[5].visible" key="status" label="状态" align="center">
             <template #default="scope">
-              <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+              <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
             </template>
           </el-table-column>
 
@@ -101,23 +109,12 @@
               <span>{{ scope.row.createTime }}</span>
             </template>
           </el-table-column>
-
-          <el-table-column label="操作" fixed="right" width="180" class-name="small-padding fixed-width">
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template #default="scope">
-              <el-tooltip v-if="scope.row.userId !== 1" content="修改" placement="top">
-                <el-button v-hasPermi="['system:user:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
-              </el-tooltip>
-              <el-tooltip v-if="scope.row.userId !== 1" content="删除" placement="top">
-                <el-button v-hasPermi="['system:user:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
-              </el-tooltip>
-
-              <el-tooltip v-if="scope.row.userId !== 1" content="重置密码" placement="top">
-                <el-button v-hasPermi="['system:user:resetPwd']" link type="primary" icon="Key" @click="handleResetPwd(scope.row)"></el-button>
-              </el-tooltip>
-
-              <el-tooltip v-if="scope.row.userId !== 1" content="分配角色" placement="top">
-                <el-button v-hasPermi="['system:user:edit']" link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)"></el-button>
-              </el-tooltip>
+              <el-text v-hasPermi="['system:menu:edit']" class="common-btn-text-primary" @click="handleUpdate(scope.row)">修改</el-text>
+              <el-text v-hasPermi="['system:menu:remove']" class="common-btn-text-danger" @click="handleDelete(scope.row)">删除</el-text>
+              <el-text v-hasPermi="['system:menu:resetPwd']" class="common-btn-text-primary" @click="handleResetPwd(scope.row)">重置密码</el-text>
+              <el-text v-hasPermi="['system:menu:edit']" class="common-btn-text-primary" @click="handleAuthRole(scope.row)">分配角色</el-text>
             </template>
           </el-table-column>
         </el-table>
@@ -131,12 +128,12 @@
       <el-form ref="userFormRef" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="用户昵称" prop="nickName">
+            <el-form-item label="用户昵称：" prop="nickName">
               <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="归属部门" prop="deptId">
+            <el-form-item label="归属部门：" prop="deptId">
               <el-tree-select
                 v-model="form.deptId"
                 :data="deptOptions"
@@ -151,12 +148,12 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="手机号码" prop="phonenumber">
+            <el-form-item label="手机号码：" prop="phonenumber">
               <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="邮箱" prop="email">
+            <el-form-item label="邮箱：" prop="email">
               <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
             </el-form-item>
           </el-col>
@@ -175,14 +172,14 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="用户性别">
+            <el-form-item label="用户性别：">
               <el-select v-model="form.sex" placeholder="请选择">
                 <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="状态">
+            <el-form-item label="状态：">
               <el-radio-group v-model="form.status">
                 <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
               </el-radio-group>
@@ -191,7 +188,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="岗位">
+            <el-form-item label="岗位：">
               <el-select v-model="form.postIds" multiple placeholder="请选择">
                 <el-option
                   v-for="item in postOptions"
@@ -204,7 +201,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="角色" prop="roleIds">
+            <el-form-item label="角色：" prop="roleIds">
               <el-select v-model="form.roleIds" filterable multiple placeholder="请选择">
                 <el-option
                   v-for="item in roleOptions"
@@ -219,7 +216,7 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="备注">
+            <el-form-item label="备注：">
               <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
             </el-form-item>
           </el-col>