jwyu 9 meses atrás
pai
commit
9714123bed

+ 1 - 0
src/layout/components/LeftWrap.vue

@@ -121,6 +121,7 @@ function getMenuIcon(item){
   display: flex;
   flex-direction: column;
   padding-bottom: 111px;
+  transition: all 0.5s;
   .menu-wrap {
     flex: 1;
     height: 100%;

+ 1 - 1
src/views/customer/PotentialUserList.vue

@@ -138,7 +138,7 @@ function handleShowDetail(e){
         />
       </div>
       <el-input
-        placeholder="姓名/手机号/邮箱"
+        placeholder="手机号/邮箱"
         v-model="filterState.keyword"
         :prefix-icon="Search"
         clearable

+ 1 - 1
src/views/customer/reportStatistic/components/UserStatisticDetail.vue

@@ -111,7 +111,7 @@ watch(() => show.value, (n) => {
         highlight-current-row
         element-loading-text="数据加载中..."
         v-loading="tableLoading"
-        height="700px"
+        height="500px"
       >
         <el-table-column
           v-for="column in tableColOpt"

+ 5 - 0
src/views/customer/reportStatistic/utils/chartRender.js

@@ -70,6 +70,11 @@ export function lineChartRender(data) {
         },
       },
     ],
+    tooltip: {
+      format: '<span style="font-size: 0.8em">{key}</span><br/>'+
+      '<span style="color:{color}">\u25CF</span> ' +
+      '{series.name}: <b>{y}</b><br/>',
+    },
     series: [
       {
         data: data.value,

+ 2 - 2
src/views/system/RoleList.vue

@@ -92,10 +92,10 @@ async function handleDel(e) {
         <el-table-column prop="SysRoleName" label="角色" />
         <el-table-column prop="opt" label="操作">
           <template #default="{ row }">
-            <el-button v-permission="'role:edit'" link type="primary" @click="handleEdit(row)"
+            <el-button v-if="row.SysRoleName!=='admin'" v-permission="'role:edit'" link type="primary" @click="handleEdit(row)"
               >编辑</el-button
             >
-            <el-button v-permission="'role:delete'" link type="danger" @click="handleDel(row)"
+            <el-button v-if="row.SysRoleName!=='admin'" v-permission="'role:delete'" link type="danger" @click="handleDel(row)"
               >删除</el-button
             >
           </template>

+ 4 - 1
src/views/system/userList/components/EditUser.vue

@@ -47,6 +47,9 @@ watch(
         status: true
       })
     }
+    if(n){
+      getDepartList()
+    }
   }
 )
 
@@ -69,7 +72,7 @@ async function getDepartList() {
   const list = res.Data.List || []
   departArr.value = list
 }
-getDepartList()
+
 
 // 获取角色
 const roleArr = ref([])