diff --git a/src/assets/images/emergencywz.png b/src/assets/images/emergencywz.png new file mode 100644 index 00000000..c031c566 Binary files /dev/null and b/src/assets/images/emergencywz.png differ diff --git a/src/assets/js/api/emergencyDisposal.js b/src/assets/js/api/emergencyDisposal.js index 55c8308c..87705b9f 100644 --- a/src/assets/js/api/emergencyDisposal.js +++ b/src/assets/js/api/emergencyDisposal.js @@ -7,18 +7,19 @@ import {post, get, put} from '../http' // 应急处置台账 export const getEmergencyRecordPageApi = data => get('xmgl/xzEmergencyRecord/page', data); //列表接口 export const getEmergencyRecordQueryByIdApi = data => get('xmgl/xzEmergencyRecord/queryById', data); //详情 -export const getEmergencyRecordEditApi = data => post('xmgl/xzEmergencyRecord/edit', data); //详情 +export const getEmergencyRecordEditApi = data => post('xmgl/xzEmergencyRecord/edit', data); //编辑 export const getEmergencyRecordDeleteApi = data => post('xmgl/xzEmergencyRecord/delete', data); //删除 +export const getEmergencyRecordListApi = data => get('xmgl/xzEmergencyRecord/list', data); //类型列表 // 应急类型 export const getEmergencyTypeApi = data => get('xmgl/xzEmergencyType/page', data); //列表接口 export const getEmergencyTypeAddApi = data => post('xmgl/xzEmergencyType/add', data); //添加 +export const getEmergencyTypeEditApi = data => post('xmgl/xzEmergencyType/edit', data); //编辑 export const getEmergencyTypeDeleteApi = data => post('xmgl/xzEmergencyType/delete', data); //删除 export const getEmergencyTypeListApi = data => get('xmgl/xzEmergencyType/list', data); //类型列表 // 应急推送 -// /xmgl/xzEmergencyPush/save // 设置责任人 export const getEmergencyPushPageApi = data => get('xmgl/xzEmergencyPush/page', data); //列表接口 export const getEmergencyPushSaveApi = data => post('xmgl/xzEmergencyPush/save', data); //添加 export const getWorkerInfoApi = data => post('xmgl/systemUser/getProjectChilderSystemUserList', data); //添加 @@ -26,9 +27,8 @@ export const getWorkerInfoApi = data => post('xmgl/systemUser/getProjectChilderS // 救援物资 // EmergencyRelief export const getEmergencyReliefPageApi = data => get('xmgl/xzEmergencyReliefGoods/page', data); //列表接口 export const getEmergencyReliefAddApi = data => post('xmgl/xzEmergencyReliefGoods/add', data); //添加 +export const getEmergencyReliefEditApi = data => post('xmgl/xzEmergencyReliefGoods/edit', data); //编辑 export const getEmergencyReliefDeleteApi = data => post('xmgl/xzEmergencyReliefGoods/delete', data); //删除 - - - +export const getEmergencyReliefListApi = data => get('xmgl/xzEmergencyReliefGoods/list', data); //类型列表 // 救援隐患审批 diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 08e97487..6778e31c 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -84,8 +84,8 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 - // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 - axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 + axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 + // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 diff --git a/src/pages/index/index.html b/src/pages/index/index.html index 7fde49ed..1fed5cac 100644 --- a/src/pages/index/index.html +++ b/src/pages/index/index.html @@ -26,7 +26,7 @@ 智慧工地云平台 - + @@ -71,7 +76,7 @@ 待救援 救援中 + style="color:#5181f6;font-weight:bold;">救援中 已救援 @@ -111,24 +116,6 @@ :page-sizes="[10, 20, 30, 40]" :page-size="pageSize" :total="Number(total)"> - - - - - {{ $t('message.dangerousBigProject.hintContent') }} - - - - - {{ $t('message.dangerousBigProject.cancel') }} - - - - {{ $t('message.dangerousBigProject.confirm') }} - - -
@@ -139,7 +126,7 @@
报警人员姓名：{{ firstAidCallDetail.alarmPersonName }}
现场视频情况： - {{ (firstAidCallDetail.liveVideoSituation && JSON.parse(firstAidCallDetail.liveVideoSituation) instanceof Array && @@ -155,7 +142,7 @@ 待救援 救援中 + style="color:#5181f6;font-weight:bold;">救援中 已救援
@@ -164,21 +151,23 @@
所属企业：{{ firstAidCallDetail.enterpriseName }}
经纬度： - {{ firstAidCallDetail.longitude }},{{ - firstAidCallDetail.latitude }} - + {{ firstAidCallDetail.longitude }},{{ + firstAidCallDetail.latitude }} +
+
+
详细地址：{{ firstAidCallDetail.incidentSite }}
+
报警时间：{{ firstAidCallDetail.alarmTime }}
+
应急详情：{{ firstAidCallDetail.emergencyDetail }}
-
报警时间：{{ firstAidCallDetail.alarmTime }}
-
-
现场图片：
+ :key="index" style="flex: 1;"> 处置资料： - {{JSON.parse(emergencyInfo.disposalInformation).map(item => item.name).join("、") }} + {{ JSON.parse(emergencyInfo.disposalInformation).map(item => item.name).join("、") }}
@@ -215,12 +204,10 @@
-
+
救援情况 - 新增救援情况 -
事故已关闭
+
事故已关闭
现场视频： + return handleDelete(fileList, index, 1) + }" :action="$store.state.UPLOADURL" multiple>
将文件拖到此处，或点击上传
现场图片： - + return handleDelete(fileList, index, 2) + }"> @@ -264,8 +257,9 @@ placeholder="请输入">
-
- 删除 +
+ +
@@ -310,45 +304,55 @@ -
- 全部提交 + 新增救援情况 +
+
+ 提交救援记录
-
+
处置报告 - 提交处置报告 +
-
+
+ return handleDelete(fileList, -1, 3) + }" :action="$store.state.UPLOADURL" multiple>
将文件拖到此处，或点击上传
-
下载处置报告
+
+ 提交处置报告 +
+
- - +
@@ -360,25 +364,18 @@ 您的浏览器不支持 video 标签。 + + +