diff --git a/src/api/common/index.ts b/src/api/common/index.ts new file mode 100644 index 0000000..5d5bab7 --- /dev/null +++ b/src/api/common/index.ts @@ -0,0 +1,33 @@ +import { defHttp } from '@/utils/http/axios'; + +enum Api { + getSubcategoryType = '/platform/subcategoryType/list', + getProjectInfo = '/platform/projectInfo/getNames', + getOrganizationType = '/platform/organizationType/list', + getContractNamesByProjectName = '/platform/contractInfo/getContractNamesByProjectName', + queryPointNames = '/platform/pointInfo/queryPointNames ', + +} + + + + + +export function getSubcategoryType() { + return defHttp.get({ url: Api.getSubcategoryType }); +} + +export function getProjectInfo() { + return defHttp.get({ url: Api.getProjectInfo }); +} +export function getOrganizationType() { + return defHttp.get({ url: Api.getOrganizationType }); +} + +export function getContractNamesByProjectName(data:any) { + return defHttp.post({ url: Api.getContractNamesByProjectName,data }); +} + +export function queryPointNames() { + return defHttp.get({ url: Api.queryPointNames }); +} \ No newline at end of file diff --git a/src/views/IO/delayPatrol/waitAudit/faultModal.vue b/src/views/IO/delayPatrol/waitAudit/faultModal.vue index a89344d..b9061cd 100644 --- a/src/views/IO/delayPatrol/waitAudit/faultModal.vue +++ b/src/views/IO/delayPatrol/waitAudit/faultModal.vue @@ -39,8 +39,8 @@ - 是 - 否 + 是 + 否 @@ -78,7 +78,7 @@ :options="faultSubcategoryOptions" :fieldNames="{ label: 'typeName', - value: 'id', + value: 'typeName', options: 'options', }" /> @@ -105,13 +105,18 @@ v-model:value="form.faultLocation" :options="faultLocationOptions" @change="faultLocationChange" + :fieldNames="{ + label: 'pointName', + value: 'pointName', + options: 'options', + }" /> -
+
@@ -132,15 +137,15 @@ > 上传 - + - 是 - 否 + 是 + 否 @@ -178,6 +183,7 @@ import AMapLoader from '@amap/amap-jsapi-loader'; import { getToken } from '@/utils/auth'; import { useGlobSetting } from '@/hooks/setting'; + import {queryPointNames} from '@/api/common/index' export default { setup() { const visible = ref(false); @@ -218,51 +224,44 @@ }; const responseLevelOptions = [ { - value: 0, - label: '常规', + value: '常规', }, { - value: 1, - label: '紧急', + value: '紧急', }, { - value: 2, - label: '特级', + value: '特级', }, ]; const maintenanceRequirementOptions = [ { - value: 1, - label: '新增', + value: '修复', + }, + { + value: '新增', }, - ]; - const faultLocationOptions = [ { - value: '1', - label: 'a', - latitude: '29.8537459', - longitude: '121.5591519', + value: '拆除', }, { - value: '2', - label: 'b', - latitude: '29.8572957 ', - longitude: '121.5611743', + value: '清除', }, { - value: '3', - label: 'c', - latitude: '29.8537459', - longitude: '121.5591519', + value: '其他', }, ]; + const faultLocationOptions = ref([]) + const getFaultLocationOptions = async() =>{ + const res = await queryPointNames() + faultLocationOptions.value = res + } const faultLocationChange = (val) => { - const obj = faultLocationOptions.find((i) => { - return (i.value = val); + const obj = faultLocationOptions.value.find((i) => { + return (i.pointName = val); }); form.longitude = obj.longitude; form.latitude = obj.latitude; - initMap(obj.longitude, obj.latitude, obj.organizationName); + initMap(obj.longitude, obj.latitude, obj.pointName); }; const faultSubcategoryOptions = ref([]); const getFaultSubcategoryOptions = async () => { @@ -274,6 +273,7 @@ getFaultSubcategoryOptions(); getProjectNameOptions(); getOrganizationNameOptions(); + getFaultLocationOptions() }; const handleOk = () => { @@ -302,7 +302,7 @@ }); // 初始化地图 - map.value = new AMap.Map('amapContainer', { + map.value = new AMap.Map('waitAuditMap', { zoom: 17, center: [longitude, latitude], }); @@ -320,7 +320,7 @@ }; const closeModal = () => { formRef.value.resetFields(); - fileLists.value=[] + fileLists.value = []; visible.value = false; map.value?.destroy(); }; diff --git a/src/views/IO/delayPatrol/waitPatrol/faultModal.vue b/src/views/IO/delayPatrol/waitPatrol/faultModal.vue index a89344d..e7d8a4e 100644 --- a/src/views/IO/delayPatrol/waitPatrol/faultModal.vue +++ b/src/views/IO/delayPatrol/waitPatrol/faultModal.vue @@ -39,8 +39,8 @@ - 是 - 否 + 是 + 否 @@ -78,7 +78,7 @@ :options="faultSubcategoryOptions" :fieldNames="{ label: 'typeName', - value: 'id', + value: 'typeName', options: 'options', }" /> @@ -105,13 +105,18 @@ v-model:value="form.faultLocation" :options="faultLocationOptions" @change="faultLocationChange" + :fieldNames="{ + label: 'pointName', + value: 'pointName', + options: 'options', + }" /> -
+
@@ -132,15 +137,15 @@ > 上传 - + - 是 - 否 + 是 + 否 @@ -178,6 +183,7 @@ import AMapLoader from '@amap/amap-jsapi-loader'; import { getToken } from '@/utils/auth'; import { useGlobSetting } from '@/hooks/setting'; + import {queryPointNames} from '@/api/common/index' export default { setup() { const visible = ref(false); @@ -218,51 +224,44 @@ }; const responseLevelOptions = [ { - value: 0, - label: '常规', + value: '常规', }, { - value: 1, - label: '紧急', + value: '紧急', }, { - value: 2, - label: '特级', + value: '特级', }, ]; const maintenanceRequirementOptions = [ { - value: 1, - label: '新增', + value: '修复', + }, + { + value: '新增', }, - ]; - const faultLocationOptions = [ { - value: '1', - label: 'a', - latitude: '29.8537459', - longitude: '121.5591519', + value: '拆除', }, { - value: '2', - label: 'b', - latitude: '29.8572957 ', - longitude: '121.5611743', + value: '清除', }, { - value: '3', - label: 'c', - latitude: '29.8537459', - longitude: '121.5591519', + value: '其他', }, ]; + const faultLocationOptions = ref([]) + const getFaultLocationOptions = async() =>{ + const res = await queryPointNames() + faultLocationOptions.value = res + } const faultLocationChange = (val) => { - const obj = faultLocationOptions.find((i) => { - return (i.value = val); + const obj = faultLocationOptions.value.find((i) => { + return (i.pointName = val); }); form.longitude = obj.longitude; form.latitude = obj.latitude; - initMap(obj.longitude, obj.latitude, obj.organizationName); + initMap(obj.longitude, obj.latitude, obj.pointName); }; const faultSubcategoryOptions = ref([]); const getFaultSubcategoryOptions = async () => { @@ -274,6 +273,7 @@ getFaultSubcategoryOptions(); getProjectNameOptions(); getOrganizationNameOptions(); + getFaultLocationOptions() }; const handleOk = () => { @@ -302,7 +302,7 @@ }); // 初始化地图 - map.value = new AMap.Map('amapContainer', { + map.value = new AMap.Map('waitPatrolMap', { zoom: 17, center: [longitude, latitude], }); @@ -320,7 +320,7 @@ }; const closeModal = () => { formRef.value.resetFields(); - fileLists.value=[] + fileLists.value = []; visible.value = false; map.value?.destroy(); }; diff --git a/src/views/IO/patrolReport/index.vue b/src/views/IO/patrolReport/index.vue index fbca564..986bb69 100644 --- a/src/views/IO/patrolReport/index.vue +++ b/src/views/IO/patrolReport/index.vue @@ -23,7 +23,7 @@ - + diff --git a/src/views/IO/patrolReport/patrolReportdata.ts b/src/views/IO/patrolReport/patrolReportdata.ts index ee2998a..137b2f7 100644 --- a/src/views/IO/patrolReport/patrolReportdata.ts +++ b/src/views/IO/patrolReport/patrolReportdata.ts @@ -30,10 +30,10 @@ export const columns: BasicColumn[] = [ title: '巡检部位', dataIndex: 'inspectionPart', }, - { - title: '类型', - dataIndex: 'type', - }, + // { + // title: '类型', + // dataIndex: 'type', + // }, { title: '巡检时间', dataIndex: 'inspectionTime', diff --git a/src/views/IO/patrolReport/reportModal.vue b/src/views/IO/patrolReport/reportModal.vue index 7ce3fbe..e8737c9 100644 --- a/src/views/IO/patrolReport/reportModal.vue +++ b/src/views/IO/patrolReport/reportModal.vue @@ -102,7 +102,7 @@ import { getToken } from '@/utils/auth'; import { useGlobSetting } from '@/hooks/setting'; export default { - setup() { + setup(props,{emit}) { const title = ref('新增'); const formRef = ref(); // const attachmentList = ref([]); @@ -165,6 +165,8 @@ }; //弹窗 const showModal = async (type, id) => { + visible.value = true; + getProjectOptions() if (type == 1) { title.value = '新增'; } else if (type == 2) { @@ -192,8 +194,7 @@ }) } } - visible.value = true; - getProjectOptions() + }; const handleOk = () => { @@ -207,7 +208,9 @@ delete params.id add(params).then((_) => { message.success('新增成功'); + emit('success') closeModal() + }); } else { let params = {}; @@ -216,7 +219,8 @@ } update(params).then((_) => { message.success('编辑成功'); - closeModal() + emit('success') + closeModal() }); } } diff --git a/src/views/IO/workOrder/delayAudit/auditModal.vue b/src/views/IO/workOrder/delayAudit/auditModal.vue new file mode 100644 index 0000000..d4c98f7 --- /dev/null +++ b/src/views/IO/workOrder/delayAudit/auditModal.vue @@ -0,0 +1,173 @@ + + + + + diff --git a/src/views/IO/workOrder/delayAudit/detailDrawer.vue b/src/views/IO/workOrder/delayAudit/detailDrawer.vue index 2ac8e60..90cfcf2 100644 --- a/src/views/IO/workOrder/delayAudit/detailDrawer.vue +++ b/src/views/IO/workOrder/delayAudit/detailDrawer.vue @@ -13,82 +13,79 @@ -
所属项目:{{ DetailDr }}
+
所属项目：{{ detail.projectName }}
 -
所属合同:
+
所属合同：{{ detail.contractName }}
 -
编号:
+
编号：{{ detail.id }}
 -
报修人员:
+
报修人员：{{ detail.repairer }}
 -
状态:
+
状态：{{ detail.status }}
 -
待处理人:
+
待处理人：{{ detail.handler }}
 -
报修时间:
+
报修时间：{{ detail.repairTime }}
 -
是否事故:
+
是否事故：{{ detail.isAccident }}
 -
故障大类:
+
故障大类：{{ detail.faultCategory }}
 -
故障小类:
+
故障小类：{{ detail.faultSubcategory }}
 -
所属机构:
+
所属机构：{{ detail.institution }}
 -
响应级别:
+
响应级别：{{ detail.responseLevel }}
 - x - - -
维修人员:
+
响应时限(小时)：{{ detail.responseTime }}
 -
修复时间:
+
故障地址：{{ detail.faultLocation }}
 -
修复结果:
+
故障描述：{{ detail.faultDescription }}
 -
费用情况:
+
故障图片：{{ detail.faultImg }}
 - -
处理图片:
- - + +
+ +
@@ -120,105 +117,91 @@
- - - - - - - - - - - - - diff --git a/src/views/IO/workOrder/delayAudit/index.vue b/src/views/IO/workOrder/delayAudit/index.vue index 6ec6d68..9a07f34 100644 --- a/src/views/IO/workOrder/delayAudit/index.vue +++ b/src/views/IO/workOrder/delayAudit/index.vue @@ -1,16 +1,16 @@ @@ -19,7 +19,7 @@ import { BasicTable, useTable } from '@/components/Table'; import { list } from './api'; import { formSchemas, columns } from './data'; - import faultModal from './faultModal.vue'; + import auditModal from './auditModal.vue'; import detailDrawer from './detailDrawer.vue'; import { ref } from 'vue'; @@ -34,7 +34,7 @@ useSearchForm: true, formConfig: { schemas: formSchemas, - name: 'patroling', + name: 'delayAudit', baseColProps: { xs: 24, sm: 24, @@ -51,14 +51,14 @@ }, }); //弹窗内容 - const falutModalRef = ref(); - const showFaultModal = () => { - falutModalRef.value.showModal(); + const auditModalRef = ref(); + const showAuditModal = (id:any) => { + auditModalRef.value.showModal(id); }; //详情抽屉 const detailDrawerRef = ref(); - const showDrawer = () => { - detailDrawerRef.value.showDrawer(); + const showDrawer = (id:any) => { + detailDrawerRef.value.showDrawer(id); }; // 前往审批记录页面 diff --git a/src/views/IO/workOrder/orderAudit/auditModal.vue b/src/views/IO/workOrder/orderAudit/auditModal.vue new file mode 100644 index 0000000..fdb9609 --- /dev/null +++ b/src/views/IO/workOrder/orderAudit/auditModal.vue @@ -0,0 +1,173 @@ + + + + + diff --git a/src/views/IO/workOrder/orderAudit/data.ts b/src/views/IO/workOrder/orderAudit/data.ts index 766b735..3c3c843 100644 --- a/src/views/IO/workOrder/orderAudit/data.ts +++ b/src/views/IO/workOrder/orderAudit/data.ts @@ -27,16 +27,13 @@ export const formSchemas: FormSchema[] = [ //列表展示 const responseLevelOptions = [ { - value: 0, - label: '常规', + value: '常规', }, { - value: 1, - label: '紧急', + value: '紧急', }, { - value: 2, - label: '特级', + value: '特级', }, ]; @@ -52,11 +49,6 @@ export const columns: BasicColumn[] = [ { title: '响应级别', dataIndex: 'responseLevel', - customRender({ text }) { - return responseLevelOptions.find((i) => { - return i.value == text; - })?.label; - }, }, { title: '故障描述', diff --git a/src/views/IO/workOrder/orderAudit/detailDrawer.vue b/src/views/IO/workOrder/orderAudit/detailDrawer.vue index 38509b5..fed9e85 100644 --- a/src/views/IO/workOrder/orderAudit/detailDrawer.vue +++ b/src/views/IO/workOrder/orderAudit/detailDrawer.vue @@ -13,80 +13,104 @@ -
所属项目:
+
所属项目：{{ detail.projectName }}
 -
所属合同:
+
所属合同：{{ detail.contractName }}
 -
编号:
+
编号：{{ detail.id }}
 -
报修人员:
+
报修人员：{{ detail.repairer }}
 -
状态:
+
状态：{{ detail.status }}
 -
待处理人:
+
待处理人：{{ detail.handler }}
 -
报修时间:
+
报修时间：{{ detail.repairTime }}
 -
是否事故:
+
是否事故：{{ detail.isAccident }}
 -
故障大类:
+
故障大类：{{ detail.faultCategory }}
 -
故障小类:
+
故障小类：{{ detail.faultSubcategory }}
 -
所属机构:
+
所属机构：{{ detail.institution }}
 -
响应级别:
+
响应级别：{{ detail.responseLevel }}
 - x + + +
响应时限(小时)：{{ detail.responseTime }}
+ + + + +
故障地址：{{ detail.faultLocation }}
+ + + + +
故障描述：{{ detail.faultDescription }}
+ + + + +
故障图片：{{ detail.faultImg }}
+ + + + +
+ + -
维修人员:
+
维修人员：{{ detail.fixPeople }}
 -
修复时间:
+
修复时间：{{ detail.fixTime }}
 -
修复结果:
+
修复结果：{{ detail.fixResult }}
 -
费用情况:
+
费用情况：{{ detail.cost }}
 -
处理图片:
+
处理图片：{{ detail.handleImg }}
 @@ -144,26 +168,37 @@ - - diff --git a/src/views/IO/workOrder/orderAudit/index.vue b/src/views/IO/workOrder/orderAudit/index.vue index 8a3ebf7..23dfffa 100644 --- a/src/views/IO/workOrder/orderAudit/index.vue +++ b/src/views/IO/workOrder/orderAudit/index.vue @@ -1,16 +1,16 @@ @@ -19,7 +19,7 @@ import { BasicTable, useTable } from '@/components/Table'; import { list } from './api'; import { formSchemas, columns } from './data'; - import faultModal from './faultModal.vue'; + import auditModal from './auditModal.vue'; import detailDrawer from './detailDrawer.vue'; import { ref } from 'vue'; @@ -34,7 +34,7 @@ useSearchForm: true, formConfig: { schemas: formSchemas, - name: 'patroling', + name: 'orderAudit', baseColProps: { xs: 24, sm: 24, @@ -51,14 +51,14 @@ }, }); //弹窗内容 - const falutModalRef = ref(); - const showFaultModal = () => { - falutModalRef.value.showModal(); + const auditModalRef = ref(); + const showAuditModal = (id:any) => { + auditModalRef.value.showModal(id); }; //详情抽屉 const detailDrawerRef = ref(); - const showDrawer = () => { - detailDrawerRef.value.showDrawer(); + const showDrawer = (id:any) => { + detailDrawerRef.value.showDrawer(id); }; // 前往审批记录页面 diff --git a/src/views/IO/workOrder/orderSearch/data.ts b/src/views/IO/workOrder/orderSearch/data.ts index cbab50b..e2db2ca 100644 --- a/src/views/IO/workOrder/orderSearch/data.ts +++ b/src/views/IO/workOrder/orderSearch/data.ts @@ -3,16 +3,13 @@ import { FormSchema } from '@/components/Form'; //列表展示 const responseLevelOptions = [ { - value: 0, - label: '常规', + value: '常规', }, { - value: 1, - label: '紧急', + value: '紧急', }, { - value: 2, - label: '特级', + value: '特级', }, ]; export const formSchemas: FormSchema[] = [ @@ -22,18 +19,6 @@ export const formSchemas: FormSchema[] = [ component: 'Select', componentProps: { options: [ - { - value: '1', - label: '2323', - }, - { - value: '2', - label: '2323', - }, - { - value: '3', - label: '2323', - }, ], }, }, @@ -62,9 +47,6 @@ export const formSchemas: FormSchema[] = [ label: '地址', field: 'location', component: 'Input', - componentProps: { - placeholder: '输入天数', - }, }, { field: 'status', @@ -73,37 +55,12 @@ export const formSchemas: FormSchema[] = [ componentProps: { options: [ { - value: '1', - label: '2323', - }, - { - value: '2', - label: '2323', + value: '0', + label: '启用', }, - { - value: '3', - label: '2323', - }, - ], - }, - }, - { - field: 'faultCategory', - label: '故障大类', - component: 'Select', - componentProps: { - options: [ { value: '1', - label: '2323', - }, - { - value: '2', - label: '2323', - }, - { - value: '3', - label: '2323', + label: '禁用', }, ], }, @@ -114,39 +71,6 @@ export const formSchemas: FormSchema[] = [ component: 'Select', componentProps: { options: [ - { - value: '1', - label: '2323', - }, - { - value: '2', - label: '2323', - }, - { - value: '3', - label: '2323', - }, - ], - }, - }, - { - field: 'institution', - label: '所属机构', - component: 'Select', - componentProps: { - options: [ - { - value: '1', - label: '2323', - }, - { - value: '2', - label: '2323', - }, - { - value: '3', - label: '2323', - }, ], }, }, @@ -164,11 +88,6 @@ export const columns: BasicColumn[] = [ { title: '响应级别', dataIndex: 'responseLevel', - customRender({ text }) { - return responseLevelOptions.find((i) => { - return i.value == text; - })?.label; - }, }, { title: '故障描述', diff --git a/src/views/IO/workOrder/orderSearch/detailDrawer.vue b/src/views/IO/workOrder/orderSearch/detailDrawer.vue index 33bce3e..5c4697a 100644 --- a/src/views/IO/workOrder/orderSearch/detailDrawer.vue +++ b/src/views/IO/workOrder/orderSearch/detailDrawer.vue @@ -81,6 +81,11 @@
故障图片：{{ detail.faultImg }}
+ + +
+ + @@ -165,7 +170,7 @@ diff --git a/src/views/IO/workOrder/orderSend/data.ts b/src/views/IO/workOrder/orderSend/data.ts index a6c8d36..2d53cfc 100644 --- a/src/views/IO/workOrder/orderSend/data.ts +++ b/src/views/IO/workOrder/orderSend/data.ts @@ -48,16 +48,13 @@ export const formSchemas: FormSchema[] = [ //列表展示 const responseLevelOptions = [ { - value: 0, - label: '常规', + value: '常规', }, { - value: 1, - label: '紧急', + value: '紧急', }, { - value: 2, - label: '特级', + value: '特级', }, ]; export const columns: BasicColumn[] = [ @@ -72,11 +69,6 @@ export const columns: BasicColumn[] = [ { title: '响应级别', dataIndex: 'responseLevel', - customRender({ text }) { - return responseLevelOptions.find((i) => { - return i.value == text; - })?.label; - }, }, { title: '故障描述', diff --git a/src/views/IO/workOrder/orderSend/detailDrawer.vue b/src/views/IO/workOrder/orderSend/detailDrawer.vue index 33bce3e..eb6a09b 100644 --- a/src/views/IO/workOrder/orderSend/detailDrawer.vue +++ b/src/views/IO/workOrder/orderSend/detailDrawer.vue @@ -81,6 +81,11 @@
故障图片：{{ detail.faultImg }}
 + + +
+ + @@ -165,7 +170,7 @@ diff --git a/src/views/IO/workOrder/orderSend/sendModal.vue b/src/views/IO/workOrder/orderSend/sendModal.vue new file mode 100644 index 0000000..3eefb48 --- /dev/null +++ b/src/views/IO/workOrder/orderSend/sendModal.vue @@ -0,0 +1,148 @@ + + + + + diff --git a/src/views/analysis/type/data.ts b/src/views/analysis/type/data.ts index 57669bf..46f5df6 100644 --- a/src/views/analysis/type/data.ts +++ b/src/views/analysis/type/data.ts @@ -34,18 +34,6 @@ export const formSchemas: FormSchema[] = [ component: 'Select', componentProps: { options: [ - { - value: '1', - label: '2323', - }, - { - value: '2', - label: '2323', - }, - { - value: '3', - label: '2323', - }, ], }, }, diff --git a/src/views/property/point/addModal.vue b/src/views/property/point/addModal.vue index de03927..c238674 100644 --- a/src/views/property/point/addModal.vue +++ b/src/views/property/point/addModal.vue @@ -1,5 +1,5 @@