From 60e16bd5406c4cbdf61bf20a50e8e1b49a45b2aa Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Fri, 06 Sep 2024 11:14:59 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
src/views/list/devicesBasic.vue | 1779 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 1,227 insertions(+), 552 deletions(-)
diff --git a/src/views/list/devicesBasic.vue b/src/views/list/devicesBasic.vue
index 69ece7a..2da62a4 100644
--- a/src/views/list/devicesBasic.vue
+++ b/src/views/list/devicesBasic.vue
@@ -1,752 +1,1082 @@
<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-button
+ icon="plus"
+ type="primary"
+ @click="() => this.handleModalVisible1(true)"
+ 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="���������������������"
+ :visible="visibleCreateModal1"
+ @cancel="handleCreateModalCancel1"
+ destroyOnClose
+ class="modalStylezhi"
+ okText="������"
>
- <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>
+ <template #footer>
+ <a-button key="back" @click="handleCreateModalCancel1">������</a-button>
+ <a-button
+ key="submit"
+ type="primary"
+ :loading="loading"
+ @click="handleOk"
+ >������</a-button
+ >
+ </template>
+ <div class="modalone">
+ <div class="theone">
+ <a-select
+ ref="select"
+ v-model="selectvalue1"
+ allowClear
+ placeholder="���������������"
+ :options="selectoptions"
+ @change="handleChangevalue1"
+ style="margin-top: 40px; margin-left: 10px; width: 130px"
+ ></a-select>
+ </div>
+ <div class="thetwo">
+ <div style="height: 50px">
+ <div style="margin-top: 15px; margin-left: 20px">
+ <span style="font-size: 17.5px; color: black">AQI��� :</span
+ ><a-select
+ ref="select"
+ v-model="AQIvalue1"
+ style="width: 100px; margin-left: 16px"
+ allowClear
+ :options="AQIoptions"
+ @change="AQIhandleChange"
+ ></a-select>
+ <a-input
+ v-model="AQIvalue"
+ style="width: 100px; margin-left: 15px"
+ @blur="ceAQIhandleChange"
+ />
+ </div>
+ </div>
+ <div style="height: 50px">
+ <div style="margin-left: 20px">
+ <span style="font-size: 17.5px; color: black">��������� :</span
+ ><a-select
+ ref="select"
+ v-model="ceAQIvalue"
+ style="width: 100px; margin-left: 10px"
+ allowClear
+ :options="ceAQIoptions"
+ @change="AQIhandleChange"
+ ></a-select>
+ <a-input
+ v-model="ceAQIvaluein"
+ style="width: 100px; margin-left: 15px"
+ @blur="ceAQIhandleChange"
+ />
+ </div>
+ </div>
+ </div>
+ <div class="thethree">
+ <div style="margin-left: 20px; margin-top: 40px">
+ <span style="font-size: 16px; color: black">������������:</span>
+ <span style="font-size: 17.5px; color: black">
+ (���AQI������ {{ AQIvalue1 }}
+ <span style="color: #cbcb28">{{ AQIvalue }} </span>) + (���������������
+ {{ ceAQIvalue
+ }}<span style="color: #cbcb28"> {{ ceAQIvaluein }}</span
+ >)</span
+ >
+ </div>
+ </div>
+ </div>
+ <div class="modaltwo">
+ <a-select
+ placeholder="������������(������������������)"
+ allow-clear
+ show-search
+ style="width: 200px"
+ >
+ <a-select-option
+ v-for="(item, index) in MonitorPoints"
+ :key="index"
+ :value="item.id"
+ @click="handleChange2"
+ >{{ item.name }}
+ </a-select-option>
+ </a-select>
+ </div>
+ <div>
+ <a-table
+ :row-selection="{
+ getCheckboxProps: this.rowSelection.getCheckboxProps,
+ onChange: this.rowSelectionChange,
+ }"
+ :columns="tablecolumns"
+ :data-source="datatable"
+ style="margin-top: 20px"
+ bordered
+ row-key="name"
+ :scroll="{ x: 900, y: 300 }"
+ :pagination="false"
+ >
+ <template #bodyCell="{ column, text }">
+ <template v-if="column.dataIndex === 'name'">
+ <a>{{ text }}</a>
+ </template>
+ </template>
+ </a-table>
+ </div>
+ </a-modal>
+
+ <a-modal
+ 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>
- <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>
<script lang="tsx">
import {Component, Prop, Vue, Model, Watch} from "vue-property-decorator";
+import type { TableProps, TableColumnType } from 'ant-design-vue';
import moment from "moment";
import { get, post } from "@/util/request";
import UpdateTaskForm from "./components/UpdateTaskFormRole.vue";
@@ -758,7 +1088,6 @@
import axios from "axios";
import { jsonp } from 'vue-jsonp'
import any = jasmine.any;
-
const statusMap = ["default", "processing", "success", "error"];
const status = ["������", "���������", "���������", "������"];
@@ -867,6 +1196,8 @@
private visibleCreateModal: boolean = false;
+ private visibleCreateModal1: boolean = false;
+
private editTaskFormVisible: boolean = false;
private distributionMenuVisible: boolean = false;
@@ -874,17 +1205,192 @@
private createForm: any = null;
private editRecord: any = {};
+
private pagination: any = {
total: 0,
current: 1,
- pageSize: 5,
- showSizeChanger: false,
- showQuickJumper: false
+ pageSize: 10,
+ showSizeChanger: true,
+ showQuickJumper: true,
+ pageSizeOptions: ["10", "30", "60", "100"],
+ showTotal: (total: number) => `������ ${this.pagination.total} ���������`, //���������������������������
};
private updateRecord1: any = {};
+ private selectvalue1:any = '���������������';
+ private selectoptions:any[]=[
+ {
+ value: 'a34004',
+ label: 'PM2.5',
+ },
+ {
+ value: 'a34002',
+ label: 'PM10',
+ },
+ {
+ value: 'a05024',
+ label: '������',
+ },
+ {
+ value: 'a21004',
+ label: '������������',
+ },
+ {
+ value: 'a21026',
+ label: '������������',
+ },
+ {
+ value: 'a21005',
+ label: '������������',
+ },
+ {
+ value: 'a99054',
+ label: 'TVOC',
+ },
+ ]
+ private AQIvalue1:any = '+';
+ private ceAQIvalue:any = '+';
+ private ceAQIvaluein:number = 0.01;
+ private AQIvalue:number = 0.01;
+ private AQIoptions:any[]=[
+ {
+ value: '+',
+ label: '+',
+ },
+ {
+ value: '-',
+ label: '-',
+ },
+ {
+ value: '*',
+ label: '*',
+ },
+ {
+ value: '/',
+ label: '/',
+ },
+ ]
+ private ceAQIoptions:any[]=[
+ {
+ value: '+',
+ label: '+',
+ },
+ {
+ value: '-',
+ label: '-',
+ },
+ {
+ value: '*',
+ label: '*',
+ },
+ {
+ value: '/',
+ label: '/',
+ },
+ ]
+ private changesen:number=0
+ private handleChangevalue1(value: string){
+ console.log(this.changesen);
+ if(this.changesen===1){
+ this.handleChange2(this.reskey);
+ }
+ }
+ private AQIhandleChange(value: string){
+ console.log(this.changesen);
+ if(this.changesen===1){
+ this.handleChange2(this.reskey);
+ }
+ }
+ private ceAQIhandleChange(value: string){
+ console.log(this.changesen);
+ if(this.changesen===1){
+ this.handleChange2(this.reskey);
+ }
+ }
+ private tablecolumns:TableColumnType<datatable>=[
+ {
+ title: "������",
+ dataIndex: "name"
+ },
+ {
+ title: '���������',
+ dataIndex: 'value',
+ },
+ {
+ title: '���������',
+ dataIndex: 'agehou',
+ },
+ ]
+ private datatable:any[]=[
+ // {
+ // key: '1',
+ // name: 'John Brown',
+ // age: 'aqi*0.93+cel*0.07',
+ // age1:0.93,
+ // age2:0.07,
+ // address: 'New York No. 1 Lake Park',
+ // agehou:''
+ // },
+ // {
+ // key: '2',
+ // name: 'Jim Green',
+ // age: 'aqi*0.93+cel*0.07',
+ // age1:0.93,
+ // age2:0.07,
+ // address: 'London No. 1 Lake Park',
+ // agehou:''
+ // },
+ // {
+ // key: '3',
+ // name: 'Joe Black',
+ // age: 'aqi*0.93+cel*0.07',
+ // age1:0.93,
+ // age2:0.07,
+ // address: 'Sidney No. 1 Lake Park',
+ // agehou:''
+ // }
+ ]
+
+ private rowSelectionChange(selectedRowKeys: string[], selectedRows: DataType[]){
+ // console.log(selectedRows);
+ this.selectedtable=selectedRows
+ }
+ private selectedtable:any[]=[]
+ private rowSelection:TableProps['rowSelection']={
+ onChange: (selectedRowKeys: string[], selectedRows: DataType[]) => {
+ this.selectedtable=selectedRows
+ // console.log(this.selectedtable);
+ },
+ getCheckboxProps: (record: DataType) => ({
+ name: record.name,
+ }),
+ }
+ private handleOk(){
+ // console.log(this.selectedtable);
+ post('deviceAdjustValue/updateAllAdjust',{
+ AdjustForm:this.selectedtable
+ }).then((res:any)=>{
+ console.log(res);
+ if(res.data.code == 0){
+ this.$message.success('������������')
+ this.handleCreateModalCancel1()
+ }
+ })
+ // this.loading = true;
+ // setTimeout(() => {
+ // this.loading = false;
+ // }, 2000);
+ }
private columns: any[] = [
+ {
+ title: "������",
+ dataIndex: "key",
+ key: "key",
+ align: "center",
+ customRender: (text:any, record:any, index:any) => `${index + 1}`,
+ width: 60,
+ },
{
title: "������",
dataIndex: "name"
@@ -1016,6 +1522,7 @@
this.addMapFlag = true
}
private showMap2() {
+ this.typeOperation = 'upa'
this.editMapFlag = true
}
// ������������������
@@ -1091,6 +1598,7 @@
//������������������������
get("device/techs", {})
.then(res => {
+ console.log(res,'res');
this.Techs = res.data.data;
})
.catch(err => {
@@ -1123,6 +1631,9 @@
this.getGovPointByArea('')
this.techFlag = false
}
+ private handleModalVisible1(isVisible: boolean): void {
+ this.visibleCreateModal1=isVisible
+ }
private toggleForm(): void {
this.expandForm = !this.expandForm;
@@ -1141,6 +1652,9 @@
private current: number = 1
private handlerTableChange(pagination: any, filter: any, sorter: any): void {
this.current = pagination.current
+ this.pagination.current = pagination.current;
+ this.pagination.pageSize = pagination.pageSize;
+ this.pagination.total = pagination.total;
this.loadRuleData(pagination.current)
}
@@ -1166,6 +1680,64 @@
this.selectMt = selectedItems;
}
this.loadRuleData(1)
+ }
+ private reskey:any=0
+ private handleChange2(res:any){
+ console.log(res.key);
+ this.reskey=res
+ console.log(this.reskey);
+ if(this.selectvalue1==='���������������'){
+ this.$message.warning('������������������')
+ return
+ }
+ post('deviceAdjustValue/getAllAdjust',{
+ code:this.selectvalue1,
+ id:res.key,
+ }).then((res:any)=>{
+ this.datatable=[]
+ this.datatable=res.data.data
+ if(this.selectvalue1==='a99054'){
+ console.log(21323);
+ for(var i=0;i<this.datatable.length;i++){
+ if(this.ceAQIvalue==='+'){
+ this.datatable[i].cel=((this.datatable[i].cel-0) + (this.ceAQIvaluein-0)).toFixed(2)
+ }else if(this.ceAQIvalue==='-'){
+ this.datatable[i].cel=Number((this.datatable[i].cel - this.ceAQIvaluein).toFixed(2))
+ }else if(this.ceAQIvalue==='*'){
+ this.datatable[i].cel=Number((this.datatable[i].cel * this.ceAQIvaluein).toFixed(2))
+ }else if(this.ceAQIvalue==='/'){
+ this.datatable[i].cel=Number((this.datatable[i].cel / this.ceAQIvaluein).toFixed(3))
+ }
+ this.datatable[i].agehou='ce1*'+this.datatable[i].cel
+ }
+ }else{
+ for(var i=0;i<this.datatable.length;i++){
+ // this.datatable[i].aqi=parseFloat(this.datatable[i].aqi+this.AQIvalue).toFixed(2)
+ // this.datatable[i].cel=parseFloat(this.datatable[i].cel+this.ceAQIvaluein).toFixed(2)
+ // this.datatable[i].agehou='aqi*'+this.datatable[i].aqi+'+'+'ce1*'+this.datatable[i].cel
+ if(this.AQIvalue1==='+'){
+ this.datatable[i].aqi=((this.datatable[i].aqi-0) + (this.AQIvalue-0)).toFixed(2)
+ }else if(this.AQIvalue1==='-'){
+ this.datatable[i].aqi=Number((this.datatable[i].aqi - this.AQIvalue)).toFixed(2)
+ } else if(this.AQIvalue1==='*'){
+ this.datatable[i].aqi=Number((this.datatable[i].aqi * this.AQIvalue)).toFixed(2)
+ }else if(this.AQIvalue1==='/'){
+ this.datatable[i].aqi=Number((this.datatable[i].aqi / this.AQIvalue).toFixed(3))
+ }
+ if(this.ceAQIvalue==='+'){
+ this.datatable[i].cel=((this.datatable[i].cel-0) + (this.ceAQIvaluein-0)).toFixed(2)
+ }else if(this.ceAQIvalue==='-'){
+ this.datatable[i].cel=Number((this.datatable[i].cel - this.ceAQIvaluein)).toFixed(2)
+ }else if(this.ceAQIvalue==='*'){
+ this.datatable[i].cel=Number((this.datatable[i].cel * this.ceAQIvaluein)).toFixed(2)
+ }else if(this.ceAQIvalue==='/'){
+ this.datatable[i].cel=Number((this.datatable[i].cel / this.ceAQIvaluein).toFixed(3))
+ }
+ this.datatable[i].agehou='aqi*'+this.datatable[i].aqi+'+'+'ce1*'+this.datatable[i].cel
+ }
+ }
+ this.changesen=1;
+ })
}
@@ -1394,6 +1966,11 @@
// ���������������������id
private selectMt: any = null
+ private loading: boolean=false
+
+ private handleCancel(){
+
+ }
//������������
private handleCreateModalOk() {
this.form.validateFields((err: any, values: any) => {
@@ -1487,6 +2064,13 @@
this.visibleCreateModal = false;
}
+ private handleCreateModalCancel1():any{
+ this.datatable=[];
+ this.selectvalue1='���������������';
+ this.changesen=0;
+ this.visibleCreateModal1=false;
+ }
+
private handlerSelectChange(arr1: any, arr2: any) {
this.selectedRows = arr2;
}
@@ -1527,7 +2111,7 @@
name: this.serch.name,
mac: this.serch.name,
page: pageSize,
- size: 8
+ size: this.pagination.pageSize,
})
.then(res => {
if(res.data.code === 0) {
@@ -1609,6 +2193,7 @@
private mapUrl:string = 'device/update'
private showMap(flag: boolean, record: any) {
+ console.log(record,'record');
this.mapFlag = flag
this.mapRecord = record
}
@@ -1624,48 +2209,95 @@
}
private receiveFlag2(flag: boolean){
+ console.log('receiveFlag2');
this.editMapFlag = flag
}
// ������������������������
private receiveLomLat(lonLat: any) {
+
this.addLL = lonLat
this.getTownData(lonLat)
}
private getTownData(lonLat: any) {
- // jsonp('/proxy/reverse_geocoding/v3/', {
- jsonp('https://api.map.baidu.com/reverse_geocoding/v3/', {
- ak: 'e5ig9Z7AKFjv8wbkqDbuLkUMzBev0tgT',
- output: 'json',
- coordtype: 'wgs8411',
- extensions_town: true,
- location: lonLat.lat+ ',' + lonLat.lng
- }).then((res: any) => {
- if(this.typeOperation === 'add') {
- this.town_code = res.result.addressComponent.town_code
- this.form.setFieldsValue({
- jingdu: this.addLL.lng,
- weidu: this.addLL.lat,
- town: res.result.addressComponent.town
- })
- } else {
- console.log(res);
- if (!(res.result.addressComponent.town === '' && res.result.addressComponent.town_code === '')){
- this.editBeforeData.town.townName = res.result.addressComponent.town
- this.editBeforeData.town.townCode = res.result.addressComponent.town_code
- } else {
- this.editBeforeData.town.townName = res.result.addressComponent.town
- this.editBeforeData.town.townCode = res.result.addressComponent.town_code
- this.$message.warning('������������������������')
- }
+ console.log(lonLat,'dsasa');
+ let self=this
+ var geocoder = new AMap.Geocoder({
+ // city ������������������������������������������������������������adcode ��� citycode
+ city: '010'
+ })
+ geocoder.getAddress(lonLat, function(status, result) {
+ console.log(result,'result');
+ if (status === 'complete' && result.info === 'OK') {
+ // self.formattedAddress=result.regeocode.formattedAddress
+ // console.log(result,'321312');
+ if(self.typeOperation === 'add') {
+ if(result.regeocode.addressComponent.towncode.length>9){
+ self.town_code=result.regeocode.addressComponent.towncode.slice(0,9)
+ }else{
+ self.town_code = result.regeocode.addressComponent.towncode
+ }
+ self.form.setFieldsValue({
+ jingdu: self.addLL[0],
+ weidu: self.addLL[1],
+ town: result.regeocode.addressComponent.township
+ })
+ console.log(self.town_code);
+ } else {
+ if (!(result.regeocode.addressComponent.township === '' && result.regeocode.addressComponent.towncode === '')){
+ self.editBeforeData.town.townName = result.regeocode.addressComponent.township
+ if(result.regeocode.addressComponent.towncode.length>9){
+ self.editBeforeData.town.townCode = result.regeocode.addressComponent.towncode.slice(0,9)
+ }else{
+ self.editBeforeData.town.townCode = result.regeocode.addressComponent.towncode
+ }
+ // console.log(self.editBeforeData.town.townName,self.editBeforeData.town.townCode,'222');
+ } else {
+ self.editBeforeData.town.townName = result.regeocode.addressComponent.town
+ self.editBeforeData.town.townCode = result.regeocode.addressComponent.towncode
+ self.$message.warning('������������������������')
+ }
- }
- })
+ }
+ // result������������������������������������
+ }
+ })
+
+ // jsonp('/proxy/reverse_geocoding/v3/', {
+ // jsonp('https://api.map.baidu.com/reverse_geocoding/v3/', {
+ // ak: 'e5ig9Z7AKFjv8wbkqDbuLkUMzBev0tgT',
+ // output: 'json',
+ // coordtype: 'wgs8411',
+ // extensions_town: true,
+ // location: lonLat.lat+ ',' + lonLat.lng
+ // }).then((res: any) => {
+ // console.log(res,'res');
+ // if(this.typeOperation === 'add') {
+ // this.town_code = res.result.addressComponent.town_code
+ // this.form.setFieldsValue({
+ // jingdu: this.addLL.lng,
+ // weidu: this.addLL.lat,
+ // town: res.result.addressComponent.town
+ // })
+ // } else {
+ // console.log(res,'555');
+ // if (!(res.result.addressComponent.town === '' && res.result.addressComponent.town_code === '')){
+ // this.editBeforeData.town.townName = res.result.addressComponent.town
+ // this.editBeforeData.town.townCode = res.result.addressComponent.town_code
+ // } else {
+ // this.editBeforeData.town.townName = res.result.addressComponent.town
+ // this.editBeforeData.town.townCode = res.result.addressComponent.town_code
+ // this.$message.warning('������������������������')
+ // }
+
+ // }
+ // })
}
// ������������������������
private receiveLomLat1(lonLat: any) {
- this.editBeforeData.longitude = lonLat.lng
- this.editBeforeData.latitude = lonLat.lat
+ console.log(lonLat,'lonLat');
+ this.editBeforeData.longitude = lonLat[0]
+ this.editBeforeData.latitude = lonLat[1]
this.getTownData(lonLat)
}
@@ -1754,6 +2386,49 @@
min-height: 0;
}
}
+.modalStylezhi {
+ .ant-modal-content {
+ width: 1000px;
+ margin-left: -250px;
+ }
+ .ant-modal-title {
+ font-size: 20px;
+ margin-left: -25px;
+ }
+ .ant-form-item {
+ margin-bottom: 0px;
+ }
-
+ .ant-form-explain {
+ display: none;
+ min-height: 0;
+ }
+ .ant-modal-header {
+ width: 95%;
+ margin-left: 25px;
+ }
+}
+.modalone {
+ height: 120px;
+ border-bottom: 1px solid #e8e8e8;
+ display: flex;
+ .theone {
+ width: 20%;
+ border-right: 1px #e8e8e8 dashed;
+ height: 100px;
+ }
+ .thetwo {
+ width: 35%;
+ border-right: 1px #e8e8e8 dashed;
+ height: 100px;
+ }
+ .thethree {
+ width: 45%;
+ height: 100px;
+ }
+}
+.modaltwo {
+ margin-top: 20px;
+ margin-left: 10px;
+}
</style>
--
Gitblit v1.8.0