dyf/dyf-vue-ui
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.107.152.87:3000/liubiao/dyf-vue-ui

Browse Source
This commit is contained in:
liub
2025-10-11 11:01:31 +08:00
parent 7445e789a4 fabab0a577
commit c7a05f2118
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/controlCenter/controlPanel/components/map.vue
View File

@ -222,7 +222,7 @@ onUnmounted(() => {
} }
.amap-container { .amap-container {
height: calc(100vh - 22vh); height: calc(100vh - 25vh);
border-radius: 4px; border-radius: 4px;
overflow: hidden; overflow: hidden;
width: 100%; width: 100%;

6
src/views/controlCenter/controlPanel/index.vue
View File

@ -82,7 +82,7 @@
</transition> </transition>
<el-card class="Maplist"> <el-card class="Maplist">
<div v-if="isListView" key="list"> <div v-if="isListView" key="list">
<el-table v-loading="loading" border :data="deviceList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" border :data="deviceList" @selection-change="handleSelectionChange" height="calc(100vh - 310px)">
<el-table-column type="selection" width="50" align="center" :selectable="isSelectable" /> <el-table-column type="selection" width="50" align="center" :selectable="isSelectable" />
<el-table-column label="设备名称" align="center" prop="deviceName" /> <el-table-column label="设备名称" align="center" prop="deviceName" />
<el-table-column label="设备图片" align="center" prop="devicePic"> <el-table-column label="设备图片" align="center" prop="devicePic">
@ -575,7 +575,7 @@ const forceAlarm = async () => {
} }
.Maplist { .Maplist {
height: calc(100vh - 24vh); //height: calc(100vh - 24vh);
overflow: auto; //overflow: auto;
} }
</style> </style>

4
src/views/controlCenter/delivery/index.vue
View File

@ -58,7 +58,7 @@
</transition> </transition>
<el-card class="Maplist"> <el-card class="Maplist">
<div> <div>
<el-table v-loading="loading" border :data="deviceList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" border :data="deviceList" @selection-change="handleSelectionChange" height="calc(100vh - 400px)">
<el-table-column type="selection" width="50" align="center" /> <el-table-column type="selection" width="50" align="center" />
<el-table-column label="设备名称" align="center" prop="deviceName" /> <el-table-column label="设备名称" align="center" prop="deviceName" />
<el-table-column label="设备型号" align="center" prop="deviceType" /> <el-table-column label="设备型号" align="center" prop="deviceType" />
@ -300,6 +300,6 @@ height: calc(100vh - 8vh);
.Maplist { .Maplist {
height: calc(100vh - 24vh); height: calc(100vh - 24vh);
overflow: auto; // overflow: auto;
} }
</style> </style>

4
src/views/controlCenter/historyjectory/index.vue
View File

@ -58,7 +58,7 @@
</transition> </transition>
<el-card class="Maplist"> <el-card class="Maplist">
<div> <div>
<el-table v-loading="loading" border :data="deviceList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" border :data="deviceList" @selection-change="handleSelectionChange" height="calc(100vh - 400px)">
<el-table-column type="selection" width="50" align="center" /> <el-table-column type="selection" width="50" align="center" />
<el-table-column label="设备名称" align="center" prop="deviceName" /> <el-table-column label="设备名称" align="center" prop="deviceName" />
<el-table-column label="设备型号" align="center" prop="deviceType" /> <el-table-column label="设备型号" align="center" prop="deviceType" />
@ -308,6 +308,6 @@ height: calc(100vh - 8vh);
.Maplist { .Maplist {
height: calc(100vh - 24vh); height: calc(100vh - 24vh);
overflow: auto; // overflow: auto;
} }
</style> </style>

4
src/views/system/dict/index.vue
View File

@ -43,9 +43,9 @@
删除 删除
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button v-hasPermi="['system:dict:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button> <el-button v-hasPermi="['system:dict:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
</el-col> </el-col> -->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button v-hasPermi="['system:dict:remove']" type="danger" plain icon="Refresh" @click="handleRefreshCache">刷新缓存</el-button> <el-button v-hasPermi="['system:dict:remove']" type="danger" plain icon="Refresh" @click="handleRefreshCache">刷新缓存</el-button>
</el-col> </el-col>

6
src/views/system/role/index.vue
View File

@ -48,9 +48,9 @@
<el-col :span="1.5"> <el-col :span="1.5">
<el-button v-hasPermi="['system:role:delete']" type="danger" plain :disabled="ids.length === 0" @click="handleDelete()">删除</el-button> <el-button v-hasPermi="['system:role:delete']" type="danger" plain :disabled="ids.length === 0" @click="handleDelete()">删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button v-hasPermi="['system:role:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button> <el-button v-hasPermi="['system:role:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
</el-col> </el-col> -->
<right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar> <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
</el-row> </el-row>
</template> </template>
@ -84,7 +84,7 @@
<el-button v-hasPermi="['system:role:edit']" link type="primary" icon="CircleCheck" @click="handleDataScope(scope.row)"></el-button> <el-button v-hasPermi="['system:role:edit']" link type="primary" icon="CircleCheck" @click="handleDataScope(scope.row)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="scope.row.roleId !== 1" content="分配用户" placement="top"> <el-tooltip v-if="scope.row.roleId !== 1" content="分配用户" placement="top">
<el-button v-hasPermi="['system:role:edit']" link type="primary" icon="User" @click="handleAuthUser(scope.row)"></el-button> <el-button v-hasPermi="['system:role:edit']" link type="primary" icon="User" @click=" (scope.row)"></el-button>
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>