修复bug

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>

src/page/accounts/stbAdmin.vue

@@ -105,7 +105,7 @@ export default {
       this.getPageList();
     },
     handleSubmit() {
-      this.getPageList();
+       this.getFirstPageList();
     },
     handleReset() {
       this.form.userName = "";

src/page/accounts/unitAdmin.vue

@@ -142,7 +142,7 @@ export default {
     },
     // 查询数据
     handleSubmit() {
-      this.getPageList();
+     this.getFirstPageList();
     },
     // 重置查询
     handleReset() {

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 = {

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",

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>

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",

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",

src/page/statistics/interaction.vue

 /* 互动频次 */
 <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

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 {

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;

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) {

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: {},

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) {

src/page/system/log/userlog.vue

@@ -112,7 +112,7 @@ export default {
       });
     },
     handleSubmit() {
-      this.getPageList();
+      this.getFirstPageList();
     },
     handleReset() {
       for (let key in this.form) {