Merge branch 'dev' of http://39.101.143.165:8090/sxzgd/vue-insagent-pc into dev

src/views/AgreementManage/CarInsurance/AgreementProductFee.vue

@@ -578,7 +578,7 @@
 
           <el-form-item label="费用日期">
             <el-date-picker style="width: 100%;" v-model="productcopyDate" type="daterange" value-format="yyyy-MM-dd"
-              range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="costsEndDateChange1">
+              range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="costsEndDateChange2">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="费用描述">
@@ -1325,7 +1325,7 @@ export default {
           this.productcopyItemResult = res;
         });
     },
-    costsEndDateChange1(e) {
+    costsEndDateChange2(e) {
       this.productcopyItemPageRequest.costsStartDate = e[0];
       this.productcopyItemPageRequest.costsEndDate = e[1];
     },

src/views/PeopleManage/PcLoginRecord.vue

@@ -313,7 +313,7 @@ export default {
     return {
       deptPeopleVisible: false,
       deptPeopleType: 0,
-      deptPeopleId: '',
+      deptPeopleId: null,
       ztreeNodes: [],
       ztreeNodeAll: {},
       deptPeopleValue: true,
@@ -486,7 +486,7 @@ export default {
     },
 
     queryAnalysis(param) {
-      this.$api.user.ipAddrGetPcAddress({ source: this.source, ...param }).then((res) => {
+      this.$api.user.ipAddrGetPcAddress({ source: this.source, ...param,type:this.deptPeopleType,queryId:this.deptPeopleId  }).then((res) => {
         if (res.code == 200) {
           this.onlineHisData = res.data.onlineNum
           this.formatAnalysisDate(res.data.list)
@@ -510,6 +510,7 @@ export default {
                 id: item.id,
                 userId: item.userId,
                 address: item.address,
+                deptName: item.deptName,
                 leaderName: item.leaderName ? item.leaderName : '无',
                 // onlineImg: item.status ? "Frame-1(2).png" : "Frame(2).png",
                 onlineImg: "Frame-1(2).png",

src/views/PeopleManage/UserMap.vue

@@ -324,7 +324,7 @@ export default {
     return {
       deptPeopleVisible:false,
       deptPeopleType:0,
-      deptPeopleId:'',
+      deptPeopleId:null,
       ztreeNodes:[],
       ztreeNodeAll:{},
       deptPeopleValue:true,
@@ -492,7 +492,14 @@ export default {
       this.queryAnalysis({ startTime: val[0], endTime: val[1] });
     },
     queryAnalysis(param) {
-      this.$api.user.getGeographyPosition({ source: this.source, ...param }).then((res) => {
+      // let data={}
+      // if(this.deptPeopleType==1){
+      //   data={
+      //     type:this.deptPeopleType,
+      //     queryId:this.deptPeopleId
+      //   }
+      // }
+      this.$api.user.getGeographyPosition({ source: this.source, ...param,type:this.deptPeopleType,queryId:this.deptPeopleId }).then((res) => {
         if (res.code == 200) {
           this.onlineHisData = res.data.onlineNum
           this.formatAnalysisDate(res.data.list)
@@ -513,6 +520,7 @@ export default {
                 userName: item.userName,
                 id: item.userId,
                 address: item.address,
+                deptName: item.deptName,
                 onlineImg: item.status ? "Frame-1(2).png" : "Frame(2).png",
                 // status: item.status ? "在线" : "离线",
                 status: item.status ? "#1CE247" : "#B2B2B2",