From f5d88e4f31bec1d77721c0795afde3f3a571e9aa Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 11 Aug 2021 15:55:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

---
 src/views/securityGuard/securityGuardDetail.vue |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/views/securityGuard/securityGuardDetail.vue b/src/views/securityGuard/securityGuardDetail.vue
index 398bdaa..aae9a3f 100644
--- a/src/views/securityGuard/securityGuardDetail.vue
+++ b/src/views/securityGuard/securityGuardDetail.vue
@@ -37,7 +37,13 @@
   trackRecordColumn,
 } from "./data";
 import { getUserPractitionersInfo } from "@/api/system/user";
-import { add, update, page, remove } from "@/api/performance/performance";
+import {
+  getPerformanceInfo,
+  add,
+  update,
+  page,
+  remove,
+} from "@/api/performance/performance";
 export default {
   data() {
     return {
@@ -154,16 +160,20 @@
     getPractitionersPageInfo() {
       var that = this;
       //获取用户从业信息
-      console.log(this.cardid, "cid");
-      getUserPractitionersInfo(this.cardid).then((res1) => {
+      console.log(this.id, "cid");
+      getUserPractitionersInfo(this.id).then((res1) => {
         that.data1 = res1.data.data;
       });
     },
     //查询当前保安员的现实表现记录信息
     getPerformancePageInfo() {
       //获取现实表现信息
+      // getPerformanceInfo(this.id).then((res) => {
+      //   that.data2 = res1.data.data;
+      //   console.log(that.data2, 1);
+      // });
       var param = {
-        cardid: this.cardid,
+        securityid: this.id,
       };
       page(this.current, this.size, param).then((res2) => {
         const data = res2.data.data;
@@ -174,7 +184,7 @@
       });
     },
     rowSave2(form, done, loading) {
-      form.cardid = this.cardid;
+      form.securityid = this.id;
       add(form).then(
         (res) => {
           this.getPerformancePageInfo(this.page2);
@@ -192,7 +202,7 @@
       // }
     },
     rowUpdate2(row, index, done, loading) {
-      row.cardid = this.cardid;
+      row.securityid = this.id;
       update(row).then(
         () => {
           this.getPerformancePageInfo(this.page2);

--
Gitblit v1.9.3