全局添加输入框空格校验
This commit is contained in:
@@ -3,21 +3,21 @@
|
||||
<TableHeader>
|
||||
<template #select>
|
||||
<el-form-item label="数据分类">
|
||||
<el-select v-model="tableStore.table.params.dataType" multiple filterable collapse-tags clearable
|
||||
placeholder="请选择数据分类">
|
||||
<el-select v-model.trim="tableStore.table.params.dataType" multiple filterable collapse-tags
|
||||
clearable placeholder="请选择数据分类">
|
||||
<el-option v-for="item in DataTypeSelect" :key="item.id" :label="item.name"
|
||||
:value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="数据存储">
|
||||
<el-select v-model="tableStore.table.params.classId" multiple filterable collapse-tags clearable
|
||||
placeholder="请选择数据存储">
|
||||
<el-select v-model.trim="tableStore.table.params.classId" multiple filterable collapse-tags
|
||||
clearable placeholder="请选择数据存储">
|
||||
<el-option v-for="item in DataSelect" :key="item.id" :label="item.name"
|
||||
:value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="过滤筛选">
|
||||
<el-input maxlength="32" show-word-limit v-model="tableStore.table.params.searchValue"
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="tableStore.table.params.searchValue"
|
||||
placeholder="数据名称、别名、名称" clearable></el-input>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
@@ -1,78 +1,78 @@
|
||||
<template>
|
||||
<el-dialog class="cn-operate-dialog" v-model="dialogVisible" :title="title">
|
||||
<el-dialog class="cn-operate-dialog" v-model.trim="dialogVisible" :title="title">
|
||||
<el-scrollbar>
|
||||
<div style="padding-left: 50px">
|
||||
<el-divider content-position="center">基础数据</el-divider>
|
||||
</div>
|
||||
<el-form :model="form" label-width="140px" ref="formRef" class="form-two" :rules="rules">
|
||||
<el-form-item label="数据分类:" prop="dataType">
|
||||
<el-select v-model="form.dataType" filterable clearable placeholder="请选择数据分类">
|
||||
<el-select v-model.trim="form.dataType" filterable clearable placeholder="请选择数据分类">
|
||||
<el-option v-for="item in DataTypeSelect" :key="item.id" :label="item.name"
|
||||
:value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="数据名称:" prop="name">
|
||||
<el-input maxlength="32" show-word-limit v-model="form.name" autocomplete="off"
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="form.name" autocomplete="off"
|
||||
placeholder="请输入数据名称"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="别名:" prop="otherName">
|
||||
<el-input maxlength="32" show-word-limit v-model="form.otherName" autocomplete="off"
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="form.otherName" autocomplete="off"
|
||||
placeholder="请输入别名"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="展示名称:" prop="showName">
|
||||
<el-input maxlength="32" show-word-limit v-model="form.showName" autocomplete="off"
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="form.showName" autocomplete="off"
|
||||
placeholder="请输入展示名称"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="相别:" prop="phase">
|
||||
<el-select v-model="form.phase" filterable clearable placeholder="请选择相别">
|
||||
<el-select v-model.trim="form.phase" filterable clearable placeholder="请选择相别">
|
||||
<el-option v-for="item in phaseSelect" :key="item.id" :label="item.name"
|
||||
:value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="单位:" prop="unit">
|
||||
<el-input maxlength="32" show-word-limit v-model="form.unit" autocomplete="off"
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="form.unit" autocomplete="off"
|
||||
placeholder="请输入单位"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="基础数据类型:" prop="type">
|
||||
<el-input maxlength="32" show-word-limit v-model="form.type" autocomplete="off"
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="form.type" autocomplete="off"
|
||||
placeholder="请输入基础数据类型"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="开始结束次数:" prop="harmStart">
|
||||
<el-slider v-model="form.harm" range show-stops :max="50" style="width: 95%" />
|
||||
<el-slider v-model.trim="form.harm" range show-stops :max="50" style="width: 95%" />
|
||||
</el-form-item>
|
||||
<el-form-item label="统计方法:" prop="statMethod">
|
||||
<el-select v-model="form.statMethod" multiple collapse-tags collapse-tags-tooltip filterable
|
||||
<el-select v-model.trim="form.statMethod" multiple collapse-tags collapse-tags-tooltip filterable
|
||||
clearable placeholder="请选择统计方法">
|
||||
<el-option v-for="item in StatMethodSelect" :key="item.id" :label="item.name"
|
||||
:value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="数据存储:" prop="classId">
|
||||
<el-select v-model="form.classId" filterable clearable placeholder="请选择数据存储">
|
||||
<el-select v-model.trim="form.classId" filterable clearable placeholder="请选择数据存储">
|
||||
<el-option v-for="item in DataSelect" :key="item.code" :label="item.name"
|
||||
:value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="报表数据来源:" prop="resourcesId">
|
||||
<el-select v-model="form.resourcesId" filterable clearable placeholder="请选择报表数据来源">
|
||||
<el-select v-model.trim="form.resourcesId" filterable clearable placeholder="请选择报表数据来源">
|
||||
<el-option v-for="item in ResourcesIdSelect" :key="item.code" :label="item.name"
|
||||
:value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="序号:" prop="sort">
|
||||
<el-input maxlength="32" show-word-limit type="number" v-model="form.sort" autocomplete="off"
|
||||
<el-input maxlength="32" show-word-limit type="number" v-model.trim="form.sort" autocomplete="off"
|
||||
placeholder="请输入序号"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="限值名称:" prop="limitName">
|
||||
<el-input maxlength="32" show-word-limit type="text" v-model="form.limitName" autocomplete="off"
|
||||
placeholder="请输入限值名称"></el-input>
|
||||
<el-input maxlength="32" show-word-limit type="text" v-model.trim="form.limitName"
|
||||
autocomplete="off" placeholder="请输入限值名称"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="限值表名:" prop="limitTable">
|
||||
<el-input maxlength="32" show-word-limit type="text" v-model="form.limitTable" autocomplete="off"
|
||||
placeholder="请输入限值表名"></el-input>
|
||||
<el-input maxlength="32" show-word-limit type="text" v-model.trim="form.limitTable"
|
||||
autocomplete="off" placeholder="请输入限值表名"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="超标判断方式:" prop="formula">
|
||||
<el-select v-model="form.formula" filterable clearable placeholder="请选择超标判断方式">
|
||||
<el-select v-model.trim="form.formula" filterable clearable placeholder="请选择超标判断方式">
|
||||
<el-option v-for="item in FormulaSelect" :key="item.code" :label="item.name"
|
||||
:value="item.id"></el-option>
|
||||
</el-select>
|
||||
@@ -83,53 +83,53 @@
|
||||
</div>
|
||||
<el-form class="form-two" :model="form" label-width="140px" ref="formRef2" :rules="rules">
|
||||
<el-form-item label="参数缺省值:" prop="defaultValue">
|
||||
<el-input maxlength="32" show-word-limit v-model="form.defaultValue" autocomplete="off"
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="form.defaultValue" autocomplete="off"
|
||||
placeholder="请输入参数缺省值"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="事件类别:" prop="eventType">
|
||||
<el-input maxlength="32" show-word-limit v-model="form.eventType" autocomplete="off"
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="form.eventType" autocomplete="off"
|
||||
placeholder="请输入事件类别"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="设置最大值:" prop="maxNum">
|
||||
<el-input maxlength="32" show-word-limit type="number" v-model="form.maxNum" autocomplete="off"
|
||||
<el-input maxlength="32" show-word-limit type="number" v-model.trim="form.maxNum" autocomplete="off"
|
||||
placeholder="请输入设置最大值"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="设置最小值:" prop="minNum">
|
||||
<el-input maxlength="32" show-word-limit type="number" v-model="form.minNum" autocomplete="off"
|
||||
<el-input maxlength="32" show-word-limit type="number" v-model.trim="form.minNum" autocomplete="off"
|
||||
placeholder="请输入设置最小值"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="枚举序列:" prop="setValue">
|
||||
<el-input maxlength="32" show-word-limit v-model="form.setValue" autocomplete="off"
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="form.setValue" autocomplete="off"
|
||||
placeholder="请输入枚举序列"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="字符串长度上限:" prop="strlen">
|
||||
<el-input maxlength="32" show-word-limit type="number" v-model="form.strlen" autocomplete="off"
|
||||
<el-input maxlength="32" show-word-limit type="number" v-model.trim="form.strlen" autocomplete="off"
|
||||
placeholder="请输入字符串长度上限"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="上送规则:" prop="tranRule">
|
||||
<el-input maxlength="32" show-word-limit v-model="form.tranRule" autocomplete="off"
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="form.tranRule" autocomplete="off"
|
||||
placeholder="请输入上送规则"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="是否可远程控制:" prop="ctlSts">
|
||||
<el-radio v-model="form.ctlSts" :label="1">是</el-radio>
|
||||
<el-radio v-model="form.ctlSts" :label="0">否</el-radio>
|
||||
<el-radio v-model.trim="form.ctlSts" :label="1">是</el-radio>
|
||||
<el-radio v-model.trim="form.ctlSts" :label="0">否</el-radio>
|
||||
</el-form-item>
|
||||
<el-form-item label="是否需遥控校验:" prop="curSts">
|
||||
<el-radio v-model="form.curSts" :label="1">是</el-radio>
|
||||
<el-radio v-model="form.curSts" :label="0">否</el-radio>
|
||||
<el-radio v-model.trim="form.curSts" :label="1">是</el-radio>
|
||||
<el-radio v-model.trim="form.curSts" :label="0">否</el-radio>
|
||||
</el-form-item>
|
||||
<el-form-item label="是否存储:" prop="storeFlag">
|
||||
<el-radio v-model="form.storeFlag" :label="1">是</el-radio>
|
||||
<el-radio v-model="form.storeFlag" :label="0">否</el-radio>
|
||||
<el-radio v-model.trim="form.storeFlag" :label="1">是</el-radio>
|
||||
<el-radio v-model.trim="form.storeFlag" :label="0">否</el-radio>
|
||||
</el-form-item>
|
||||
<el-form-item label="是否加密:" prop="storeFlag">
|
||||
<el-radio v-model="form.storeFlag" :label="1">是</el-radio>
|
||||
<el-radio v-model="form.storeFlag" :label="0">否</el-radio>
|
||||
<el-radio v-model.trim="form.storeFlag" :label="1">是</el-radio>
|
||||
<el-radio v-model.trim="form.storeFlag" :label="0">否</el-radio>
|
||||
</el-form-item>
|
||||
<el-form-item label="数据是否上送:" prop="tranFlag">
|
||||
<el-radio v-model="form.tranFlag" :label="1">是</el-radio>
|
||||
<el-radio v-model="form.tranFlag" :label="0">否</el-radio>
|
||||
<el-radio v-model.trim="form.tranFlag" :label="1">是</el-radio>
|
||||
<el-radio v-model.trim="form.tranFlag" :label="0">否</el-radio>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-scrollbar>
|
||||
|
||||
@@ -1,41 +1,41 @@
|
||||
<template>
|
||||
<el-dialog class="cn-operate-dialog" width="800px" v-model="dialogVisible" :title="title">
|
||||
<el-dialog class="cn-operate-dialog" width="800px" v-model.trim="dialogVisible" :title="title">
|
||||
|
||||
<el-form class="form-two" :model="form" label-width="120px" ref="formRef" :rules="rules">
|
||||
<el-form-item label="装置类型:" prop="type">
|
||||
<el-select v-model="form.type" filterable placeholder="请选择" @change="typeChange">
|
||||
<el-select v-model.trim="form.type" filterable placeholder="请选择" @change="typeChange">
|
||||
<el-option v-for="item in TypeOptions" :key="item.id" :label="item.name"
|
||||
:value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="装置型号:" prop="devType">
|
||||
<el-select v-model="form.devType" placeholder="请选择" filterable @change="devTypeChange">
|
||||
<el-select v-model.trim="form.devType" placeholder="请选择" filterable @change="devTypeChange">
|
||||
<el-option v-for="item in DevTypeOptions" :key="item.id" :label="item.name"
|
||||
:value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="版本号:" prop="versionNo">
|
||||
<el-input maxlength="32" show-word-limit v-model="form.versionNo" autocomplete="off"
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="form.versionNo" autocomplete="off"
|
||||
placeholder="请输入"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="版本类型:" prop="versionType">
|
||||
<el-input maxlength="32" show-word-limit v-model="form.versionType" autocomplete="off"
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="form.versionType" autocomplete="off"
|
||||
placeholder="填写特殊类型(不填默认通用类型)"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="版本协议:" prop="versionAgreement">
|
||||
<el-input maxlength="32" show-word-limit v-model="form.versionAgreement" autocomplete="off"
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="form.versionAgreement" autocomplete="off"
|
||||
placeholder="请输入"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="版本日期:" prop="versionDate">
|
||||
<el-date-picker v-model="form.versionDate" type="date" value-format="yyyy-MM-dd" placeholder="选择日期时间"
|
||||
style="width: 100%"></el-date-picker>
|
||||
<el-date-picker v-model.trim="form.versionDate" type="date" value-format="yyyy-MM-dd"
|
||||
placeholder="选择日期时间" style="width: 100%"></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="描述:" prop="description">
|
||||
<el-input maxlength="32" show-word-limit v-model="form.description" autocomplete="off"
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="form.description" autocomplete="off"
|
||||
placeholder="请输入"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="CRC校验:" prop="crcInfo">
|
||||
<el-input maxlength="32" show-word-limit v-model="form.crcInfo" autocomplete="off"
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="form.crcInfo" autocomplete="off"
|
||||
placeholder="请输入"></el-input>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
<TableHeader ref="tableHeaderRef">
|
||||
<template #select>
|
||||
<el-form-item label="模版名称">
|
||||
<el-input maxlength="32" show-word-limit v-model="tableStore.table.params.name" clearable
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="tableStore.table.params.name" clearable
|
||||
placeholder="请输入名称"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="装置型号">
|
||||
<el-select v-model="tableStore.table.params.devType" placeholder="请选择" clearable>
|
||||
<el-select v-model.trim="tableStore.table.params.devType" placeholder="请选择" clearable>
|
||||
<el-option v-for="item in DevTypeOptions" :key="item.id" :label="item.name"
|
||||
:value="item.id"></el-option>
|
||||
</el-select>
|
||||
|
||||
@@ -3,17 +3,9 @@
|
||||
<TableHeader ref="tableHeaderRef">
|
||||
<template #select>
|
||||
<el-form-item label="装置型号:">
|
||||
<el-select
|
||||
v-model="tableStore.table.params.devType"
|
||||
placeholder="请选择"
|
||||
clearable
|
||||
>
|
||||
<el-option
|
||||
v-for="item in DevTypeOptions"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
></el-option>
|
||||
<el-select v-model.trim="tableStore.table.params.devType" placeholder="请选择" clearable>
|
||||
<el-option v-for="item in DevTypeOptions" :key="item.id" :label="item.name"
|
||||
:value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
@@ -3,27 +3,28 @@
|
||||
<TableHeader>
|
||||
<template v-slot:select>
|
||||
<el-form-item label="设备类型">
|
||||
<!-- <el-input maxlength="32" show-word-limit v-model="tableStore.table.params.searchValue" placeholder="请输入设备类型" /> -->
|
||||
<el-select v-model="tableStore.table.params.devType" clearable @change="devTypeChange"
|
||||
<!-- <el-input maxlength="32" show-word-limit v-model.trim="tableStore.table.params.searchValue" placeholder="请输入设备类型" /> -->
|
||||
<el-select v-model.trim="tableStore.table.params.devType" clearable @change="devTypeChange"
|
||||
placeholder="请选择设备类型">
|
||||
<el-option v-for="item in devTypeOptions" :key="item.value" :label="item.label"
|
||||
:value="item.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="设备型号">
|
||||
<el-select v-model="tableStore.table.params.devModel" filterable clearable placeholder="请选择设备型号">
|
||||
<el-select v-model.trim="tableStore.table.params.devModel" filterable clearable
|
||||
placeholder="请选择设备型号">
|
||||
<el-option v-for="item in devModelOptionsFilter" :key="item.value" :label="item.label"
|
||||
:value="item.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="通讯协议">
|
||||
<el-select v-model="tableStore.table.params.devAccessMethod" clearable placeholder="请选择通讯协议">
|
||||
<el-select v-model.trim="tableStore.table.params.devAccessMethod" clearable placeholder="请选择通讯协议">
|
||||
<el-option label="MQTT" value="MQTT"></el-option>
|
||||
<el-option label="CLD" value="CLD"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="状态">
|
||||
<el-select v-model="tableStore.table.params.status" clearable placeholder="请选择状态">
|
||||
<el-select v-model.trim="tableStore.table.params.status" clearable placeholder="请选择状态">
|
||||
<el-option label="未注册" :value="1"></el-option>
|
||||
<el-option label="注册" :value="2"></el-option>
|
||||
<el-option label="接入" :value="3"></el-option>
|
||||
@@ -43,7 +44,7 @@
|
||||
</TableHeader>
|
||||
<Table ref="tableRef"></Table>
|
||||
|
||||
<el-dialog :title="dialogTitle" v-model="dialogFormVisible" :close-on-click-modal="false"
|
||||
<el-dialog :title="dialogTitle" v-model.trim="dialogFormVisible" :close-on-click-modal="false"
|
||||
:before-close="resetForm" draggable width="800px">
|
||||
<el-form :model="form" label-width="auto" :rules="rules" ref="ruleFormRef" class="form-two">
|
||||
<el-form-item label="设备名称:" prop="name">
|
||||
@@ -55,19 +56,19 @@
|
||||
placeholder="请输入"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="设备类型:" prop="devType" class="top">
|
||||
<el-select v-model="form.devType" placeholder="请选择" @change="formDevTypeChange" clearable>
|
||||
<el-select v-model.trim="form.devType" placeholder="请选择" @change="formDevTypeChange" clearable>
|
||||
<el-option v-for="item in devTypeOptions" :key="item.value" :label="item.label"
|
||||
:value="item.value"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="设备型号:" prop="devModel" class="top">
|
||||
<el-select v-model="form.devModel" filterable placeholder="请选择" clearable>
|
||||
<el-select v-model.trim="form.devModel" filterable placeholder="请选择" clearable>
|
||||
<el-option v-for="item in formDevModelOptionsFilter" :key="item.value" :label="item.label"
|
||||
:value="item.value"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="通讯协议:" prop="devAccessMethod" class="top">
|
||||
<el-select v-model="form.devAccessMethod" placeholder="请选择" clearable>
|
||||
<el-select v-model.trim="form.devAccessMethod" placeholder="请选择" clearable>
|
||||
<el-option label="MQTT" value="MQTT"></el-option>
|
||||
<el-option label="CLD" value="CLD"></el-option>
|
||||
</el-select>
|
||||
@@ -77,7 +78,7 @@
|
||||
</el-form-item>
|
||||
|
||||
<!-- <el-form-item label="合同号:" prop="cntractNo" class="top">
|
||||
<el-input maxlength="32" show-word-limit v-model="form.cntractNo" autocomplete="off" placeholder="请输入"></el-input>
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="form.cntractNo" autocomplete="off" placeholder="请输入"></el-input>
|
||||
</el-form-item> -->
|
||||
</el-form>
|
||||
<template #footer>
|
||||
@@ -395,7 +396,7 @@ const tableStore = new TableStore({
|
||||
// },
|
||||
//便携式设备手动接入
|
||||
{
|
||||
title: '接5入',
|
||||
title: '接入',
|
||||
type: 'primary',
|
||||
icon: 'el-icon-Grid',
|
||||
render: 'basicButton',
|
||||
@@ -403,7 +404,7 @@ const tableStore = new TableStore({
|
||||
return (
|
||||
(row.devType != '8b45cf6b7f5266e777d07c166ad5fa77' &&
|
||||
row.devModel != 'a0d4da4b5c17b2172362a3f5a27bf217') ||
|
||||
row.status != '5'
|
||||
row.status != '6'
|
||||
)
|
||||
},
|
||||
click: row => {
|
||||
@@ -425,7 +426,7 @@ const tableStore = new TableStore({
|
||||
}
|
||||
},
|
||||
{
|
||||
title: '接3入',
|
||||
title: '接入',
|
||||
type: 'primary',
|
||||
icon: 'el-icon-Grid',
|
||||
render: 'basicButton',
|
||||
@@ -433,7 +434,7 @@ const tableStore = new TableStore({
|
||||
return (
|
||||
(row.devType != '8b45cf6b7f5266e777d07c166ad5fa77' &&
|
||||
row.devModel != 'a0d4da4b5c17b2172362a3f5a27bf217') ||
|
||||
row.status != '3'
|
||||
row.status != '5'
|
||||
)
|
||||
},
|
||||
click: row => {
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
<TableHeader datePicker>
|
||||
<template v-slot:select>
|
||||
<el-form-item label="关键词">
|
||||
<el-input maxlength="32" show-word-limit v-model="tableStore.table.params.searchValue" clearable
|
||||
placeholder="请输入关键词" />
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="tableStore.table.params.searchValue"
|
||||
clearable placeholder="请输入关键词" />
|
||||
</el-form-item>
|
||||
</template>
|
||||
</TableHeader>
|
||||
|
||||
@@ -1,55 +1,29 @@
|
||||
<template>
|
||||
<el-dialog class="cn-operate-dialog" v-model="dialogVisible" title="编辑拓扑图信息">
|
||||
<el-dialog class="cn-operate-dialog" v-model.trim="dialogVisible" title="编辑拓扑图信息">
|
||||
<el-form :label-width="140">
|
||||
<el-form-item label="拓扑图:" style="height: auto !important">
|
||||
<div class="gplot-content">
|
||||
<VueDraggableResizable
|
||||
class-name-draggable="gplot-content-item"
|
||||
class-name-active="gplot-content-item-active"
|
||||
:active="editorIndex == index"
|
||||
:resizable="false"
|
||||
:parent="true"
|
||||
:x="item.left"
|
||||
:y="item.top"
|
||||
:w="item.width"
|
||||
:h="item.height"
|
||||
@dragStart="editorIndex = index"
|
||||
@dragging="resize"
|
||||
v-for="(item, index) in pointList"
|
||||
:key="index"
|
||||
:isResizable="false"
|
||||
>
|
||||
<div
|
||||
class="text"
|
||||
style="line-height: 20px; white-space: nowrap"
|
||||
:style="{ color: item.name === '监测点' ? 'red' : 'black' }"
|
||||
>
|
||||
<VueDraggableResizable class-name-draggable="gplot-content-item"
|
||||
class-name-active="gplot-content-item-active" :active="editorIndex == index" :resizable="false"
|
||||
:parent="true" :x="item.left" :y="item.top" :w="item.width" :h="item.height"
|
||||
@dragStart="editorIndex = index" @dragging="resize" v-for="(item, index) in pointList"
|
||||
:key="index" :isResizable="false">
|
||||
<div class="text" style="line-height: 20px; white-space: nowrap"
|
||||
:style="{ color: item.name === '监测点' ? 'red' : 'black' }">
|
||||
{{ item.name }}
|
||||
</div>
|
||||
</VueDraggableResizable>
|
||||
<img
|
||||
:src="imgUrl"
|
||||
class="gplot-content"
|
||||
style="border: 1px solid #dcdfe6; position: unset; user-select: none"
|
||||
draggable="false"
|
||||
/>
|
||||
<img :src="imgUrl" class="gplot-content"
|
||||
style="border: 1px solid #dcdfe6; position: unset; user-select: none" draggable="false" />
|
||||
<div>注意监测点不要移出圈</div>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="监测点位置:" v-if="editorIndex > -1">
|
||||
<div style="display: flex">
|
||||
<el-select
|
||||
v-model="pointList[editorIndex].position"
|
||||
placeholder="请选择"
|
||||
style="flex: 1"
|
||||
@change="positionChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in linePosition"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
></el-option>
|
||||
<el-select v-model.trim="pointList[editorIndex].position" placeholder="请选择" style="flex: 1"
|
||||
@change="positionChange">
|
||||
<el-option v-for="item in linePosition" :key="item.id" :label="item.name"
|
||||
:value="item.id"></el-option>
|
||||
</el-select>
|
||||
<el-button class="ml20" type="danger" @click="deletePoint" icon="el-icon-Delete">删除</el-button>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user