设备异常

dependabot/npm_and_yarn/fir_admin/async-2.6.4
nineven 3 years ago
parent 5eb947843e
commit 4cd0dc7586
  1. 20
      fir_client/src/components/user/FirSuperSignBase.vue
  2. 10
      fir_ser/xsign/utils/supersignutils.py

@ -857,11 +857,18 @@
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
:formatter="deviceformatter"
align="center"
label="添加时间"
prop="created_time"
width="100">
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
label="开发者ID" label="开发者ID"
prop="developer_id" prop="developer_id"
width="200"> width="170">
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover placement="top" trigger="hover"> <el-popover placement="top" trigger="hover">
<p>开发者ID: {{ scope.row.developer_id }}</p> <p>开发者ID: {{ scope.row.developer_id }}</p>
@ -941,7 +948,7 @@
align="center" align="center"
label="开发者ID" label="开发者ID"
prop="developer_id" prop="developer_id"
width="200"> width="170">
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover placement="top" trigger="hover"> <el-popover placement="top" trigger="hover">
<p>开发者ID: {{ get_developer_uid(scope.row.developer_id) }}</p> <p>开发者ID: {{ get_developer_uid(scope.row.developer_id) }}</p>
@ -972,7 +979,7 @@
align="center" align="center"
label="授权时间" label="授权时间"
prop="created_time" prop="created_time"
width="160"> width="100">
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -1019,7 +1026,7 @@
<p>UDID: {{ scope.row.udid }}</p> <p>UDID: {{ scope.row.udid }}</p>
<p>开发者ID: {{ scope.row.issuer_id }}</p> <p>开发者ID: {{ scope.row.issuer_id }}</p>
<div slot="reference" class="name-wrapper"> <div slot="reference" class="name-wrapper">
<el-tag size="medium">{{ scope.row.udid }}</el-tag> {{ scope.row.udid }}
</div> </div>
</el-popover> </el-popover>
</template> </template>
@ -1057,6 +1064,7 @@
<el-table-column <el-table-column
align="center" align="center"
label="开发者ID" label="开发者ID"
width="170"
prop="issuer_id"> prop="issuer_id">
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover placement="top" trigger="hover"> <el-popover placement="top" trigger="hover">
@ -1093,7 +1101,7 @@
align="center" align="center"
label="添加时间" label="添加时间"
prop="created_time" prop="created_time"
width="160"> width="100">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
@ -1106,6 +1114,7 @@
<el-button <el-button
size="mini" size="mini"
type="danger" type="danger"
plain
@click="udidDeleteFun(scope,0)">仅删除 @click="udidDeleteFun(scope,0)">仅删除
</el-button> </el-button>
</el-tooltip> </el-tooltip>
@ -1115,6 +1124,7 @@
<el-button <el-button
size="mini" size="mini"
type="danger" type="danger"
plain
@click="udidDeleteFun(scope,1)">删除并禁用设备 @click="udidDeleteFun(scope,1)">删除并禁用设备
</el-button> </el-button>
</el-tooltip> </el-tooltip>

@ -612,11 +612,12 @@ class IosUtils(object):
return status, device_obj return status, device_obj
if device_obj and device_obj.status not in ['ENABLED', 'DISABLED']: if device_obj and device_obj.status not in ['ENABLED', 'DISABLED']:
if not IosUtils.check_device_status(developer_obj, org_device_obj=device_obj)[0]: status, sync_device_obj = IosUtils.check_device_status(developer_obj, org_device_obj=device_obj)
if not status:
update_or_create_developer_udid_info(device_obj, developer_obj) update_or_create_developer_udid_info(device_obj, developer_obj)
return False, 'UNEXPECTED_ERROR' return False, 'UNEXPECTED_ERROR'
else:
sync_device_obj, _ = update_or_create_developer_udid_info(device_obj, developer_obj) sync_device_obj, _ = update_or_create_developer_udid_info(device_obj, developer_obj)
# 更新设备状态 # 更新设备状态
# 1. UDIDsyncDeveloper 库,通过udid 更新或创建设备信息 # 1. UDIDsyncDeveloper 库,通过udid 更新或创建设备信息
@ -698,7 +699,8 @@ class IosUtils(object):
return False, err_msg return False, err_msg
else: else:
if org_device_obj and org_device_obj.id == device_obj.id: if org_device_obj and org_device_obj.id == device_obj.id:
org_device_obj.status = device_obj.status sync_device_obj, _ = update_or_create_developer_udid_info(device_obj, developer_obj)
return True, sync_device_obj
return True, '' return True, ''
@staticmethod @staticmethod

Loading…
Cancel
Save