2022/3/8

minggao/src/main.js

@@ -53,13 +53,13 @@ Vue.config.productionTip = false
 const axios = require('axios')
 const Qs = require('qs')
 
-Vue.prototype.$imghost = 'http://192.168.1.17:12345' // 翟毅飞本地图片服务器路径常量
+Vue.prototype.$imghost = Vue.prototype.DOMIN // 翟毅飞本地图片服务器路径常量
 // Vue.prototype.$imghost = 'http://www.hnyfwlw.com:8006/projectimg' // 线上图片服务器路径常量
 Vue.prototype.$insectHost = 'https://images.weserv.nl/?url=' // 线上图片服务器路径常量
 Vue.prototype.$wsUrl = Vue.prototype.wsUrl  // 实时通信服务器url 
 Vue.prototype.$deriveData = Vue.prototype.DOMIN // 导出
 // Vue.prototype.$deriveData = 'http://192.168.1.112:8002' // 导出
-Vue.prototype.$faultvideo = 'http://192.168.1.3:8000' //售后视频地址前缀
+Vue.prototype.$faultvideo = Vue.prototype.DOMIN //售后视频地址前缀
 
 import VueHighcharts from 'vue-highcharts';
 Vue.use(VueHighcharts);

minggao/src/page/commandCenter/laboratory.vue

@@ -77,6 +77,9 @@
         style="width: 100%; overflow-y: auto"
       >
         <el-table-column prop="serial" label="序号" width="100">
+          <template slot-scope="scope">
+            <span>{{ ((page-1)*20)+scope.row.serial}}</span>
+          </template>
         </el-table-column>
         <el-table-column prop="trap_number" label="设备编号" width="120">
         </el-table-column>

minggao/src/page/commandCenter/realTime.vue

@@ -56,6 +56,9 @@
             style="width: 100%; overflow-y: auto"
           >
             <el-table-column prop="ind" label="序号" width="180">
+              <template slot-scope="scope">
+                <span>{{ (page - 1) * 20 + scope.row.ind }}</span>
+              </template>
             </el-table-column>
             <el-table-column prop="real_name" label="组织成员" width="330">
             </el-table-column>
@@ -373,7 +376,7 @@ export default {
       loading2: false,
       defaultProps: {
         children: "childrens",
-        label: "org_name"
+        label: "org_name",
       },
 
       // 分页
@@ -416,7 +419,7 @@ export default {
       websock: null,
       getUserObj: {}, // 获取到当前点击的行数据
       msgList: [], //当前点击的账号消息列表
-      userName: ""
+      userName: "",
     };
   },
   //监听属性 类似于data概念
@@ -429,7 +432,7 @@ export default {
         this.fullHeight = val;
         this.timer = true;
         let that = this;
-        setTimeout(function() {
+        setTimeout(function () {
           //防止过度调用监测事件，导致卡顿
           that.timer = false;
         }, 400);
@@ -472,7 +475,7 @@ export default {
           }
         }
       }
-    }
+    },
     // 测试
   },
   //方法集合
@@ -516,21 +519,21 @@ export default {
         data: this.qs.stringify({
           page: this.page,
           page_item: "100000000",
-          org_name: ""
-        })
+          org_name: "",
+        }),
       })
-        .then(res => {
+        .then((res) => {
           if (res.data.data.page_list.length !== 0) {
             var obj = {
               org_name: "全部",
-              id: ""
+              id: "",
             };
             var data = res.data.data.page_list;
             this.data = [obj, ...data]; // 左侧组织列表
           }
           this.loading2 = false;
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading2 = false;
         });
     },
@@ -545,10 +548,10 @@ export default {
           page_item: "20",
           real_name: this.nameVal, //用户名称
           mobile: this.phoneVal, // 电话
-          org_id: this.org_id
-        })
+          org_id: this.org_id,
+        }),
       })
-        .then(res => {
+        .then((res) => {
           if (res.data.data.total_item !== 0) {
             var data = res.data.data.page_list;
             var list = [];
@@ -561,7 +564,7 @@ export default {
             this.loading = false;
           }
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading = false;
         });
     },
@@ -578,8 +581,8 @@ export default {
         recv_user_id: data.user_id,
         data: {
           msg_status: false,
-          msg_info: ""
-        }
+          msg_info: "",
+        },
       };
       this.websock.send(JSON.stringify(obj)); // 获取聊天记录
       var readObj = {};
@@ -588,8 +591,8 @@ export default {
         send_user_id: data.user_id,
         data: {
           msg_status: false,
-          msg_info: ""
-        }
+          msg_info: "",
+        },
       };
       this.websock.send(JSON.stringify(readObj)); // 消息已读
       this.dialogVisible = true;
@@ -609,8 +612,8 @@ export default {
         recv_user_id: data.user_id,
         data: {
           msg_status: false,
-          msg_info: ""
-        }
+          msg_info: "",
+        },
       };
       this.websock.send(JSON.stringify(obj));
       // // 登录房间
@@ -676,10 +679,10 @@ export default {
     // 当音视频通话关闭时的回调
     handleClose(done) {
       this.$confirm("目前正在音视频通话中,确认关闭？")
-        .then(_ => {
+        .then((_) => {
           done();
         })
-        .catch(_ => {});
+        .catch((_) => {});
     },
 
     // 发送消息
@@ -689,7 +692,7 @@ export default {
           this.$message({
             message: "不能发送空白消息！",
             type: "warning",
-            duration: 1500
+            duration: 1500,
           });
         }
         this.input = "";
@@ -701,8 +704,8 @@ export default {
             recv_user_id: this.getUserObj.user_id,
             data: {
               msg_status: false,
-              msg_info: this.input
-            }
+              msg_info: this.input,
+            },
           };
           var v = JSON.stringify(obj);
           this.websock.send(v);
@@ -734,7 +737,7 @@ export default {
         this.websock = new window.WebSocket(
           this.url + "&token=" + localStorage.getItem("session")
         );
-        this.websock.onopen = event => {
+        this.websock.onopen = (event) => {
           console.log("WebSocket：已连接");
           console.log(event);
           // 发送消息 - 获取对话列表
@@ -744,12 +747,12 @@ export default {
             recv_user_id: "",
             data: {
               msg_status: false,
-              msg_info: ""
-            }
+              msg_info: "",
+            },
           };
           this.websock.send(JSON.stringify(obj1));
         };
-        this.websock.onmessage = event => {
+        this.websock.onmessage = (event) => {
           // console.log("WebSocket:消息");
           var data = JSON.parse(event.data);
           if (data.action == "none") {
@@ -778,8 +781,8 @@ export default {
               recv_user_id: this.getUserObj.user_id,
               data: {
                 msg_status: false,
-                msg_info: ""
-              }
+                msg_info: "",
+              },
             };
             this.websock.send(JSON.stringify(obj));
           } else if (data.action == "recv_video") {
@@ -797,7 +800,7 @@ export default {
                 { userID: this.UserID, userName: this.UserID },
                 { userUpdate: true }
               )
-              .then(result => {
+              .then((result) => {
                 if (result == true) {
                   console.log("0000000000000000000000000000000000000登录成功");
                   this.plugFlow(); //推流
@@ -806,11 +809,11 @@ export default {
               });
           }
         };
-        this.websock.onerror = event => {
+        this.websock.onerror = (event) => {
           console.log("WebSocket:发生错误 ");
           console.log(event);
         };
-        this.websock.onclose = event => {
+        this.websock.onclose = (event) => {
           console.log("WebSocket:已关闭");
           console.log(event);
         };
@@ -841,7 +844,7 @@ export default {
                 this.$message({
                   message: "没人接听，请稍后重试",
                   type: "warning",
-                  duration: 2500
+                  duration: 2500,
                 });
               }
               this.videoVisible = false;
@@ -887,7 +890,7 @@ export default {
         }
       );
 
-      this.zg.on("publisherStateUpdate", result => {
+      this.zg.on("publisherStateUpdate", (result) => {
         // 推流状态更新回调
         console.log("推流状态更新");
       });
@@ -924,7 +927,7 @@ export default {
       } else {
         console.log("不兼容");
       }
-    }
+    },
   },
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {
@@ -953,7 +956,7 @@ export default {
   updated() {}, //生命周期 - 更新之后
   beforeDestroy() {}, //生命周期 - 销毁之前
   destroyed() {}, //生命周期 - 销毁完成
-  activated() {} //如果页面有keep-alive缓存功能，这个函数会触发
+  activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
 };
 </script>
 <style lang="less" scoped>

minggao/src/page/commandCenter/supervise.vue

@@ -83,7 +83,11 @@
         :height="48 * 13"
         style="width: 100%; overflow-y: auto"
       >
-        <el-table-column prop="ind" label="序号" width="100"> </el-table-column>
+        <el-table-column prop="ind" label="序号" width="100">
+          <template slot-scope="scope">
+            <span>{{ ((page-1)*20)+scope.row.ind}}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="task_id" label="任务编号" width="180">
         </el-table-column>
         <el-table-column prop="supervisor_user" label="监督人" width="180">

minggao/src/page/commandCenter/superviseAdmin.vue

@@ -107,7 +107,11 @@
         style="width: 100%; overflow-y: auto"
         :height="48 * 13"
       >
-        <el-table-column prop="ind" label="序号" width="80"> </el-table-column>
+        <el-table-column prop="ind" label="序号" width="80">
+          <template slot-scope="scope">
+            <span>{{ ((page-1)*20)+scope.row.ind}}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="task_id" label="任务编号" width="100">
         </el-table-column>
         <el-table-column prop="task_type" label="任务类型" width="180">

minggao/src/page/commandCenter/superviseLog.vue

@@ -87,7 +87,11 @@
           </template>
         </el-table-column> -->
 
-        <el-table-column prop="ind" label="序号"> </el-table-column>
+        <el-table-column prop="ind" label="序号">
+          <template slot-scope="scope">
+            <span>{{ ((page-1)*20)+scope.row.ind}}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="owner_user" label="监测人员"> </el-table-column>
         <el-table-column prop="monitor_time" label="监测时间">
         </el-table-column>

minggao/src/page/commandCenter/taskRegulator.vue

@@ -109,7 +109,11 @@
         :height="48 * 13"
         style="width: 100%; overflow-y: auto"
       >
-        <el-table-column prop="ind" label="序号" width="80"></el-table-column>
+        <el-table-column prop="ind" label="序号" width="80">
+          <template slot-scope="scope">
+            <span>{{ ((page-1)*20)+scope.row.ind}}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="task_id" label="任务编号" width="100">
         </el-table-column>
         <el-table-column

minggao/src/page/forecasting/maintain/maintain.vue

@@ -21,7 +21,11 @@
     <el-card class="box-card" style="margin-top: 15px">
       <div class="cbdboxs_table" v-loading="loading">
         <el-table :data="tableData" style="width: 100%" :stripe="true" :height="48*13">
-          <el-table-column prop="index" label="序号"> </el-table-column>
+          <el-table-column prop="index" label="序号">
+            <template slot-scope="scope">
+            <span>{{ ((page-1)*20)+scope.row.index}}</span>
+          </template>
+          </el-table-column>
           <el-table-column
             prop="point_name"
             label="监测点名称"

minggao/src/page/forecasting/trap/bait.vue

@@ -26,7 +26,11 @@
           :stripe="true"
           :height="48 * 13"
         >
-          <el-table-column prop="index" label="序号"> </el-table-column>
+          <el-table-column prop="index" label="序号">
+            <template slot-scope="scope">
+            <span>{{ ((queryInfo.page-1)*20)+scope.row.index}}</span>
+          </template>
+          </el-table-column>
           <el-table-column
             prop="inducer_name"
             label="引诱剂名称"

minggao/src/page/forecasting/trap/fillinrecord.vue

@@ -79,6 +79,9 @@
           :height="48 * 13"
         >
           <el-table-column prop="index" label="序号" width="60px">
+            <template slot-scope="scope">
+            <span>{{ ((queryInfo.page-1)*20)+scope.row.index}}</span>
+          </template>
           </el-table-column>
           <el-table-column prop="trap_number" label="编号"></el-table-column>
           <el-table-column prop="org_name" label="组织">

minggao/src/page/forecasting/trap/trap.vue

@@ -87,8 +87,13 @@
             prop="index"
             label="序号"
             width="60px"
-          ></el-table-column>
-          <el-table-column prop="trap_number" label="编号"></el-table-column>
+          >
+          <template slot-scope="scope">
+            <span>{{ ((queryInfo.page-1)*20)+scope.row.index}}</span>
+          </template>
+          </el-table-column>
+          <el-table-column prop="trap_number" label="编号">
+          </el-table-column>
           <el-table-column prop="lng" label="经度">
             <template slot-scope="scope">
               <span>{{ ToDegrees(scope.row.lng, "lng") }}</span>

minggao/src/page/login/login.vue

@@ -111,7 +111,7 @@ export default {
         // console.log(res.data.data[0].sys_name)
         if(res.data.data[0].sys_name){
           this.title = res.data.data[0].sys_name.slice(0,-6)
-          this.title2 = res.data.data[0].sys_name.slice(-6,data.length)
+          this.title2 = res.data.data[0].sys_name.slice(-6)
         }
       });
     },

minggao/src/page/superviseModule/superviseModule.vue

@@ -79,7 +79,11 @@
         style="width: 100%"
         :height="48 * 13"
       >
-        <el-table-column prop="ind" label="序号" width="180"> </el-table-column>
+        <el-table-column prop="ind" label="序号" width="180">
+          <template slot-scope="scope">
+            <span>{{ ((page-1)*20)+scope.row.ind}}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="supervisor_user" label="监督人" width="180">
         </el-table-column>
         <el-table-column

minggao/src/page/systemmanger/dayRecord.vue

@@ -54,7 +54,11 @@
         :height="48 * 13"
         style="width: 100%;overflow-y: auto"
       >
-        <el-table-column prop="id" label="序号" width="180"> </el-table-column>
+        <el-table-column prop="id" label="序号" width="180">
+          <template slot-scope="scope">
+            <span>{{ ((page-1)*20)+scope.row.id}}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="create_time" label="操作时间" width="200">
         </el-table-column>
         <el-table-column

minggao/src/page/systemmanger/harmfulBiology.vue

@@ -83,7 +83,11 @@
         :height="48 * 13"
         style="width: 100%"
       >
-        <el-table-column prop="ind" label="序号"> </el-table-column>
+        <el-table-column prop="ind" label="序号">
+          <template slot-scope="scope">
+            <span>{{ ((page-1)*20)+scope.row.ind}}</span>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="pest_name"
           :show-overflow-tooltip="true"

minggao/src/page/systemmanger/role.vue

@@ -72,7 +72,11 @@
         style="width: 100%;overflow-y: auto"
         :height="48 * 13"
       >
-        <el-table-column prop="ind" label="序号"></el-table-column>
+        <el-table-column prop="ind" label="序号">
+          <template slot-scope="scope">
+            <span>{{ ((page-1)*20)+scope.row.ind}}</span>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="role_name"
           :show-overflow-tooltip="true"

minggao/src/page/systemmanger/userManger.vue

@@ -59,6 +59,9 @@
             style="width: 100%; overflow-y: auto"
           >
             <el-table-column prop="ind" label="序号" width="90">
+              <template slot-scope="scope">
+                <span>{{ (page - 1) * 20 + scope.row.ind }}</span>
+              </template>
             </el-table-column>
             <el-table-column prop="real_name" label="姓名" width="190">
             </el-table-column>
@@ -89,7 +92,11 @@
                 >
                   <div class="popover-content" v-html="content"></div>
                   <span @mouseover="orglisthover(scope.row)" slot="reference"
-                    >{{ scope.row.org_list.length==0?"暂无组织":scope.row.org_list[0].org_name }}...</span
+                    >{{
+                      scope.row.org_list.length == 0
+                        ? "暂无组织"
+                        : scope.row.org_list[0].org_name
+                    }}...</span
                   >
                 </el-popover>
               </template>
@@ -114,7 +121,11 @@
                 >
                   <div class="popover-content" v-html="content2"></div>
                   <span @mouseover="orglisthover2(scope.row)" slot="reference"
-                    >{{ scope.row.role_list.length==0?"暂无组织":scope.row.role_list[0].role_list }}...</span
+                    >{{
+                      scope.row.role_list.length == 0
+                        ? "暂无组织"
+                        : scope.row.role_list[0].role_list
+                    }}...</span
                   >
                 </el-popover>
               </template>
@@ -436,8 +447,8 @@ export default {
 
       isClick: true, // 防止重复弹框
       submitBtn: false, // 防止弹框确定按钮重复请求
-      content:"",
-      content2:""
+      content: "",
+      content2: "",
     };
   },
   //监听属性 类似于data概念
@@ -698,7 +709,7 @@ export default {
 
     // 搜索
     searchData() {
-      this.page = 1
+      this.page = 1;
       this.loading2 = true;
       this.userListData();
     },
@@ -883,14 +894,14 @@ export default {
       }
       this.content = str;
     },
-    orglisthover2(e){
+    orglisthover2(e) {
       console.log(e);
       var str = ``;
       for (var i = 0; i < e.role_list.length; i++) {
         str += `<p>` + e.role_list[i].role_list + `</p>`;
       }
       this.content2 = str;
-    }
+    },
   },
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {},

minggao/src/util/http.js

@@ -15,11 +15,11 @@ Vue.prototype.DOMIN = DOMIN
 Vue.prototype.wsUrl = wsUrl // 实时通信Url
 Vue.prototype.mapJson = mapJson //请求地图json,不带端口号
 // console.log(DOMIN)
-// axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
-// axios.defaults.timeout = 30000;
-// axios.defaults.withCredentials = true //axios请求时携带session
-// axios.defaults.crossDomain = true
-// axios.defaults.baseURL = DOMIN
+axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
+axios.defaults.timeout = 30000;
+axios.defaults.withCredentials = true //axios请求时携带session
+axios.defaults.crossDomain = true
+axios.defaults.baseURL = DOMIN
 
 
 // axios请求前的拦截