From e559267de39e996bc59354fc2245c46cf9a28d16 Mon Sep 17 00:00:00 2001
From: youngS <ly_1301b@163.com>
Date: Tue, 14 Dec 2021 17:53:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8B=B9=E6=9E=9C=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E8=80=85=E5=A4=87=E6=B3=A8=E6=98=BE=E7=A4=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/user/FirSuperSignBase.vue  | 61 ++++++++++++++++---
 fir_ser/api/utils/serializer.py               | 24 +++++++-
 2 files changed, 75 insertions(+), 10 deletions(-)

diff --git a/fir_client/src/components/user/FirSuperSignBase.vue b/fir_client/src/components/user/FirSuperSignBase.vue
index 4308c2c..dc542d2 100644
--- a/fir_client/src/components/user/FirSuperSignBase.vue
+++ b/fir_client/src/components/user/FirSuperSignBase.vue
@@ -527,6 +527,15 @@
               label="开发者ID"
               prop="developer_id"
               width="200">
+            <template slot-scope="scope">
+              <el-popover placement="top" trigger="hover">
+                <p>开发者ID: {{ scope.row.developer_id }}</p>
+                <p>开发者备注: {{ scope.row.developer_description }}</p>
+                <div slot="reference" class="name-wrapper">
+                  <span>{{ scope.row.developer_id }}</span>
+                </div>
+              </el-popover>
+            </template>
           </el-table-column>
 
         </el-table>
@@ -589,9 +598,18 @@
               label="开发者ID"
               prop="developer_id"
               width="200">
+            <template slot-scope="scope">
+              <el-popover placement="top" trigger="hover">
+                <p>开发者ID: {{ scope.row.developer_id }}</p>
+                <p>开发者备注: {{ scope.row.developer_description }}</p>
+                <div slot="reference" class="name-wrapper">
+                  <span>{{ scope.row.developer_id }}</span>
+                </div>
+              </el-popover>
+            </template>
           </el-table-column>
           <el-table-column
-              v-if="$store.state.userinfo&&$store.state.userinfo.role == 3"
+              v-if="$store.state.userinfo&&$store.state.userinfo.role === 3"
               align="center"
               label="被使用户uid"
               prop="other_uid">
@@ -612,12 +630,17 @@
             v-model="udidsearch"
             clearable
             placeholder="输入UDID"
-            style="width: 30%;margin-right: 30px;margin-bottom: 10px"/>
+            style="width: 27%;margin-right: 10px;margin-bottom: 10px"/>
         <el-input
             v-model="Bundleidsearch"
             clearable
             placeholder="输入BundleID"
-            style="width: 30%;margin-right: 30px;margin-bottom: 10px"/>
+            style="width: 27%;margin-right: 10px;margin-bottom: 10px"/>
+        <el-input
+            v-model="appidseach"
+            clearable
+            placeholder="输入开发者ID"
+            style="width: 27%;margin-right: 10px;margin-bottom: 10px"/>
         <el-button icon="el-icon-search" type="primary" @click="handleCurrentChange(1)">
           搜索
         </el-button>
@@ -641,6 +664,7 @@
                 <p>Bundle_ID: {{ scope.row.bundle_id }}</p>
                 <p>应用名称: {{ scope.row.bundle_name }}</p>
                 <p>UDID: {{ scope.row.udid }}</p>
+                <p>开发者ID: {{ scope.row.issuer_id }}</p>
                 <div slot="reference" class="name-wrapper">
                   <el-tag size="medium">{{ scope.row.udid }}</el-tag>
                 </div>
@@ -651,7 +675,7 @@
               align="center"
               label="imei"
               prop="imei"
-              width="160">
+              width="100">
 
           </el-table-column>
           <el-table-column
@@ -665,15 +689,34 @@
               label="设备型号"
               prop="version"
               width="100">
+
+            <template slot-scope="scope">
+              <el-popover placement="top" trigger="hover">
+                <p>设备型号: {{ scope.row.version }}</p>
+                <p>设备序列号: {{ scope.row.serial }}</p>
+                <div slot="reference" class="name-wrapper">
+                  <span>{{ scope.row.version }}</span>
+                </div>
+              </el-popover>
+            </template>
+
           </el-table-column>
           <el-table-column
               align="center"
-              label="设备序列号"
-              prop="serial"
-              width="140">
+              label="开发者ID"
+              prop="issuer_id">
+            <template slot-scope="scope">
+              <el-popover placement="top" trigger="hover">
+                <p>开发者ID: {{ scope.row.issuer_id }}</p>
+                <p>开发者备注: {{ scope.row.developer_description }}</p>
+                <div slot="reference" class="name-wrapper">
+                  <span>{{ scope.row.issuer_id }}</span>
+                </div>
+              </el-popover>
+            </template>
           </el-table-column>
           <el-table-column
-              v-if="$store.state.userinfo&&$store.state.userinfo.role == 3"
+              v-if="$store.state.userinfo&&$store.state.userinfo.role === 3"
               align="center"
               label="被使用户uid"
               prop="other_uid">
@@ -689,7 +732,7 @@
               align="center"
               fixed="right"
               label="操作"
-              width="110">
+              width="100">
             <template slot-scope="scope">
               <el-button
                   v-if="scope.row.is_mine"
diff --git a/fir_ser/api/utils/serializer.py b/fir_ser/api/utils/serializer.py
index c7b924b..76a43a7 100644
--- a/fir_ser/api/utils/serializer.py
+++ b/fir_ser/api/utils/serializer.py
@@ -532,7 +532,7 @@ class AdminDeveloperSerializer(DeveloperSerializer):
 class SuperSignUsedSerializer(serializers.ModelSerializer):
     class Meta:
         model = models.APPSuperSignUsedInfo
-        fields = ["created_time", "device_udid", "device_name", "developer_id", "bundle_id", "bundle_name", "other_uid"]
+        fields = ["created_time", "device_udid", "device_name", "developer_id", "bundle_id", "bundle_name", "other_uid", "developer_description"]
 
     device_udid = serializers.CharField(source="udid.udid.udid")
     device_name = serializers.CharField(source="udid.product")
@@ -540,6 +540,7 @@ class SuperSignUsedSerializer(serializers.ModelSerializer):
     bundle_name = serializers.CharField(source="app_id.name")
     other_uid = serializers.SerializerMethodField()
     developer_id = serializers.SerializerMethodField()
+    developer_description = serializers.SerializerMethodField()
 
     def get_developer_id(self, obj):
         if self.context.get('mine'):
@@ -547,6 +548,12 @@ class SuperSignUsedSerializer(serializers.ModelSerializer):
         else:
             return '公共账号池'
 
+    def get_developer_description(self, obj):
+        if self.context.get('mine'):
+            return obj.developerid.description
+        else:
+            return '公共账号池'
+
     def get_other_uid(self, obj):
         user_obj = self.context.get('user_obj')
         role = 0
@@ -578,6 +585,7 @@ class DeveloperDeviceSerializer(serializers.ModelSerializer):
         exclude = ["id", "developerid"]
 
     developer_id = serializers.CharField(source="developerid.issuer_id")
+    developer_description = serializers.CharField(source="developerid.description")
 
 
 class DeviceUDIDSerializer(serializers.ModelSerializer):
@@ -588,10 +596,24 @@ class DeviceUDIDSerializer(serializers.ModelSerializer):
 
     bundle_name = serializers.CharField(source="app_id.name")
     bundle_id = serializers.CharField(source="app_id.bundle_id")
+    issuer_id = serializers.SerializerMethodField()
+    developer_description = serializers.SerializerMethodField()
     udid = serializers.CharField(source="udid.udid")
     is_mine = serializers.SerializerMethodField()
     other_uid = serializers.SerializerMethodField()
 
+    def get_issuer_id(self, obj):
+        if self.context.get('mine'):
+            return obj.udid.developerid.issuer_id
+        else:
+            return '公共账号池'
+
+    def get_developer_description(self, obj):
+        if self.context.get('mine'):
+            return obj.udid.developerid.description
+        else:
+            return '公共账号池'
+
     def get_other_uid(self, obj):
         user_obj = self.context.get('user_obj')
         role = 0