日志管理界面表头字段位置调整，导出判断大于5000即提示不查询接口

src/components/ptCxForm_components.vue

@@ -212,7 +212,7 @@
         <el-table-column
           align="center"
           :min-width="
-            columnTitle.prop == 'jyaq' || columnTitle.prop == 'asjbh'
+            columnTitle.prop == 'czxxJyqk' || columnTitle.prop == 'asjbh'
               ? '360'
               : '160'
           "
@@ -222,17 +222,18 @@
           :label="columnTitle.label"
         >
           <template slot-scope="scope">
-            <div class="ajxq_s" v-if="columnTitle.prop == 'jyaq'">
+            <div class="ajxq_s" v-if="columnTitle.prop == 'czxxJyqk'">
               <span class="none" v-html="scope.row[columnTitle.prop]"></span
               ><a
                 href="javascript:void(0);"
                 onclick='javascript:this.parentNode.style.display="none";this.parentNode.nextSibling.style.display="block"'
                 style="display: inline-block;width: 100%;text-align: right;color: #3692c6;font-weight:600;"
                 id="open"
+                v-show="scope.row[columnTitle.prop]!=''&&scope.row[columnTitle.prop]!=null"
                 >展开</a
               >
             </div>
-            <div class="ajxq_n" style="display:none;">
+            <div class="ajxq_n" style="display:none;" v-if="columnTitle.prop == 'czxxJyqk'">
               <span
                 style="display: block;"
                 v-html="scope.row[columnTitle.prop]"
@@ -242,6 +243,7 @@
                 onclick='javascript:this.parentNode.style.display="none";this.parentNode.previousSibling.style.display="block"'
                 style="float:right;color: #3692c6;font-weight:600;"
                 id="stop"
+                v-show="scope.row[columnTitle.prop]!=''&&scope.row[columnTitle.prop]!=null"
                 >收起</a
               >
             </div>
@@ -277,7 +279,7 @@
               </el-tooltip>
             </div>
             <div
-              v-if="columnTitle.prop != 'jyaq' && columnTitle.prop != 'asjbh'"
+              v-if="columnTitle.prop != 'czxxJyqk' && columnTitle.prop != 'asjbh'"
               v-html="scope.row[columnTitle.prop]"
             ></div>
           </template>
@@ -369,35 +371,35 @@ export default {
       let self = this,
         tHeader = [],
         filterVal = [];
-      self.formData.limit = 5000;
-      const loading = this.$loading({
-        lock: true,
-        text: "正在导出...",
-        spinner: "el-icon-loading",
-        background: "rgba(255, 255, 255, 0.7)"
-      });
-      let json={};
-      for(let i in self.formData){
-        if(i!="cxSj"){
-          json[i]=self.formData[i]
-        }else{
-          json[i]=self.formData[i]!=''?(self.formData[i].join(" - ")):"";
+      if (self.tableDataLength > 5000) {
+        self.$message({
+          type: "error",
+          message: "最多只能导出5000条"
+        });
+      }else{
+        self.formData.limit = 5000;
+        const loading = this.$loading({
+          lock: true,
+          text: "正在导出...",
+          spinner: "el-icon-loading",
+          background: "rgba(255, 255, 255, 0.7)"
+        });
+        let json={};
+        for(let i in self.formData){
+          if(i!="cxSj"){
+            json[i]=self.formData[i]
+          }else{
+            json[i]=self.formData[i]!=''?(self.formData[i].join(" - ")):"";
+          }
         }
-      }
-      tHeader = [];
-      filterVal = [];
-      self.propdefaultFormThead.forEach(val => {
-        tHeader.push(val.label);
-        filterVal.push(val.prop);
-      });
-      self.doQueryRequest(JSON.stringify(json)).then(res => {
-        if (res.success === true) {
-          if (res.data.total > 5000) {
-            self.$message({
-              type: "error",
-              message: "最多只能导出5000条"
-            });
-          } else {
+        tHeader = [];
+        filterVal = [];
+        self.propdefaultFormThead.forEach(val => {
+          tHeader.push(val.label);
+          filterVal.push(val.prop);
+        });
+        self.doQueryRequest(JSON.stringify(json)).then(res => {
+          if (res.success === true) {
             require.ensure([], () => {
               const {
                 export_json_to_excel
@@ -406,17 +408,18 @@ export default {
               const data = self.formatJson(filterVal, list);
               export_json_to_excel(tHeader, data, self.excelHeader);
             });
+            loading.close();
+          } else {
+            loading.close();
+            self.$message({
+              type: "error",
+              message: "查询失败"
+            });
           }
-          loading.close();
-        } else {
-          loading.close();
-          self.$message({
-            type: "error",
-            message: "查询失败"
-          });
-        }
-        self.tableLoadingEmit = false;
-      });
+          self.tableLoadingEmit = false;
+        });
+      }
+
     },
     handleCurrentChange(val) {
       this.currentPage1 = val;

src/utils/params.js

@@ -4025,15 +4025,15 @@ let rzcxCxQueryField = [
 ];
 let rzcxCxDefaultFormThead = [
   {
+    label: "用户姓名",
+    prop: "xxdjryXm"
+  },
+  {
     /*table默认得表头*/
     label: "登录时间",
     prop: "dlsj"
   },
   {
-    label: "用户身份证号",
-    prop: "yhGmsfhm"
-  },
-  {
     label: "IP",
     prop: "yhIp"
   },
@@ -4042,8 +4042,8 @@ let rzcxCxDefaultFormThead = [
     prop: "xxdjdwGajgmc"
   },
   {
-    label: "用户姓名",
-    prop: "xxdjryXm"
+    label: "用户身份证号",
+    prop: "yhGmsfhm"
   },
   {
     label: "用户联系电话",
@@ -4197,37 +4197,36 @@ let rzcxGnCxQueryField = [
 ];
 let rzcxGnCxDefaultFormThead = [
   {
-    /*table默认得表头*/
-    label: "操作时间",
-    prop: "fwsj"
+    label: "用户姓名",
+    prop: "yhXm"
   },
   {
     label: "应用名称",
     prop: "yymcJyqk"
   },
   {
-    label: "用户身份证号码",
-    prop: "yhGmsfhm"
-  },
-  {
-    label: "用户姓名",
-    prop: "yhXm"
+    label: "操作时间",
+    prop: "fwsj"
   },
   {
     label: "IP",
     prop: "yhIp"
   },
   {
-    label: "操作内容",
-    prop: "czxxJyqk"
-  },
-  {
     label: "用户单位",
     prop: "xxdjdwGajgmc"
   },
   {
+    label: "用户身份证号码",
+    prop: "yhGmsfhm"
+  },
+  {
     label: "用户联系电话",
     prop: "xxdjryLxdh"
+  },
+  {
+    label: "操作内容",
+    prop: "czxxJyqk"
   }
 ];
 let rzcxGnCxURL = "/log/getCzLog";
@@ -4379,15 +4378,18 @@ let rzcxSyqkCxQueryField = [
 ];
 let rzcxSyqkCxDefaultFormTheadYh = [
   {
-    /*table默认得表头*/
-    label: "用户账号",
-    prop: "userName"
-  },
-  {
     label: "姓名",
     prop: "trueName"
   },
   {
+    label: "单位",
+    prop: "unitName"
+  },
+  {
+    label: "用户账号",
+    prop: "userName"
+  },
+  {
     label: "警号",
     prop: "policemanId"
   },
@@ -4396,10 +4398,6 @@ let rzcxSyqkCxDefaultFormTheadYh = [
     prop: "telephone"
   },
   {
-    label: "单位",
-    prop: "unitName"
-  },
-  {
     label: "登录次数",
     prop: "num"
   },
@@ -4419,6 +4417,10 @@ let rzcxSyqkCxDefaultFormTheadDw = [
     prop: "userNumber"
   },
   {
+    label: "活跃用户数",
+    prop: "actUser"
+  },
+  {
     label: "总使用量",
     prop: "total"
   },
@@ -4427,10 +4429,6 @@ let rzcxSyqkCxDefaultFormTheadDw = [
     prop: "avgr"
   },
   {
-    label: "活跃用户数",
-    prop: "actUser"
-  },
-  {
     label: "排名",
     prop: "rank"
   }
@@ -5402,5 +5400,5 @@ export {
   naotuQsWbURL,
   naotuQsWbQueryField,
   naotuQsWbFormData,
-  naotuQsWbDefaultFormThead,
+  naotuQsWbDefaultFormThead
 };

src/views/rzcx/ldfwrz.vue

@@ -518,7 +518,6 @@ export default {
       let self = this,
         tHeader = [],
         filterVal = [];
-      //self.formData.limit = 5000;
       const loading = this.$loading({
         lock: true,
         text: "正在导出...",
@@ -528,20 +527,21 @@ export default {
       tHeader = [];
       filterVal = [];
       if (flag == "YH") {
-        self.propdefaultFormTheadYh.forEach(val => {
-          tHeader.push(val.label);
-          filterVal.push(val.prop);
-        });
-        let excelHeader = "用户" + self.excelHeader;
-        let json = self.creteForm(flag, self.zdyUnitCode, "export");
-        self.doQueryRequestYh(JSON.stringify(json)).then(res => {
-          if (res.success === true) {
-            if (res.data.total > 5000) {
-              self.$message({
-                type: "error",
-                message: "最多只能导出5000条"
-              });
-            } else {
+        if (self.tableDataLength > 5000) {
+          self.$message({
+            type: "error",
+            message: "最多只能导出5000条"
+          });
+          loading.close();
+        }else{
+          self.propdefaultFormTheadYh.forEach(val => {
+            tHeader.push(val.label);
+            filterVal.push(val.prop);
+          });
+          let excelHeader = "用户" + self.excelHeader;
+          let json = self.creteForm(flag, self.zdyUnitCode, "export");
+          self.doQueryRequestYh(JSON.stringify(json)).then(res => {
+            if (res.success === true) {
               require.ensure([], () => {
                 const {
                   export_json_to_excel
@@ -550,32 +550,33 @@ export default {
                 const data = self.formatJson(filterVal, list);
                 export_json_to_excel(tHeader, data, excelHeader);
               });
-            }
-            loading.close();
-          } else {
-            loading.close();
-            self.$message({
-              type: "error",
-              message: "查询失败"
-            });
-          }
-          self.tableLoadingEmit = false;
-        });
-      } else if (flag == "DW") {
-        self.propdefaultFormTheadDw.forEach(val => {
-          tHeader.push(val.label);
-          filterVal.push(val.prop);
-        });
-        let excelHeader = "单位" + self.excelHeader;
-        let json = self.creteForm(flag, self.zdyUnitCode, "export");
-        self.doQueryRequestDw(JSON.stringify(json)).then(res => {
-          if (res.success === true) {
-            if (res.data.total > 5000) {
+              loading.close();
+            } else {
+              loading.close();
               self.$message({
                 type: "error",
-                message: "最多只能导出5000条"
+                message: "查询失败"
               });
-            } else {
+            }
+            self.tableLoadingEmit = false;
+          });
+        }
+      } else if (flag == "DW") {
+        if (self.tableDataLengthDw > 5000) {
+          self.$message({
+            type: "error",
+            message: "最多只能导出5000条"
+          });
+          loading.close();
+        }else{
+          self.propdefaultFormTheadDw.forEach(val => {
+            tHeader.push(val.label);
+            filterVal.push(val.prop);
+          });
+          let excelHeader = "单位" + self.excelHeader;
+          let json = self.creteForm(flag, self.zdyUnitCode, "export");
+          self.doQueryRequestDw(JSON.stringify(json)).then(res => {
+            if (res.success === true) {
               require.ensure([], () => {
                 const {
                   export_json_to_excel
@@ -584,32 +585,34 @@ export default {
                 const data = self.formatJson(filterVal, list);
                 export_json_to_excel(tHeader, data, excelHeader);
               });
-            }
-            loading.close();
-          } else {
-            loading.close();
-            self.$message({
-              type: "error",
-              message: "查询失败"
-            });
-          }
-          self.tableLoadingEmit = false;
-        });
-      } else if (flag == "DWXZ") {
-        self.propdefaultFormTheadDw.forEach(val => {
-          tHeader.push(val.label);
-          filterVal.push(val.prop);
-        });
-        let excelHeader = self.zdyDwName + self.excelHeader;
-        let json = self.creteForm(flag, self.zdyUnitCode, "export");
-        self.doQueryRequestDwXz(JSON.stringify(json)).then(res => {
-          if (res.success === true) {
-            if (res.data.total > 5000) {
+              loading.close();
+            } else {
+              loading.close();
               self.$message({
                 type: "error",
-                message: "最多只能导出5000条"
+                message: "查询失败"
               });
-            } else {
+            }
+            self.tableLoadingEmit = false;
+          });
+        }
+
+      } else if (flag == "DWXZ") {
+        if (self.tableDataLengthDwXz > 5000) {
+          self.$message({
+            type: "error",
+            message: "最多只能导出5000条"
+          });
+          loading.close();
+        }else{
+          self.propdefaultFormTheadDw.forEach(val => {
+            tHeader.push(val.label);
+            filterVal.push(val.prop);
+          });
+          let excelHeader = self.zdyDwName + self.excelHeader;
+          let json = self.creteForm(flag, self.zdyUnitCode, "export");
+          self.doQueryRequestDwXz(JSON.stringify(json)).then(res => {
+            if (res.success === true) {
               require.ensure([], () => {
                 const {
                   export_json_to_excel
@@ -618,17 +621,18 @@ export default {
                 const data = self.formatJson(filterVal, list);
                 export_json_to_excel(tHeader, data, excelHeader);
               });
+              loading.close();
+            } else {
+              loading.close();
+              self.$message({
+                type: "error",
+                message: "查询失败"
+              });
             }
-            loading.close();
-          } else {
-            loading.close();
-            self.$message({
-              type: "error",
-              message: "查询失败"
-            });
-          }
-          self.tableLoadingEmit = false;
-        });
+            self.tableLoadingEmit = false;
+          });
+        }
+
       }
     },
     handleCurrentChange(val) {