|
|
@@ -46,18 +46,69 @@
|
|
|
</div>
|
|
|
</el-row>
|
|
|
</el-dialog>
|
|
|
+
|
|
|
+ <!-- 原始数据start -->
|
|
|
+ <el-dialog title="原始数据" v-model="yssjDialog" width="70%" top="15vh" custom-class="modal"
|
|
|
+ :close-on-click-modal="false" :before-close="yssjDialogClose">
|
|
|
+
|
|
|
+ <div class="query mg-b-8">
|
|
|
+ <div class="query-items">
|
|
|
+ <div class="query-item">
|
|
|
+ <div class="lable">时间：</div>
|
|
|
+ <div class="search-input">
|
|
|
+ <el-date-picker v-model="value3" type="datetimerange" range-separator="至"
|
|
|
+ start-placeholder="开始日期" end-placeholder="结束日期">
|
|
|
+ </el-date-picker>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="query-item">
|
|
|
+ <div class="lable">等间隔：</div>
|
|
|
+ <div class="search-input">
|
|
|
+ <el-select v-model="value2" multiple placeholder="请选择" popper-class="select">
|
|
|
+ <el-option v-for="item in TingJiLeiXing" :key="item.value" :value="item.value"
|
|
|
+ :label="item.label">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="query-actions">
|
|
|
+ <button class="btn" @click="query()">查询</button>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <tab :data="tabData" @select="select" />
|
|
|
+ <el-row type="flex" v-if="currTab == 1">
|
|
|
+ <el-col :span="24">
|
|
|
+ <ComTable :data="tableData" :pageSize="pageSize" @onPagging="onChangePage" height="84vh"
|
|
|
+ v-loading="tableLoading" element-loading-text="拼命加载中"
|
|
|
+ element-loading-background="rgba(0, 0, 0, 0.8)"></ComTable>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row type="flex" v-if="currTab == 2">
|
|
|
+ <el-col :span="24">
|
|
|
+ <double-line-chart :height="'200px'" />
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ </el-dialog>
|
|
|
+ <!-- 原始数据end -->
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
import ComTable from "@/components/coms/table/table.vue";
|
|
|
+ import DoubleLineChart from "@/components/chart/line/double-line-chart.vue";
|
|
|
+ import Tab from "@/components/coms/tabs/tab.vue";
|
|
|
export default {
|
|
|
components: {
|
|
|
- ComTable
|
|
|
+ ComTable,DoubleLineChart,Tab
|
|
|
},
|
|
|
data() {
|
|
|
const that = this;
|
|
|
return {
|
|
|
+ currTab:1,
|
|
|
+ tabData:[{ id: "1", text: "表格"}, { id: "2", text: "图表", }],
|
|
|
+ value2: '',
|
|
|
+ value3: [],
|
|
|
pageIndex: 1,
|
|
|
pageSize: 20,
|
|
|
myInput1: "",
|
|
|
@@ -65,6 +116,7 @@
|
|
|
myInput3: "",
|
|
|
myInput4: "",
|
|
|
isvisiable: false,
|
|
|
+ yssjDialog:false,
|
|
|
isvisiableType: 1, //新增为1，编辑为2
|
|
|
tableData: {
|
|
|
column: [{
|
|
|
@@ -136,6 +188,10 @@
|
|
|
},
|
|
|
},
|
|
|
methods: {
|
|
|
+ select(data) {
|
|
|
+ // console.log(data);
|
|
|
+ this.currTab = parseInt(data.id);
|
|
|
+ },
|
|
|
getTable() {
|
|
|
let that = this;
|
|
|
this.tableLoading = true;
|
|
|
@@ -224,14 +280,17 @@
|
|
|
});
|
|
|
that.isvisiable = true;
|
|
|
}
|
|
|
- if ("config" == e.target.getAttribute("value")) { //传感点
|
|
|
- that.gzCgd = 2;
|
|
|
+ if ("config" == e.target.getAttribute("value")) { //原始数据
|
|
|
+ that.yssjDialog=true;
|
|
|
}
|
|
|
},
|
|
|
onClickDialogClose() { // 弹窗右上角关闭按钮
|
|
|
this.isvisiable = false;
|
|
|
this.isvisiableType = 1;
|
|
|
},
|
|
|
+ yssjDialogClose(){//原始数据
|
|
|
+ this.yssjDialog = false;
|
|
|
+ },
|
|
|
dialogSave() {
|
|
|
console.log(this.myInput1)
|
|
|
// myInput1: "",
|
|
|
@@ -241,7 +300,25 @@
|
|
|
},
|
|
|
back() {
|
|
|
this.$emit('gzCgdClick', 1);
|
|
|
- }
|
|
|
+ },
|
|
|
+ query() {
|
|
|
+ var that = this;
|
|
|
+ console.log(that.value2)
|
|
|
+ console.log(that.value3)
|
|
|
+ if(that.value3){
|
|
|
+ that.value3[0].valueOf()//开始时间
|
|
|
+ that.value3[1].valueOf()//结束时间
|
|
|
+ }
|
|
|
+
|
|
|
+ // that.API.requestData({
|
|
|
+ // method: "GET",
|
|
|
+ // baseURL: "http://10.155.32.4:9001/",
|
|
|
+ // subUrl: "benchmarking/wplist",
|
|
|
+ // success(res) {
|
|
|
+ // that.ChangZhan = res.data;
|
|
|
+ // },
|
|
|
+ // });
|
|
|
+ },
|
|
|
},
|
|
|
created() {
|
|
|
// console.log(this.data)//上个页面的参数
|
mw_666