From 648d11b8ea7df744c189dfc9f19202ff62a26345 Mon Sep 17 00:00:00 2001 From: guoshipeng <3194674006@qq.com> Date: Thu, 03 Aug 2023 11:38:35 +0800 Subject: [PATCH] 修改批量补偿 --- src/views/list/devicesBasic.vue | 1637 +++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 1,118 insertions(+), 519 deletions(-) diff --git a/src/views/list/devicesBasic.vue b/src/views/list/devicesBasic.vue index 69ece7a..0a554d1 100644 --- a/src/views/list/devicesBasic.vue +++ b/src/views/list/devicesBasic.vue @@ -1,752 +1,1080 @@ <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" + /> + </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="ceAQIhandleChange" + ></a-select> + <a-input + v-model="ceAQIvaluein" + style="width: 100px; margin-left: 15px" + /> + </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"; @@ -867,6 +1195,8 @@ private visibleCreateModal: boolean = false; + private visibleCreateModal1: boolean = false; + private editTaskFormVisible: boolean = false; private distributionMenuVisible: boolean = false; @@ -883,6 +1213,160 @@ }; 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 handleChangevalue1(value: string){ + console.log(value); + } + private AQIhandleChange(value: string){ + console.log(value); + } + private ceAQIhandleChange(value: string){ + console.log(value); + } + 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[] = [ { @@ -1091,6 +1575,7 @@ //������������������������ get("device/techs", {}) .then(res => { + console.log(res,'res'); this.Techs = res.data.data; }) .catch(err => { @@ -1122,6 +1607,9 @@ this.visibleCreateModal = isVisible; this.getGovPointByArea('') this.techFlag = false + } + private handleModalVisible1(isVisible: boolean): void { + this.visibleCreateModal1=isVisible } private toggleForm(): void { @@ -1160,12 +1648,68 @@ //��������������������� private handleChange1(selectedItems:any) { + if (selectedItems === undefined) { this.selectMt = null }else { this.selectMt = selectedItems; } this.loadRuleData(1) + } + private handleChange2(res:any){ + // console.log(res.key); + 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'){ + for(var i=0;i<this.datatable.length;i++){ + if(this.ceAQIvalue==='+'){ + this.datatable[i].cel=parseFloat(this.datatable[i].cel+Number(this.ceAQIvaluein)).toFixed(2) + }else if(this.ceAQIvalue==='-'){ + this.datatable[i].cel=parseFloat(this.datatable[i].cel-Number(this.ceAQIvaluein)).toFixed(2) + }else if(this.ceAQIvalue==='*'){ + this.datatable[i].cel=parseFloat(this.datatable[i].cel*Number(this.ceAQIvaluein)).toFixed(3) + }else if(this.ceAQIvalue==='/'){ + this.datatable[i].cel=parseFloat(this.datatable[i].cel/Number(this.ceAQIvaluein)).toFixed(2) + } + 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==='+'){ + // console.log(this,'+++'); + this.datatable[i].aqi=parseFloat((this.datatable[i].aqi) + Number(this.AQIvalue)).toFixed(2) + }else if(this.AQIvalue1==='-'){ + this.datatable[i].aqi=parseFloat(this.datatable[i].aqi - Number(this.AQIvalue)).toFixed(2) + } else if(this.AQIvalue1==='*'){ + this.datatable[i].aqi=parseFloat(this.datatable[i].aqi * Number(this.AQIvalue)).toFixed(3) + }else if(this.AQIvalue1==='/'){ + this.datatable[i].aqi=parseFloat(this.datatable[i].aqi / Number(this.AQIvalue)).toFixed(2) + } + if(this.ceAQIvalue==='+'){ + this.datatable[i].cel=parseFloat(this.datatable[i].cel + Number(this.ceAQIvaluein)).toFixed(2) + }else if(this.ceAQIvalue==='-'){ + this.datatable[i].cel=parseFloat(this.datatable[i].cel - Number(this.ceAQIvaluein)).toFixed(2) + }else if(this.ceAQIvalue==='*'){ + this.datatable[i].cel=parseFloat(this.datatable[i].cel * Number(this.ceAQIvaluein)).toFixed(3) + }else if(this.ceAQIvalue==='/'){ + this.datatable[i].cel=parseFloat(this.datatable[i].cel / Number(this.ceAQIvaluein)).toFixed(2) + } + this.datatable[i].agehou='aqi*'+this.datatable[i].aqi+'+'+'ce1*'+this.datatable[i].cel + } + } + + }) } @@ -1393,7 +1937,12 @@ // ���������������������id private selectMt: any = null - + + private loading: boolean=false + + private handleCancel(){ + + } //������������ private handleCreateModalOk() { this.form.validateFields((err: any, values: any) => { @@ -1485,6 +2034,12 @@ lat: '' } this.visibleCreateModal = false; + } + + private handleCreateModalCancel1():any{ + this.visibleCreateModal1=false; + this.datatable=[] + this.selectvalue1='���������������' } private handlerSelectChange(arr1: any, arr2: any) { @@ -1609,6 +2164,7 @@ private mapUrl:string = 'device/update' private showMap(flag: boolean, record: any) { + console.log(record,'record'); this.mapFlag = flag this.mapRecord = record } @@ -1754,6 +2310,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