From 11f6acee504c77a8919a4e0ddfe3e70a746e3522 Mon Sep 17 00:00:00 2001 From: fei.wang <wf18701153496@163.com> Date: 星期五, 18 四月 2025 17:39:33 +0800 Subject: [PATCH] 4.18更新v2.1.5 --- src/views/analysis/index.vue | 759 +++++++++++++++++++++++++++++++++------------------------- 1 files changed, 429 insertions(+), 330 deletions(-) diff --git a/src/views/analysis/index.vue b/src/views/analysis/index.vue index 92c50aa..1d9d41a 100644 --- a/src/views/analysis/index.vue +++ b/src/views/analysis/index.vue @@ -1,7 +1,13 @@ <template> <div v-if="analy" class="app-container"> <div class="filter-container"> - <el-input v-model="listQuery.keyword" size="small" placeholder="璇疯緭鍏ョ紪鍙�/鍚嶇О" clearable class="filter-item w-200" /> + <el-input + v-model="listQuery.keyword" + size="small" + placeholder="璇疯緭鍏ョ紪鍙�/鍚嶇О" + clearable + class="filter-item w-200" + /> <!-- <el-date-picker v-model="queryForm.time" type="daterange" range-separator="鑷�" start-placeholder="寮�濮嬫椂闂�" class="filter-item w-300" size="small" end-placeholder="缁撴潫鏃堕棿" value-format="yyyy-MM-dd" /> --> @@ -20,25 +26,41 @@ </el-button> --> </el-button-group> - <span style="margin-left: 100px;"> - <el-date-picker v-model="timeExport" type="daterange" unlink-panels :picker-options="pickerOptions" - range-separator="鑷�" start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿" value-format="yyyy-MM-dd" /> + <span style="margin-left: 100px"> + <el-date-picker + v-model="timeExport" + type="daterange" + unlink-panels + :picker-options="pickerOptions" + range-separator="鑷�" + start-placeholder="寮�濮嬫椂闂�" + end-placeholder="缁撴潫鏃堕棿" + value-format="yyyy-MM-dd" + /> - <el-button style="margin-left: 10px;" type="primary" @click="exportExcel">瀵煎嚭EXCEL</el-button> + <el-button style="margin-left: 10px" type="primary" @click="exportExcel" + >瀵煎嚭EXCEL</el-button + > - <el-button style="margin-left: 10px;" type="primary" @click="resetinitv">閲嶇疆鍒濆鍊�</el-button> - + <el-button style="margin-left: 10px" type="primary" @click="resetinitv" + >閲嶇疆鍒濆鍊�</el-button + > </span> - - </div> - <el-table v-loading="listLoading" :data="list" element-loading-text="Loading" border fit height="100%" - class="table-container" highlight-current-row @selection-change="handleSelectionChange"> - <el-table-column type="selection" width="55"> - </el-table-column> + <el-table + v-loading="listLoading" + :data="list" + element-loading-text="Loading" + border + fit + height="100%" + class="table-container" + highlight-current-row + @selection-change="handleSelectionChange" + > + <el-table-column type="selection" width="55"> </el-table-column> <el-table-column fixed label="搴忓彿" width="80"> - <template slot-scope="scope"> {{ scope.row.id }} </template> @@ -80,14 +102,17 @@ </el-table-column> <el-table-column label="鍒嗘瀽" width="120"> <template slot-scope="scope"> - <img src="../../assets/images/analyze.png" alt="" style="width: 30px;height: 30px;" @click="analyze(scope)"> + <img + src="../../assets/images/analyze.png" + alt="" + style="width: 30px; height: 30px" + @click="analyze(scope)" + /> </template> - - </el-table-column> <el-table-column label="鍒濆鍊间笢鍖楀ぉ" width="250"> <template slot-scope="scope"> - {{ scope.row.ed + ';' + scope.row.nd + ';' + scope.row.td }} + {{ scope.row.ed + ";" + scope.row.nd + ";" + scope.row.td }} </template> </el-table-column> <el-table-column label="娣诲姞鏃堕棿"> @@ -97,45 +122,89 @@ </el-table-column> </el-table> - <pagination v-show="total > 0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size" - @pagination="searchorfetchData" /> - - + <pagination + v-show="total > 0" + :total="total" + :page.sync="listQuery.current" + :limit.sync="listQuery.size" + @pagination="searchorfetchData" + /> </div> <div v-else class="app-container"> - <div style="margin-bottom: 30px;"> - <el-date-picker v-model="queryForm.time" type="daterange" unlink-panels :picker-options="pickerOptions" - range-separator="鑷�" start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿" value-format="yyyy-MM-dd" /> - <el-button style="margin-left: 10px;" type="primary" @click="handlechart">鎼滅储</el-button> - <el-button style="position: absolute; right: 50px;" type="primary" @click="fanhui">杩斿洖</el-button> + <div style="margin-bottom: 30px"> + <el-date-picker + v-model="queryForm.time" + type="daterange" + unlink-panels + :picker-options="pickerOptions" + range-separator="鑷�" + start-placeholder="寮�濮嬫椂闂�" + end-placeholder="缁撴潫鏃堕棿" + value-format="yyyy-MM-dd" + /> + <el-button style="margin-left: 10px" type="primary" @click="handlechart" + >鎼滅储</el-button + > + <el-button style="position: absolute; right: 50px" type="primary" @click="fanhui" + >杩斿洖</el-button + > - <el-button style="margin-left: 10px;" :type="oneprimary" @click="one">鏈�杩戜竴鏈�</el-button> + <el-button style="margin-left: 10px" :type="oneprimary" @click="one" + >鏈�杩戜竴鏈�</el-button + > - <el-button style="margin-left: 10px;" :type="twoprimary" @click="two">鏈�杩戜簩鏈�</el-button> + <el-button style="margin-left: 10px" :type="twoprimary" @click="two" + >鏈�杩戜簩鏈�</el-button + > - <el-button style="margin-left: 10px;" :type="threeprimary" @click="three">鏈�杩戜笁鏈�</el-button> + <el-button style="margin-left: 10px" :type="threeprimary" @click="three" + >鏈�杩戜笁鏈�</el-button + > - <el-button style="margin-left: 10px;" :type="yearprimary" @click="year">浠婂勾</el-button> + <el-button style="margin-left: 10px" :type="yearprimary" @click="year" + >浠婂勾</el-button + > - <el-button v-if="last" style="margin-left: 10px;" :type="lastyearprimary" @click="lastyear">涓婁竴骞�</el-button> - <el-button v-if="next" style="margin-left: 10px;" :type="nextyearprimary" @click="nextyear">涓嬩竴骞�</el-button> + <el-button + v-if="last" + style="margin-left: 10px" + :type="lastyearprimary" + @click="lastyear" + >涓婁竴骞�</el-button + > + <el-button + v-if="next" + style="margin-left: 10px" + :type="nextyearprimary" + @click="nextyear" + >涓嬩竴骞�</el-button + > </div> - <span style=" display: flex;justify-content: center;align-items: center;font-size: 25px;"> {{ this.anchorname + "-" - + this.tagid + "鍙樺寲瓒嬪娍鍥�" }}</span> + <span + style="display: flex; justify-content: center; align-items: center; font-size: 25px" + > + {{ this.anchorname + "-" + this.tagid + "鍙樺寲瓒嬪娍鍥�" }}</span + > <line-chart :chart-data="lineChartData" /> - - </div> </template> <script> -import * as XLSX from 'xlsx'; -import { saveAs } from 'file-saver'; +import * as XLSX from "xlsx"; +import { saveAs } from "file-saver"; import { formatTime1 } from "@/utils/index.js"; //鏃ユ湡鏍煎紡杞崲 import LineChart from "./components/LineChart"; -import Pagination from '@/components/Pagination' -import { getList, searcheveryday, handlechart2, handlechartupdate3, handlechartupdate2,resetinitv } from '@/api/analysis' -import { deepClone } from '@/utils' +import Pagination from "@/components/Pagination"; +import { + getList, + searcheveryday, + handlechart2, + handlechartupdate3, + handlechartupdate2, + resetinitv, + addSystemOperationLog, +} from "@/api/analysis"; +import { deepClone } from "@/utils"; const lineChartData = { newVisitis: { @@ -143,56 +212,58 @@ nd: [], hd: [], x: [], - }, - }; export default { components: { LineChart, - Pagination + Pagination, }, data() { return { pickerOptions: { - shortcuts: [{ - text: '鏈湀', - onClick(picker) { - picker.$emit('pick', [new Date(), new Date()]); - } - }, { - text: '浠婂勾鑷充粖', - onClick(picker) { - const end = new Date(); - const start = new Date(new Date().getFullYear(), 0); - picker.$emit('pick', [start, end]); - } - }, { - text: '鏈�杩戝叚涓湀', - onClick(picker) { - const end = new Date(); - const start = new Date(); - start.setMonth(start.getMonth() - 6); - picker.$emit('pick', [start, end]); - } - }] + shortcuts: [ + { + text: "鏈湀", + onClick(picker) { + picker.$emit("pick", [new Date(), new Date()]); + }, + }, + { + text: "浠婂勾鑷充粖", + onClick(picker) { + const end = new Date(); + const start = new Date(new Date().getFullYear(), 0); + picker.$emit("pick", [start, end]); + }, + }, + { + text: "鏈�杩戝叚涓湀", + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setMonth(start.getMonth() - 6); + picker.$emit("pick", [start, end]); + }, + }, + ], }, - yearprimary: 'success', - oneprimary: 'primary', - twoprimary: 'primary', - threeprimary: 'primary', - lastyearprimary: 'primary', - nextyearprimary: 'primary', + yearprimary: "success", + oneprimary: "primary", + twoprimary: "primary", + threeprimary: "primary", + lastyearprimary: "primary", + nextyearprimary: "primary", last: true, next: false, yeardata: 0, - anchorname: '', - tagid: '', + anchorname: "", + tagid: "", queryForm: { - time: '', - tagid: '' + time: "", + tagid: "", }, - timeExport: '', + timeExport: "", lineChartData: lineChartData.newVisitis, analy: true, total: 0, @@ -200,128 +271,163 @@ ForwardData: [], listLoading: true, listQuery: { - username: localStorage.getItem('username') || '', + username: localStorage.getItem("username") || "", current: 1, size: 20, keyword: undefined, time: undefined, }, - uploadUrl: '', + uploadUrl: "", multipleSelection: [], dialogVisible: false, - dialogType: 'create', - loading: false - } + dialogType: "create", + loading: false, + }; }, created() { - this.fetchData() + this.fetchData(); }, methods: { handleSelectionChange(val) { this.multipleSelection = val; }, resetinitv() { - console.log("閲嶇疆鍒濆鍊�"); - console.log(this.multipleSelection); if (this.multipleSelection.length == 0) { this.$message({ - message: '璇峰厛閫夋嫨涓�鏉℃暟鎹�', - type: 'error' - }) + message: "璇峰厛閫夋嫨涓�鏉℃暟鎹�", + type: "error", + }); } else if (this.multipleSelection.length > 1) { this.$message({ - message: '璇烽�夋嫨涓�鏉℃暟鎹�', - type: 'error' - }) - - - }else{ - - this.$confirm('浣犲皢纭畾灏�' + this.multipleSelection[0].tagid + ' 缂栧彿璁惧閲嶇疆鍒濆鍊间负' + this.multipleSelection[0].ed + ';' + this.multipleSelection[0].nd + ';' + this.multipleSelection[0].td + ' 鍚�?', '鎻愮ず', { - confirmButtonText: '纭畾', - cancelButtonText: '鍙栨秷', - type: 'warning', - center: true - }).then(() => { - - const params = { tagid: this.multipleSelection[0].tagid , initv: this.multipleSelection[0].ed + ';' + this.multipleSelection[0].nd + ';' + this.multipleSelection[0].td }; - resetinitv(params).then(response => { -console.log(response); - - - }) - this.$message({ - type: 'success', - message: '閲嶇疆鎴愬姛!' + message: "璇烽�夋嫨涓�鏉℃暟鎹�", + type: "error", }); - }).catch(() => { - this.$message({ - type: 'info', - message: '宸插彇娑堥噸缃�' - }); - }); - - } - + } else { + this.$confirm( + "浣犲皢纭畾灏�" + + this.multipleSelection[0].tagid + + " 缂栧彿璁惧閲嶇疆鍒濆鍊间负" + + this.multipleSelection[0].ed + + ";" + + this.multipleSelection[0].nd + + ";" + + this.multipleSelection[0].td + + " 鍚�?", + "鎻愮ず", + { + confirmButtonText: "纭畾", + cancelButtonText: "鍙栨秷", + type: "warning", + center: true, + } + ) + .then(() => { + const params = { + tagid: this.multipleSelection[0].tagid, + initv: + this.multipleSelection[0].ed + + ";" + + this.multipleSelection[0].nd + + ";" + + this.multipleSelection[0].td, + }; + resetinitv(params).then((response) => { + const params = { + name: localStorage.getItem("username") || "", + content: + localStorage.getItem("username") + + "灏�" + + this.multipleSelection[0].tagid + + "缂栧彿璁惧閲嶇疆鍒濆鍊间负" + + this.multipleSelection[0].ed + + ";" + + this.multipleSelection[0].nd + + ";" + + this.multipleSelection[0].td, + }; + addSystemOperationLog(params).then((response) => {}); + }); + this.$message({ + type: "success", + message: "閲嶇疆鎴愬姛!", + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "宸插彇娑堥噸缃�", + }); + }); + } }, exportExcel() { - console.log(this.timeExport); - // const data = [] - const params = { date1: this.timeExport[1], date2: this.timeExport[0], username: localStorage.getItem('username') || '' }; - handlechartupdate2(params).then(response => { - console.log(response); - const data = response.data - // 鑾峰彇瑕佸鍑虹殑鏁版嵁 - // const data = this.list; // 鍋囪list鏄〃鏍肩殑鏁版嵁 - // 鍒涘缓涓�涓┖鐨勫伐浣滅翱 - const workbook = XLSX.utils.book_new(); - // 鍒涘缓涓�涓伐浣滆〃 - const worksheet = XLSX.utils.json_to_sheet(data); - // 灏嗗伐浣滆〃娣诲姞鍒板伐浣滅翱涓� - XLSX.utils.book_append_sheet(workbook, worksheet, 'Sheet1'); - // 灏嗗伐浣滅翱杞崲涓轰簩杩涘埗瀛楃涓� - const excelBuffer = XLSX.write(workbook, { bookType: 'xlsx', type: 'array' }); - // 灏嗕簩杩涘埗瀛楃涓茶浆鎹负Blob瀵硅薄 - const blob = new Blob([excelBuffer], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8' }); - // 鍒涘缓涓�涓笅杞介摼鎺� - const url = URL.createObjectURL(blob); - // 鍒涘缓涓�涓殣钘忕殑閾炬帴鍏冪礌 - const link = document.createElement('a'); - link.href = url; - link.download = 'export.xlsx'; // 璁剧疆涓嬭浇鐨勬枃浠跺悕 - // 妯℃嫙鐐瑰嚮涓嬭浇閾炬帴 - link.click(); - // 閲婃斁URL瀵硅薄 - URL.revokeObjectURL(url); - }) - // console.log(data); - - + if (this.timeExport == "") { + this.$message({ + message: "璇烽�夋嫨鏃ユ湡鑼冨洿", + type: "error", + }); + return false; + } else { + const params = { + date1: this.timeExport[1], + date2: this.timeExport[0], + username: localStorage.getItem("username") || "", + }; + handlechartupdate2(params).then((response) => { + const data = response.data; + // 鑾峰彇瑕佸鍑虹殑鏁版嵁 + // const data = this.list; // 鍋囪list鏄〃鏍肩殑鏁版嵁 + // 鍒涘缓涓�涓┖鐨勫伐浣滅翱 + const workbook = XLSX.utils.book_new(); + // 鍒涘缓涓�涓伐浣滆〃 + const worksheet = XLSX.utils.json_to_sheet(data); + // 灏嗗伐浣滆〃娣诲姞鍒板伐浣滅翱涓� + XLSX.utils.book_append_sheet(workbook, worksheet, "Sheet1"); + // 灏嗗伐浣滅翱杞崲涓轰簩杩涘埗瀛楃涓� + const excelBuffer = XLSX.write(workbook, { bookType: "xlsx", type: "array" }); + // 灏嗕簩杩涘埗瀛楃涓茶浆鎹负Blob瀵硅薄 + const blob = new Blob([excelBuffer], { + type: + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8", + }); + // 鍒涘缓涓�涓笅杞介摼鎺� + const url = URL.createObjectURL(blob); + // 鍒涘缓涓�涓殣钘忕殑閾炬帴鍏冪礌 + const link = document.createElement("a"); + link.href = url; + link.download = "export.xlsx"; // 璁剧疆涓嬭浇鐨勬枃浠跺悕 + // 妯℃嫙鐐瑰嚮涓嬭浇閾炬帴 + link.click(); + // 閲婃斁URL瀵硅薄 + URL.revokeObjectURL(url); + }); + } }, - Export() { - - }, + Export() {}, fanhui() { - this.analy = true + this.analy = true; }, analyze(scope) { - this.anchorname = scope.row.anchorname - this.tagid = scope.row.tagid - const params = { date1: this.queryForm.time[1], date2: this.queryForm.time[0], username: localStorage.getItem('username') || '', tagid: scope.row.tagid }; - handlechart2(params).then(response => { - console.log(response); - - this.lineChartData = response.data - this.analy = false - }) + this.anchorname = scope.row.anchorname; + this.tagid = scope.row.tagid; + const params = { + date1: this.queryForm.time[1], + date2: this.queryForm.time[0], + username: localStorage.getItem("username") || "", + tagid: scope.row.tagid, + }; + handlechart2(params).then((response) => { + this.lineChartData = response.data; + this.analy = false; + }); }, one() { - this.oneprimary = 'success' - this.twoprimary = 'primary' - this.threeprimary = 'primary' - this.yearprimary = 'primary' - this.lastyearprimary = 'primary' - this.nextyearprimary = 'primary' + this.oneprimary = "success"; + this.twoprimary = "primary"; + this.threeprimary = "primary"; + this.yearprimary = "primary"; + this.lastyearprimary = "primary"; + this.nextyearprimary = "primary"; // 鑾峰彇褰撳墠鏃ユ湡 const currentDate = new Date(); // 鑾峰彇褰撳墠鏈堜唤 @@ -331,23 +437,27 @@ const newDate = formatTime1(currentDate, "yyyy-MM-dd"); //鑾峰彇褰撳墠骞存湀鏃� const dateYear = formatTime1(new Date(), "yyyy-MM-dd"); - var time = [] - time.push(newDate) - time.push(dateYear) - this.queryForm.time = time - const params = { date1: dateYear, date2: newDate, username: localStorage.getItem('username') || '', tagid: this.tagid }; - handlechartupdate3(params).then(response => { - this.lineChartData = response.data - }) - + var time = []; + time.push(newDate); + time.push(dateYear); + this.queryForm.time = time; + const params = { + date1: dateYear, + date2: newDate, + username: localStorage.getItem("username") || "", + tagid: this.tagid, + }; + handlechartupdate3(params).then((response) => { + this.lineChartData = response.data; + }); }, two() { - this.oneprimary = 'primary' - this.twoprimary = 'success' - this.threeprimary = 'primary' - this.yearprimary = 'primary' - this.lastyearprimary = 'primary' - this.nextyearprimary = 'primary' + this.oneprimary = "primary"; + this.twoprimary = "success"; + this.threeprimary = "primary"; + this.yearprimary = "primary"; + this.lastyearprimary = "primary"; + this.nextyearprimary = "primary"; // 鑾峰彇褰撳墠鏃ユ湡 const currentDate = new Date(); // 鑾峰彇褰撳墠鏈堜唤 @@ -357,23 +467,27 @@ const newDate = formatTime1(currentDate, "yyyy-MM-dd"); //鑾峰彇褰撳墠骞存湀鏃� const dateYear = formatTime1(new Date(), "yyyy-MM-dd"); - var time = [] - time.push(newDate) - time.push(dateYear) - this.queryForm.time = time - const params = { date1: dateYear, date2: newDate, username: localStorage.getItem('username') || '', tagid: this.tagid }; - handlechartupdate3(params).then(response => { - this.lineChartData = response.data - }) - + var time = []; + time.push(newDate); + time.push(dateYear); + this.queryForm.time = time; + const params = { + date1: dateYear, + date2: newDate, + username: localStorage.getItem("username") || "", + tagid: this.tagid, + }; + handlechartupdate3(params).then((response) => { + this.lineChartData = response.data; + }); }, three() { - this.oneprimary = 'primary' - this.twoprimary = 'primary' - this.threeprimary = 'success' - this.yearprimary = 'primary' - this.lastyearprimary = 'primary' - this.nextyearprimary = 'primary' + this.oneprimary = "primary"; + this.twoprimary = "primary"; + this.threeprimary = "success"; + this.yearprimary = "primary"; + this.lastyearprimary = "primary"; + this.nextyearprimary = "primary"; // 鑾峰彇褰撳墠鏃ユ湡 const currentDate = new Date(); // 鑾峰彇褰撳墠鏈堜唤 @@ -384,26 +498,30 @@ //鑾峰彇褰撳墠骞存湀鏃� const dateYear = formatTime1(new Date(), "yyyy-MM-dd"); - var time = [] - time.push(newDate) - time.push(dateYear) - this.queryForm.time = time - const params = { date1: dateYear, date2: newDate, username: localStorage.getItem('username') || '', tagid: this.tagid }; - handlechartupdate3(params).then(response => { - - this.lineChartData = response.data - }) + var time = []; + time.push(newDate); + time.push(dateYear); + this.queryForm.time = time; + const params = { + date1: dateYear, + date2: newDate, + username: localStorage.getItem("username") || "", + tagid: this.tagid, + }; + handlechartupdate3(params).then((response) => { + this.lineChartData = response.data; + }); }, year() { - this.oneprimary = 'primary' - this.twoprimary = 'primary' - this.threeprimary = 'primary' - this.yearprimary = 'success' - this.lastyearprimary = 'primary' - this.nextyearprimary = 'primary' - this.next = false - this.last = true + this.oneprimary = "primary"; + this.twoprimary = "primary"; + this.threeprimary = "primary"; + this.yearprimary = "success"; + this.lastyearprimary = "primary"; + this.nextyearprimary = "primary"; + this.next = false; + this.last = true; // 鑾峰彇褰撳墠鏃ユ湡 // const currentDate = new Date(); // 鑾峰彇褰撳墠鏈堜唤 @@ -413,47 +531,44 @@ const newDate = formatTime1(new Date(), "yyyy-MM-dd"); //鑾峰彇褰撳墠骞存湀鏃� const dateYear = formatTime1(new Date(), "yyyy"); - console.log(dateYear + '-01-01'); - this.yeardata = dateYear - var time = [] - time.push(newDate + '-01-01') - time.push(newDate) - this.queryForm.time = time - const params = { date1: newDate, date2: dateYear + '-01-01', username: localStorage.getItem('username') || '', tagid: this.tagid }; - handlechartupdate3(params).then(response => { - console.log(response); - - this.lineChartData = response.data - }) + this.yeardata = dateYear; + var time = []; + time.push(newDate + "-01-01"); + time.push(newDate); + this.queryForm.time = time; + const params = { + date1: newDate, + date2: dateYear + "-01-01", + username: localStorage.getItem("username") || "", + tagid: this.tagid, + }; + handlechartupdate3(params).then((response) => { + this.lineChartData = response.data; + }); }, lastornext() { const currentDate = new Date(); const currentMonth = currentDate.getFullYear(); - console.log(currentMonth); - console.log(this.yeardata); - - if (this.yeardata < currentMonth) { - this.next = true + this.next = true; if (this.yeardata <= 2022) { - this.last = false + this.last = false; } else { - this.last = true + this.last = true; } } else { - this.next = false + this.next = false; } - }, lastyear() { - this.oneprimary = 'primary' - this.twoprimary = 'primary' - this.threeprimary = 'primary' - this.yearprimary = 'primary' - this.lastyearprimary = 'success' - this.nextyearprimary = 'primary' + this.oneprimary = "primary"; + this.twoprimary = "primary"; + this.threeprimary = "primary"; + this.yearprimary = "primary"; + this.lastyearprimary = "success"; + this.nextyearprimary = "primary"; // 鑾峰彇褰撳墠鏃ユ湡 const currentDate = new Date(); // 鑾峰彇褰撳墠鏈堜唤 @@ -464,138 +579,123 @@ if (this.yeardata == "") { currentDate.setFullYear(currentMonth - 1); // this.yeardata=currentMonth - 1; - } else { currentDate.setFullYear(this.yeardata - 1); // this.yeardata = this.yeardata - 1 - } const newDate = formatTime1(currentDate, "yyyy"); - this.yeardata = parseInt(newDate) - this.lastornext() + this.yeardata = parseInt(newDate); + this.lastornext(); //鑾峰彇褰撳墠骞存湀鏃� const dateYear = formatTime1(new Date(), "yyyy-MM-dd"); // this.queryForm.time.push(newDate+'-01-01') // this.queryForm.time.push(newDate+'-12-31') - var time = [] - time.push(newDate + '-01-01') - time.push(newDate + '-12-31') - this.queryForm.time = time - const params = { date1: newDate + '-12-31', date2: newDate + '-01-01', username: localStorage.getItem('username') || '', tagid: this.tagid }; - handlechartupdate3(params).then(response => { - - this.lineChartData = response.data - }) + var time = []; + time.push(newDate + "-01-01"); + time.push(newDate + "-12-31"); + this.queryForm.time = time; + const params = { + date1: newDate + "-12-31", + date2: newDate + "-01-01", + username: localStorage.getItem("username") || "", + tagid: this.tagid, + }; + handlechartupdate3(params).then((response) => { + this.lineChartData = response.data; + }); }, nextyear() { - this.oneprimary = 'primary' - this.twoprimary = 'primary' - this.threeprimary = 'primary' - this.yearprimary = 'primary' - this.lastyearprimary = 'primary' - this.nextyearprimary = 'success' + this.oneprimary = "primary"; + this.twoprimary = "primary"; + this.threeprimary = "primary"; + this.yearprimary = "primary"; + this.lastyearprimary = "primary"; + this.nextyearprimary = "success"; // 鑾峰彇褰撳墠鏃ユ湡 const currentDate = new Date(); // 鑾峰彇褰撳墠鏈堜唤 // const currentMonth = currentDate.getFullYear(); // 璁剧疆鏃ユ湡鐨勬湀浠戒负褰撳墠鏈堜唤鍑忎竴 - console.log(this.yeardata); - currentDate.setFullYear(this.yeardata + 1); const newDate = formatTime1(currentDate, "yyyy"); - console.log(newDate); - - this.yeardata = parseInt(newDate) + this.yeardata = parseInt(newDate); //鑾峰彇褰撳墠骞存湀鏃� - this.lastornext() + this.lastornext(); const dateYear = formatTime1(new Date(), "yyyy-MM-dd"); - var time = [] - time.push(newDate + '-01-01') - time.push(newDate + '-12-31') - this.queryForm.time = time - const params = { date1: newDate + '-12-31', date2: newDate + '-01-01', username: localStorage.getItem('username') || '', tagid: this.tagid }; - handlechartupdate3(params).then(response => { - - this.lineChartData = response.data - }) + var time = []; + time.push(newDate + "-01-01"); + time.push(newDate + "-12-31"); + this.queryForm.time = time; + const params = { + date1: newDate + "-12-31", + date2: newDate + "-01-01", + username: localStorage.getItem("username") || "", + tagid: this.tagid, + }; + handlechartupdate3(params).then((response) => { + this.lineChartData = response.data; + }); }, handlechart() { - console.log(this.queryForm.time); - - const params = { date1: this.queryForm.time[1], date2: this.queryForm.time[0], username: localStorage.getItem('username') || '', tagid: this.tagid }; - handlechartupdate3(params).then(response => { - this.lineChartData = response.data - }) - + const params = { + date1: this.queryForm.time[1], + date2: this.queryForm.time[0], + username: localStorage.getItem("username") || "", + tagid: this.tagid, + }; + handlechartupdate3(params).then((response) => { + this.lineChartData = response.data; + }); }, // 鎼滅储 search() { - this.listLoading = true - searcheveryday(this.listQuery).then(response => { + this.listLoading = true; + searcheveryday(this.listQuery).then((response) => { if (response.data != null) { - this.list = response.data.records - this.total = response.data.total + this.list = response.data.records; + this.total = response.data.total; } else { this.$message({ - message: '鏈悳绱㈠埌鏁版嵁', - type: 'error' - }) + message: "鏈悳绱㈠埌鏁版嵁", + type: "error", + }); } - this.listLoading = false - }) + this.listLoading = false; + }); }, refresh() { this.listQuery = { - username: localStorage.getItem('username') || '', + username: localStorage.getItem("username") || "", current: 1, size: 20, time: undefined, - keyword: undefined - } - this.fetchData() + keyword: undefined, + }; + this.fetchData(); }, // 鍒嗛〉鏁版嵁 fetchData() { - this.listLoading = true - getList(this.listQuery).then(response => { - console.log(response); - - this.list = response.data.records - this.total = response.data.total - this.listLoading = false - }) + this.listLoading = true; + getList(this.listQuery).then((response) => { + this.list = response.data.records; + this.total = response.data.total; + this.listLoading = false; + }); }, - - searchorfetchData() { - console.log(this.listQuery.keyword); - if (this.listQuery.keyword != undefined) { - console.log(111111); - - this.search() + this.search(); } else { - console.log(2222); - - this.fetchData() + this.fetchData(); } - // this.listLoading = true - // getList(this.listQuery).then(response => { - // console.log(response); - - // this.list = response.data.records - // this.total = response.data.total - // this.listLoading = false - // }) }, - - } -} + }, +}; </script> <style lang="scss" scoped> @@ -625,13 +725,12 @@ } .el-table__body { - tr:hover>td { + tr:hover > td { background-color: transparent !important; /* 浣犳兂瑕佺殑鑳屾櫙鑹� */ color: #000 !important; } } - .avatar-uploader { height: 128px; -- Gitblit v1.9.3