田源
2023-09-18 80cb8edcb5e5d8455532035950ef69dcb89cbbe4
元数据管理-枚举查询联调修复bug
已修改3个文件
38 ■■■■■ 文件已修改
Source/UBCS-WEB/src/config/website.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/views/modeling/originalAdd.vue 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/views/wel/Statistic.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/config/website.js
@@ -46,7 +46,7 @@
  // 报表设计器地址(cloud端口为8108,boot端口为80)
  reportUrl: 'http://localhost:8108/ureport',
  // 单点登录系统认证(ubcs-auth服务的地)
  ssoUrl:'',
  ssoUrl:'http://localhost:37000/oauth/authorize?client_id=saber&response_type=code&redirect_uri=',
  // 单点登录回调地址(Saber服务的地址)
  redirectUri: 'http://localhost:1888',
  redirectUri: 'http://localhost:37000',
}
Source/UBCS-WEB/src/views/modeling/originalAdd.vue
@@ -300,18 +300,20 @@
    },
    methods: {
      onSubmit() {
        const conditionMap = {};
        if (this.form.name) {
          conditionMap[`conditionMap['name_like']`] = this.form.name;
        if (this.form.name || this.form.label) {
          const params = {};
          if (this.form.name) {
            params.name = this.form.name;
          }
          if (this.form.label) {
            params.label = this.form.label;
          }
          getParentList(this.enumRefer.enumPage.currentPage, this.enumRefer.enumPage.pageSize, params)
            .then((res) => {
              this.enumRefer.enumPage.total = res.data.data.total;
              this.enumRefer.data = res.data.data.records;
            });
        }
        if (this.form.label) {
          conditionMap[`conditionMap['label_like']`] = this.form.label;
        }
        getParentList(this.enumRefer.enumPage.currentPage, this.enumRefer.enumPage.pageSize, conditionMap)
          .then((res) => {
            this.enumRefer.enumPage.total = res.data.data.total;
            this.enumRefer.data = res.data.data.records;
          });
      },
        enumOnLoad(){
          getParentList(this.enumRefer.enumPage.currentPage, this.enumRefer.enumPage.pageSize).then(res => {
Source/UBCS-WEB/src/views/wel/Statistic.vue
@@ -21,7 +21,7 @@
        {
          click: this.handleItemAClick,
          title: '物品主数据',
          count: 0,
          count: 1723,
          icon: 'iconfont iconicon_doc',
          color: 'rgb(49, 180, 141)',
          uiUrl: "/MasterData/items?id=wupin@name=物品主数据",
@@ -30,7 +30,7 @@
        {
          click: this.handleItemBClick,
          title: '人员主数据',
          count: 0,
          count: 1225,
          icon: 'iconfont iconicon_dispose',
          color: 'rgb(56, 161, 242)',
          uiUrl:'/MasterData/items?id=renyuan@@name=人员主数据',
@@ -39,7 +39,7 @@
        {
          click: this.handleItemCClick,
          title: '主题库定义',
          count: 0,
          count: 523,
          icon: 'el-icon-setting',
          color: 'rgb(117, 56, 199)',
          uiUrl:'/modeling/classifyTree',
@@ -59,7 +59,7 @@
  }
  },
  created() {
  // this.getList();
  this.getList();
  },
  computed(){
@@ -78,11 +78,13 @@
      this.$router.push({ path: '/MasterData/items?id=gongyingshang@@name=供应商主数据'} );
    },
    getList() {
      // debugger
      Object.values(this.option.data).map(record => {
        record.count = record.count || 0;
        if (!this.countByServer) {
          // 是前端查询
          getList(record.countUrl, {}).then(res => {
            console.log('res',res)
            if (res.data.data.success) {
              record.count = res.data.data.obj;
            } else {