Merge branch 'master' of ssh://111.61.77.35:15/lizhichao/whp-xl into master

dcit-hcsystem-hcsystem-master/src/views/Enterprises/EnterprisesQt.vue

@@ -61,10 +61,21 @@
 		    <el-table-column prop="legalPerson" label="企业法人"></el-table-column>
 		    <el-table-column prop="orgCode" label="统一社会信用代码"></el-table-column>
 		    <el-table-column prop="legalPersonEmail" label="法人邮箱"></el-table-column>
-		    <el-table-column prop="" label="监管分类"></el-table-column>
-		    <el-table-column prop="" label="危险源数量"></el-table-column>
-		    <el-table-column prop="" label="企业地址">
-		    </el-table-column>
+		    <el-table-column prop="regulationBigType" label="监管分类">
+				<template slot-scope="scope">
+					<span v-if="scope.row.regulationBigType == 1">非煤矿山</span>
+					<span v-if="scope.row.regulationBigType == 2">危险化学品</span>
+					<span v-if="scope.row.regulationBigType == 3">冶金</span>
+					<span v-if="scope.row.regulationBigType == 4">有色</span>
+					<span v-if="scope.row.regulationBigType == 5">建材</span>
+					<span v-if="scope.row.regulationBigType == 6">机械</span>
+					<span v-if="scope.row.regulationBigType == 7">轻工</span>
+					<span v-if="scope.row.regulationBigType == 8">纺织</span>
+					<span v-if="scope.row.regulationBigType == 9">商贸</span>
+					<span v-if="scope.row.regulationBigType == 10">其他</span>
+				</template>
+			</el-table-column>
+		    <el-table-column prop="regAddress" label="企业地址" />
 		    <el-table-column label="操作" width="170" align="center">
 		      <template slot-scope="scope">
 		        <el-button type="success" size="small" @click="checkDetal(scope.row)">