-
+
- {{ scope.row.inspectTime }}
+ {{ scope.row.patrolTime }}
-
+
- {{ scope.row.inspectStaffName }}
+ {{ scope.row.staffName }}
-
+
-
- {{ scope.row.inspectStaffMobile }}
+
+ {{ scope.row.mobile }}
-
+
-
+
- {{ scope.row.inspectResult == 1 ? '正常' : '异常' }}
+ {{ scope.row.result == 1 ? '正常' : '异常' }}
@@ -84,7 +76,7 @@
-->
-
+
-
+
- {{ scope.row.nextInspectTime }}
+ {{ scope.row.reviewTime }}
@@ -221,7 +213,6 @@ export default {
watch: {
id: {
handler(val) {
- console.log('val------points', val);
if (val.length > 0) {
this.btnDisabled = false;
this.getList();
@@ -232,9 +223,7 @@ export default {
},
created() {
- console.log('id', this.id);
this.getOptionStaff();
- this.getList();
},
methods: {
@@ -256,7 +245,6 @@ export default {
},
handleImgSuccess(res, row) {
- console.log('handleImgSuccess', res);
if (res.code === 0 && res.msg === 'success') {
row.imgList.push(res.data.url);
this.computeImgShowList(row);
@@ -272,7 +260,6 @@ export default {
},
handleImgRemove(file, row) {
- console.log('handleImgRemove', file);
let url = file.url || file.response.data.url;
if (url) {
row.imgList = row.imgList.filter(item => item !== url);
@@ -287,13 +274,11 @@ export default {
},
handleChange(row, type) {
- console.log('type----', type);
if (type == 'cancle') {
row = { ...this.tempRow };
row.isEdit = false;
if (this.btnType == 'add') this.tableData.pop();
this.getList();
- console.log('row----', row);
} else {
this.tempRow = { ...row };
row.isEdit = true;
@@ -303,12 +288,12 @@ export default {
},
handleChangeStaff(row) {
- const { inspectStaffId } = row;
+ const { staffId } = row;
const { optionStaff } = this;
- let item = optionStaff.find(item => item.value == inspectStaffId);
+ let item = optionStaff.find(item => item.value == staffId);
if (item) {
- row.inspectStaffName = item.name;
- row.inspectStaffMobile = item.mobile;
+ row.staffName = item.name;
+ row.mobile = item.mobile;
}
},
@@ -334,14 +319,14 @@ export default {
const item = {
isEdit: true,
- id: this.id,
- inspectTime: '',
- inspectStaffId: '',
- inspectStaffName: '',
- inspectStaffMobile: '',
- inspectResult: '',
- imgList: [],
- nextInspectTime: ''
+ enterpriseId: this.id,
+ patrolTime: '',
+ staffId: '',
+ staffName: '',
+ mobile: '',
+ result: '',
+ reviewTime: '',
+ imgList: []
};
this.computeImgShowList(item);
this.tableData.push(item);
@@ -382,7 +367,7 @@ export default {
},
async del(row) {
- const url = `/actual/base/enterprise/del-patrol/${this.id}`;
+ const url = `/actual/base/enterprise/del-patrol/${row.patrolId}`;
const { data, code, msg } = await requestPost(url);
if (code === 0) {
@@ -394,17 +379,11 @@ export default {
},
async getList() {
- const url = `/actual/base/enterprise/patrollist/`;
- console.log('this.id', this.id);
- const params = {
- enterpriseId: this.id,
- pageNo: 1,
- pageSize: 10000
- };
-
- const { data, code, msg } = await requestPost(url, params);
-
+ const url = `/actual/base/enterprise/patrollist/${this.id}`;
+ console.log('getList---------------------------------------------------------------------------', url);
+ const { data, code, msg } = await requestPost(url);
if (code === 0) {
+ console.log('data', data);
this.tableData = data.list.map(item => {
this.computeImgShowList(item);
return {
diff --git a/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue
index 95b10d04f..1e01630d4 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue
@@ -66,7 +66,7 @@
关闭
- 重置
+
确 定
@@ -301,7 +301,7 @@ export default {
}, // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
initMap() {
let { latitude, longitude } = this.$store.state.user;
-
+
if (this.formData.latitude && this.formData.longitude) {
latitude = this.formData.latitude;
longitude = this.formData.longitude;
@@ -310,24 +310,24 @@ export default {
latitude = 39.9088810666821;
longitude = 116.39743841556731;
}
-
+
this.$nextTick(() => {
- if (!map) {
- map = new daiMap(
- document.getElementById('app_event'),
- { latitude, longitude },
- {
- zoom: 16.2, // 设置地图缩放级别
- pitch: 43.5, // 设置俯仰角
- rotation: 45 // 设置地图旋转角度
- }
- );
- // 监听地图平移结束
- map.on('dragend', e => {
- this.handleMoveCenter(e);
- });
- } else {
- map.setCenter(latitude, longitude);
+ map = new daiMap(
+ document.getElementById('app_event'),
+ { latitude, longitude },
+ {
+ zoom: 16.2, // 设置地图缩放级别
+ pitch: 43.5, // 设置俯仰角
+ rotation: 45 // 设置地图旋转角度
+ }
+ );
+ // 监听地图平移结束
+ map.on('dragend', e => {
+ this.handleMoveCenter(e);
+ });
+
+ map.setCenter(latitude, longitude);
+ if (this.formData.latitude) {
map.setMarker(latitude, longitude);
}
});
diff --git a/src/views/modules/shequzhili/tuceng/anquan/shebei/index.vue b/src/views/modules/shequzhili/tuceng/anquan/shebei/index.vue
index 0ffc75bef..6b5957dc3 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/shebei/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/shebei/index.vue
@@ -63,11 +63,13 @@
-
+
查看
- 编辑
- 删除
+
+ 编辑
+ 待完善
+ 删除
diff --git a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue
index c668523c4..21a2eabea 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue
@@ -37,7 +37,7 @@
:action="uploadUrl"
:show-file-list="true"
:limit="3"
- :file-list="formData.imgShowList"
+ :file-list="formData.imgList"
:on-success="res => handleImgSuccess(res, formData)"
:on-remove="res => handleImgRemove(res, formData)"
list-type="picture"
@@ -74,7 +74,7 @@
{{ formData.reportTime }}
{{ formData.dangerPlaceName }}
{{ formData.gridName }}
-
{{ formData.dangerContent }}
+
+ {{ formData.dangerContent }}
+
+
+
+
{{ formData.handleStateName }}
{{ formData.reportPerson }}
{{ formData.mobile }}
@@ -110,7 +121,7 @@
{{ formData.location }}
-
+
@@ -118,10 +129,10 @@