Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

src/utils/enum.js

@@ -117,4 +117,27 @@ export const mpointGatherStateEnum = new EnumFactory({
   "0": { text: '正常', type: 'success' },
   "-1": { text: '错误', type: 'danger' },
   "-2": { text: '无', type: 'info' },
-}, parseInt)
+}, parseInt)
+
+
+export const enpfieldEnum = new EnumFactory({
+  'running_state': '运行状态',
+  'dust_rtd': '颗粒物实测(mg/m3)',
+  'dust_zs': '颗粒物折算(mg/m3)',
+  'temperature': '温度(℃)',
+  'pressure': '压力(kPa)',
+  'speed': '流速(m/s)',
+  'humidity': '湿度(%)',
+  'flux': '流量(m3/h)',
+  'pm25': 'PM2.5(ug/m3)',
+  'pm10': 'PM10(ug/m3)',
+  'tsp': 'TSP(ug/m3)',
+  'wind_direction': '风向',
+  'wind_speed': '风速(m/s)',
+  'so2_rtd': '风向',
+  'so2_rtd': '二氧化硫实测(mg/m3)',
+  'so2_zs': '二氧化硫折算(mg/m3)',
+  'nox_rtd': '氮氧化物实测(mg/m3)',
+  'nox_zs': '氮氧化物折算(mg/m3)',
+  'o2': '含氧量(%)',
+})

src/views/em/mpoint_form.vue

@@ -31,16 +31,11 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<el-col :md="6" :sm="24">
+						<el-col :md="12" :sm="24">
 							<el-form-item label="是否启用">
 								<el-switch v-model="form.enabled" />
 							</el-form-item>
 						</el-col>
-						<el-col :md="6" :sm="24">
-							<el-form-item label="是否展示">
-								<el-switch v-model="form.need_display" />
-							</el-form-item>
-						</el-col>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="名称" prop="name">
 								<el-input
@@ -164,6 +159,27 @@
 								></el-input-number>
 							</el-form-item>
 						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="关联环保字段" label-width="120">
+								<el-select
+									v-model="form.enp_field"
+									clearable
+									style="width: 100%"
+								>
+									<el-option
+										v-for="e in enpfieldEnum.values"
+										:key="e.key"
+										:value="e.key"
+										:label="e.text"
+									></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="是否展示">
+								<el-switch v-model="form.need_display" />
+							</el-form-item>
+						</el-col>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="报告排序" prop="report_sortstr">
 								<el-input
@@ -222,6 +238,17 @@
 								></el-input>
 							</el-form-item>
 						</el-col>
+						<el-col :md="16" :sm="24">
+							<el-form-item
+								label="影响测点编号"
+								label-width="100"
+							>
+							<el-input
+									v-model="form.mpoint_affect"
+									clearable
+								></el-input>
+							</el-form-item>
+						</el-col>
 						<el-divider/>
 						<el-col :md="12" :sm="24">
 							<el-form-item
@@ -303,13 +330,14 @@
 </template>
 
 <script>
-import { valTypeEnum, mpointTypeEnum } from "@/utils/enum.js";
+import { valTypeEnum, mpointTypeEnum, enpfieldEnum } from "@/utils/enum.js";
 export default {
 	emits: ["success", "closed"],
 	data() {
 		return {
 			valTypeEnum,
 			mpointTypeEnum,
+			enpfieldEnum,
 			loading: false,
 			mode: "add",
 			titleMap: {