查询接口页码置1

src/views/sensitive-control/data-in.vue

@@ -35,7 +35,7 @@
 
     <div class="block" style="margin-bottom:20px">
       <el-button @click="createDataHandle">数据导入</el-button>
-      <el-button @click="queryDataList">数据查询</el-button>
+      <el-button @click="queryDataListByClick">数据查询</el-button>
       <el-button @click="addproject">添加项目</el-button>
     </div>
     <template>
@@ -290,6 +290,10 @@ export default {
     },
     // 选中sheet
     handleSheetchange(val) {},
+    queryDataListByClick() {
+      this.currentPage = 1;
+      queryDataList();
+    },
     // 数据查询
     queryDataList() {
       this.getDataList(this.currentPage, this.queryParams);

src/views/sensitive-control/data-statistic.vue

@@ -47,7 +47,7 @@
     <div class="block" style="margin-bottom:20px">
       <el-button @click="showProjectTag">项目标签设置</el-button>
       <el-button @click="showProjectStatus">项目标记状态设置</el-button>
-      <el-button @click="queryDataList">数据查询</el-button>
+      <el-button @click="queryDataListByClick">数据查询</el-button>
       <el-button @click="showExportModal">导出</el-button>
     </div>
     <template>
@@ -667,6 +667,11 @@ export default {
       );
     },
 
+    queryDataListByClick() {
+      this.currentPage=1;
+      this.queryDataList();
+    },
+
     // 数据查询
     queryDataList() {
       this.getDataList(this.currentPage, this.queryParams);

src/views/sensitive-control/data-view-message.vue

@@ -34,7 +34,7 @@
 
         <el-row class="button-wrap">
           <el-button class="each-button" type="primary" @click="labelVisible=true">添加标签筛选</el-button>
-          <el-button class="each-button" type="primary" @click="handleSearch">查询</el-button>
+          <el-button class="each-button" type="primary" @click="handleSearchByClick">查询</el-button>
           <el-button
             class="each-button"
             type="primary"
@@ -668,6 +668,11 @@ export default {
     handleSearch() {
       vm.getTableList(true);
     },
+    handleSearchByClick() {
+      vm.pageNo = 1;
+      handleSearch();
+    },
+
 
     //下拉操作列表点击
     dealOperationClick(row) {

src/views/sensitive-control/data-view.vue

@@ -56,8 +56,9 @@
         <el-button type="primary" style="margin-left: 50px;" @click="showAddConditionModal">添加筛选条件</el-button>
         <el-button type="primary" @click="labelVisible=true">添加标签筛选</el-button>
         <el-button type="primary" @click="handleSend" v-if="showSendBtn">分发</el-button>
-        <el-button type="primary" @click="showExportModal" v-if="showExportBtn">导出</el-button>
-        <el-button type="primary" @click="submitForm('ruleForm')">查询</el-button>
+        <el-button type="primary" @click="checkExport" v-if="showExportBtn">导出</el-button>
+        <el-button type="primary" @click="exportNormalModalVisible=true" v-if="showNormalExportBtn">常规导出</el-button>
+        <el-button type="primary" @click="ruleForm.pageNo=1;submitForm('ruleForm')">查询</el-button>
       </el-form-item>
     </el-form>
     <template v-if="isSearchSend">
@@ -205,12 +206,26 @@
     <el-dialog title="导出" :visible.sync="exportModalVisible" width="300px" center>
       <p>您当前数据总导出次数为：{{checkExportData.dataExportTotal}}次</p>
       <p>剩余导出次数为：{{checkExportData.dataExportCount}}次</p>
+      <p style="margin-top: 10px;margin-bottom: 5px">备注：请使用谷歌浏览器导出</p>
+      <a :href ="'http://www.google.cn/chrome/'" class="href-link">点击下载</a>
       <span slot="footer" class="dialog-footer">
         <el-button @click="exportModalVisible = false">取 消</el-button>
         <el-button type="primary" @click="handleExport">确 定</el-button>
       </span>
     </el-dialog>
 
+    <!-- 常规导出弹窗 -->
+    <el-dialog title="导出" :visible.sync="exportNormalModalVisible" width="300px" center>
+      <p>只能导出已修改过标记状态的数据，</p>
+      <p>其它数据不可导出</p>
+      <p style="margin-top: 10px;margin-bottom: 5px">备注：请使用谷歌浏览器导出</p>
+      <a :href ="'http://www.google.cn/chrome/'" class="href-link">点击下载</a>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="exportNormalModalVisible = false">取 消</el-button>
+        <el-button type="primary" @click="handleNormalExport">确 定</el-button>
+      </span>
+    </el-dialog>
+
     <!-- 浏览器检测弹窗 -->
     <el-dialog
       title="当前不是chome浏览器，去下载？"
@@ -315,6 +330,7 @@ export default {
       isSearchSend: false, // 是否有效查询过
       showSendBtn: false, // 是否显示 分发按钮
       showExportBtn: false, // 是否显示 导出按钮
+      showNormalExportBtn: false, // 是否显示 常规导出按钮
       remarkHistory: [], // 历史备注列表
       ruleForm: {
         columnMap: {},
@@ -363,6 +379,8 @@ export default {
         dataExportCount: 0, // 剩余的
       },
 
+      exportNormalModalVisible: false, // 常规导出弹窗
+
       tagVisible: false, //标记处理弹窗
       tagStatus: "",
 
@@ -593,6 +611,7 @@ export default {
       vm.checkExport();
     },
     checkExport() {
+      vm.exportModalVisible = true;
       // /dataSearch/searchUserDis
       // 查询分发人员列表
       let data = {
@@ -606,7 +625,7 @@ export default {
           console.log("导出前校验》》》》 ", res);
           vm.checkExportData.dataExportTotal = res.data.dataExportTotal;
           vm.checkExportData.dataExportCount = res.data.dataExportCount;
-          vm.exportModalVisible = true;
+          // vm.exportModalVisible = true;
         } else {
           vm.$message.error(res.message);
         }
@@ -645,6 +664,25 @@ export default {
       a.setAttribute("download", exportFileName);
       a.click();
     },
+    handleNormalExport() {
+      let data = {
+        dingdingNum: vm.ruleForm.dingdingNumber,
+        dingdingDate: vm.ruleForm.dingdingDate,
+        dataSheetName: vm.ruleForm.sheet,
+      };
+
+      let callback = (res) => {
+        if (res.code == "000000") {
+          console.log("常规导出》》》》 ", res);
+          // 执行下载excel
+          vm.downloadFile(res.data.path, res.data.fileName);
+          vm.exportNormalModalVisible = false;
+        } else {
+          vm.$message.error(res.message);
+        }
+      };
+      vm.sendRequest("post", `/sensitive/dataSearch/export/common`, data, callback);
+    },
     checkChrome() {
       // return (navigator.appVersion.indexOf('Chrome') || navigator.appVersion.indexOf('chrome')) != -1;
       return this.getBroswer().broswer=='Chrome'
@@ -751,6 +789,10 @@ export default {
                 vm.showExportBtn = true;
               }
 
+              if (res.data.distributeRole == 2) {
+                vm.showNormalExportBtn = true;
+              }
+
               vm.getLabelStatus();
             } else {
               vm.$message.error(res.message);
@@ -1062,5 +1104,8 @@ export default {
     margin-top: 20px;
     display: inline-block;
   }
+  .href-link {
+    color: red;
+  }
 }
 </style>
\ No newline at end of file