From b93c2d64a8d57f9da10e1bc2fd54e96004af5bfc Mon Sep 17 00:00:00 2001
From: jxj_yjl <1490736767@qq.com>
Date: Tue, 16 May 2023 14:40:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E9=99=8D=E6=9C=BA=E8=AE=BE=E5=A4=87/?=
=?UTF-8?q?=E5=A1=94=E5=90=8A=E8=AE=BE=E5=A4=87=E9=A1=B5=E9=9D=A2=E6=97=A5?=
=?UTF-8?q?=E6=9C=9F=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/store/index.js | 4 +-
src/views/projectFront/lifter/devMaintain.vue | 160 ++++++++++++------
.../projectFront/towerCrane/devMaintain.vue | 26 ++-
3 files changed, 132 insertions(+), 58 deletions(-)
diff --git a/src/store/index.js b/src/store/index.js
index a68b9574..bc25e386 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -95,8 +95,8 @@ export default new Vuex.Store({
// FILEURL: 'http://101.43.164.214:12345/image/',//内蒙古
// UPLOADURL: 'http://42.194.144.62:8088/upload/image',//中建四
// FILEURL: 'http://42.194.144.62:8088/image/',//中建四
- UPLOADURL: 'http://182.90.224.147:30262/upload/image',//四川成润
- FILEURL: 'http://182.90.224.147:30262/image/',//四川成润
+ // UPLOADURL: 'http://182.90.224.147:30262/upload/image',//四川成润
+ // FILEURL: 'http://182.90.224.147:30262/image/',//四川成润
ACCOUNTTYPE: [
"系统管理员",
diff --git a/src/views/projectFront/lifter/devMaintain.vue b/src/views/projectFront/lifter/devMaintain.vue
index 8751bbb9..8b08082b 100644
--- a/src/views/projectFront/lifter/devMaintain.vue
+++ b/src/views/projectFront/lifter/devMaintain.vue
@@ -27,8 +27,9 @@
>
-
+
{{ $t("message.lifter.demand") }}{{ $t('message.lifter.demand') }}
{{
- $t("message.lifter.refresh")
+ $t('message.lifter.refresh')
}}
{{
- $t("message.videoManage.add")
+ $t('message.videoManage.add')
}}
@@ -68,38 +69,46 @@
style="width: 100%"
height="600px"
>
-
-
+
+
-
+
-
+
- {{ scope.row.maintenanceStatus == 1 ? $t('message.lifter.normal') : $t('message.lifter.abnormalTow') }}
+ {{
+ scope.row.maintenanceStatus == 1
+ ? $t('message.lifter.normal')
+ : $t('message.lifter.abnormalTow')
+ }}
-
+
-
+ :src="fileUrl + scope.row.maintenanceImage"
+ :preview-src-list="[fileUrl + scope.row.maintenanceImage]"
+ >
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-->
-
+
-
+
@@ -326,6 +364,10 @@ export default {
{ required: true, message: this.$t('message.lifter.pleaseUploadPictures'), trigger: "change" },
],
},
+ maintenanceEndTime: '',
+ maintenanceStartTime: '',
+ time: [],
+
};
},
created() {
@@ -337,6 +379,16 @@ export default {
},
methods: {
+ //选择时间
+ getTime(val) {
+ if (val || val.length > 0) {
+ this.maintenanceEndTime = val[1];
+ this.maintenanceStartTime = val[0];
+ } else {
+ this.maintenanceEndTime = "";
+ this.maintenanceStartTime = "";
+ }
+ },
//获取设备列表下拉
getLifterList() {
let data = {
@@ -357,6 +409,9 @@ export default {
pageNo: this.pageNo,
pageSize: this.pageSize,
devSn: this.devSn,
+ maintenanceStartTime: this.maintenanceStartTime,
+ maintenanceEndTime: this.maintenanceEndTime,
+
};
getMaintenanceListApi(data).then((res) => {
if (res.code == 200) {
@@ -426,6 +481,7 @@ export default {
this.pageSize = 10;
this.devSn = "";
this.getListData();
+ this.time=[]
},
handleSizeChange(val) {
@@ -444,26 +500,26 @@ export default {
// .alarmInfo {
// width: 100%;
// height: 100%;
- // .title {
- // background-color: #ffffff;
- // padding: 0 20px;
- // padding-top: 17px;
- // height: 70px;
- // box-sizing: border-box;
- // }
- // .content {
- // margin-top: 10px;
- // box-sizing: border-box;
- // width: 100%;
- // height: 720px;
- // background-color: #ffffff;
- // }
+// .title {
+// background-color: #ffffff;
+// padding: 0 20px;
+// padding-top: 17px;
+// height: 70px;
+// box-sizing: border-box;
// }
-.dialog-footer{
- display: flex;
- justify-content: flex-end;
+// .content {
+// margin-top: 10px;
+// box-sizing: border-box;
+// width: 100%;
+// height: 720px;
+// background-color: #ffffff;
+// }
+// }
+.dialog-footer {
+ display: flex;
+ justify-content: flex-end;
}
-.dialog_content{
+.dialog_content {
margin: 0 20px;
}
diff --git a/src/views/projectFront/towerCrane/devMaintain.vue b/src/views/projectFront/towerCrane/devMaintain.vue
index d4d6c7da..b7a5f85e 100644
--- a/src/views/projectFront/towerCrane/devMaintain.vue
+++ b/src/views/projectFront/towerCrane/devMaintain.vue
@@ -26,8 +26,9 @@
>
-
+
{{
$t('message.lifter.demand')
@@ -285,7 +286,11 @@ export default {
maintenanceImage: [
{ required: true, message: '请上传图片', trigger: 'change' }
]
- }
+ },
+ maintenanceEndTime: '',
+ maintenanceStartTime: '',
+ time: [],
+
}
},
@@ -298,6 +303,16 @@ export default {
},
methods: {
+ //选择时间
+ getTime(val) {
+ if (val || val.length > 0) {
+ this.maintenanceEndTime = val[1];
+ this.maintenanceStartTime = val[0];
+ } else {
+ this.maintenanceEndTime = "";
+ this.maintenanceStartTime = "";
+ }
+ },
//获取设备下拉
getTowerList() {
let data = {
@@ -317,7 +332,9 @@ export default {
projectSn: this.projectSn,
devSn: this.devSn,
pageNo: this.pageNo,
- pageSize: this.pageSize
+ pageSize: this.pageSize,
+ maintenanceStartTime: this.maintenanceStartTime,
+ maintenanceEndTime: this.maintenanceEndTime,
}
getMaintenanceListApi(data).then((res) => {
if (res.code == 200) {
@@ -333,6 +350,7 @@ export default {
this.pageNo = 1
this.pageSize = 10
this.getMaintenanceList()
+ this.time=[]
},
//新增按钮
addMaintenanceBtn() {