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-07-18 17:50:14 +08:00
parent f41acb2b11
commit b65edd63f4
24 changed files with 219 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.env.production
View File

@ -4,7 +4,8 @@ NODE_ENV = "production"
# 线上环境接口地址(easymock)
# VITE_API_URL = "http://139.9.66.234:6688"
# VITE_API_URL = "http://182.90.224.147:6688"
VITE_API_URL = "http://182.90.224.147:9013"
VITE_API_URL = 'http://192.168.34.155:6688'
# VITE_API_URL = "http://182.90.224.147:9013"
VITE_WPAPI_URL = "http://182.90.224.147:8081"
# VITE_API_URL = "http://101.43.164.214:6688"
# VITE_API_URL = "https://wx.antjg.com:6081/"

1
src/styles/common.scss
View File

@ -185,6 +185,7 @@
justify-content: center;
height: 100%;
cursor: pointer;
box-shadow: 0 0 0 1px #fff inset !important;
}
.ellipsisText {
width: 150px;

2
src/views/goverment/huizhou/largeScreen/largeScreenOne/components/BDmaps.vue
View File

@ -25,7 +25,7 @@ watch(() => props.projectData, setProjectData, { deep: true });
const mapData = async () => {
map.value = new BMapGL.Map("mapBox"); // 初始化地图
let point = new BMapGL.Point(114.272994, 23.032578); // 点位设置
map.value.centerAndZoom(point, 14); // 初始化地图，设置中心点坐标和地图级别
map.value.centerAndZoom(point, 12); // 初始化地图，设置中心点坐标和地图级别
map.value.enableScrollWheelZoom(true); // 设置可以鼠标滑动进行缩放
map.value.setMapStyleV2({
styleJson: mapstyle()

2
src/views/goverment/huizhou/largeScreen/largeScreenOne/components/BDmaps3D.vue
View File

@ -25,7 +25,7 @@ watch(() => props.projectData, setProjectData, { deep: true });
const mapData = async () => {
map.value = new BMapGL.Map("mapBox"); // 初始化地图
let point = new BMapGL.Point(114.272994, 23.032578); // 点位设置
map.value.centerAndZoom(point, 15); // 初始化地图，设置中心点坐标和地图级别
map.value.centerAndZoom(point, 12); // 初始化地图，设置中心点坐标和地图级别
map.value.enableScrollWheelZoom(true); // 设置可以鼠标滑动进行缩放
map.value.setMapStyleV2({
styleJson: mapstyle()

43
src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.vue
View File

@ -60,7 +60,7 @@
row-key="id"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
>
<el-table-column align="center" prop="name" label="分部分项工程名称"></el-table-column>
<el-table-column align="center" prop="name" width="200" label="分部分项工程名称"></el-table-column>
<el-table-column align="center" prop="planStartTime" label="计划开始日期"></el-table-column>
<el-table-column align="center" prop="planEndTime" label="截止完成日期"></el-table-column>
<el-table-column align="center" prop="realEndTime" label="实际完成日期"></el-table-column>
@ -158,6 +158,36 @@
<el-form-item label="负责人：" prop="commander">
<el-input disabled v-model="childrenFormData.commander" placeholder="请输入" />
</el-form-item>
<el-form-item label="逾期问题描述：" prop="overdueIssueDesc">
<el-input v-model="childrenFormData.overdueIssueDesc" placeholder="请输入" />
</el-form-item>
<el-form-item label="整改期限：" prop="deadline">
<el-date-picker
style="width: 100%"
v-model="childrenFormData.deadline"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
type="datetime"
placeholder="请选择时间"
/>
</el-form-item>
<el-form-item label="逾期文件说明：" prop="overdueIssueFile">
<el-upload
ref="upload"
:headers="headers"
:file-list="fileList1"
class="upload-demo"
:action="`${baseUrl}` + '/xmgl/file/upload'"
:on-remove="onRemove"
disabled
multiple
:limit="1"
:on-success="uploadSuccess"
style="width: 100%"
>
<el-button class="uploadBtn" type="primary">点击上传</el-button>
</el-upload>
</el-form-item>
<el-form-item label="附件：" prop="annexFile">
<el-upload
ref="upload"
@ -223,6 +253,7 @@ const active = ref(0);
const baseUrl = import.meta.env.VITE_API_URL;
const globalStore = GlobalStore();
const fileList = ref([]);
const fileList1 = ref([]);
const headers = ref({ Authorization: "Bearer " + globalStore.token });
const childrenFormData = ref({
name: "",
@ -234,6 +265,9 @@ const childrenFormData = ref({
planEndTime: "",
importance: "",
commander: "",
overdueIssueDesc: "",
deadline: "",
overdueIssueFile: "",
annexFile: "",
completeRatio: "",
state: null
@ -293,7 +327,12 @@ const handleEditItem = async (row: any) => {
parentObj.value = row;
newTitle.value = "查看";
childrenFormData.value = { ...row };
fileList.value = [{ name: "文件", url: row.annexFile }];
if (row.annexFile) {
fileList.value = [{ name: "文件", url: row.annexFile }];
}
if (row.overdueIssueFile) {
fileList1.value = [{ name: "文件", url: row.overdueIssueFile }];
}
childrenVisible.value = true;
};
const getDataList = async () => {

20
src/views/goverment/huizhou/progressManagement/panoramicPlan/index.vue
View File

@ -84,6 +84,7 @@ import {
} from "@/api/modules/huizhou";
import { getDicList } from "@/api/modules/jxjview";
import { ElMessage } from "element-plus";
import { getgovNamelist } from "@/api/modules/goverment";
const pages = ref({
pageNo: 1,
pageSize: 7,
@ -133,8 +134,9 @@ const columns: ColumnProps[] = [
}
},
{ prop: "phaseName", label: "智能条线", width: 150 },
{ prop: "chargerNumber", label: "节点责任人编号", width: 150 },
{ prop: "chargerName", label: "节点责任人", width: 150 },
{ prop: "chargerNumber", label: "节点责任人", width: 150 },
{ prop: "chargerPhone", label: "负责人联系方式", width: 180 },
// { prop: "chargerName", label: "节点责任人", width: 150 },
{
prop: "isDeleted",
label: "节点失效标记",
@ -247,14 +249,16 @@ const formConfig = {
disabled: true
},
{
label: "节点负责人编号",
label: "节点负责人",
prop: "chargerNumber",
type: "input",
type: "select",
data: [],
clearable: true,
disabled: true
},
{
label: "节点负责人",
prop: "chargerName",
label: "负责人联系方式",
prop: "chargerNumber",
type: "input",
disabled: true
}
@ -327,6 +331,10 @@ const formConfig = {
};
// 项目或者工程名字
const searchName = ref<string>("");
const getPeopleList = async () => {
const res = await getgovNamelist({});
console.log(res);
};
// 修改数据按钮
const handleEditItem = async (row: any) => {
console.log(row);

2
src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue
View File

@ -130,7 +130,7 @@ const columns: ColumnProps[] = [
{ prop: "planStartTime", label: "开始日期" },
{ prop: "planEndTime", label: "结束日期" },
{ prop: "unit", label: "申请单位" },
{ prop: "completeRatio", label: "完成百分比(%)" },
{ prop: "completeRatio", label: "完成百分比(%)", width: 200 },
{ prop: "slippage", label: "逾期情况(天)" },
{
prop: "payTime",

37
src/views/goverment/huizhou/projectMonitoring/qualityControl/components/orderAdd.vue
View File

@ -74,7 +74,6 @@
<span class="row-span">整改期限：</span>
<el-date-picker
v-model="basicData.deadline"
style="width: 180px; height: 26px"
type="datetime"
placeholder="请选择日期"
format="YYYY-MM-DD HH:mm:ss"
@ -688,6 +687,10 @@ const submitForm = async () => {
};
// 全部提交
const allSubmit = async () => {
if (!basicData.value.deadline) {
ElMessage.error("请选择整改期限");
return;
}
recordData.value.map(item => {
item.image = JSON.stringify(item.image);
});
@ -806,20 +809,20 @@ onMounted(() => {});
font-size: 16px;
color: #008bff;
}
.diaMapIcon {
background-color: #008bff;
width: 34px;
position: absolute;
right: 0;
border-radius: 0 4px 4px 0;
color: #fff;
font-size: 16px;
display: flex;
align-items: center;
justify-content: center;
height: 100%;
cursor: pointer;
}
// .diaMapIcon {
// background-color: red;
// width: 34px;
// position: absolute;
// right: 0;
// border-radius: 0 4px 4px 0;
// color: #fff;
// font-size: 16px;
// display: flex;
// align-items: center;
// justify-content: center;
// height: 100%;
// cursor: pointer;
// }
}
.face-img {
@include flex;
@ -860,8 +863,8 @@ onMounted(() => {});
color: var(--el-menu-text-color);
}
.btn-style {
width: 105px;
height: 20px;
// width: 105px;
padding: 0 10px;
// background: rgba(48, 172, 124, 0.15);
background: transparent;
opacity: 1;

2
src/views/goverment/huizhou/projectMonitoring/qualityControl/index.scss
View File

@ -60,12 +60,14 @@
}
}
.table-box {
width: calc(100% - 300px);
height: 100%;
.table {
margin-left: 20px;
height: 100%;
:deep(.table-main) {
height: calc(100% - 82px);
overflow-x: scroll;
}
}
}

29
src/views/goverment/huizhou/projectMonitoring/qualityControl/index.vue
View File

@ -140,41 +140,50 @@ const columns: ColumnProps[] = [
{
prop: "engineeringName",
label: "工程名称",
search: { el: "input" }
search: { el: "input" },
width: 150
},
{
prop: "inspectUserName",
label: "监督员"
label: "监督员",
width: 150
},
{
prop: "createTime",
label: "检查时间"
label: "检查时间",
width: 220
},
{
prop: "buildEnt",
label: "建设单位"
label: "建设单位",
width: 150
},
{
prop: "supervisorEnt",
label: "监理单位"
label: "监理单位",
width: 150
},
{
prop: "opEnt",
label: "施工单位"
label: "施工单位",
width: 150
},
{
prop: "surveyEnt",
label: "勘察单位"
label: "勘察单位",
width: 150
},
{
prop: "designEnt",
label: "设计单位"
label: "设计单位",
width: 150
},
{
prop: "state",
label: "状态"
label: "状态",
width: 150
},
{ prop: "slippage", label: "逾期情况(天)" },
{ prop: "slippage", label: "逾期情况(天)", width: 150 },
{ prop: "operation", label: "操作", fixed: "right", width: 100 }
];
const pageable = ref({

44
src/views/goverment/huizhou/projectMonitoring/safetyManagement/components/orderAdd.vue
View File

@ -74,7 +74,6 @@
<span class="row-span">整改期限：</span>
<el-date-picker
v-model="basicData.deadline"
style="width: 180px; height: 26px"
type="datetime"
placeholder="请选择日期"
format="YYYY-MM-DD HH:mm:ss"
@ -90,7 +89,7 @@
<el-col :span="8">
<span class="row-span">施工单位：</span>
<div class="face-img">
<div class="imgList" v-if="basicData.opSignature">
<div class="imgList" v-if="basicData.opSignature && basicData.opSignature.length > 0">
<div v-for="(item, index) in basicData.opSignature" :key="index">
<img :src="item.url" class="face-avatar" />
<div class="close-icon" @click="deleteImg(1, index)">X</div>
@ -116,7 +115,7 @@
<el-col :span="8">
<span class="row-span">监理单位：</span>
<div class="face-img">
<div class="imgList" v-if="basicData.supervisorSignature">
<div class="imgList" v-if="basicData.supervisorSignature && basicData.supervisorSignature.length > 0">
<div v-for="(item, index) in basicData.supervisorSignature" :key="index">
<img :src="item.url" class="face-avatar" />
<div class="close-icon" @click="deleteImg(2, index)">X</div>
@ -138,7 +137,7 @@
<el-col :span="8">
<span class="row-span">检查人员：</span>
<div class="face-img">
<div class="imgList" v-if="basicData.inspectSignature">
<div class="imgList" v-if="basicData.inspectSignature && basicData.inspectSignature.length > 0">
<div v-for="(item, index) in basicData.inspectSignature" :key="index">
<img :src="item.url" class="face-avatar" />
<div class="close-icon" @click="deleteImg(3, index)">X</div>
@ -160,7 +159,7 @@
<el-col :span="8">
<span class="row-span">其他单位：</span>
<div class="face-img">
<div class="imgList" v-if="basicData.otherSignature">
<div class="imgList" v-if="basicData.otherSignature && basicData.otherSignature.length > 0">
<div v-for="(item, index) in basicData.otherSignature" :key="index">
<img :src="item.url" class="face-avatar" />
<div class="close-icon" @click="deleteImg(4, index)">X</div>
@ -654,6 +653,10 @@ const submitForm = async () => {
};
// 全部提交
const allSubmit = async () => {
if (!basicData.value.deadline) {
ElMessage.error("请选择整改期限");
return;
}
recordData.value.map(item => {
item.image = JSON.stringify(item.image);
});
@ -772,20 +775,20 @@ onMounted(() => {});
font-size: 16px;
color: #008bff;
}
.diaMapIcon {
background-color: #008bff;
width: 34px;
position: absolute;
right: 0;
border-radius: 0 4px 4px 0;
color: #fff;
font-size: 16px;
display: flex;
align-items: center;
justify-content: center;
height: 100%;
cursor: pointer;
}
// .diaMapIcon {
// background-color: #008bff;
// width: 34px;
// position: absolute;
// right: 0;
// border-radius: 0 4px 4px 0;
// color: #fff;
// font-size: 16px;
// display: flex;
// align-items: center;
// justify-content: center;
// height: 100%;
// cursor: pointer;
// }
}
.face-img {
@include flex;
@ -826,8 +829,7 @@ onMounted(() => {});
color: var(--el-menu-text-color);
}
.btn-style {
width: 105px;
height: 20px;
padding: 0 10px;
// background: rgba(48, 172, 124, 0.15);
background: transparent;
opacity: 1;

2
src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.scss
View File

@ -60,12 +60,14 @@
}
}
.table-box {
width: calc(100% - 300px);
height: 100%;
.table {
margin-left: 20px;
height: 100%;
:deep(.table-main) {
height: calc(100% - 82px);
overflow-x: scroll;
}
}
}

29
src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.vue
View File

@ -109,41 +109,50 @@ const columns: ColumnProps[] = [
{
prop: "engineeringName",
label: "工程名称",
search: { el: "input" }
search: { el: "input" },
width: 150
},
{
prop: "inspectUserName",
label: "监督员"
label: "监督员",
width: 150
},
{
prop: "createTime",
label: "检查时间"
label: "检查时间",
width: 220
},
{
prop: "buildEnt",
label: "建设单位"
label: "建设单位",
width: 150
},
{
prop: "supervisorEnt",
label: "监理单位"
label: "监理单位",
width: 150
},
{
prop: "opEnt",
label: "施工单位"
label: "施工单位",
width: 150
},
{
prop: "surveyEnt",
label: "勘察单位"
label: "勘察单位",
width: 150
},
{
prop: "designEnt",
label: "设计单位"
label: "设计单位",
width: 150
},
{
prop: "state",
label: "状态"
label: "状态",
width: 150
},
{ prop: "slippage", label: "逾期情况(天)" },
{ prop: "slippage", label: "逾期情况(天)", width: 150 },
{ prop: "operation", label: "操作", fixed: "right", width: 100 }
];
const pageable = ref({

2
src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.scss
View File

@ -60,9 +60,11 @@
height: 100%;
:deep(.table-main) {
height: calc(100% - 82px);
overflow-x: scroll;
}
}
.table-box {
width: calc(100% - 300px);
height: 100% !important;
}
}

16
src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.vue
View File

@ -83,7 +83,7 @@ const columns: ColumnProps[] = [
{ type: "index", label: "序号", width: 80 },
// 多级 prop
{ prop: "name", label: "设备名称", isShow: false, search: { el: "input" } },
{ prop: "deviceName", label: "设备名称" },
{ prop: "deviceName", label: "设备名称", width: 180 },
{
prop: "temperature",
label: "温度",
@ -101,6 +101,7 @@ const columns: ColumnProps[] = [
{
prop: "pm25",
label: "PM2.5",
width: 150,
render: scoped => {
return scoped.row.pm25 + "μg/m³";
}
@ -108,6 +109,7 @@ const columns: ColumnProps[] = [
{
prop: "noise",
label: "噪音",
width: 150,
render: scoped => {
return scoped.row.noise + "db";
}
@ -115,10 +117,19 @@ const columns: ColumnProps[] = [
{
prop: "pm10",
label: "PM10",
width: 150,
render: scoped => {
return scoped.row.pm10 + "μg/m³";
}
},
{
prop: "tsp",
label: "TSP",
width: 150,
render: scoped => {
return scoped.row.tsp + "μg/m³";
}
},
{
prop: "humidity",
label: "湿度",
@ -129,11 +140,12 @@ const columns: ColumnProps[] = [
{
prop: "winddirection",
label: "风向",
width: 160,
render: scoped => {
return scoped.row.winddirection + "风";
}
},
{ prop: "createTime", label: "上报时间" }
{ prop: "createTime", label: "上报时间", width: 220 }
];
interface formData {
title: string;

26
src/views/goverment/qualitySupervision/components/orderAdd.vue
View File

@ -805,19 +805,19 @@ onMounted(() => {});
font-weight: 400;
color: #008bff;
}
.diaMapIcon {
background-color: #008bff;
width: 34px;
position: absolute;
right: 0;
border-radius: 0 4px 4px 0;
color: #fff;
display: flex;
align-items: center;
justify-content: center;
height: 100%;
cursor: pointer;
}
// .diaMapIcon {
// background-color: #008bff;
// width: 34px;
// position: absolute;
// right: 0;
// border-radius: 0 4px 4px 0;
// color: #fff;
// display: flex;
// align-items: center;
// justify-content: center;
// height: 100%;
// cursor: pointer;
// }
}
.face-img {
@include flex;

26
src/views/goverment/safetySupervision/components/orderAdd.vue
View File

@ -772,19 +772,19 @@ onMounted(() => {});
font-weight: 400;
color: #008bff;
}
.diaMapIcon {
background-color: #008bff;
width: 34px;
position: absolute;
right: 0;
border-radius: 0 4px 4px 0;
color: #fff;
display: flex;
align-items: center;
justify-content: center;
height: 100%;
cursor: pointer;
}
// .diaMapIcon {
// background-color: #008bff;
// width: 34px;
// position: absolute;
// right: 0;
// border-radius: 0 4px 4px 0;
// color: #fff;
// display: flex;
// align-items: center;
// justify-content: center;
// height: 100%;
// cursor: pointer;
// }
}
.face-img {
@include flex;

4
src/views/hz-project/localeMonitor/attendanceStatistics/index.vue
View File

@ -158,6 +158,7 @@ const columns: ColumnProps[] = [
{
prop: "teamName",
label: "班组",
width: 150,
search: { el: "input" }
},
{
@ -172,14 +173,17 @@ const columns: ColumnProps[] = [
},
{
prop: "lateDay",
width: 150,
label: "迟到天数"
},
{
prop: "earlyDay",
width: 150,
label: "早退天数"
},
{
prop: "workerHour",
width: 150,
label: "总工时"
}
];

10
src/views/hz-project/localeMonitor/realTime/index.vue
View File

@ -66,6 +66,14 @@ const columns: ColumnProps[] = [
return scoped.row.pm10 + "μg/m³";
}
},
{
prop: "tsp",
label: "TSP",
width: 150,
render: scoped => {
return scoped.row.tsp + "μg/m³";
}
},
{
prop: "humidity",
label: "湿度",
@ -80,7 +88,7 @@ const columns: ColumnProps[] = [
return scoped.row.winddirection + "风";
}
},
{ prop: "createTime", label: "上报时间" }
{ prop: "createTime", label: "上报时间", width: 220 }
];
const initParam = reactive({

2
src/views/hz-project/progressManagement/globalPlanManagement/index.vue
View File

@ -293,7 +293,7 @@ const columns: ColumnProps[] = [
// }
// },
{ prop: "phaseName", label: "智能条线", width: 150 },
{ prop: "chargerNumber", label: "节点责任人编号", width: 150 },
{ prop: "chargerNumber", label: "节点责任人编号", width: 200 },
{ prop: "chargerName", label: "节点责任人", width: 150 },
{
prop: "isDeleted",

13
src/views/hz-project/progressManagement/subItemManagement/index.vue
View File

@ -137,6 +137,16 @@
placeholder="请选择时间"
/>
</el-form-item>
<el-form-item label="实际完成日期：" prop="realEndTime">
<el-date-picker
style="width: 100%"
v-model="childrenFormData.realEndTime"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
type="datetime"
placeholder="请选择时间"
/>
</el-form-item>
<el-form-item label="重要程度：" prop="importance">
<el-input v-model="childrenFormData.importance" placeholder="请输入" />
</el-form-item>
@ -191,7 +201,7 @@
</el-form>
<template #footer>
<div>
<el-button class="cancelButtonStyle" @click="childrenVisible = false">取消</el-button>
<el-button class="hzCancelStyle" @click="childrenVisible = false">取消</el-button>
<el-button type="primary" @click="childrenConfirm(ruleFormRef, childrenFormData)"> 保存 </el-button>
</div>
</template>
@ -258,6 +268,7 @@ const childrenFormData = ref({
taskDesc: "",
planStartTime: "",
planEndTime: "",
realEndTime: "",
importance: "",
commander: "",
overdueIssueDesc: "",

3
src/views/hz-project/projectMonitor/qualityManagement/index.vue
View File

@ -65,7 +65,8 @@ const columns: ColumnProps[] = [
},
{
prop: "createTime",
label: "检查时间"
label: "检查时间",
width: 220
},
{
prop: "buildEnt",

3
src/views/hz-project/projectMonitor/safetyManagement/index.vue
View File

@ -63,7 +63,8 @@ const columns: ColumnProps[] = [
},
{
prop: "createTime",
label: "检查时间"
label: "检查时间",
width: 220
},
{
prop: "buildEnt",

2
src/views/hz-project/smartSite/realTime/index.vue
View File

@ -81,7 +81,7 @@ const columns: ColumnProps[] = [
return scoped.row.winddirection + "风";
}
},
{ prop: "createTime", label: "上报时间" }
{ prop: "createTime", label: "上报时间", width: 220 }
];
const initParam = reactive({