From d5f3b5005f0daaf4e89101ff05c9259071bd6ed6 Mon Sep 17 00:00:00 2001
From: zpzgiser <45806316+zpzgiser@users.noreply.github.com>
Date: Tue, 13 Jul 2021 21:51:52 +0800
Subject: [PATCH] 改背景
---
/dev/null | 0
src/views/wel/index.vue | 223 ++++++++++++++++++++++++++++++++++++++++++++-----------
package-lock.json | 15 +++
public/img/bajgxt/title2_2.png | 0
package.json | 1
public/img/bajgxt/title2.png | 0
6 files changed, 192 insertions(+), 47 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index dff0302..9e9aa26 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1148,6 +1148,14 @@
"xlsx": "0.16.9"
},
"dependencies": {
+ "echarts": {
+ "version": "4.9.0",
+ "resolved": "https://registry.npmjs.org/echarts/-/echarts-4.9.0.tgz",
+ "integrity": "sha512-+ugizgtJ+KmsJyyDPxaw2Br5FqzuBnyOWwcxPKO6y0gc5caYcfnEUIlNStx02necw8jmKmTafmpHhGo4XDtEIA==",
+ "requires": {
+ "zrender": "4.3.2"
+ }
+ },
"ol": {
"version": "6.4.3",
"resolved": "https://registry.nlark.com/ol/download/ol-6.4.3.tgz",
@@ -1157,6 +1165,11 @@
"pbf": "3.2.1",
"rbush": "^3.0.1"
}
+ },
+ "zrender": {
+ "version": "4.3.2",
+ "resolved": "https://registry.npmjs.org/zrender/-/zrender-4.3.2.tgz",
+ "integrity": "sha512-bIusJLS8c4DkIcdiK+s13HiQ/zjQQVgpNohtd8d94Y2DnJqgM1yjh/jpDb8DoL6hd7r8Awagw8e3qK/oLaWr3g=="
}
}
},
@@ -13957,7 +13970,7 @@
},
"webfont-matcher": {
"version": "1.1.0",
- "resolved": "https://registry.npm.taobao.org/webfont-matcher/download/webfont-matcher-1.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/webfont-matcher/-/webfont-matcher-1.1.0.tgz",
"integrity": "sha1-mM6VCXsp4x++czBT4Q5XFkLRxsc="
},
"webpack": {
diff --git a/package.json b/package.json
index 6857845..da5b6d0 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,6 @@
"vue-router": "^3.0.1",
"vuex": "^3.1.1",
"@supermap/iclient-ol": "^10.1.2",
- "ol": "^6.5.0",
"olcs": "^2.12.0"
},
"devDependencies": {
diff --git a/public/img/bajgxt/title2.png b/public/img/bajgxt/title2.png
index bf945a7..89ca968 100644
--- a/public/img/bajgxt/title2.png
+++ b/public/img/bajgxt/title2.png
Binary files differ
diff --git a/public/img/bajgxt/title2_2.png b/public/img/bajgxt/title2_2.png
new file mode 100644
index 0000000..bf945a7
--- /dev/null
+++ b/public/img/bajgxt/title2_2.png
Binary files differ
diff --git a/public/img/bajgxt/title2_3.png b/public/img/bajgxt/title2_3.png
deleted file mode 100644
index 9dd9713..0000000
--- a/public/img/bajgxt/title2_3.png
+++ /dev/null
Binary files differ
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index b4a8619..759be9f 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -2,7 +2,7 @@
<div class="bajgxt-home">
<div class="head-title">
<span>保安监管系统可视化平台</span>
- <img src="../../../public/img/bajgxt/linkimg.png" title="进入系统" >
+ <img src="../../../public/img/bajgxt/linkimg.png" title="进入系统" />
</div>
<div class="content">
<div class="left">
@@ -24,21 +24,21 @@
<div class="middle">
<div class="mapimg">
<!-- <div></div> -->
- <div class="mapBtn">
+ <div class="mapBtn" @click="getTableData('car')">
<img src="../../../public/img/bajgxt/car.png" alt="" />
<div class="text">
<span>押运车辆</span>
<span>700</span>
</div>
</div>
- <div class="mapBtn">
+ <div class="mapBtn" @click="getTableData('peo')">
<img src="../../../public/img/bajgxt/peo.png" alt="" />
<div class="text">
<span>保安员</span>
<span>700</span>
</div>
</div>
- <div class="mapBtn">
+ <div class="mapBtn" @click="getTableData('gun')">
<img src="../../../public/img/bajgxt/gun.png" alt="" />
<div class="text">
<span>枪支</span>
@@ -56,13 +56,49 @@
<el-table :data="tableData" stripe>
<el-table-column type="index" label="序号" width="50">
</el-table-column>
- <el-table-column prop="carNum" label="押运车辆车牌号" width="180">
+ <el-table-column
+ v-if="curTableType === 'car'"
+ prop="carNum"
+ label="押运车辆车牌号"
+ width="180"
+ >
+ </el-table-column>
+ <el-table-column
+ v-if="curTableType === 'peo'"
+ prop="name"
+ label="押运人员名称"
+ width="180"
+ >
+ </el-table-column>
+ <el-table-column
+ v-if="curTableType === 'gun'"
+ prop="number"
+ label="枪支编号"
+ width="180"
+ >
</el-table-column>
<el-table-column prop="location" label="实时位置">
</el-table-column>
<el-table-column prop="company" label="所属公司"> </el-table-column>
- <el-table-column prop="linkman" label="联系人"> </el-table-column>
+ <el-table-column
+ v-if="curTableType === 'car'"
+ prop="linkman"
+ label="联系人"
+ >
+ </el-table-column>
+ <el-table-column
+ v-if="curTableType === 'gun'"
+ prop="linkman"
+ label="负责人"
+ >
+ </el-table-column>
<el-table-column prop="tel" label="联系电话"> </el-table-column>
+ <el-table-column
+ v-if="curTableType === 'peo'"
+ prop="bz"
+ label="备注"
+ >
+ </el-table-column>
</el-table>
</div>
</div>
@@ -139,43 +175,8 @@
data() {
return {
map: null,
- tableData: [
- {
- carNum: "111111111111",
- location: "红谷滩",
- company: "公司",
- linkman: "小李",
- tel: "13999999999"
- },
- {
- carNum: "111111111111",
- location: "红谷滩",
- company: "公司",
- linkman: "小李",
- tel: "13999999999"
- },
- {
- carNum: "111111111111",
- location: "红谷滩",
- company: "公司",
- linkman: "小李",
- tel: "13999999999"
- },
- {
- carNum: "111111111111",
- location: "红谷滩",
- company: "公司",
- linkman: "小李",
- tel: "13999999999"
- },
- {
- carNum: "111111111111",
- location: "红谷滩",
- company: "公司",
- linkman: "小李",
- tel: "13999999999"
- }
- ],
+ curTableType: "car",
+ tableData: [],
value1: "1",
options1: [
{
@@ -240,6 +241,139 @@
right3Echart.setOption(optionJs.right3Data(data));
},
+ getTableData(type) {
+ this.curTableType = type;
+ if (type === "car") {
+ this.tableData = [
+ {
+ carNum: "111111111111",
+ location: "红谷滩",
+ company: "公司",
+ linkman: "小李",
+ tel: "13999999999"
+ },
+ {
+ carNum: "111111111111",
+ location: "红谷滩",
+ company: "公司",
+ linkman: "小李",
+ tel: "13999999999"
+ },
+ {
+ carNum: "111111111111",
+ location: "红谷滩",
+ company: "公司",
+ linkman: "小李",
+ tel: "13999999999"
+ },
+ {
+ carNum: "111111111111",
+ location: "红谷滩",
+ company: "公司",
+ linkman: "小李",
+ tel: "13999999999"
+ },
+ {
+ carNum: "111111111111",
+ location: "红谷滩",
+ company: "公司",
+ linkman: "小李",
+ tel: "13999999999"
+ }
+ ];
+ } else if (type === "peo") {
+ this.tableData = [
+ {
+ name: "小张",
+ location: "红谷滩",
+ company: "公司",
+ tel: "13999999999",
+ bz: "zzz"
+ },
+ {
+ name: "小张",
+ location: "红谷滩",
+ company: "公司",
+ tel: "13999999999",
+ bz: "zzz"
+ },
+ {
+ name: "小张",
+ location: "红谷滩",
+ company: "公司",
+ tel: "13999999999",
+ bz: "zzz"
+ },
+ {
+ name: "小张",
+ location: "红谷滩",
+ company: "公司",
+ tel: "13999999999",
+ bz: "zzz"
+ },
+ {
+ name: "小张",
+ location: "红谷滩",
+ company: "公司",
+ tel: "13999999999",
+ bz: "zzz"
+ },
+ {
+ name: "小张",
+ location: "红谷滩",
+ company: "公司",
+ tel: "13999999999",
+ bz: "zzz"
+ }
+ ];
+ } else if (type === "gun") {
+ this.tableData = [
+ {
+ number: "Q1111",
+ location: "红谷滩",
+ company: "公司",
+ linkman: "张强",
+ tel: "13999999999"
+ },
+ {
+ number: "Q1111",
+ location: "红谷滩",
+ company: "公司",
+ linkman: "张强",
+ tel: "13999999999"
+ },
+ {
+ number: "Q1111",
+ location: "红谷滩",
+ company: "公司",
+ linkman: "张强",
+ tel: "13999999999"
+ },
+ {
+ number: "Q1111",
+ location: "红谷滩",
+ company: "公司",
+ linkman: "张强",
+ tel: "13999999999"
+ },
+ {
+ number: "Q1111",
+ location: "红谷滩",
+ company: "公司",
+ linkman: "张强",
+ tel: "13999999999"
+ },
+ {
+ number: "Q1111",
+ location: "红谷滩",
+ company: "公司",
+ linkman: "张强",
+ tel: "13999999999"
+ }
+ ];
+ }
+ },
+
initMap() {
this.map = new Map({
target: "map", // 对应页面里 id 为 map 的元素
@@ -281,8 +415,6 @@
});
this.map.addLayer(vectorLayer);
});
-
- // debugger;
// var center = new transform(
// [104.06667, 30.66667],
// "EPSG:4326",
@@ -305,6 +437,7 @@
},
mounted() {
this.initEchart();
+ this.getTableData("car");
this.initMap();
}
};
--
Gitblit v1.9.3