diff --git a/src/page/accounts/components/accountTable.vue b/src/page/accounts/components/accountTable.vue index 11fe647416350050da089db3b6b937b5af558aca..2e14db4805e79ae80c53ac2d874a22e9fd7787d4 100644 --- a/src/page/accounts/components/accountTable.vue +++ b/src/page/accounts/components/accountTable.vue @@ -71,6 +71,9 @@ <div v-else> <span v-if="item.prop === 'roleList'"> {{ accoutRoleList(scope.row[item.prop]) }} + </span> + <span v-if="item.prop === 'exiredDate'"> + {{ accoutRoleList(scope.row[item.prop]) || '永久有效' }} </span> <span v-else>{{ scope.row[item.prop] }}</span> </div> diff --git a/src/page/accounts/stbAdmin.vue b/src/page/accounts/stbAdmin.vue index 0908fb9f4cd6d5bef0ee2885c07fb30922c2ed15..ab2f6336b471f3c38c2c3b5871b0a9eb44293874 100644 --- a/src/page/accounts/stbAdmin.vue +++ b/src/page/accounts/stbAdmin.vue @@ -105,7 +105,7 @@ export default { this.getPageList(); }, handleSubmit() { - this.getPageList(); + this.getFirstPageList(); }, handleReset() { this.form.userName = ""; diff --git a/src/page/accounts/unitAdmin.vue b/src/page/accounts/unitAdmin.vue index a3e2f73d61545b08cdc51428dd2a6f69dd50c162..68ecc22424d85564a482bff6e78aee03f8880292 100644 --- a/src/page/accounts/unitAdmin.vue +++ b/src/page/accounts/unitAdmin.vue @@ -142,7 +142,7 @@ export default { }, // æŸ¥è¯¢æ•°æ® handleSubmit() { - this.getPageList(); + this.getFirstPageList(); }, // é‡ç½®æŸ¥è¯¢ handleReset() { diff --git a/src/page/accounts/users.vue b/src/page/accounts/users.vue index 41f44d89a8678e874432a354c22d9649f40c445c..762feaf33d047d4b51e36fafd5cc050e9332644a 100644 --- a/src/page/accounts/users.vue +++ b/src/page/accounts/users.vue @@ -5,6 +5,7 @@ <el-form :inline="true" :model="form"> <el-form-item> <el-input + clearable v-model="form.userName" placeholder="请输入平å°ç”¨æˆ·å" suffix-icon="el-icon-search" @@ -36,8 +37,18 @@ /> <party-pagination :page="page" @changePage="handleChangeCurrent" /> </div> - <add-dialog ref="addDialog" :organList="organList" :rolesList="rolesList" @success="getFirstPageList()" /> - <edit-dialog ref="editDialog" :organList="organList" :rolesList="rolesList" @success="getFirstPageList()" /> + <add-dialog + ref="addDialog" + :organList="organList" + :rolesList="rolesList" + @success="getFirstPageList()" + /> + <edit-dialog + ref="editDialog" + :organList="organList" + :rolesList="rolesList" + @success="getFirstPageList()" + /> <msg-dialog ref="msgDilaog" :msgInfo="msgInfo" /> </div> </template> @@ -71,8 +82,8 @@ export default { }, activeRow: {}, msgInfo: {}, - organList:[], - rolesList:[] + organList: [], + rolesList: [], }; }, components: { @@ -88,7 +99,7 @@ export default { this.getFirstPageList(); }, methods: { - // èŽ·å–æœºæž„列表 + // èŽ·å–æœºæž„列表 getOrgList() { getOrgListWithOutPage().then((res) => { this.organList = res; @@ -105,7 +116,7 @@ export default { this.getPageList(); }, handleSubmit() { - this.getPageList(); + this.getFirstPageList(); }, handleReset() { this.form.userName = ""; @@ -144,7 +155,7 @@ export default { console.log(err); }); }, - // 页é¢è¿”回值为空 + // 页é¢è¿”回值为空 getResWithOutData() { this.list = []; this.page = { diff --git a/src/page/statistics/components/demand.vue b/src/page/statistics/components/demand.vue index b8e5660593747ffa624b053bebc69b3d679b0d6b..8520fb38e06659e3e0ad81017c6a77e0a60474c0 100644 --- a/src/page/statistics/components/demand.vue +++ b/src/page/statistics/components/demand.vue @@ -33,7 +33,7 @@ export default { methods: { getList() { let curTime = getCurDate(); - let frequencyDate = curTime.year + curTime.month + curTime.date; + let frequencyDate = curTime.year + curTime.month; this.$https({ method: "post", url: "tBoardStatistic/getInteractionFrequencyPageList?frequencyDate=" + frequencyDate, @@ -132,7 +132,7 @@ export default { type: "value", name: "å•ä½/次", splitNumber: 5, - max: 100, + // max: 100, axisLabel: { textStyle: { color: "#333333", diff --git a/src/page/statistics/components/detail-table/rankTable.vue b/src/page/statistics/components/detail-table/rankTable.vue index 7c8f1c2e1d9f1f4271308221d4b4fd11800a2c0b..2863f131109654953d67402d6a5cdfe4bcf3aa32 100644 --- a/src/page/statistics/components/detail-table/rankTable.vue +++ b/src/page/statistics/components/detail-table/rankTable.vue @@ -12,8 +12,8 @@ <img :src="getImg(index + 1)" alt="" v-if="index < 3" /> <p v-else>{{ index + 1 }}</p> </span> - <span>{{ item.organName }}</span> - <span>{{ item.frequencyCnt }}</span> + <span>{{ item.playDate || item.organName }}</span> + <span>{{ item.playNumber || item.frequencyCnt}}</span> </li> </ul> </div> @@ -28,8 +28,8 @@ <span> {{ 6 + index }} </span> - <span>{{ item.organName }}</span> - <span>{{ item.frequencyCnt }}</span> + <span>{{ item.playDate || item.organName }}</span> + <span>{{ item.playNumber || item.frequencyCnt}}</span> </li> </ul> </div> diff --git a/src/page/statistics/components/echarts/line.vue b/src/page/statistics/components/echarts/line.vue index 713c2ab518d13b25e5d8d897bc3b1364087605f6..04fb9535b1cbb47a439cc78cb8a65b326b7c37fb 100644 --- a/src/page/statistics/components/echarts/line.vue +++ b/src/page/statistics/components/echarts/line.vue @@ -85,7 +85,7 @@ export default { { type: "value", splitNumber: 5, - max: 100, + // max: 100, axisLabel: { textStyle: { color: "#333333", diff --git a/src/page/statistics/components/interact.vue b/src/page/statistics/components/interact.vue index f345fdf1fa83619b5fd5d2c38730c337a759dee2..35bda76643459e6c892f468a040893a26369d48a 100644 --- a/src/page/statistics/components/interact.vue +++ b/src/page/statistics/components/interact.vue @@ -29,7 +29,7 @@ export default { methods: { getList() { let curTime = getCurDate(); - let playDate = curTime.year + curTime.month + curTime.date; + let playDate = curTime.year + curTime.month; let _this = this; this.$https({ method: "post", @@ -120,7 +120,7 @@ export default { { type: "value", splitNumber: 5, - max: 100, + // max: 100, axisLabel: { textStyle: { color: "#333333", diff --git a/src/page/statistics/interaction.vue b/src/page/statistics/interaction.vue index bf3bb154094ce57e2227ca8dffcb5e3e9d51a2f6..1f688862e0037eea9017483ecc13c9131817def2 100644 --- a/src/page/statistics/interaction.vue +++ b/src/page/statistics/interaction.vue @@ -1,26 +1,37 @@ /* 互动频次 */ <template> <div class="interaction-wrapper height100 overview-detail"> - <div class="ecahrts-panel-box"> - <div class="panel-box-header"> - <span class="title">互动频次</span> - <div class="tip"> - <span class="tip-title">页é¢è¯´æ˜Ž:</span> - <span> - 坿Ÿ¥çœ‹å½“å‰ç³»ç»Ÿå„项数æ®ç»Ÿè®¡æƒ…况。互动频次åŠç‚¹æ’趋势图展示部分数æ®ï¼Œå¯è¿›å…¥äº’动统计åŠè¶‹åŠ¿åˆ†æžè¯¦æƒ…页查看全部数æ®ã€‚</span - > - </div> - </div> - <div class="panel-box-content"> - <bar :data="echartsData" ref="echarts" /> - </div> + <div class="btn-group"> + <el-button + class="export" + type="primary" + icon="el-icon-download" + @click="handleExport" + >导出文件</el-button + > </div> - <div class="rank-panel-box"> - <div class="panel-box-header"> - <span class="title">互动频次排行</span> + <div id="bodyCanvas"> + <div class="ecahrts-panel-box"> + <div class="panel-box-header"> + <span class="title">互动频次</span> + <div class="tip"> + <span class="tip-title">页é¢è¯´æ˜Ž:</span> + <span> + 坿Ÿ¥çœ‹å½“å‰ç³»ç»Ÿå„项数æ®ç»Ÿè®¡æƒ…况。互动频次åŠç‚¹æ’趋势图展示部分数æ®ï¼Œå¯è¿›å…¥äº’动统计åŠè¶‹åŠ¿åˆ†æžè¯¦æƒ…页查看全部数æ®ã€‚</span + > + </div> + </div> + <div class="panel-box-content"> + <bar :data="echartsData" ref="echarts" /> + </div> </div> - <div class="panel-box-content"> - <rank-table :tList="tList" :data="data" /> + <div class="rank-panel-box"> + <div class="panel-box-header"> + <span class="title">互动频次排行</span> + </div> + <div class="panel-box-content"> + <rank-table :tList="tList" :data="data" /> + </div> </div> </div> </div> @@ -45,14 +56,15 @@ export default { getList() { let curTime = getCurDate(); let frequencyDate = curTime.year + curTime.month; - let _this = this - _this.$https({ - method: "post", - url: - "tBoardStatistic/getInteractionPageList?frequencyDate=" + - frequencyDate, - authType: this.backToken, - }) + let _this = this; + _this + .$https({ + method: "post", + url: + "tBoardStatistic/getInteractionPageList?frequencyDate=" + + frequencyDate, + authType: this.backToken, + }) .then((res) => { if (res.status == 200) { if (res.data.resultCode == 200) { @@ -70,7 +82,7 @@ export default { } setTimeout(() => { _this.init(); - },100); + }, 100); }) .catch((err) => { _this.$message.error(err.message); @@ -80,10 +92,49 @@ export default { }, init() { this.$refs.echarts.init(); - } + }, + handleExport() { + let _this = this; + if (this.timer) { + return false; + } + this.timer = setTimeout(() => { + clearTimeout(_this.timer); + _this.timer = null; + }, 30000); + _this.getPdf("#bodyCanvas", "互动频次"); + const loading = this.$loading({ + lock: true, + text: "Loading", + spinner: "el-icon-loading", + background: "rgba(0, 0, 0, 0.7)", + }); + setTimeout(() => { + loading.close(); + }, 2000); + }, }, }; </script> - -<style> +<style lang="less" scoped> +.interaction-wrapper { + .btn-group { + margin-bottom: 20px; + height: 36px; + } + /deep/ .el-button.export { + width: 128px; + float: right; + .el-icon-download { + font-size: 18px; + font-weight: bold; + } + } + #bodyCanvas { + height: calc(100% - 56px); + } + .ul-wrapper { + background-color: @party-white; + } +} </style> \ No newline at end of file diff --git a/src/page/statistics/tend.vue b/src/page/statistics/tend.vue index 06abba230a99af87eb1f94c8ce5659391ff333cc..548da592867f4c413e6c4123f5d9f155cf3b613f 100644 --- a/src/page/statistics/tend.vue +++ b/src/page/statistics/tend.vue @@ -48,8 +48,6 @@ <script> import { trendLine, rankTable } from "./components"; import { getCurDate } from "@/utils/util.time"; -import htmlCanvas from "@/utils/htmlCanvas"; -import JsPDF from "jspdf"; export default { data() { return { @@ -61,7 +59,7 @@ export default { options: [ { label: "å¹´", value: "1" }, { label: "月", value: "2" }, - { label: "æ—¥", value: "3" }, + // { label: "æ—¥", value: "3" }, ], timer: null, }; @@ -77,7 +75,7 @@ export default { .$https({ method: "post", url: - "tBoardStatistic/getBoardPageList?frequencyDate=" + + "tBoardStatistic/getBoardTrendPageList?playDate=" + frequencyDate, authType: this.backToken, }) @@ -85,7 +83,7 @@ export default { if (res.status == 200) { if (res.data.resultCode == 200) { _this.echartsData = {}; - _this.echartsData.xAxisData = res.data.data.organList; + _this.echartsData.xAxisData = res.data.data.dateList; _this.echartsData.yAxisData = res.data.data.cntList; _this.data = res.data.data.page.records; } else { diff --git a/src/page/system/changePwd.vue b/src/page/system/changePwd.vue index f2d4212b1e80b84ae51622f69aef8f78d0a7b888..255e1c22b12633ba14fc0def8c6519ffcfcc68fd 100644 --- a/src/page/system/changePwd.vue +++ b/src/page/system/changePwd.vue @@ -11,6 +11,9 @@ label-position="top" class="party-form" > + <el-form-item label="当å‰è´¦å·"> + <span>{{ userName }}</span> + </el-form-item> <el-form-item label="请输入当å‰å¯†ç " prop="oldPassWord"> <el-input v-model="form.oldPassWord" @@ -66,6 +69,7 @@ export default { } }; return { + userName: localStorage.getItem("user"), form: { oldPassWord: "", password: "", @@ -92,6 +96,7 @@ export default { password: "", checkPass: "", }; + this.$router.go(-1) }, handleSubmit() { let _this = this; diff --git a/src/page/system/log/devops.vue b/src/page/system/log/devops.vue index f5add4c83832ddd47e7dcc208b33d844061f3b3b..975aa1723eeb50d52ab3908beb002c6e7f2044f8 100644 --- a/src/page/system/log/devops.vue +++ b/src/page/system/log/devops.vue @@ -84,7 +84,7 @@ export default { }, getFirstPageList() { this.page._index = 1; - this.getPageList(); + this.getFirstPageList(); }, handleReset() { for (let key in this.form) { diff --git a/src/page/system/log/platformlog.vue b/src/page/system/log/platformlog.vue index 55f406e585b75fd4e44f1cfded32ed33ab699432..d64490eb47ca9b07c327b910a76946fdb5e19af7 100644 --- a/src/page/system/log/platformlog.vue +++ b/src/page/system/log/platformlog.vue @@ -5,6 +5,7 @@ <el-form :inline="true" :model="form"> <el-form-item> <el-input + clearable v-model="form.nameOrCode" placeholder="请输入æ“作者" suffix-icon="el-icon-search" @@ -93,7 +94,7 @@ export default { // èŽ·å–æ—¥å¿—æ“作类型 this.getOperationType(); // èŽ·å–æœºé¡¶ç›’è¿ç»´ç±»è¡¨ - this.getLog(); + this.getFirstPageList(); }, methods: { getOperationType() { @@ -102,15 +103,20 @@ export default { }); }, handleSubmit() { - this.getLog(); + this.getFirstPageList(); + }, + getFirstPageList() { + this.page._index = 1; + this.getPageList(); }, handleReset() { for (let key in this.form) { this.form[key] = ""; } - this.getLog(); + this.getFirstPageList(); }, - getLog() { + + getPageList() { let requestParams = {}; requestParams._index = this.page._index; requestParams._size = this.page._size; @@ -162,7 +168,7 @@ export default { // 翻页 handleChangeCurrent(val) { this.page._index = val; - this.getLog(); + this.getPageList(); }, }, watch: {}, diff --git a/src/page/system/log/settoplog.vue b/src/page/system/log/settoplog.vue index be2a26ffc6da72485e8a9c85a03a5c5da5914dad..afed0e47dee6f08a22cdde108c83fa244185cfa8 100644 --- a/src/page/system/log/settoplog.vue +++ b/src/page/system/log/settoplog.vue @@ -4,9 +4,12 @@ <div class="search-container"> <el-form :inline="true" :model="form"> <el-form-item> - <el-select v-model="form.user" placeholder="请选择所属å•ä½"> + <el-select + clearable + v-model="form.organId" + placeholder="请选择所属å•ä½" + > <el-option - v-model="form.organId" v-for="item in organList" :key="item.id" :label="item.name" @@ -17,6 +20,7 @@ </el-form-item> <el-form-item> <el-date-picker + clearable v-model="form.date" type="daterange" range-separator="至" @@ -99,7 +103,7 @@ export default { this.getPageList(); }, handleSubmit() { - this.getPageList(); + this.getFirstPageList(); }, handleReset() { for (let key in this.form) { diff --git a/src/page/system/log/userlog.vue b/src/page/system/log/userlog.vue index 4c5b974c46f766d967b2f58e4758c5559f37cce0..22210e41d8e15d43dc8e258403225b67fc924b3a 100644 --- a/src/page/system/log/userlog.vue +++ b/src/page/system/log/userlog.vue @@ -112,7 +112,7 @@ export default { }); }, handleSubmit() { - this.getPageList(); + this.getFirstPageList(); }, handleReset() { for (let key in this.form) {