admin/wisdomisitezwfront-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2023-09-22 13:55:40 +08:00
parent 43e213caff
commit d886eec60a
19 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/directives/modules/waterMarker.ts
View File

@ -19,6 +19,7 @@ let style = `
height: 100%; height: 100%;
background-repeat: repeat; background-repeat: repeat;
pointer-events: none; pointer-events: none;
z-index: 100;
`; `;
let systemConfig = {}; let systemConfig = {};
import type { Directive, DirectiveBinding } from "vue"; import type { Directive, DirectiveBinding } from "vue";
@ -27,7 +28,7 @@ import { getSystemConfig } from "@/api/modules/jxjview";
const getConfigMarker = async () => { const getConfigMarker = async () => {
// 获取起重机械设备类型字典 // 获取起重机械设备类型字典
const { result } = await getSystemConfig({ configKey: "system_watermark" }); const { result } = await getSystemConfig({ configKey: "system_watermark" });
systemConfig = result; systemConfig = result[0];
console.log(result); console.log(result);
}; };
// 设置水印 // 设置水印

2
src/views/enterprise/hoistingMachineryRecord/index.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="all-content"> <div class="all-content" v-waterMarker>
<layoutTop></layoutTop> <layoutTop></layoutTop>
<div class="table-box"> <div class="table-box">
<div class="table"> <div class="table">

1
src/views/enterprise/progressManagement/ganttChart/index.vue
View File

@ -499,6 +499,7 @@ const dateList = computed(() => {
.gantt-box { .gantt-box {
box-sizing: border-box; box-sizing: border-box;
min-width: 1120px; min-width: 1120px;
width: 100%;
height: 100%; height: 100%;
padding: 18px; padding: 18px;
background: #ffffff; background: #ffffff;

1
src/views/enterprise/qualitySupervision/index.vue
View File

@ -220,7 +220,6 @@ const getInfo = async () => {
.table { .table {
height: calc(100% - 133px); height: calc(100% - 133px);
position: relative; position: relative;
z-index: 500;
:deep() { :deep() {
.table-main { .table-main {
height: calc(100% - 82px); height: calc(100% - 82px);

1
src/views/enterprise/safetySupervision/index.vue
View File

@ -220,7 +220,6 @@ const getInfo = async () => {
.table { .table {
height: calc(100% - 133px); height: calc(100% - 133px);
position: relative; position: relative;
z-index: 500;
:deep() { :deep() {
.table-main { .table-main {
height: calc(100% - 82px); height: calc(100% - 82px);

2
src/views/goverment/dustManagement/index.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="warning-page"> <div class="warning-page" v-waterMarker>
<layoutTop></layoutTop> <layoutTop></layoutTop>
<div id="map-container" class="map"></div> <div id="map-container" class="map"></div>
<LeftMenu <LeftMenu

2
src/views/goverment/hoistingMachineryRecord/index.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="all-content"> <div class="all-content" v-waterMarker>
<layoutTop></layoutTop> <layoutTop></layoutTop>
<div class="type-select"> <div class="type-select">
<div <div

2
src/views/goverment/liftSupervision/operatingData/index.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="entire-box"> <div class="entire-box" v-waterMarker>
<layoutTop></layoutTop> <layoutTop></layoutTop>
<div class="operate-box"> <div class="operate-box">
<div class="alarm-data"> <div class="alarm-data">

2
src/views/goverment/naturalResources/index.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="outside"> <div class="outside" v-waterMarker>
<layoutTop></layoutTop> <layoutTop></layoutTop>
<iframe :src="`${baseUrl}?token=${token}`" style="width: 100%; height: 100%; border: medium none" frameborder="1"></iframe> <iframe :src="`${baseUrl}?token=${token}`" style="width: 100%; height: 100%; border: medium none" frameborder="1"></iframe>
</div> </div>

1
src/views/goverment/qualitySupervision/index.vue
View File

@ -233,7 +233,6 @@ const getInfo = async () => {
.table { .table {
height: calc(100% - 133px); height: calc(100% - 133px);
position: relative; position: relative;
z-index: 500;
:deep() { :deep() {
.table-main { .table-main {
height: calc(100% - 82px); height: calc(100% - 82px);

2
src/views/goverment/reportStatistics/index.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="outside"> <div class="outside" v-waterMarker>
<layoutTop></layoutTop> <layoutTop></layoutTop>
<iframe :src="`${baseUrl}/jmreport/list`" style="width: 100%; height: 98%; border: medium none" frameborder="1"></iframe> <iframe :src="`${baseUrl}/jmreport/list`" style="width: 100%; height: 98%; border: medium none" frameborder="1"></iframe>
</div> </div>

1
src/views/goverment/safetySupervision/index.vue
View File

@ -232,7 +232,6 @@ const getInfo = async () => {
.table { .table {
height: calc(100% - 133px); height: calc(100% - 133px);
position: relative; position: relative;
z-index: 500;
:deep() { :deep() {
.table-main { .table-main {
height: calc(100% - 82px); height: calc(100% - 82px);

2
src/views/goverment/towerCraneSupervision/operatingData/index.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="entire-box"> <div class="entire-box" v-waterMarker>
<layoutTop></layoutTop> <layoutTop></layoutTop>
<div class="operate-box"> <div class="operate-box">
<div class="alarm-data"> <div class="alarm-data">

2
src/views/goverment/videoMonitor/index.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="video-box"> <div class="video-box" v-waterMarker>
<layoutTop></layoutTop> <layoutTop></layoutTop>
<div class="plr-20" style="display: flex"> <div class="plr-20" style="display: flex">
<el-tabs class="demo-tabs" v-model="active"> <el-tabs class="demo-tabs" v-model="active">

11
src/views/jxjview/system/index.vue
View File

@ -48,7 +48,7 @@
<el-input v-model="formData.configValue" placeholder="请输入" /> <el-input v-model="formData.configValue" placeholder="请输入" />
</el-form-item> </el-form-item>
<el-form-item label="图片：" prop="configValueUrl" v-if="formData.configValueType == 2"> <el-form-item label="图片：" prop="configValueUrl" v-if="formData.configValueType == 2">
<div class="face-img" v-if="!formData.configValueUrl"> <div class="face-img">
<el-upload <el-upload
class="face-uploader" class="face-uploader"
:action="`${baseUrl}` + '/xmgl/file/upload'" :action="`${baseUrl}` + '/xmgl/file/upload'"
@ -60,7 +60,6 @@
<el-icon v-else><plus /></el-icon> <el-icon v-else><plus /></el-icon>
</el-upload> </el-upload>
</div> </div>
<img class="showImg" v-else :src="formData.configValueUrl" />
</el-form-item> </el-form-item>
<el-form-item label="备注：" prop="remark"> <el-form-item label="备注：" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入" /> <el-input v-model="formData.remark" placeholder="请输入" />
@ -208,7 +207,7 @@ const submitConfirm = async (formEl: FormInstance | undefined, form: any) => {
form.configValue = form.configValueUrl; form.configValue = form.configValueUrl;
delete form.configValueUrl; delete form.configValueUrl;
} }
if (form.id) { if (form.configId) {
const res = await editUser(form); const res = await editUser(form);
proTable.value.getTableList(); proTable.value.getTableList();
ElMessage.success("编辑成功"); ElMessage.success("编辑成功");
@ -290,11 +289,5 @@ const deleteAccount = async (params: User.ResUserList) => {
display: block; display: block;
} }
} }
.showImg {
width: 50px;
height: 50px;
border-radius: 6px;
}
} }
</style> </style>

2
src/views/project/hoistingMachineryRecord/index.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="all-content"> <div class="all-content" v-waterMarker>
<layoutTop></layoutTop> <layoutTop></layoutTop>
<div class="table-box"> <div class="table-box">
<div class="table"> <div class="table">

1
src/views/project/progressManagement/ganttChart/index.vue
View File

@ -532,6 +532,7 @@ const dateList = computed(() => {
.gantt-box { .gantt-box {
box-sizing: border-box; box-sizing: border-box;
min-width: 1120px; min-width: 1120px;
width: 100%;
height: 100%; height: 100%;
padding: 18px; padding: 18px;
background: #ffffff; background: #ffffff;

1
src/views/project/qualitySupervision/index.vue
View File

@ -221,7 +221,6 @@ const getInfo = async () => {
.table { .table {
height: calc(100% - 133px); height: calc(100% - 133px);
position: relative; position: relative;
z-index: 500;
:deep() { :deep() {
.table-main { .table-main {
height: calc(100% - 82px); height: calc(100% - 82px);

1
src/views/project/safetySupervision/index.vue
View File

@ -218,7 +218,6 @@ const getInfo = async () => {
.table { .table {
height: calc(100% - 133px); height: calc(100% - 133px);
position: relative; position: relative;
z-index: 500;
:deep() { :deep() {
.table-main { .table-main {
height: calc(100% - 82px); height: calc(100% - 82px);