Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-work-pc into dev

src/assets/scss/modules/management/form.scss

@@ -39,3 +39,20 @@
 	text-align: right;
 	padding-right: 12px;
 }
+
+/deep/.m-record {
+	h3 {
+		&::before {
+			display: inline-block;
+			width: 4px;
+			height: 12px;
+			background: #0056D6;
+			content: '';
+			/**
+		    这个指为正的话 小方块就往上， 为负的话，小方块就往下
+		    */
+			vertical-align: 1px;
+			margin-right: 5px;
+		}
+	}
+}

src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue

@@ -21,14 +21,15 @@
 						</el-col>
 						<el-col :span="6">
 							<el-form-item label="场所规模" prop="scaleTotal">
-								<el-input-number
+								<el-input
+									type="number"
 									v-model="formData.scaleTotal"
 									:disabled="disabled"
 									class="u-item-width-normal"
 									size="small"
 									clearable
 									placeholder="请输入可容纳人数"
-								></el-input-number>
+								></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
@@ -455,5 +456,4 @@ export default {
 @import '@/assets/scss/modules/management/form-main.scss';
 @import '@/assets/scss/modules/management/form.scss';
 @import '@/assets/scss/modules/visual/a_customize.scss';
-
 </style>

src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/index.vue

@@ -23,8 +23,8 @@
 							</el-select>
 						</el-form-item>
 						<el-form-item label="场所规模" prop="scaleTotal">
-							<el-input-number v-model="formData.scaleTotal" class="u-item-width-normal" size="small" clearable placeholder="请输入">
-							</el-input-number>
+							<el-input type="number" v-model="formData.scaleTotal" class="u-item-width-normal" size="small" clearable placeholder="请输入">
+							</el-input>
 						</el-form-item>
 						<el-form-item label="所属组织" prop="gridId">
 							<el-select class="u-item-width-normal" v-model="formData.gridId" placeholder="全部" size="small" clearable>

src/views/modules/shequzhili/tuceng/anquan/shebei/index.vue

@@ -13,12 +13,11 @@
 							</el-select>
 						</el-form-item>
 						<el-form-item label="所处位置" prop="location">
-							<el-input v-model="formData.location" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+							<el-input v-model="formData.location" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
 						<el-form-item label="负责人" prop="principalName">
 							<el-input v-model="formData.principalName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 						</el-form-item>
-
 						<el-row>
 							<el-col :span="24" align="right">
 								<el-button style="margin-left: 30px" size="small" type="primary " @click="handleSearch">查询</el-button>
@@ -57,7 +56,7 @@
 					<!-- <el-table-column label="" fixed="left" type="selection" align="center" width="50" /> -->
 					<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
 					<el-table-column prop="equipmentName" align="center" label="设备名称" :show-overflow-tooltip="true"></el-table-column>
-					<el-table-column prop="equipmentCategoryName" align="center" width="100" label="设备类型"></el-table-column>
+					<el-table-column prop="equipmentCategoryName" align="center" width="140" label="设备类型"></el-table-column>
 
 					<el-table-column prop="agencyName" label="所属组织" min-width="100" align="center" :show-overflow-tooltip="true" />
 					<el-table-column prop="location" label="所处位置" min-width="140" align="center" :show-overflow-tooltip="true" />
@@ -69,8 +68,24 @@
 						<template slot-scope="scope">
 							<el-button @click="handleAdd(scope.row, 'view')" type="text" size="small">查看</el-button>
 
-							<el-button v-if="scope.row.latitude&&agencyId==scope.row.agencyId" style="margin-right: 10px" @click="handleAdd(scope.row, 'edit')" size="small" type="text">编辑</el-button>
-							<el-button v-if="!scope.row.latitude&&agencyId==scope.row.agencyId" style="margin-right: 10px" @click="handleAdd(scope.row, 'edit')" size="small" type="text">待完善</el-button>
+							<el-button
+								v-if="scope.row.latitude && agencyId == scope.row.agencyId"
+								style="margin-right: 10px"
+								@click="handleAdd(scope.row, 'edit')"
+								size="small"
+								type="text"
+							>
+								编辑
+							</el-button>
+							<el-button
+								v-if="!scope.row.latitude && agencyId == scope.row.agencyId"
+								style="margin-right: 10px"
+								@click="handleAdd(scope.row, 'edit')"
+								size="small"
+								type="text"
+							>
+								待完善
+							</el-button>
 							<el-button @click="handleDel(scope.row)" v-if="agencyId == scope.row.agencyId" type="text" size="small" class="">删除</el-button>
 						</template>
 					</el-table-column>
@@ -90,7 +105,9 @@
 			</div>
 		</div>
 		<div>
-			<addForm v-if="dialogVisible" :dialogVisible="dialogVisible"
+			<addForm
+				v-if="dialogVisible"
+				:dialogVisible="dialogVisible"
 				:pageType="pageType"
 				:disabled="disabled"
 				:detailId="detailId"
@@ -112,7 +129,8 @@ import axios from 'axios';
 
 export default {
 	data() {
-		return {dialogVisible: false,
+		return {
+			dialogVisible: false,
 			importLoading: false,
 			disabled: false,
 			user: '',
@@ -249,7 +267,6 @@ export default {
 		handleAdd(row, type) {
 			if (row.id) {
 				this.detailId = row.id;
-				
 			}
 			this.pageType = type;
 			if (type == 'view') {
@@ -259,7 +276,8 @@ export default {
 			}
 			this.dialogVisible = true;
 		},
-		handleClose() {this.dialogVisible = false;
+		handleClose() {
+			this.dialogVisible = false;
 			this.pageType = 'list';
 			this.detailId = '';
 			this.getTableData();