From 6b2741434cb2be708a869505440f9f4efc8e6fd1 Mon Sep 17 00:00:00 2001
From: guoshipeng <3194674006@qq.com>
Date: Thu, 06 Jul 2023 10:00:14 +0800
Subject: [PATCH] 修改设备点击经纬度
---
src/views/list/devicesBasic.vue | 1239 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 720 insertions(+), 519 deletions(-)
diff --git a/src/views/list/devicesBasic.vue b/src/views/list/devicesBasic.vue
index 69ece7a..ec7b793 100644
--- a/src/views/list/devicesBasic.vue
+++ b/src/views/list/devicesBasic.vue
@@ -1,747 +1,948 @@
<template>
<div>
- <a-card :bordered="false" style="margin-top:24px">
+ <a-card :bordered="false" style="margin-top: 24px">
<div class="tableList">
<div class="tableListForm">
<a-form-model @submit="handleSearch" layout="horizontal">
- <a-row :gutter="[8,0]">
+ <a-row :gutter="[8, 0]">
<a-col :span="10">
- <a-button
+ <a-button
icon="plus"
type="primary"
@click="() => this.handleModalVisible(true)"
- style="margin-left: 25px;"
- >������
- </a-button>
+ style="margin-left: 25px"
+ >������
+ </a-button>
</a-col>
- <a-col :span="4">
- <a-form-model-item :labelCol="{span:2}" :wrapperCol="{span:10}">
- <a-select
+ <a-col :span="4">
+ <a-form-model-item
+ :labelCol="{ span: 2 }"
+ :wrapperCol="{ span: 10 }"
+ >
+ <a-select
placeholder="������������(������������������)"
allow-clear
show-search
- style="width:200px"
+ style="width: 200px"
:filter-option="filterOption"
@change="handleChange"
- >
- <a-select-option v-for="(item,index) in orgData" :key="index" :value="item.id">
- {{ item.name }}
- </a-select-option>
- </a-select>
- </a-form-model-item>
- </a-col>
- <a-col :span="4">
- <a-form-model-item :labelCol="{span:2}" :wrapperCol="{span:10}">
- <a-select
- placeholder="������������(������������������)"
- allow-clear
- show-search
- style="width:200px"
- :filter-option="filterOption"
- @change="handleChange1"
+ >
+ <a-select-option
+ v-for="(item, index) in orgData"
+ :key="index"
+ :value="item.id"
>
- <a-select-option
- v-for="(item,index) in MonitorPoints"
- :key="index"
- :value="item.id"
+ {{ item.name }}
+ </a-select-option>
+ </a-select>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="4">
+ <a-form-model-item
+ :labelCol="{ span: 2 }"
+ :wrapperCol="{ span: 10 }"
+ >
+ <a-select
+ placeholder="������������(������������������)"
+ allow-clear
+ show-search
+ style="width: 200px"
+ :filter-option="filterOption"
+ @change="handleChange1"
+ >
+ <a-select-option
+ v-for="(item, index) in MonitorPoints"
+ :key="index"
+ :value="item.id"
>{{ item.name }}
- </a-select-option>
- </a-select>
- </a-form-model-item>
- </a-col>
- <a-col :span="6">
- <a-form-item
- :labelCol="{span:2}" :wrapperCol="{span:12}"
+ </a-select-option>
+ </a-select>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-item
+ :labelCol="{ span: 2 }"
+ :wrapperCol="{ span: 12 }"
fieldDecoratorId="name"
- v-bind="searchFormLayout">
- <a-input v-model="serch.name" placeholder="���������������������������mac���"/>
- </a-form-item>
- </a-col>
+ v-bind="searchFormLayout"
+ >
+ <a-input
+ v-model="serch.name"
+ placeholder="���������������������������mac���"
+ />
+ </a-form-item>
+ </a-col>
</a-row>
</a-form-model>
</div>
<av-standard-table
- :dataSource="dataSource"
- :selectedRows="selectedRows"
- :columns="columns"
- :paginationProps="pagination"
- :loading="tableLoading"
- @tableChange="handlerTableChange"
- @selectChange="handlerSelectChange"
+ :dataSource="dataSource"
+ :selectedRows="selectedRows"
+ :columns="columns"
+ :paginationProps="pagination"
+ :loading="tableLoading"
+ @tableChange="handlerTableChange"
+ @selectChange="handlerSelectChange"
></av-standard-table>
</div>
</a-card>
<a-modal
- title="������-������"
- destroyOnClose
- :visible="visibleCreateModal"
- @ok="handleCreateModalOk"
- @cancel="handleCreateModalCancel"
- okText="������"
- class="modalStyle"
+ title="������-������"
+ destroyOnClose
+ :visible="visibleCreateModal"
+ @ok="handleCreateModalOk"
+ @cancel="handleCreateModalCancel"
+ okText="������"
+ class="modalStyle"
>
- <a-row :gutter="[8,0]" style="border:0px">
- <a-col :span="12">
- <a-button style="background-color: #00a0e9; color: white" @click="showMap1()"> ��������������������� </a-button>
- </a-col>
+ <a-row :gutter="[8, 0]" style="border: 0px">
+ <a-col :span="12">
+ <a-button
+ style="background-color: #00a0e9; color: white"
+ @click="showMap1()"
+ >
+ ���������������������
+ </a-button>
+ </a-col>
</a-row>
- <a-form style="margin:0px;padding:0px" :form="form">
- <a-row :gutter="[8,0]" style="border:0px">
+ <a-form style="margin: 0px; padding: 0px" :form="form">
+ <a-row :gutter="[8, 0]" style="border: 0px">
<!-- wrapperCol ���������������������input��������� labelCol ������������������ ���������������������24-->
<a-col :span="12">
- <a-form-item has-feedback :labelCol="{ span: 5 }" :wrapperCol="{ span: 19 }" label="������">
+ <a-form-item
+ has-feedback
+ :labelCol="{ span: 5 }"
+ :wrapperCol="{ span: 19 }"
+ label="������"
+ >
<a-input
- placeholder="������������"
- type="string"
- v-decorator="['deviceName', { rules: [{ required: true}] }]"
+ placeholder="������������"
+ type="string"
+ v-decorator="['deviceName', { rules: [{ required: true }] }]"
/>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item
- :labelCol="{ span: 5 }"
- has-feedback
- :wrapperCol="{ span: 19 }"
- label="mac"
+ :labelCol="{ span: 5 }"
+ has-feedback
+ :wrapperCol="{ span: 19 }"
+ label="mac"
>
<a-input
- placeholder="mac������"
- type="string"
- v-decorator="['mac', { rules: [{ required: true }] }]"
+ placeholder="mac������"
+ type="string"
+ v-decorator="['mac', { rules: [{ required: true }] }]"
/>
</a-form-item>
</a-col>
</a-row>
- <a-row :gutter="[8,0]">
+ <a-row :gutter="[8, 0]">
<a-col :span="12">
- <a-form-item :labelCol="{ span: 5 }" has-feedback :wrapperCol="{ span: 19 }" label="������">
+ <a-form-item
+ :labelCol="{ span: 5 }"
+ has-feedback
+ :wrapperCol="{ span: 19 }"
+ label="������"
+ >
<a-input
- v-decorator="['jingdu', { rules: [{ required: true},{message: '������������������������',pattern:/^[+-]?\d+(\.\d+)?$/}]}]"
- placeholder="-180~180������"
- :disabled="true"
- type="string"
+ v-decorator="[
+ 'jingdu',
+ {
+ rules: [
+ { required: true },
+ {
+ message: '������������������������',
+ pattern: /^[+-]?\d+(\.\d+)?$/,
+ },
+ ],
+ },
+ ]"
+ placeholder="-180~180������"
+ :disabled="true"
+ type="string"
/>
</a-form-item>
</a-col>
<a-col :span="12">
- <a-form-item :labelCol="{ span: 5 }" has-feedback :wrapperCol="{ span:19 }" label="������">
- <a-input
+ <a-form-item
+ :labelCol="{ span: 5 }"
+ has-feedback
+ :wrapperCol="{ span: 19 }"
+ label="������"
+ >
+ <a-input
:disabled="true"
- v-decorator="['weidu', { rules: [{ required: true},{message: '������������������������',pattern:/^[+-]?\d+(\.\d+)?$/}]}]"
+ v-decorator="[
+ 'weidu',
+ {
+ rules: [
+ { required: true },
+ {
+ message: '������������������������',
+ pattern: /^[+-]?\d+(\.\d+)?$/,
+ },
+ ],
+ },
+ ]"
placeholder="-90~90������"
type="string"
- />
- </a-form-item>
-
- </a-col>
- </a-row>
- <a-row :gutter="[8,0]">
- <a-col :span="12">
- <a-form-item
- :labelCol="{ span: 5 }"
- has-feedback
- :wrapperCol="{ span: 19 }"
- label="������������"
- >
- <a-select
- placeholder="������������������������������������"
- type="string"
- allow-clear
- :filter-option="filterOption"
- show-search
- v-decorator="['model', { rules: [{ required: true }] }]"
- >
- <a-select-option v-for="(item,index) in model" :key="index" :value = 'item.id'>{{ item.name }}</a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
- <a-col :span="12">
- <a-form-item
- :labelCol="{ span: 5 }"
- has-feedback
- :wrapperCol="{ span: 19 }"
- label="���������"
- >
- <a-select
- placeholder="���������������"
- mode="multiple"
- type="string"
- allow-clear
- v-decorator="['operator', { rules: [{ required: false }] }]"
- >
- <a-select-option
- v-for="(item,index) in operators"
- :key="index"
- :value = 'item.id'
- >{{ item.user_name }}
- </a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
- </a-row>
-
- <a-row :gutter="[8,0]">
- <a-col :span="12">
- <a-form-item
- :labelCol="{ span: 5 }"
- has-feedback
- :wrapperCol="{ span: 19 }"
- label="������������"
- >
- <a-date-picker
- @change="onStartTimeChange"
- v-decorator="['createTime', { rules: [{ required: false }] }]"
- format="YYYY-MM-DD HH:mm:ss"
- :show-time="{ defaultValue: moment('00:00:00', 'HH:mm:ss') }"
- style="width:299px"
- />
- </a-form-item>
- </a-col>
- <a-col :span="12">
- <a-form-item
- :labelCol="{ span: 5 }"
- :wrapperCol="{ span: 19 }"
- has-feedback
- label="������������"
- >
- <a-date-picker
- @change="onEndTimeChange"
- v-decorator="['updateTime', { rules: [{ required: false }] }]"
- format="YYYY-MM-DD HH:mm:ss"
- :show-time="{ defaultValue: moment('00:00:00', 'HH:mm:ss') }"
- style="width:299px"
/>
</a-form-item>
</a-col>
</a-row>
-
- <a-row :gutter="[8,0]">
+ <a-row :gutter="[8, 0]">
<a-col :span="12">
<a-form-item
- :labelCol="{ span: 5 }"
- has-feedback
- :wrapperCol="{ span: 19 }"
- label="������������"
+ :labelCol="{ span: 5 }"
+ has-feedback
+ :wrapperCol="{ span: 19 }"
+ label="������������"
>
<a-select
- type="string"
- placeholder="������������������������������������������"
- v-decorator="['monitorPoint', { rules: [{ required: true }] }]"
- allow-clear
- :filter-option="filterOption"
- show-search
- >
- <a-select-option
- v-for="(item,index) in MonitorPoints"
- :key="index"
- :value = 'item.id'
- >{{ item.name }}
- </a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
- <a-col :span="12">
- <a-form-item :labelCol="{ span: 5 }" has-feedback :wrapperCol="{ span: 19 }" label="������">
- <a-select
- placeholder="������������������"
- mode="multiple"
- v-decorator="['profession', { rules: [{ required: true }] }]"
- allow-clear
- :filter-option="filterOption"
- show-search
- >
- <a-select-option
- v-for="(item,index) in Professions"
- :key="index"
- :value="item.dataKey"
- >{{ item.dataValue }}
- </a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
- </a-row>
-
- <a-row :gutter="[8,0]">
- <a-col :span="12">
- <a-form-item
- :labelCol="{ span: 5 }"
- has-feedback
- :wrapperCol="{ span: 19 }"
- label="������������"
+ placeholder="������������������������������������"
type="string"
- >
- <a-select
- placeholder="������������������"
- v-decorator="['tech', { rules: [{ required: false }] }]"
- allow-clear
- :filter-option="filterOption"
- show-search
- @change="changeTech"
+ allow-clear
+ :filter-option="filterOption"
+ show-search
+ v-decorator="['model', { rules: [{ required: true }] }]"
>
- <a-select-option v-for="(item,index) in Techs" :key="index" :value="item.dataKey">{{ item.dataValue }}</a-select-option>
+ <a-select-option
+ v-for="(item, index) in model"
+ :key="index"
+ :value="item.id"
+ >{{ item.name }}</a-select-option
+ >
</a-select>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item
- :labelCol="{ span: 5 }"
- has-feedback
- :wrapperCol="{ span: 19 }"
- label="���������������"
+ :labelCol="{ span: 5 }"
+ has-feedback
+ :wrapperCol="{ span: 19 }"
+ label="���������"
>
<a-select
- placeholder="���������������������"
- v-decorator="['detector', { rules: [{ required: false }] }]"
- allow-clear
- :filter-option="filterOption"
- show-search
+ placeholder="���������������"
+ mode="multiple"
+ type="string"
+ allow-clear
+ v-decorator="['operator', { rules: [{ required: false }] }]"
>
<a-select-option
- v-for="(item,index) in this.Detectors"
- :key="index"
- :value="item.dataKey"
- >{{ item.dataValue }}
+ v-for="(item, index) in operators"
+ :key="index"
+ :value="item.id"
+ >{{ item.user_name }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
</a-row>
-
-
- <a-row :gutter="[8,0]" v-if="techFlag">
+ <a-row :gutter="[8, 0]">
<a-col :span="12">
- <a-form-item :labelCol="{ span: 5 }" has-feedback :wrapperCol="{ span: 19 }" label="������������(m��)">
- <a-input
- v-decorator="['area', { rules: [{ required: false }] }]"
- placeholder="������������"
- type="string"
+ <a-form-item
+ :labelCol="{ span: 5 }"
+ has-feedback
+ :wrapperCol="{ span: 19 }"
+ label="������������"
+ >
+ <a-date-picker
+ @change="onStartTimeChange"
+ v-decorator="['createTime', { rules: [{ required: false }] }]"
+ format="YYYY-MM-DD HH:mm:ss"
+ :show-time="{ defaultValue: moment('00:00:00', 'HH:mm:ss') }"
+ style="width: 299px"
/>
</a-form-item>
</a-col>
<a-col :span="12">
- <a-form-item :labelCol="{ span: 5 }" has-feedback :wrapperCol="{ span:19 }" label="������������(m/s)">
- <a-input
- v-decorator="['speed', { rules: [{ required: false }] }]"
- placeholder="������������"
- type="string"
+ <a-form-item
+ :labelCol="{ span: 5 }"
+ :wrapperCol="{ span: 19 }"
+ has-feedback
+ label="������������"
+ >
+ <a-date-picker
+ @change="onEndTimeChange"
+ v-decorator="['updateTime', { rules: [{ required: false }] }]"
+ format="YYYY-MM-DD HH:mm:ss"
+ :show-time="{ defaultValue: moment('00:00:00', 'HH:mm:ss') }"
+ style="width: 299px"
/>
</a-form-item>
</a-col>
</a-row>
- <a-row :gutter="[8,0]">
- <a-col :span="12">
- <a-form-item :labelCol="{ span: 5 }" :wrapperCol="{ span: 19 }" label="������������������" >
- <a-cascader :options="areaData" placeholder="������������������(���������������������������������)" change-on-select @change="positionLevel" labelInValue/>
- </a-form-item>
- </a-col>
+
+ <a-row :gutter="[8, 0]">
<a-col :span="12">
<a-form-item
- :labelCol="{ span: 5 }"
- :wrapperCol="{ span: 19 }"
- label="������������"
- has-feedback
- prop="position"
+ :labelCol="{ span: 5 }"
+ has-feedback
+ :wrapperCol="{ span: 19 }"
+ label="������������"
>
<a-select
- placeholder="������������"
- v-decorator="['govMonitor', { rules: [{ required: false }] }]"
- allow-clear
- :filter-option="filterOption"
- show-search
+ type="string"
+ placeholder="������������������������������������������"
+ v-decorator="['monitorPoint', { rules: [{ required: true }] }]"
+ allow-clear
+ :filter-option="filterOption"
+ show-search
>
<a-select-option
- v-for="(item,index) in govMonitors"
- :key="index"
- :value="item.guid"
- >{{ item.name }}
- </a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
- </a-row>
- <a-row :gutter="[8,0]">
- <a-col :span="12">
- <a-form-item
- :labelCol="{ span: 5 }"
- has-feedback
- :wrapperCol="{ span: 19 }"
- label="���������������"
- >
- <a-select
- placeholder="���������������������"
- v-decorator="['purchaser', { rules: [{ required: false }] }]"
- allow-clear
- :filter-option="filterOption"
- show-search
- >
- <a-select-option
- v-for="(item,index) in this.Purchasers"
- :key="index"
- :value="item.dataKey"
- >{{ item.dataValue }}
+ v-for="(item, index) in MonitorPoints"
+ :key="index"
+ :value="item.id"
+ >{{ item.name }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item
- has-feedback
- :labelCol="{ span: 5 }"
- :wrapperCol="{ span: 19 }"
- label="������������"
+ :labelCol="{ span: 5 }"
+ has-feedback
+ :wrapperCol="{ span: 19 }"
+ label="������"
>
- <a-input
- disabled="disabled"
- v-decorator="['town', { rules: [{ required: true, message: '������������������������' }] }]"
- placeholder="���������������������������������/���������"
- />
-
- </a-form-item>
- </a-col>
- <a-col :span="12">
- <a-form-item has-feedback :labelCol="{ span: 5 }" :wrapperCol="{ span: 19 }" label="������������">
- <a-input
- placeholder="������������"
- type="string"
- v-decorator="['address', { rules: [{ required: false}] }]"
- />
+ <a-select
+ placeholder="������������������"
+ mode="multiple"
+ v-decorator="['profession', { rules: [{ required: true }] }]"
+ allow-clear
+ :filter-option="filterOption"
+ show-search
+ >
+ <a-select-option
+ v-for="(item, index) in Professions"
+ :key="index"
+ :value="item.dataKey"
+ >{{ item.dataValue }}
+ </a-select-option>
+ </a-select>
</a-form-item>
</a-col>
</a-row>
+ <a-row :gutter="[8, 0]">
+ <a-col :span="12">
+ <a-form-item
+ :labelCol="{ span: 5 }"
+ has-feedback
+ :wrapperCol="{ span: 19 }"
+ label="������������"
+ type="string"
+ >
+ <a-select
+ placeholder="������������������"
+ v-decorator="['tech', { rules: [{ required: false }] }]"
+ allow-clear
+ :filter-option="filterOption"
+ show-search
+ @change="changeTech"
+ >
+ <a-select-option
+ v-for="(item, index) in Techs"
+ :key="index"
+ :value="item.dataKey"
+ >{{ item.dataValue }}</a-select-option
+ >
+ </a-select>
+ </a-form-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-item
+ :labelCol="{ span: 5 }"
+ has-feedback
+ :wrapperCol="{ span: 19 }"
+ label="���������������"
+ >
+ <a-select
+ placeholder="���������������������"
+ v-decorator="['detector', { rules: [{ required: false }] }]"
+ allow-clear
+ :filter-option="filterOption"
+ show-search
+ >
+ <a-select-option
+ v-for="(item, index) in this.Detectors"
+ :key="index"
+ :value="item.dataKey"
+ >{{ item.dataValue }}
+ </a-select-option>
+ </a-select>
+ </a-form-item>
+ </a-col>
+ </a-row>
+
+ <a-row :gutter="[8, 0]" v-if="techFlag">
+ <a-col :span="12">
+ <a-form-item
+ :labelCol="{ span: 5 }"
+ has-feedback
+ :wrapperCol="{ span: 19 }"
+ label="������������(m��)"
+ >
+ <a-input
+ v-decorator="['area', { rules: [{ required: false }] }]"
+ placeholder="������������"
+ type="string"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-item
+ :labelCol="{ span: 5 }"
+ has-feedback
+ :wrapperCol="{ span: 19 }"
+ label="������������(m/s)"
+ >
+ <a-input
+ v-decorator="['speed', { rules: [{ required: false }] }]"
+ placeholder="������������"
+ type="string"
+ />
+ </a-form-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="[8, 0]">
+ <a-col :span="12">
+ <a-form-item
+ :labelCol="{ span: 5 }"
+ :wrapperCol="{ span: 19 }"
+ label="������������������"
+ >
+ <a-cascader
+ :options="areaData"
+ placeholder="������������������(���������������������������������)"
+ change-on-select
+ @change="positionLevel"
+ labelInValue
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-item
+ :labelCol="{ span: 5 }"
+ :wrapperCol="{ span: 19 }"
+ label="������������"
+ has-feedback
+ prop="position"
+ >
+ <a-select
+ placeholder="������������"
+ v-decorator="['govMonitor', { rules: [{ required: false }] }]"
+ allow-clear
+ :filter-option="filterOption"
+ show-search
+ >
+ <a-select-option
+ v-for="(item, index) in govMonitors"
+ :key="index"
+ :value="item.guid"
+ >{{ item.name }}
+ </a-select-option>
+ </a-select>
+ </a-form-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="[8, 0]">
+ <a-col :span="12">
+ <a-form-item
+ :labelCol="{ span: 5 }"
+ has-feedback
+ :wrapperCol="{ span: 19 }"
+ label="���������������"
+ >
+ <a-select
+ placeholder="���������������������"
+ v-decorator="['purchaser', { rules: [{ required: false }] }]"
+ allow-clear
+ :filter-option="filterOption"
+ show-search
+ >
+ <a-select-option
+ v-for="(item, index) in this.Purchasers"
+ :key="index"
+ :value="item.dataKey"
+ >{{ item.dataValue }}
+ </a-select-option>
+ </a-select>
+ </a-form-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-item
+ has-feedback
+ :labelCol="{ span: 5 }"
+ :wrapperCol="{ span: 19 }"
+ label="������������"
+ >
+ <a-input
+ disabled="disabled"
+ v-decorator="[
+ 'town',
+ { rules: [{ required: true, message: '������������������������' }] },
+ ]"
+ placeholder="���������������������������������/���������"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-item
+ has-feedback
+ :labelCol="{ span: 5 }"
+ :wrapperCol="{ span: 19 }"
+ label="������������"
+ >
+ <a-input
+ placeholder="������������"
+ type="string"
+ v-decorator="['address', { rules: [{ required: false }] }]"
+ />
+ </a-form-item>
+ </a-col>
+ </a-row>
</a-form>
- <pick-coordinate1 v-if="addMapFlag" :typeOperation="typeOperation" @mapFlag1="receiveFlag1" @sendLonLat="receiveLomLat"/>
-<!-- <pick-coordinate :mapUrl="mapUrl" :mapRecord="mapRecord" v-if="!mapFlag" @mapFlag="receiveFlag"/>-->
+ <pick-coordinate1
+ v-if="addMapFlag"
+ :typeOperation="typeOperation"
+ @mapFlag1="receiveFlag1"
+ @sendLonLat="receiveLomLat"
+ />
+ <!-- <pick-coordinate :mapUrl="mapUrl" :mapRecord="mapRecord" v-if="!mapFlag" @mapFlag="receiveFlag"/>-->
</a-modal>
<a-modal
- title="������-������"
- destroyOnClose
- :visible="editTaskFormVisible"
- @ok="handleEditModalOk"
- @cancel="handleEditModalCancel"
- okText="������"
- class="modalStyle"
+ title="������-������"
+ destroyOnClose
+ :visible="editTaskFormVisible"
+ @ok="handleEditModalOk"
+ @cancel="handleEditModalCancel"
+ okText="������"
+ class="modalStyle"
>
- <a-form-model style="margin:0px;padding:0px"
- :model="editBeforeData"
- :rules="rules"
- ref="editRulesForm"
+ <a-form-model
+ style="margin: 0px; padding: 0px"
+ :model="editBeforeData"
+ :rules="rules"
+ ref="editRulesForm"
>
- <a-row :gutter="[8,0]" style="border:0px">
+ <a-row :gutter="[8, 0]" style="border: 0px">
<a-col :span="12">
- <a-button style="background-color: #00a0e9; color: white" @click="showMap2()"> ��������������������� </a-button>
+ <a-button
+ style="background-color: #00a0e9; color: white"
+ @click="showMap2()"
+ >
+ ���������������������
+ </a-button>
</a-col>
</a-row>
- <a-row :gutter="[8,0]" style="border:0px">
+ <a-row :gutter="[8, 0]" style="border: 0px">
<!-- wrapperCol ���������������������input��������� labelCol ������������������ ���������������������24-->
<a-col :span="12">
- <a-form-model-item :labelCol="{ span: 5 }" has-feedback :wrapperCol="{ span: 19 }" label="������" prop="name">
- <a-input v-model="editBeforeData.name" placeholder="������������"/>
+ <a-form-model-item
+ :labelCol="{ span: 5 }"
+ has-feedback
+ :wrapperCol="{ span: 19 }"
+ label="������"
+ prop="name"
+ >
+ <a-input v-model="editBeforeData.name" placeholder="������������" />
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item :labelCol="{ span: 5 }" has-feedback :wrapperCol="{ span: 19 }" label="mac" prop="mac">
- <a-input v-model="editBeforeData.mac" placeholder="mac������"/>
+ <a-form-model-item
+ :labelCol="{ span: 5 }"
+ has-feedback
+ :wrapperCol="{ span: 19 }"
+ label="mac"
+ prop="mac"
+ >
+ <a-input v-model="editBeforeData.mac" placeholder="mac������" />
</a-form-model-item>
</a-col>
</a-row>
- <a-row :gutter="[8,0]">
+ <a-row :gutter="[8, 0]">
<a-col :span="12">
- <a-form-model-item :labelCol="{ span: 5 }" has-feedback :wrapperCol="{ span: 19 }" label="������" prop="longitude">
- <a-input disabled="disabled" v-model="editBeforeData.longitude" placeholder="-180~180������" type="string"/>
+ <a-form-model-item
+ :labelCol="{ span: 5 }"
+ has-feedback
+ :wrapperCol="{ span: 19 }"
+ label="������"
+ prop="longitude"
+ >
+ <a-input
+ disabled="disabled"
+ v-model="editBeforeData.longitude"
+ placeholder="-180~180������"
+ type="string"
+ />
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item :labelCol="{ span: 5 }" has-feedback :wrapperCol="{ span:19 }" label="������" prop="latitude">
- <a-input disabled="disabled" v-model="editBeforeData.latitude" placeholder="-90~90������" type="string"/>
+ <a-form-model-item
+ :labelCol="{ span: 5 }"
+ has-feedback
+ :wrapperCol="{ span: 19 }"
+ label="������"
+ prop="latitude"
+ >
+ <a-input
+ disabled="disabled"
+ v-model="editBeforeData.latitude"
+ placeholder="-90~90������"
+ type="string"
+ />
</a-form-model-item>
</a-col>
</a-row>
- <a-row :gutter="[8,0]">
+ <a-row :gutter="[8, 0]">
<a-col :span="12">
- <a-form-model-item :labelCol="{ span: 5 }" has-feedback :wrapperCol="{ span: 19 }" label="������������" prop="version.id">
+ <a-form-model-item
+ :labelCol="{ span: 5 }"
+ has-feedback
+ :wrapperCol="{ span: 19 }"
+ label="������������"
+ prop="version.id"
+ >
<a-select
- v-model='editBeforeData.version.id'
- placeholder="������������������������������������"
- type="string"
- allow-clear
- :filter-option="filterOption"
- show-search
+ v-model="editBeforeData.version.id"
+ placeholder="������������������������������������"
+ type="string"
+ allow-clear
+ :filter-option="filterOption"
+ show-search
>
- <a-select-option v-for="(item,index) in this.model" :key="index" :value="item.id">{{ item.name }}</a-select-option>
+ <a-select-option
+ v-for="(item, index) in this.model"
+ :key="index"
+ :value="item.id"
+ >{{ item.name }}</a-select-option
+ >
</a-select>
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item :labelCol="{ span: 5 }" has-feedback :wrapperCol="{ span: 19 }" label="���������">
+ <a-form-model-item
+ :labelCol="{ span: 5 }"
+ has-feedback
+ :wrapperCol="{ span: 19 }"
+ label="���������"
+ >
<a-select
- v-model="selectMaintainer"
- placeholder="���������������"
- mode="multiple"
- type="string"
- allow-clear
- option-label-prop="lable"
+ v-model="selectMaintainer"
+ placeholder="���������������"
+ mode="multiple"
+ type="string"
+ allow-clear
+ option-label-prop="lable"
>
<a-select-option
- v-for="(item,index) in this.operators"
- :key = "index"
- :value = "item.id"
- :lable="item.user_name"
- >{{ item.user_name }}
+ v-for="(item, index) in this.operators"
+ :key="index"
+ :value="item.id"
+ :lable="item.user_name"
+ >{{ item.user_name }}
</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
</a-row>
- <a-row :gutter="[8,0]">
+ <a-row :gutter="[8, 0]">
<a-col :span="12">
<a-form-model-item
- :labelCol="{ span: 5 }"
- has-feedback
- :wrapperCol="{ span: 19 }"
- label="������������"
+ :labelCol="{ span: 5 }"
+ has-feedback
+ :wrapperCol="{ span: 19 }"
+ label="������������"
>
<a-date-picker
- v-model="editBeforeData.createTime"
- @change="onStartTimeChange"
- format="YYYY-MM-DD HH:mm:ss"
- :show-time="{ defaultValue: moment('00:00:00', 'HH:mm:ss') }"
- style="width:299px"
+ v-model="editBeforeData.createTime"
+ @change="onStartTimeChange"
+ format="YYYY-MM-DD HH:mm:ss"
+ :show-time="{ defaultValue: moment('00:00:00', 'HH:mm:ss') }"
+ style="width: 299px"
/>
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item
- :labelCol="{ span: 5 }"
- :wrapperCol="{ span: 19 }"
- has-feedback
- label="������������"
+ :labelCol="{ span: 5 }"
+ :wrapperCol="{ span: 19 }"
+ has-feedback
+ label="������������"
>
- <a-date-picker @change="onEndTimeChange" v-model="editBeforeData.installTime"
- format="YYYY-MM-DD HH:mm:ss" :show-time="{ defaultValue: moment('00:00:00', 'HH:mm:ss') }"
- style="width:299px"
+ <a-date-picker
+ @change="onEndTimeChange"
+ v-model="editBeforeData.installTime"
+ format="YYYY-MM-DD HH:mm:ss"
+ :show-time="{ defaultValue: moment('00:00:00', 'HH:mm:ss') }"
+ style="width: 299px"
/>
</a-form-model-item>
</a-col>
</a-row>
- <a-row :gutter="[8,0]">
+ <a-row :gutter="[8, 0]">
<a-col :span="12">
<a-form-model-item
- :labelCol="{ span: 5 }"
- has-feedback
- :wrapperCol="{ span: 19 }"
- label="������������"
- prop="monitorPoint.id"
+ :labelCol="{ span: 5 }"
+ has-feedback
+ :wrapperCol="{ span: 19 }"
+ label="������������"
+ prop="monitorPoint.id"
>
<a-select
- v-model="editBeforeData.monitorPoint.id"
- type="string"
- placeholder="������������������������������������������"
- allow-clear
- :filter-option="filterOption"
- @change="resetMonitor"
- show-search
- >
- <a-select-option
- v-for="(item,index) in this.MonitorPoints"
- :key="index"
- :value="item.id"
- >{{ item.name }}
- </a-select-option>
- </a-select>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item :labelCol="{ span: 5 }" has-feedback :wrapperCol="{ span: 19 }" label="������" prop="profession">
- <a-select
- v-model="editBeforeData.profession.id"
- placeholder="������������������"
- mode="multiple"
- option-label-prop="lable"
- allow-clear
- :filter-option="filterOption"
- show-search
- >
- <a-select-option
- v-for="(item,index) in this.Professions"
- :key="index"
- :value="item.dataKey"
- :lable="item.dataValue"
- >{{ item.dataValue }}
- </a-select-option>
- </a-select>
- </a-form-model-item>
- </a-col>
- </a-row>
-
- <a-row :gutter="[8,0]">
- <a-col :span="12">
- <a-form-model-item
- :labelCol="{ span: 5 }"
- has-feedback
- :wrapperCol="{ span: 19 }"
- label="������������"
+ v-model="editBeforeData.monitorPoint.id"
type="string"
+ placeholder="������������������������������������������"
+ allow-clear
+ :filter-option="filterOption"
+ @change="resetMonitor"
+ show-search
+ >
+ <a-select-option
+ v-for="(item, index) in this.MonitorPoints"
+ :key="index"
+ :value="item.id"
+ >{{ item.name }}
+ </a-select-option>
+ </a-select>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item
+ :labelCol="{ span: 5 }"
+ has-feedback
+ :wrapperCol="{ span: 19 }"
+ label="������"
+ prop="profession"
>
<a-select
- v-model="editBeforeData.tech.id"
- placeholder="������������������"
- allow-clear
- :filter-option="filterOption"
- show-search
- @change="editTech"
+ v-model="editBeforeData.profession.id"
+ placeholder="������������������"
+ mode="multiple"
+ option-label-prop="lable"
+ allow-clear
+ :filter-option="filterOption"
+ show-search
+ >
+ <a-select-option
+ v-for="(item, index) in this.Professions"
+ :key="index"
+ :value="item.dataKey"
+ :lable="item.dataValue"
+ >{{ item.dataValue }}
+ </a-select-option>
+ </a-select>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+
+ <a-row :gutter="[8, 0]">
+ <a-col :span="12">
+ <a-form-model-item
+ :labelCol="{ span: 5 }"
+ has-feedback
+ :wrapperCol="{ span: 19 }"
+ label="������������"
+ type="string"
+ >
+ <a-select
+ v-model="editBeforeData.tech.id"
+ placeholder="������������������"
+ allow-clear
+ :filter-option="filterOption"
+ show-search
+ @change="editTech"
>
.
- <a-select-option v-for="(item,index) in this.Techs"
- :key="index"
- :value="Number(item.dataKey)">{{ item.dataValue }}</a-select-option>
+ <a-select-option
+ v-for="(item, index) in this.Techs"
+ :key="index"
+ :value="Number(item.dataKey)"
+ >{{ item.dataValue }}</a-select-option
+ >
</a-select>
</a-form-model-item>
</a-col>
-
<a-col :span="12">
<a-form-model-item
- :labelCol="{ span: 5 }"
- has-feedback
- :wrapperCol="{ span: 19 }"
- label="���������������"
+ :labelCol="{ span: 5 }"
+ has-feedback
+ :wrapperCol="{ span: 19 }"
+ label="���������������"
>
<a-select
- v-model="editBeforeData.detector.id"
- placeholder="���������������������"
- allow-clear
- :filter-option="filterOption"
- show-search
+ v-model="editBeforeData.detector.id"
+ placeholder="���������������������"
+ allow-clear
+ :filter-option="filterOption"
+ show-search
>
<a-select-option
- v-for="(item,index) in this.Detectors"
- :key="index"
- :value="Number(item.dataKey)"
- >{{ item.dataValue }}
+ v-for="(item, index) in this.Detectors"
+ :key="index"
+ :value="Number(item.dataKey)"
+ >{{ item.dataValue }}
</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
</a-row>
-
- <a-row :gutter="[8,0]" v-if="editTechFlag">
+ <a-row :gutter="[8, 0]" v-if="editTechFlag">
<a-col :span="12">
- <a-form-model-item :labelCol="{ span: 5 }" has-feedback :wrapperCol="{ span: 19 }" label="������������(m��)">
+ <a-form-model-item
+ :labelCol="{ span: 5 }"
+ has-feedback
+ :wrapperCol="{ span: 19 }"
+ label="������������(m��)"
+ >
<a-input
- v-model="editBeforeData.extand.area"
- placeholder="������������"
- type="string"
+ v-model="editBeforeData.extand.area"
+ placeholder="������������"
+ type="string"
/>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item :labelCol="{ span: 5 }" has-feedback :wrapperCol="{ span:19 }" label="������������(m/s)">
- <a-input
- v-model="editBeforeData.extand.speed"
- placeholder="������������"
- type="string"
- />
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row :gutter="[8,0]">
- <a-col :span="12">
- <a-form-model-item :labelCol="{ span: 5 }" :wrapperCol="{ span: 19 }" label="������" >
- <a-cascader :options="areaData" v-model="editBeforeData.positionBack" placeholder="������������������(���������������������������������)" change-on-select @change="positionLevel" labelInValue/>
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item
- :labelCol="{ span: 5 }"
- :wrapperCol="{ span: 19 }"
- label="������������"
- has-feedback
- prop="position"
+ :labelCol="{ span: 5 }"
+ has-feedback
+ :wrapperCol="{ span: 19 }"
+ label="������������(m/s)"
+ >
+ <a-input
+ v-model="editBeforeData.extand.speed"
+ placeholder="������������"
+ type="string"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="[8, 0]">
+ <a-col :span="12">
+ <a-form-model-item
+ :labelCol="{ span: 5 }"
+ :wrapperCol="{ span: 19 }"
+ label="������"
+ >
+ <a-cascader
+ :options="areaData"
+ v-model="editBeforeData.positionBack"
+ placeholder="������������������(���������������������������������)"
+ change-on-select
+ @change="positionLevel"
+ labelInValue
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item
+ :labelCol="{ span: 5 }"
+ :wrapperCol="{ span: 19 }"
+ label="������������"
+ has-feedback
+ prop="position"
>
<a-select
- placeholder="������������"
- v-model="editBeforeData.guid"
- allow-clear
- :filter-option="filterOption"
- show-search
+ placeholder="������������"
+ v-model="editBeforeData.guid"
+ allow-clear
+ :filter-option="filterOption"
+ show-search
>
<a-select-option
- v-for="(item,index) in govMonitors"
- :key="index"
- :value="item.guid"
- >{{ item.name }}
+ v-for="(item, index) in govMonitors"
+ :key="index"
+ :value="item.guid"
+ >{{ item.name }}
</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
</a-row>
- <a-row :gutter="[8,0]">
+ <a-row :gutter="[8, 0]">
<a-col :span="12">
<a-form-model-item
- :labelCol="{ span: 5 }"
- has-feedback
- :wrapperCol="{ span: 19 }"
- label="���������������"
+ :labelCol="{ span: 5 }"
+ has-feedback
+ :wrapperCol="{ span: 19 }"
+ label="���������������"
>
<a-select
- v-model="editBeforeData.purchaser.id"
- placeholder="���������������������"
- allow-clear
- :filter-option="filterOption"
- show-search
+ v-model="editBeforeData.purchaser.id"
+ placeholder="���������������������"
+ allow-clear
+ :filter-option="filterOption"
+ show-search
>
<a-select-option
- v-for="(item,index) in this.Purchasers"
- :key="index"
- :value = "Number(item.dataKey)"
- >{{ item.dataValue }}
+ v-for="(item, index) in this.Purchasers"
+ :key="index"
+ :value="Number(item.dataKey)"
+ >{{ item.dataValue }}
</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item
- has-feedback
- :labelCol="{ span: 5 }"
- :wrapperCol="{ span: 19 }"
- label="������������"
+ has-feedback
+ :labelCol="{ span: 5 }"
+ :wrapperCol="{ span: 19 }"
+ label="������������"
>
<a-input
- v-model="editBeforeData.address"
- placeholder="���������������������������"
+ v-model="editBeforeData.address"
+ placeholder="���������������������������"
/>
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item
- has-feedback
- :labelCol="{ span: 5 }"
- :wrapperCol="{ span: 19 }"
- label="������������"
- prop="town.townName"
+ has-feedback
+ :labelCol="{ span: 5 }"
+ :wrapperCol="{ span: 19 }"
+ label="������������"
+ prop="town.townName"
>
<a-input
- disabled="disabled"
- v-model="editBeforeData.town.townName"
- placeholder="���������������������������������/���������"
+ disabled="disabled"
+ v-model="editBeforeData.town.townName"
+ placeholder="���������������������������������/���������"
/>
</a-form-model-item>
</a-col>
</a-row>
-
</a-form-model>
- <pick-coordinate1 v-if="editMapFlag" :typeOperation="typeOperation" :lnglat="editBeforeData.latitude+ ',' + editBeforeData.longitude" @mapFlag1="receiveFlag2" @editLonLat="receiveLomLat1"/>
+ <pick-coordinate1
+ v-if="editMapFlag"
+ :typeOperation="typeOperation"
+ :lnglat="editBeforeData.latitude + ',' + editBeforeData.longitude"
+ @mapFlag1="receiveFlag2"
+ @editLonLat="receiveLomLat1"
+ />
</a-modal>
- <pick-coordinate :mapUrl="mapUrl" :mapRecord="mapRecord" v-if="!mapFlag" @mapFlag="receiveFlag"/>
- <Calibration :caliRecord="caliRecord" :wFlag="visibleFlag" @cFlag="turnFlag"/>
+ <pick-coordinate
+ :mapUrl="mapUrl"
+ :mapRecord="mapRecord"
+ v-if="!mapFlag"
+ @mapFlag="receiveFlag"
+ />
+ <Calibration
+ :caliRecord="caliRecord"
+ :wFlag="visibleFlag"
+ @cFlag="turnFlag"
+ />
</div>
</template>
@@ -1091,6 +1292,7 @@
//������������������������
get("device/techs", {})
.then(res => {
+ console.log(res,'res');
this.Techs = res.data.data;
})
.catch(err => {
@@ -1609,6 +1811,7 @@
private mapUrl:string = 'device/update'
private showMap(flag: boolean, record: any) {
+ console.log(record,'record');
this.mapFlag = flag
this.mapRecord = record
}
@@ -1754,6 +1957,4 @@
min-height: 0;
}
}
-
-
</style>
--
Gitblit v1.8.0