|
@@ -292,7 +292,11 @@
|
|
|
/>
|
|
/>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
<el-form-item label="整改意见" prop="rectificationOpinions">
|
|
<el-form-item label="整改意见" prop="rectificationOpinions">
|
|
|
- <el-input v-model="ruleForm.rectificationOpinions" type="textarea" />
|
|
|
|
|
|
|
+ <el-input
|
|
|
|
|
+ v-model="ruleForm.rectificationOpinions"
|
|
|
|
|
+ type="textarea"
|
|
|
|
|
+ :disabled="status == 1"
|
|
|
|
|
+ />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
<el-form-item>
|
|
|
<div>
|
|
<div>
|
|
@@ -320,7 +324,7 @@
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
- <div class="df aic jcfe" style="width: 100%">
|
|
|
|
|
|
|
+ <div class="df aic jcfe" style="width: 100%" v-if="status != 1">
|
|
|
<!-- <el-button @click="resetForm(ruleFormRef)">重置</el-button> -->
|
|
<!-- <el-button @click="resetForm(ruleFormRef)">重置</el-button> -->
|
|
|
|
|
|
|
|
<el-button
|
|
<el-button
|
|
@@ -470,18 +474,18 @@ let mapId = ref(`map${route.query.id}`);
|
|
|
const coordinates = ref([]);
|
|
const coordinates = ref([]);
|
|
|
function initMap() {
|
|
function initMap() {
|
|
|
let c;
|
|
let c;
|
|
|
- let longitude = 121.524761;
|
|
|
|
|
- let latitude = 31.228721;
|
|
|
|
|
|
|
+ let longitude = 113.76;
|
|
|
|
|
+ let latitude = 34.77;
|
|
|
// if (medias.value.length) {
|
|
// if (medias.value.length) {
|
|
|
// c = Math.floor(medias.value.length / 2);
|
|
// c = Math.floor(medias.value.length / 2);
|
|
|
// longitude = medias.value[c].longitude;
|
|
// longitude = medias.value[c].longitude;
|
|
|
// latitude = medias.value[c].latitude;
|
|
// latitude = medias.value[c].latitude;
|
|
|
// }
|
|
// }
|
|
|
map.value = new AMap.Map(mapId.value, {
|
|
map.value = new AMap.Map(mapId.value, {
|
|
|
- zoom: 16, //级别
|
|
|
|
|
|
|
+ zoom: 14, //级别
|
|
|
center: [longitude, latitude], //中心点坐标
|
|
center: [longitude, latitude], //中心点坐标
|
|
|
mapStyle: "amap://styles/f48d96805f5fa7f5aada657c5ee37017",
|
|
mapStyle: "amap://styles/f48d96805f5fa7f5aada657c5ee37017",
|
|
|
- zoomEnable: false,
|
|
|
|
|
|
|
+ zoomEnable: true,
|
|
|
dragEnable: false,
|
|
dragEnable: false,
|
|
|
});
|
|
});
|
|
|
let toolBar = new AMap.ToolBar({
|
|
let toolBar = new AMap.ToolBar({
|
|
@@ -498,7 +502,7 @@ function initMap() {
|
|
|
let markers = [];
|
|
let markers = [];
|
|
|
for (let i of coordinates.value) {
|
|
for (let i of coordinates.value) {
|
|
|
let content = `<div style='width:160px'>
|
|
let content = `<div style='width:160px'>
|
|
|
- <img src='https://frontend-1255802371.cos.ap-shanghai.myqcloud.com/green-circle.png' style='display:block;width:20px;height:20px;margin:6px auto'/
|
|
|
|
|
|
|
+ <img src='https://hhd-pat-1255802371.cos.ap-shanghai.myqcloud.com/frontend/ship-red-icon.png' style='display:block;width:20px;height:20px;margin:6px auto'/
|
|
|
</div>`;
|
|
</div>`;
|
|
|
|
|
|
|
|
let marker = new AMap.Marker({
|
|
let marker = new AMap.Marker({
|
|
@@ -544,6 +548,13 @@ const rules = ref({
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
const saveFireSafetyCheckRectification = async (formEl) => {
|
|
const saveFireSafetyCheckRectification = async (formEl) => {
|
|
|
|
|
+ if (!fireInspectionInfo.value.promiseeShippingAccountNames) {
|
|
|
|
|
+ ElMessage({
|
|
|
|
|
+ message: "您尚未保存安全检查员信息,请先保存",
|
|
|
|
|
+ type: "warning",
|
|
|
|
|
+ });
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
if (!formEl) return;
|
|
if (!formEl) return;
|
|
|
formEl.validate(async (valid, fields) => {
|
|
formEl.validate(async (valid, fields) => {
|
|
|
if (valid) {
|
|
if (valid) {
|