Commit 192e18ac authored by Your Name's avatar Your Name

修改overview不显示气泡

parent fc34dd31
...@@ -32,7 +32,7 @@ module.exports = { ...@@ -32,7 +32,7 @@ module.exports = {
}, },
// Various Dev Server settings // Various Dev Server settings
//host: 'localhost', // can be overwritten by process.env.HOST // host: 'localhost', // can be overwritten by process.env.HOST
host: '0.0.0.0', // can be overwritten by process.env.HOST host: '0.0.0.0', // can be overwritten by process.env.HOST
port: 3000, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined port: 3000, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: false, autoOpenBrowser: false,
......
...@@ -126,7 +126,8 @@ export default { ...@@ -126,7 +126,8 @@ export default {
let vm = this; let vm = this;
let dates = {}; let dates = {};
if (this.form.date) { if (this.form.date) {
dates.startDate = this.form.date[0]; // dates.startDate = this.form.date[0];
dates.beginDate = this.form.date[0];
dates.endDate = this.form.date[1]; dates.endDate = this.form.date[1];
} }
let param = { let param = {
...@@ -197,7 +198,7 @@ export default { ...@@ -197,7 +198,7 @@ export default {
handleExport() { handleExport() {
let dates = {}; let dates = {};
if (this.form.date) { if (this.form.date) {
dates.startDate = this.requestForm.date[0]; dates.beginDate = this.requestForm.date[0];
dates.endDate = this.requestForm.date[1]; dates.endDate = this.requestForm.date[1];
} }
let param = { let param = {
......
...@@ -85,6 +85,7 @@ export default { ...@@ -85,6 +85,7 @@ export default {
}, },
feildList: [ feildList: [
{ prop: "userName", label: "管理员姓名" }, { prop: "userName", label: "管理员姓名" },
// { prop:'typeName', label: '管理员类型' },
{ prop: "phone", label: "手机号码" }, { prop: "phone", label: "手机号码" },
{ prop: "telephone", label: "固定电话" }, { prop: "telephone", label: "固定电话" },
{ prop: "weChat", label: "微信号" }, { prop: "weChat", label: "微信号" },
......
...@@ -24,6 +24,12 @@ ...@@ -24,6 +24,12 @@
oninput="value = value.trim()" oninput="value = value.trim()"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="管理员类型" prop="typeName">
<el-input
v-model="form.typeName"
placeholder="请填写管理员类型"
></el-input>
</el-form-item> -->
<el-form-item label="固定电话" prop="telephone"> <el-form-item label="固定电话" prop="telephone">
<el-input <el-input
v-model="form.telephone" v-model="form.telephone"
...@@ -61,6 +67,12 @@ ...@@ -61,6 +67,12 @@
</el-form-item> </el-form-item>
</div> </div>
<div> <div>
<!-- <el-form-item label="管理员类型" prop="typeName">
<el-input
v-model="form.typeName"
placeholder="请填写管理员类型"
></el-input>
</el-form-item> -->
<el-form-item label="手机号码" prop="phone"> <el-form-item label="手机号码" prop="phone">
<el-input <el-input
v-model="form.phone" v-model="form.phone"
......
...@@ -24,6 +24,12 @@ ...@@ -24,6 +24,12 @@
oninput="value = value.trim()" oninput="value = value.trim()"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="管理员类型" prop="typeName">
<el-input
v-model="form.typeName"
placeholder="请填写管理员类型"
></el-input>
</el-form-item> -->
<el-form-item label="固定电话" prop="telephone"> <el-form-item label="固定电话" prop="telephone">
<el-input <el-input
v-model="form.telephone" v-model="form.telephone"
...@@ -202,6 +208,7 @@ export default { ...@@ -202,6 +208,7 @@ export default {
this.form = { this.form = {
userName: "", userName: "",
orgId: "", orgId: "",
phone: "",
permanent: true, permanent: true,
date: "", date: "",
roleList: [], roleList: [],
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<span id="back" v-if="parentInfo.length !== 1" @click="handleBack()" <span id="back" v-if="parentInfo.length !== 1" @click="handleBack()"
>返回</span >返回</span
> >
<div id="mapDiv"></div> <div id="mapDiv"></div>
</div> </div>
</template> </template>
...@@ -86,7 +87,7 @@ export default { ...@@ -86,7 +87,7 @@ export default {
init(mapData) { init(mapData) {
let option = { let option = {
tooltip: { tooltip: {
triggerOn: "click", // triggerOn: "click",
formatter: function (e, t, n) { formatter: function (e, t, n) {
return 0.5 == e.value return 0.5 == e.value
? e.name + ":播放量" ? e.name + ":播放量"
...@@ -245,6 +246,7 @@ export default { ...@@ -245,6 +246,7 @@ export default {
//geoJson必须这种格式 //geoJson必须这种格式
mapJson.features = Json; mapJson.features = Json;
//去渲染echarts //去渲染echarts
console.log(mapData)
this.initEcharts(mapData, mapJson); this.initEcharts(mapData, mapJson);
}, },
initEcharts(mapData, mapJson) { initEcharts(mapData, mapJson) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment