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

# Conflicts:
#	2022/aiot-evaluate/src/components/form/IpuForm.vue

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

@@ -195,6 +195,7 @@ const dialogData = ref({
      label: '资源类型',
      value: 1,
      attrs: {
        disabled: false,
        col: 2,
        radios: [{
          text: '目录',
@@ -269,7 +270,7 @@ const dialogData = ref({
      label: '排序',
      value: '',
      attrs: {
        col: 2,
        col: 1,
        min: 1,
        clearable: true
      },
@@ -330,16 +331,27 @@ function parseData (data) {
  }
  return data;
};
function childrenWithNameToChildren (result) {
  result.forEach((item) => {
    if (item.childrenWithName.length !== 0) {
      item.children = item.childrenWithName;
      childrenWithNameToChildren(item.childrenWithName);
    }
  });
  return result;
}
// 获取api表单数据
async function getPermissionData (params) {
  await proxy
    .$reqGetParam(proxy.$api.managementPermissionApi.listAll, params)
    .then((res) => {
      pageData.value.table.tableData = parseData(res.data.data);
      // 1. 将res中childrenWithName的值赋给children进行展示
      // 2. 资源类型的映射
      const result = JSON.parse(JSON.stringify(res.data.data));
      pageData.value.table.tableData = parseData(childrenWithNameToChildren(result));
    })
    .catch((e) => {
      console.log(e);
      ElMessage.error('获取资源数据失败');
    });
};
@@ -366,8 +378,12 @@ async function createPermission (params) {
  await proxy
    .$reqPost(proxy.$api.managementPermissionApi.addPermission, params)
    .then((res) => {
      getPermissionData();
      cancelDialog();
      if (res.data.code === 200) {
        getPermissionData();
        cancelDialog();
      } else {
        ElMessage.error(res.data.message);
      }
    })
    .catch((e) => {
      ElMessage.error('新建API资源失败');
@@ -380,8 +396,12 @@ async function changePermission (params) {
  await proxy
    .$reqPost(proxy.$api.managementPermissionApi.updatePermission, params)
    .then((res) => {
      getPermissionData();
      cancelDialog();
      if (res.data.code === 200) {
        getPermissionData();
        cancelDialog();
      } else {
        ElMessage.error('更新API资源失败');
      }
    })
    .catch((e) => {
      ElMessage.error('更新API资源失败');
@@ -446,12 +466,17 @@ function addApi() {
      item.attrs.options.length = 0;
      item.attrs.disabled = false;
    }
    if (item.name === 'type') {
      item.attrs.disabled = false;
    }
    if (item.name === 'clientId') {
      item.attrs.disabled = false;
    }
  });
}
// 编辑按钮
function editRow(row) {
  console.log(row);
  dialogData.value.drawerData = {
    title: '编辑API资源',
    type: 'edit',
@@ -475,11 +500,12 @@ function editRow(row) {
          type: 1
        };
        queryByType(params);
        item.attrs.disabled = false;
        item.attrs.disabled = true;
      }
    }
    // 资源路径是否显示
    if (item.name === 'type') {
      item.attrs.disabled = true;
      if (row.type === 1) {
        dialogData.value.forms.map((x) => {
          if (x.name === 'uri') {
@@ -496,6 +522,9 @@ function editRow(row) {
        });
      }
    }
    if (item.name === 'clientId') {
      item.attrs.disabled = true;
    }
  });
}

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

@@ -283,7 +283,7 @@ async function createClient (params) {
        search(param);
        cancelDialog();
      } else {
        ElMessage.error('新建应用失败');
        ElMessage.error(res.data.message);
      }
    })
    .catch((e) => {
@@ -305,7 +305,7 @@ async function changeClient (params) {
        search(param);
        cancelDialog();
      } else {
        ElMessage.error('更新应用失败');
        ElMessage.error(res.data.message);
      }
    })
    .catch((e) => {
@@ -326,7 +326,7 @@ async function deleteClient (clientId) {
        };
        search(param);
      } else {
        ElMessage.error('删除应用失败');
        ElMessage.error(res.data.message);
      }
    })
    .catch((e) => {

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

@@ -98,7 +98,7 @@ const pageData = ref({
      },
      {
        label: '所属应用',
        name: 'clientId',
        name: 'clientName',
        'min-width': '200'
      },
      {
@@ -230,6 +230,7 @@ const dialogData = ref({
    label: '角色描述',
    value: '',
    attrs: {
      col: 1,
      style: {
        width: '745px'
      },
@@ -237,8 +238,7 @@ const dialogData = ref({
      maxlength: 100,
      clearable: true,
      placeholder: '请输入角色描述，最多可输入100字',
      type: 'textarea',
      col: 2
      type: 'textarea'
    }
  }],
  // form按钮
@@ -377,9 +377,9 @@ async function getClientData() {
      // 动态添加至搜索框中
      const clientId = 'clientId';
      const clientName = 'clientName';
      addToSelect(pageData, res, clientId, clientName, clientName);
      addToSelect(pageData, res, clientId, clientName, clientId);
      // 动态添加至弹窗中
      addToSelect(dialogData, res, clientId, clientName, clientName);
      addToSelect(dialogData, res, clientId, clientName, clientId);
    })
    .catch((e) => {
      ElMessage.error('获取应用数据失败');
@@ -399,7 +399,7 @@ async function createRole(params) {
        search(param);
        cancelDialog();
      } else {
        ElMessage.error(res.data.data.message);
        ElMessage.error(res.data.message);
      }
    })
    .catch((e) => {