Ver Fonte

Merge branch 'master' of http://113.204.105.114:10011/TwoKe/zhgkpt-datav

liuxing há 1 ano atrás
pai
commit
dbbba56052

+ 41 - 17
app/src/views/FireCondition/components/hzfxCont.vue

@@ -162,33 +162,57 @@
 			<basic-table :data="tableData" @row-click="rowClickHandler" style="text-align: center">
 				<el-table-column type="index" label="序号">
 				</el-table-column>
-				<el-table-column prop="qx" label="区县" show-overflow-tooltip>
+				<el-table-column prop="qx" label="办公场所" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="gcjzmc" label="电气火灾(起" show-overflow-tooltip>
+				<el-table-column prop="gcjzmc" label="宾馆、饭店、招待所" width="150" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="放火(起)" show-overflow-tooltip>
+				<el-table-column prop="xxdz" label="厂房" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="静电(起)" show-overflow-tooltip>
+				<el-table-column prop="xxdz" label="纯餐饮场所"  width="150" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="雷击(起)" show-overflow-tooltip>
+				<el-table-column prop="xxdz" label="福利院" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="燃放烟花爆竹(起)" show-overflow-tooltip>
+				<el-table-column prop="xxdz" label="工地" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="生产作业(起)" show-overflow-tooltip>
+				<el-table-column prop="xxdz" label="公共娱乐设施"  width="150" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="玩火(起)" show-overflow-tooltip>
+				<el-table-column prop="xxdz" label="广播电视中心"  width="150" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="吸烟(起)" show-overflow-tooltip>
+				<el-table-column prop="xxdz" label="会议、展览中心"  width="150" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="遗留火种(起)" show-overflow-tooltip>
+				<el-table-column prop="xxdz" label="加油加气站充电"   width="150"show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="用火不慎(起)" show-overflow-tooltip>
+				<el-table-column prop="xxdz" label="交通枢纽站"  width="150" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="自燃(起)" show-overflow-tooltip>
+				<el-table-column prop="xxdz" label="金融交易场所"  width="150" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="不排除原因(起)" show-overflow-tooltip>
+				<el-table-column prop="xxdz" label="居住场所" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="其他(起)" show-overflow-tooltip>
+				<el-table-column prop="xxdz" label="汽车库" show-overflow-tooltip>
+				</el-table-column>
+				<el-table-column prop="xxdz" label="商业场所" show-overflow-tooltip>
+				</el-table-column>
+				<el-table-column prop="xxdz" label="石油化工企业"  width="150" show-overflow-tooltip>
+				</el-table-column>
+				<el-table-column prop="xxdz" label="室内农副业场所"  width="150" show-overflow-tooltip>
+				</el-table-column>
+				<el-table-column prop="xxdz" label="体育场馆" show-overflow-tooltip>
+				</el-table-column>
+				<el-table-column prop="xxdz" label="通信场所" show-overflow-tooltip>
+				</el-table-column>
+				<el-table-column prop="xxdz" label="文博馆(图书馆、博物馆、档案馆等)"  width="250" show-overflow-tooltip>
+				</el-table-column>
+				<el-table-column prop="xxdz" label="文物古建筑"  width="150" show-overflow-tooltip>
+				</el-table-column>
+				<el-table-column prop="xxdz" label="物资仓储场所"  width="150" show-overflow-tooltip>
+				</el-table-column>
+				<el-table-column prop="xxdz" label="学校" show-overflow-tooltip>
+				</el-table-column>
+				<el-table-column prop="xxdz" label="养老院" show-overflow-tooltip>
+				</el-table-column>
+				<el-table-column prop="xxdz" label="医疗机构" show-overflow-tooltip>
+				</el-table-column>
+				<el-table-column prop="xxdz" label="宗教场所" show-overflow-tooltip>
 				</el-table-column>
 			</basic-table>
 		</div>
@@ -222,7 +246,7 @@
 				</el-table-column>
 				<el-table-column prop="qx" label="区县" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="gcjzmc" label="电气火灾(起" show-overflow-tooltip>
+				<el-table-column prop="gcjzmc" label="电气火灾(起)"  width="150" show-overflow-tooltip>
 				</el-table-column>
 				<el-table-column prop="xxdz" label="放火(起)" show-overflow-tooltip>
 				</el-table-column>
@@ -230,9 +254,9 @@
 				</el-table-column>
 				<el-table-column prop="xxdz" label="雷击(起)" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="燃放烟花爆竹(起)" show-overflow-tooltip>
+				<el-table-column prop="xxdz" label="燃放烟花爆竹(起)"  width="150" show-overflow-tooltip>
 				</el-table-column>
-				<el-table-column prop="xxdz" label="生产作业(起)" show-overflow-tooltip>
+				<el-table-column prop="xxdz" label="生产作业(起)"  width="150" show-overflow-tooltip>
 				</el-table-column>
 				<el-table-column prop="xxdz" label="玩火(起)" show-overflow-tooltip>
 				</el-table-column>

+ 2 - 2
app/src/views/Iot/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<div style="padding: 0px 35px; display: flex; justify-content: space-between">
-		<div style="z-index: 100" @click="openBasicModal">
-			<border-panel height="492px" :header-type="4" width="544px" style="margin-bottom: 6px" title="总体情况">
+		<div style="z-index: 100">
+			<border-panel height="492px" :header-type="4" width="544px" style="margin-bottom: 6px" title="总体情况"  @click="openBasicModal">
 				<TotalityInfo :data="ztqkData" v-if="ztqkData && ztqkDwtjData" :dwData="ztqkDwtjData" />
 			</border-panel>
 			<border-panel height="450px" :header-type="4" width="544px" style="margin-bottom: 6px" title="视频监控">