ak/zn-admin-vue3-wcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
yyy 2025-03-20 15:54:56 +08:00
parent e742405735
commit 9fd422c4f2
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/layout/components/UserInfo/src/UserInfo.vue
View File

@ -68,10 +68,10 @@ const toDocument = () => {
<Icon icon="ep:tools" /> <Icon icon="ep:tools" />
<div @click="toProfile">{{ t('common.profile') }}</div> <div @click="toProfile">{{ t('common.profile') }}</div>
</ElDropdownItem> </ElDropdownItem>
<ElDropdownItem> <!-- <ElDropdownItem>
<Icon icon="ep:menu" /> <Icon icon="ep:menu" />
<div @click="toDocument">{{ t('common.document') }}</div> <div @click="toDocument">{{ t('common.document') }}</div>
</ElDropdownItem> </ElDropdownItem> -->
<ElDropdownItem divided> <ElDropdownItem divided>
<Icon icon="ep:lock" /> <Icon icon="ep:lock" />
<div @click="lockScreen">{{ t('lock.lockScreen') }}</div> <div @click="lockScreen">{{ t('lock.lockScreen') }}</div>

4
src/views/Profile/Index.vue
View File

@ -22,9 +22,9 @@
<el-tab-pane :label="t('profile.info.resetPwd')" name="resetPwd"> <el-tab-pane :label="t('profile.info.resetPwd')" name="resetPwd">
<ResetPwd /> <ResetPwd />
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label="t('profile.info.userSocial')" name="userSocial"> <!-- <el-tab-pane :label="t('profile.info.userSocial')" name="userSocial">
<UserSocial v-model:activeName="activeName" /> <UserSocial v-model:activeName="activeName" />
</el-tab-pane> </el-tab-pane> -->
</el-tabs> </el-tabs>
</div> </div>
</el-card> </el-card>

16
src/views/mapPage/logList/index.vue
View File

@ -253,8 +253,20 @@
<el-text v-if="scope.row.taskStatus == 4">异常</el-text> <el-text v-if="scope.row.taskStatus == 4">异常</el-text>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="startTime" label="开始时间" align="center" width="150" /> <el-table-column
<el-table-column prop="endTime" label="结束时间" align="center" width="150" /> prop="startTime"
label="开始时间"
align="center"
:formatter="dateFormatter"
width="170"
/>
<el-table-column
prop="endTime"
label="结束时间"
align="center"
:formatter="dateFormatter"
width="170"
/>
</el-table> </el-table>
<!-- 分页 --> <!-- 分页 -->
<Pagination <Pagination

5
src/views/mapPage/realTimeMap/editMap.vue
View File

@ -2713,7 +2713,6 @@ const cmConversionPx = (cWidth, cHeight) => {
pHeight pHeight
} }
} }
// 计算直线中间箭头的路径 // 计算直线中间箭头的路径
const getLineMidArrowPath = (item) => { const getLineMidArrowPath = (item) => {
const midX = (Number(item.startPointX) + Number(item.endPointX)) / 2 const midX = (Number(item.startPointX) + Number(item.endPointX)) / 2
@ -2738,7 +2737,6 @@ const getLineMidArrowPath = (item) => {
return `M ${startXArrow} ${startYArrow} L ${endXArrow} ${endYArrow}` return `M ${startXArrow} ${startYArrow} L ${endXArrow} ${endYArrow}`
} }
// 计算贝塞尔曲线中间箭头的路径（简单近似） // 计算贝塞尔曲线中间箭头的路径（简单近似）
const getBezierMidArrowPath = (item) => { const getBezierMidArrowPath = (item) => {
const path = document.createElementNS('http://www.w3.org/2000/svg', 'path') const path = document.createElementNS('http://www.w3.org/2000/svg', 'path')
@ -2748,7 +2746,6 @@ const getBezierMidArrowPath = (item) => {
const prevPoint = path.getPointAtLength(length / 2 - 1) const prevPoint = path.getPointAtLength(length / 2 - 1)
return `M ${prevPoint.x} ${prevPoint.y} L ${midPoint.x} ${midPoint.y}` return `M ${prevPoint.x} ${prevPoint.y} L ${midPoint.x} ${midPoint.y}`
} }
// 计算贝塞尔曲线中间文字的 x 坐标 // 计算贝塞尔曲线中间文字的 x 坐标
const computedCurveTextX = (item) => { const computedCurveTextX = (item) => {
return ( return (
@ -2759,7 +2756,6 @@ const computedCurveTextX = (item) => {
4 4
) )
} }
// 计算贝塞尔曲线中间文字的 y 坐标 // 计算贝塞尔曲线中间文字的 y 坐标
const computedCurveTextY = (item) => { const computedCurveTextY = (item) => {
return ( return (
@ -2770,7 +2766,6 @@ const computedCurveTextY = (item) => {
4 4
) )
} }
document.onmousedown = function (e) { document.onmousedown = function (e) {
//左击 //左击
if (e.button == 2) { if (e.button == 2) {