+
- 新增
+ 新增
查看
编辑项目大屏
-
+
+
查看编辑项目大屏
- 选择工程/项目
+ 选择项目
-
+
@@ -325,15 +325,15 @@
-
-
+
+
- 选择工程/项目
+ 选择项目
-
+
-
- 工程/项目名称
+
+
-
-->
+ 项目名称
查询
-
+
+
-
@@ -383,9 +378,9 @@
-->
-
+
@@ -432,7 +427,7 @@ const headers = ref({ Authorization: "Bearer " + store.token });
const projectVisible = ref(false);
const tableData = ref([{ name: "111" }]);
const membertableData = ref([]); // 获取检查人员表格数据
-const projectTableData = ref([]); // 获取工程/项目表格数据
+const projectTableData = ref([]); // 获取项目表格数据
const projectForm = ref({
name: ""
});
@@ -469,6 +464,7 @@ const transformDialog = ref(false); // 整改记录对话框
const recordData = ref([]); // 整改记录表格数据
const basicData = ref({
// 基础信息
+ requireType: 1,
opSignature: [],
supervisorSignature: [],
inspectSignature: [],
@@ -560,23 +556,27 @@ const projectRowClick = row => {
};
const projectTreeData = ref({}); // 工程/项目树数据
const searchData = () => {
- if (projectTreeData.value.id == 1) {
- getEngieerData();
- } else {
- getProjectData();
- }
+ getEngieerData();
+ // if (projectTreeData.value.id == 1) {
+ // getEngieerData();
+ // } else {
+ // getProjectData();
+ // }
};
const getRowDetails = async () => {
// 工程/项目详细信息
- if (projectTreeData.value.id == 1) {
- const res = await getEngineerInfo({ id: projectSelectedData.value.id });
- console.log(res);
- basicData.value = reactive({ ...basicData.value, ...res.result });
- } else {
- const res = await getProjectInfo({ projectId: projectSelectedData.value.projectId });
- console.log(res);
- basicData.value = reactive({ ...basicData.value, ...res.result });
- }
+ // if (projectTreeData.value.id == 1) {
+ // const res = await getEngineerInfo({ id: projectSelectedData.value.id });
+ // console.log(res);
+ // basicData.value = reactive({ ...basicData.value, ...res.result });
+ // } else {
+ // const res = await getProjectInfo({ projectId: projectSelectedData.value.projectId });
+ // console.log(res);
+ // basicData.value = reactive({ ...basicData.value, ...res.result });
+ // }
+ const res = await getEngineerInfo({ id: projectSelectedData.value.id });
+ console.log(res);
+ basicData.value = reactive({ ...basicData.value, ...res.result });
};
const getEngieerData = async () => {
// 工程列表
@@ -654,7 +654,7 @@ const submitForm = async () => {
// 全部提交
const allSubmit = async () => {
if (!(projectSelectedData.value.projectName || projectSelectedData.value.engineeringName)) {
- ElMessage.error("请选择工程/项目");
+ ElMessage.error("请选择项目");
return;
}
// if (!basicData.value.selectedMember) {
@@ -721,6 +721,7 @@ watch(
visible1.value = n;
if (n) {
basicData.value = {
+ requireType: 1,
opSignature: [],
supervisorSignature: [],
inspectSignature: [],
@@ -737,7 +738,9 @@ watch(
watch(visible1, (n, o) => {
emits("update:orderDialog", n);
});
-onMounted(() => {});
+onMounted(() => {
+ getEngieerData();
+});
diff --git a/src/views/goverment/huizhou/smartConstructionSite/index.vue b/src/views/goverment/huizhou/smartConstructionSite/index.vue
index 4c8c6e1..6a33041 100644
--- a/src/views/goverment/huizhou/smartConstructionSite/index.vue
+++ b/src/views/goverment/huizhou/smartConstructionSite/index.vue
@@ -234,14 +234,14 @@ const addMarker = () => {
);
// 创建一个 选中的Icon
- // let selectIcon = getIcon(
- // "selected",
- // item.environAlarmFlag === false ? createMarkerImage("clouding.gif") : createMarkerImage("warnclouding.gif")
- // );
let selectIcon = getIcon(
"selected",
- item.environAlarmFlag === false ? createMarkerImage("zhengchang.png") : createMarkerImage("zhengchang.png")
+ item.environAlarmFlag === false ? createMarkerImage("clouding.gif") : createMarkerImage("warnclouding.gif")
);
+ // let selectIcon = getIcon(
+ // "selected",
+ // item.environAlarmFlag === false ? createMarkerImage("zhengchang.png") : createMarkerImage("zhengchang.png")
+ // );
// 将 icon 传入 marker
let point = new BMapGL.Point(Number(item.longitude) || 113, Number(item.latitude) || 21); // 点位设置
diff --git a/src/views/goverment/huizhou/warnManagement/index.vue b/src/views/goverment/huizhou/warnManagement/index.vue
index 3bd36a4..f2c49ca 100644
--- a/src/views/goverment/huizhou/warnManagement/index.vue
+++ b/src/views/goverment/huizhou/warnManagement/index.vue
@@ -63,9 +63,9 @@ const columns: ColumnProps[] = [
label: "预警名称",
search: { el: "input" }
},
- // 多级 prop
- { prop: "dictSort", label: "排序" },
- { prop: "status", label: "状态", render: scope => (scope.row.status == 1 ? "正常" : "停用") },
+ // // 多级 prop
+ // { prop: "dictSort", label: "排序" },
+ // { prop: "status", label: "状态", render: scope => (scope.row.status == 1 ? "正常" : "停用") },
{ prop: "dictValue", label: "预警值" },
{ prop: "operation", label: "操作" }
];
@@ -77,20 +77,20 @@ const formConfig = {
prop: "remark",
type: "input"
},
- {
- label: "排序",
- prop: "dictSort",
- type: "number"
- },
- {
- label: "整改状态",
- prop: "status",
- type: "radio",
- data: [
- { label: "正常", value: 1 },
- { label: "停用", value: 0 }
- ]
- },
+ // {
+ // label: "排序",
+ // prop: "dictSort",
+ // type: "number"
+ // },
+ // {
+ // label: "整改状态",
+ // prop: "status",
+ // type: "radio",
+ // data: [
+ // { label: "正常", value: 1 },
+ // { label: "停用", value: 0 }
+ // ]
+ // },
{
label: "预警值",
prop: "dictValue",
@@ -105,7 +105,7 @@ const formConfig = {
trigger: "blur"
}
],
- dictSort: [
+ dictValue: [
{
required: true,
message: "请输入",
diff --git a/src/views/hz-enterprise/largeScreen/largeScreenOne/components/projectInfo.vue b/src/views/hz-enterprise/largeScreen/largeScreenOne/components/projectInfo.vue
index ef2b00d..f8b9f45 100644
--- a/src/views/hz-enterprise/largeScreen/largeScreenOne/components/projectInfo.vue
+++ b/src/views/hz-enterprise/largeScreen/largeScreenOne/components/projectInfo.vue
@@ -26,7 +26,7 @@
添加检查人员
@@ -401,7 +396,7 @@
建筑面积:
- {{ objData.engineering_area?objData.engineering_area + "㎡":"-" }}
+ {{ objData.engineering_area ? objData.engineering_area + "㎡" : "-" }}
开工日期:
@@ -75,6 +75,7 @@ let objData = ref({
longitude: "",
totalDay: ""
});
+const props = defineProps(["engineeringSn"]);
// 定义要发送的emit事件
const emit = defineEmits(["projectData"]);
const sendData = (data: any) => {
@@ -82,7 +83,7 @@ const sendData = (data: any) => {
};
// 获取项目信息
const getProject = async () => {
- const res: any = await getEntProjectInfo({ engineeringSn: "BD78E0C5C2724962930CC9FAEC216EB9" });
+ const res: any = await getEntProjectInfo({ engineeringSn: props.engineeringSn });
objData.value = reactive({ ...res.result });
sendData(res.result);
};
diff --git a/src/views/hz-enterprise/largeScreen/largeScreenOne/index.vue b/src/views/hz-enterprise/largeScreen/largeScreenOne/index.vue
index da6770a..dd04715 100644
--- a/src/views/hz-enterprise/largeScreen/largeScreenOne/index.vue
+++ b/src/views/hz-enterprise/largeScreen/largeScreenOne/index.vue
@@ -1,12 +1,15 @@
+
("");
let playUrl = ref("");
let playIndex = ref(0);
+const props = defineProps(["engineeringSn"]);
+const emits = defineEmits(["change"]);
+const changeScreen = () => {
+ emits("change");
+};
const getProjectData = (data: any) => {
projectData.value = data;
};
const dataObj = ref({});
const getPayMentData = async () => {
- const res = await screenEntPayment({ engineeringSn: "BD78E0C5C2724962930CC9FAEC216EB9" });
+ const res = await screenEntPayment({ engineeringSn: props.engineeringSn });
console.log(res);
if (res && res.result) {
dataObj.value = res.result;
@@ -253,7 +261,7 @@ let qualityData = ref([
]);
// 获取安全质量信息
const getInspect = async () => {
- const res: any = await getEntInspectInfo({ engineeringSn: "BD78E0C5C2724962930CC9FAEC216EB9" });
+ const res: any = await getEntInspectInfo({ engineeringSn: props.engineeringSn });
safetyTotal.value = res.result.safetyTotal;
saftyData.value[0].value = res.result.safetyCompleted;
saftyData.value[1].value = res.result.safetyUnCompleted;
diff --git a/src/views/hz-enterprise/largeScreen/largeScreenOne/style.scss b/src/views/hz-enterprise/largeScreen/largeScreenOne/style.scss
index 5e6ebbe..e7c7f4d 100644
--- a/src/views/hz-enterprise/largeScreen/largeScreenOne/style.scss
+++ b/src/views/hz-enterprise/largeScreen/largeScreenOne/style.scss
@@ -4,6 +4,21 @@
font-family: "Source Han Sans CN-Regular", "Source Han Sans CN";
color: #ffffff;
}
+.change-btn {
+ position: absolute;
+ right: 10px;
+ top: 0;
+ z-index: 100;
+ width: 50px;
+ height: 50px;
+ border-radius: 50%;
+ background-color: #060f2c;
+ cursor: pointer;
+ .changeImg {
+ width: 50px;
+ height: 50px;
+ }
+}
.leftBox,
.rightBox {
float: left;
@@ -68,6 +83,7 @@
font-weight: 400;
line-height: 14px;
.item {
+ width: max-content;
display: flex;
align-items: center;
margin-bottom: 15px;
diff --git a/src/views/hz-enterprise/smartSite/alarmLedger/index.vue b/src/views/hz-enterprise/smartSite/alarmLedger/index.vue
index ed28e45..453c9a7 100644
--- a/src/views/hz-enterprise/smartSite/alarmLedger/index.vue
+++ b/src/views/hz-enterprise/smartSite/alarmLedger/index.vue
@@ -34,7 +34,8 @@
:tool-button="false"
:pagination="true"
background
- :initParam="initParam"
+ :isShowSearch="false"
+ :onReset="true"
>
@@ -250,11 +251,6 @@ const formConfig = reactive({
}
});
-// 如果表格需要初始化请求参数，直接定义传给 ProTable(之后每次请求都会自动带上该参数，此参数更改之后也会一直带上，改变此参数会自动刷新表格数据)
-const initParam = reactive({
- engineeringSn: ""
-});
-
// 项目或者工程名字
const searchName = ref("");
// 搜索用的项目sn或者工程sn
@@ -321,6 +317,9 @@ const getTableList = (params: any) => {
delete newParams.createTime;
}
newParams.engineeringSn = searchSn.value;
+ if (!newParams.engineeringSn) {
+ return { result: { records: [], current: "1", total: "0", size: "10" } };
+ }
return getLedgerPage(newParams);
};
@@ -361,9 +360,9 @@ const getEngPage = async () => {
};
onMounted(async () => {
await getEngPage();
+ searchSn.value = records.value[0].engineeringSn;
+ searchName.value = records.value[0].engineeringName;
onSearch(records.value[0]);
- searchSn.value = records.value[0].projectSn;
- searchName.value = records.value[0].projectName;
});
diff --git a/src/views/hz-enterprise/smartSite/dustManagement/index.vue b/src/views/hz-enterprise/smartSite/dustManagement/index.vue
index f8bc665..6944c48 100644
--- a/src/views/hz-enterprise/smartSite/dustManagement/index.vue
+++ b/src/views/hz-enterprise/smartSite/dustManagement/index.vue
@@ -38,14 +38,16 @@
:initParam="initParam"
>
- 新增
+ 新增
-
+
编辑
- 删除
+ 删除
@@ -61,7 +63,7 @@
:formData="formData"
v-model:visible="visible"
append-to-body
- width="700px"
+ width="800px"
@confirm="saveItem"
>
@@ -84,14 +86,7 @@ import { jxj_User } from "@/api/types";
import { GlobalStore } from "@/stores";
import { useHandleData } from "@/hooks/useHandleData";
import ProTable from "@/components/ProTable/index.vue";
-import {
- getDustManagementPage,
- addDustManagement,
- editDustManagement,
- deleteDustManagement,
- getengineeringList
-} from "@/api/modules/project";
-import { getRelevanceList } from "@/api/modules/common";
+import { getDustManagementPage, addDustManagement, editDustManagement, deleteDustManagement } from "@/api/modules/enterpriseApi";
import DialogForm from "@/components/DialogForm/index.vue";
import AMap from "@/components/AMap/AMap.vue";
import LeftMenu from "@/components/LeftMenu/LeftMenu.vue";
@@ -120,7 +115,6 @@ interface formData {
name?: string;
code?: string;
hardwareId?: string;
- engineeringSn?: string;
lat?: number | undefined;
lng?: number | undefined;
position?: string;
@@ -132,7 +126,6 @@ const formData = ref({
code: "",
hardwareId: "",
priority: 1,
- engineeringSn: "",
lat: undefined,
lng: undefined,
position: ""
@@ -143,16 +136,6 @@ const searchName = ref("");
const searchSn = ref("");
// 页面的项目名称和工程名称的div点击事件
const onSearch = async (params: any) => {
- // const { result } = await getAIQuestionPage(
- // active.value === 0
- // ? { projectSn: (params as ResAiProjectPage).projectSn, pageNo: pageable.value.pageNo, pageSize: pageable.value.pageSize }
- // : {
- // engineeringSn: (params as ResAiEngineerPage).engineeringSn,
- // pageNo: pageable.value.pageNo,
- // pageSize: pageable.value.pageSize
- // }
- // );
- // pageable.value.total = Number(result.total);
active.value === 0 ? (searchSn.value = params.projectSn) : (searchSn.value = params.engineeringSn);
active.value === 0 ? (searchName.value = params.projectName) : (searchName.value = params.engineeringName);
proTable.value.getTableList();
@@ -184,20 +167,19 @@ const onCurChange = async (params: number) => {
// 修改数据按钮
const handleEditItem = async (index: number, row: any) => {
if (index === 1) {
- formConfig.formItemConfig[1].disabled = false;
+ // formConfig.formItemConfig[1].disabled = false;
title.value = "新增设备";
formData.value = reactive({
name: "",
code: "",
hardwareId: "",
priority: 1,
- engineeringSn: "",
lat: undefined,
lng: undefined,
position: ""
});
} else {
- formConfig.formItemConfig[1].disabled = true;
+ // formConfig.formItemConfig[1].disabled = true;
title.value = "编辑设备";
formData.value = reactive({ ...row });
// 判断后端返回的经纬度是不是为null
@@ -230,22 +212,13 @@ const formConfig = reactive({
{
label: "设备编码",
prop: "code",
- type: "input",
- disabled: true
+ type: "input"
},
{
label: "显示排序",
prop: "priority",
type: "number"
},
- {
- label: "所属工程",
- prop: "engineeringSn",
- type: "select",
- data: [],
- clearable: true
- },
-
{
label: "经纬度",
prop: "position",
@@ -281,13 +254,6 @@ const formConfig = reactive({
message: "请输入经纬度",
trigger: "change"
}
- ],
- engineeringSn: [
- {
- required: true,
- message: "请选择所属工程",
- trigger: "blur"
- }
]
}
});
@@ -314,6 +280,9 @@ const dataCallback = (data: any) => {
const getTableList = (params: any) => {
let newParams = JSON.parse(JSON.stringify(params));
newParams.engineeringSn = searchSn.value;
+ if (!newParams.engineeringSn) {
+ return { result: { records: [], current: "1", total: "0", size: "10" } };
+ }
return getDustManagementPage(newParams);
};
@@ -325,6 +294,7 @@ const handleDeleteItem = async (params: jxj_User.ResUserList) => {
// 页面新增，编辑数据
const saveItem = async (form: any) => {
+ form.engineeringSn = searchSn.value;
if (form.id) {
const res = await editDustManagement(form);
proTable.value.getTableList();
@@ -344,17 +314,6 @@ const getAddress = async (e: any) => {
isOpen.value = false;
ElMessage.success("获取经纬度成功");
};
-
-// 新增或者编辑按钮的下拉框
-const getNameList = async () => {
- const res = await getengineeringList({});
- formConfig.formItemConfig[3].data = res.result.map(item => {
- return {
- label: item.engineeringName,
- value: item.engineeringSn
- };
- });
-};
// 获取工程名称分页
const getEngPage = async () => {
const { result } = await getDustengineeringPage(pages.value);
@@ -366,14 +325,10 @@ const getEngPage = async () => {
pages.value.total = +result.total;
};
onMounted(async () => {
- getNameList();
- if (store.projectDateAuth === 1) {
- delete formConfig.rules.engineeringSn;
- }
await getEngPage();
- onSearch(records.value[0]);
searchSn.value = records.value[0].projectSn;
searchName.value = records.value[0].projectName;
+ onSearch(records.value[0]);
});
diff --git a/src/views/hz-enterprise/smartSite/realTime/index.vue b/src/views/hz-enterprise/smartSite/realTime/index.vue
index 2feed0d..6891f02 100644
--- a/src/views/hz-enterprise/smartSite/realTime/index.vue
+++ b/src/views/hz-enterprise/smartSite/realTime/index.vue
@@ -193,6 +193,9 @@ const dataCallback = (data: any) => {
const getTableList = (params: any) => {
let newParams = JSON.parse(JSON.stringify(params));
newParams.engineeringSn = searchSn.value;
+ if (!newParams.engineeringSn) {
+ return { result: { records: [], current: "1", total: "0", size: "10" } };
+ }
return getRealTimePage(newParams);
};
// 获取工程名称分页
diff --git a/src/views/hz-project/largeScreen/largeScreenOne/index.vue b/src/views/hz-project/largeScreen/largeScreenOne/index.vue
index 3bbb2b2..2a0e468 100644
--- a/src/views/hz-project/largeScreen/largeScreenOne/index.vue
+++ b/src/views/hz-project/largeScreen/largeScreenOne/index.vue
@@ -6,7 +6,7 @@
+ 
+
+
-
编辑
-