Skip to content

D
device-new-platform
Commit 53858352 authored by 赵啸非's avatar 赵啸非
Browse files
Options

修改百分百

parent 4a5d1278
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 46 deletions
device-manager-ui/admin/src/views/sitestat/list.vue
View file @ 53858352
...@@ -8,9 +8,17 @@ ...@@ -8,9 +8,17 @@
<el-button style="float: right" @click="switchStat" type="text">切换为地图模式</el-button> <el-button style="float: right" @click="switchStat" type="text">切换为地图模式</el-button>
</div> </div>
<el-scrollbar style="height: 100%"> <el-scrollbar style="height: 100%">
<el-tree size="mini" ref="siteTree" :data="areaData" id="el-tree" node-key="id" indent="4" :props="treeProps" <el-tree size="mini"
:load="loadNode" highlight-current default-expand-all :expand-on-click-node="false" ref="siteTree"
:render-content="renderContent" @node-click="handleNodeClick"> :data="areaData"
id="el-tree"
node-key="id"
indent="4"
:props="treeProps"
:load="loadNode"
highlight-current default-expand-all :expand-on-click-node="false"
:render-content="renderContent"
@node-click="handleNodeClick">
</el-tree> </el-tree>
</el-scrollbar> </el-scrollbar>
</el-card> </el-card>
...@@ -21,14 +29,15 @@ ...@@ -21,14 +29,15 @@
<el-row> <el-row>
<LayoutTable ref="layoutTable" :data="tableData" notAdd notDel :config="tableConfig"> <LayoutTable ref="layoutTable" :data="tableData" notAdd notDel :config="tableConfig">
<el-button slot="table-head-left2" style="margin-left: 10px" type="primary" class="addclass" size="mini" @click="doExport" <el-button slot="table-head-left2" style="margin-left: 10px" type="primary" class="addclass" size="mini" @click="doExport"
:disabled="isExport">导出</el-button> :disabled="isExport">导出
</el-button>
</LayoutTable> </LayoutTable>
</el-row> </el-row>
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row>
<dialog-show ref="dialogform" @ok="getData" /> <dialog-show ref="dialogform" @ok="getData"/>
</div> </div>
</template> </template>
...@@ -37,44 +46,47 @@ ...@@ -37,44 +46,47 @@
import dialogShow from "./dialogshow"; import dialogShow from "./dialogshow";
import table from "@/assets/mixins/table"; import table from "@/assets/mixins/table";
import tree from "@/assets/mixins/tree"; import tree from "@/assets/mixins/tree";
export default { export default {
name: "Sitestat", name: "Sitestat",
components: { dialogShow }, components: {dialogShow},
mixins: [table, tree], mixins: [table, tree],
created() { created() {
this.$get("/sitestat/siteTree", {}).then(({ data }) => { this.$get("/sitestat/siteTree", {}).then(({data}) => {
// this.areaData = data.siteTree; // this.areaData = data.siteTree;
this.areaData = data.data; this.areaData = data.data;
console.log("areaData1",data.data)
}); });
}, },
methods: { methods: {
/** 下载模板操作 */ /** 下载模板操作 */
downloadTemplate() { downloadTemplate() {
this.isExport = true; this.isExport = true;
this.$download("/sitestat/downloadTemplate", {}, { type: "excel" }) this.$download("/sitestat/downloadTemplate", {}, {type: "excel"})
.then(() => (this.isExport = false)) .then(() => (this.isExport = false))
.catch((error) => { .catch((error) => {
this.isExport = false; this.isExport = false;
this.$message.error(error.message); this.$message.error(error.message);
}); });
}, },
/** 导出Excel */ /** 导出Excel */
doExport() { doExport() {
this.isExport = true; this.isExport = true;
this.$download( this.$download(
"/sitestat/exportExcel", "/sitestat/exportExcel",
{ {
siteId: this.$route.query["siteId"], siteId: this.$route.query["siteId"],
siteName: this.$route.query["siteName"], siteName: this.$route.query["siteName"],
}, },
{ type: "excel" } {type: "excel"}
) )
.then(() => (this.isExport = false)) .then(() => (this.isExport = false))
.catch((error) => { .catch((error) => {
this.isExport = false; this.isExport = false;
this.$message.error(error.message); this.$message.error(error.message);
}); });
}, },
/** 重写新增方法 */ /** 重写新增方法 */
...@@ -91,7 +103,7 @@ export default { ...@@ -91,7 +103,7 @@ export default {
//进入设备列表页面 //进入设备列表页面
this.$router.push({ this.$router.push({
path: "/device/list", path: "/device/list",
query: { sitestatId: row.id, siteId: row.siteId }, query: {sitestatId: row.id, siteId: row.siteId},
}); });
}, },
...@@ -110,17 +122,16 @@ export default { ...@@ -110,17 +122,16 @@ export default {
if (node.id.search(",") > -1) { if (node.id.search(",") > -1) {
//this.query = { siteId: node.id.split(",")[0] ,siteIdList:node.id.split(",")} //this.query = { siteId: node.id.split(",")[0] ,siteIdList:node.id.split(",")}
this.query = { this.query = {
siteIdList: node.id.split(",").map((i) => parseInt(i)), siteIdList: node.id.split(",").map((i) => parseInt(i)),
}; };
} else { } else {
this.query = { siteId: node.id }; this.query = {siteId: node.id};
} }
this.getData(); this.getData();
} else if (node.type === "area") { } else if (node.type === "area") {
this.query = { areaCode: node.areaCode }; this.query = {areaCode: node.areaCode};
this.getData(); this.getData();
} }
...@@ -148,13 +159,12 @@ export default { ...@@ -148,13 +159,12 @@ export default {
type: "index", type: "index",
align: "center", align: "center",
label: "序号", label: "序号",
align: "center",
width: 50, width: 50,
}, },
{ label: "站点名称", align: "center", prop: "siteName" }, {label: "站点名称", align: "center", prop: "siteName"},
{ label: "站点编号", align: "center", prop: "siteCode" }, {label: "站点编号", align: "center", prop: "siteCode"},
{ {
label: "设备总数", label: "设备总数",
...@@ -196,15 +206,15 @@ export default { ...@@ -196,15 +206,15 @@ export default {
width: 240, width: 240,
formatter: (row) => { formatter: (row) => {
return ( return (
<table-buttons <table-buttons
noAdd noAdd
noEdit noEdit
noDel noDel
row={row} row={row}
onEdit={this.toEdit} onEdit={this.toEdit}
onView={this.toView} onView={this.toView}
onDel={this.toDel} onDel={this.toDel}
/> />
); );
}, },
}, },
...@@ -239,17 +249,17 @@ export default { ...@@ -239,17 +249,17 @@ export default {
} }
.mytree ::v-deep { .mytree ::v-deep {
.el-tree--highlight-current ::v-deep .el-tree-node.is-checked>.el-tree-node__content { .el-tree--highlight-current ::v-deep .el-tree-node.is-checked > .el-tree-node__content {
background-color: rgb(255, 255, 255); background-color: rgb(255, 255, 255);
color: rgb(64, 158, 255); color: rgb(64, 158, 255);
} }
.el-tree--highlight-current ::v-deep .el-tree-node.is-current>.el-tree-node__content { .el-tree--highlight-current ::v-deep .el-tree-node.is-current > .el-tree-node__content {
background-color: rgb(255, 255, 255); background-color: rgb(255, 255, 255);
color: rgb(64, 158, 255); color: rgb(64, 158, 255);
} }
.el-tree>.el-tree-node:after { .el-tree > .el-tree-node:after {
border-top: none; border-top: none;
} }
...@@ -271,11 +281,11 @@ export default { ...@@ -271,11 +281,11 @@ export default {
height: 38px; height: 38px;
} }
.el-tree>.el-tree-node:before { .el-tree > .el-tree-node:before {
border-left: none; border-left: none;
} }
.el-tree>.el-tree-node:after { .el-tree > .el-tree-node:after {
border-top: none; border-top: none;
} }
......
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