Browse Source

1.调整UI

2.调整接口/military/camera/site/list -》listBySceneIdMap
   根据所在区域加载
master
DIAMOND 9 months ago
parent
commit
d1d4eaaef6
  1. 17
      src/views/military/modules/earthMap/camera/MsCameraSite.api.ts
  2. 7
      src/views/military/modules/earthMap/camera/MsCameraSite.data.ts
  3. 39
      src/views/military/modules/earthMap/camera/MsCameraSiteList.vue
  4. 46
      src/views/military/modules/earthMap/camera/components/MsCameraSiteForm.vue

17
src/views/military/modules/earthMap/camera/MsCameraSite.api.ts

@ -8,11 +8,12 @@
*/
import { defHttp } from '/@/utils/http/axios';
import { useMessage } from '/@/hooks/web/useMessage';
import { useUserStore } from '/@/store/modules/user';
const { createConfirm } = useMessage();
const userStore = useUserStore();
enum Api {
list = '/military/camera/site/list',
listBySceneId = '/military/camera/site/listBySceneIdMap',
save = '/military/camera/site/add',
edit = '/military/camera/site/edit',
deleteOne = '/military/camera/site/delete',
@ -36,7 +37,17 @@ export const getImportUrl = Api.importExcel;
*
* @param params
*/
export const list = (params) => defHttp.get({ url: Api.list, params });
export const list = (params) =>{
if (params.sceneId == undefined)
params.sceneId = userStore.userInfo?.sceneId;
return defHttp.post({ url: Api.listBySceneId, data: params});
}
// export const list = (params) => {
// if (params.sceneId == undefined)
// params.sceneId = userStore.userInfo?.sceneId;
// return defHttp.get({ url: Api.listBySceneId, params });
// }
/**
*

7
src/views/military/modules/earthMap/camera/MsCameraSite.data.ts

@ -6,10 +6,11 @@ import { render } from '/@/utils/common/renderUtils';
export const columns: BasicColumn[] = [
{
title: '区',
title: '区',
align: "center",
// dataIndex: 'lineId_dictText',
dataIndex: 'lineName',
// dataIndex: 'lineName',
dataIndex: 'name',
width: 250,
},
{
@ -18,7 +19,7 @@ export const columns: BasicColumn[] = [
dataIndex: 'sitecode',
},
{
title: '点名称',
title: '点名称',
align: "center",
dataIndex: 'sitename'
},

39
src/views/military/modules/earthMap/camera/MsCameraSiteList.vue

@ -2,7 +2,7 @@
视频监控点位管理
目录位置三维地图管理 -> 视频监控点位管理
功能概述所在场景下的区的监控杆位置名称
功能概述所在场景下的区的监控杆位置名称
-->
<template>
<div>
@ -11,9 +11,9 @@
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="24">
<a-col :lg="8">
<a-form-item label="区名称" name="lineId">
<a-form-item label="区名称" name="lineId">
<!-- <JInput placeholder="请输入序号" v-model:value="queryParam.sitecode"></JInput> -->
<a-select v-model:value="queryParam.lineId" style="width: 300px" placeholder="请选择区名称" @select="searchQuery" allowClear>
<a-select v-model:value="queryParam.lineId" style="width: 300px" placeholder="请选择区名称" @select="searchQuery" allowClear>
<a-select-option v-for="(item, index) in lineSelect" :value="item.id" :key="item.id">
{{ item.name }}
</a-select-option>
@ -21,9 +21,9 @@
</a-form-item>
</a-col>
<a-col :lg="8">
<a-form-item label="点名称" name="sitename">
<a-input placeholder="请输入点名称" v-model:value="queryParam.sitename" @blur="searchQuery" allowClear></a-input>
<!-- <JInput laceholder="请输入点名称" v-model:value="queryParam.sitename" ></JInput> -->
<a-form-item label="点名称" name="sitename">
<a-input placeholder="请输入点名称" v-model:value="queryParam.sitename" @blur="searchQuery" allowClear></a-input>
<!-- <JInput laceholder="请输入点名称" v-model:value="queryParam.sitename" ></JInput> -->
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
@ -93,7 +93,8 @@
import MsCameraSiteModal from './components/MsCameraSiteModal.vue';
import { defHttp } from '/@/utils/http/axios';
import { BasicForm, ApiSelect, JAreaLinkage, JPopup, JAreaSelect, FormActionType, JCheckbox, JInput, JEllipsis } from '/@/components/Form';
import { useUserStore } from '/@/store/modules/user';
const userStore = useUserStore();
const formRef = ref();
const queryParam = reactive<any>({});
const toggleSearchStatus = ref<boolean>(false);
@ -231,17 +232,31 @@
const lineSelect = ref([]);
//线
function setSelectList() {
// defHttp
// .get(
// {
// url: '/military/msMapLine/mapLineSelect',
// },
// { isTransformResponse: false }
// )
// // getAction(this.url.querySelectList, {})
// .then((res) => {
// if (res.success) {
// lineSelect.value = res.result;
// }
// });
defHttp
.get(
{
url: '/military/msMapLine/mapLineSelect',
url: '/military/msMapLine/list',
params: {
sceneId: userStore.userInfo?.sceneId + "*"
},
{ isTransformResponse: false }
)
// getAction(this.url.querySelectList, {})
},{ isTransformResponse: false })
.then((res) => {
if (res.success) {
lineSelect.value = res.result;
lineSelect.value = res.result.records;
}
});
}

46
src/views/military/modules/earthMap/camera/components/MsCameraSiteForm.vue

@ -3,14 +3,14 @@
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-row>
<a-col :span="24">
<a-form-item label="区" v-bind="validateInfos.lineId">
<a-form-item label="区" v-bind="validateInfos.lineId">
<!-- <j-dict-select-tag v-model:value="formData.lineId" dictCode="" placeholder="" :disabled="disabled"/> -->
<a-select
v-model:value="formData.lineId"
style="width: 300px"
@change="changeLineValue"
:disabled="disabled"
placeholder="请选择所属区"
placeholder="请选择所属区"
>
<a-select-option v-for="(item, index) in lineSelect" :value="item.id" :key="item.id">
{{ item.name }}
@ -19,13 +19,13 @@
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="点序号" v-bind="validateInfos.sitecode">
<a-input v-model:value="formData.sitecode" placeholder="请输入点序号" :disabled="disabled"></a-input>
<a-form-item label="点序号" v-bind="validateInfos.sitecode">
<a-input v-model:value="formData.sitecode" placeholder="请输入点序号" :disabled="disabled"></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="点名称" v-bind="validateInfos.sitename">
<a-input v-model:value="formData.sitename" placeholder="请输入点名称" :disabled="disabled"></a-input>
<a-form-item label="点名称" v-bind="validateInfos.sitename">
<a-input v-model:value="formData.sitename" placeholder="请输入点名称" :disabled="disabled"></a-input>
</a-form-item>
</a-col>
<template v-if="disabled == false">
@ -98,7 +98,8 @@
import { Form } from 'ant-design-vue';
import EarthMapModal from '@/views/military/modules/earthMap/scene/model/mapModel/EarthMapModal.vue';
import locationPng from '@/assets/images/getLocation.png';
import { useUserStore } from '/@/store/modules/user';
const userStore = useUserStore();
const lineSelect: any = ref([]);
const props = defineProps({
formDisabled: { type: Boolean, default: false },
@ -126,11 +127,11 @@
const confirmLoading = ref<boolean>(false);
//
const validatorRules = {
sitecode: [{ required: true, message: '请输入点序号!' }],
sitename: [{ required: true, message: '请输入点名称!' }],
sitecode: [{ required: true, message: '请输入点序号!' }],
sitename: [{ required: true, message: '请输入点名称!' }],
longitude: [{ required: true, message: '请输入经度!' }],
latitude: [{ required: true, message: '请输入纬度!' }],
lineId: [{ required: true, message: '请选择所属区!' }],
lineId: [{ required: true, message: '请选择所属区!' }],
};
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
@ -151,19 +152,34 @@
});
//线
function setSelectList() {
// defHttp
// .get(
// {
// url: '/military/msMapLine/mapLineSelect',
// },
// { isTransformResponse: false }
// )
// // getAction(this.url.querySelectList, {})
// .then((res) => {
// if (res.success) {
// lineSelect.value = res.result;
// }
// });
defHttp
.get(
{
url: '/military/msMapLine/mapLineSelect',
url: '/military/msMapLine/list',
params: {
sceneId: userStore.userInfo?.sceneId + "*"
},
{ isTransformResponse: false }
)
// getAction(this.url.querySelectList, {})
},{ isTransformResponse: false })
.then((res) => {
if (res.success) {
lineSelect.value = res.result;
lineSelect.value = res.result.records;
}
});
}
/**

Loading…
Cancel
Save