Merge branch 'master' of http://10.1.235.20:3000/asiainfo/static

# Conflicts:
#	2022/aiot-evaluate/src/views/settings/ApiResourceManagement.vue

2022/aiot-evaluate/src/views/settings/ApiResourceManagement.vue

@@ -276,11 +276,12 @@ const dialogData = ref({
// 搜索
const search = (data) => {
  console.log(data);
  const params = {
    ...data
  };
  console.log(data);
  getPermissionData(params);
  // queryByType({ type: 1 });
  console.log('开始搜索');
};
// 清除搜索
@@ -376,6 +377,7 @@ const changePermission = async (params) => {
};
// 删除API资源
const deletePermission = async(code) => {
  await proxy
    .$reqPost(`${proxy.$api.managementPermissionApi.deletePermission}?code=${code}`)

2022/aiot-evaluate/src/views/settings/ApplicationManagement.vue

@@ -60,23 +60,24 @@ const pageData = ref({
  tableHeader: [{
    label: '应用标识',
    name: 'clientId',
    width: '193'
    'min-width': '193'
  },
  {
    label: '应用名称',
    name: 'clientName',
    width: '193'
    'min-width': '193'
  },
  {
    label: '有效时长（秒）',
    name: 'accessTokenValidity',
    width: '193'
    'min-width': '193'
  },
  {
    label: '操作',
    type: 'custom',
    name: 'custom',
    width: '217'
    width: '217',
    fixed: 'right'
  }],
  tableData: [],
  tableBtns: [{