bug修复

public/config.js

@@ -1,52 +1,55 @@
-// window._CONFIG = {
-//   CURRENT_URL: '', // pdf导出地址
-//   TITLE: '几何BI',
-//   SENSORS_HOST: 'http://sp.platomix.net',
-//   // iam相关
-//   //接口地址
-//   APIHead: 'https://91iam-gateway.9n1m.com/bireport',
-//   //应用编码
-//   APP_CODING: 'bireport-user',
-//   //iam组件base_urls
-//   VUE_APP_BASE_URLS: {
-//     inst: 'https://91iam-inst.9n1m.com', // 租户端的鉴权域名
-//     'inst-web': 'https://91iam-inst.9n1m.com', // 租户端的登录域名
-//     mgmt: 'https://91iam-mgmt.9n1m.com', // 平台端的鉴权域名
-//     'mgmt-web': 'https://91iam-mgmt.9n1m.com', // 平台端的登录域名
-//   },
-//   //iam组件env  管理端mgmt  用户端inst
-//   VUE_APP_ENV: 'inst',
-//   // 租户端 	 平台端 /iam/api
-//   // 在管理端查看租户端或平台端的访问路径，这样的设置以后iam鉴权请求就会带上这个路径
-//   API_PREFIX: '/iam/consoleApi',
-//   // 跳转登录的path，点击跳转登录
-//   loginPath: '/account#/login',
-// };
 window._CONFIG = {
-  CURRENT_URL: "",
+  CURRENT_URL: '', // pdf导出地址
   TITLE: '几何BI',
-  PREFIX_URL:'/bi/',
-  VUE_APP_RESOURCE:[],
-  SENSORS_HOST: 'https://bireport-openresty-pre.9n1m.com',
-  //多用户端的业务网关对外域名
-  SHARE_HOST: 'https://bireport-pre.9n1m.com',
+  SENSORS_HOST: 'http://sp.platomix.net',
+  SHARE_HOST:'http://bi-api.yanxiang.platomix.net',
   // iam相关
   //接口地址
-  APIHead: 'https://iam-gw-pre.9n1m.com/bireport',
+  APIHead: 'https://91iam-gateway.9n1m.com/bireport',
   //应用编码
-  APP_CODING: 'bireport',
+  APP_CODING: 'bireport-user',
   //iam组件base_urls
   VUE_APP_BASE_URLS: {
-    "inst": "https://iam-gw-pre.9n1m.com/iam/api",// 租户端的鉴权网关域名
-    "inst-web": "https://iam-pre.9n1m.com",// 租户端的登录域名
-    "mgmt": "https://iam-gw-mg-pre.9n1m.com",// 平台端的鉴权网关域名
-    "mgmt-web": "https://iam-mg-pre.9n1m.com",// 平台端的登录域名
+    inst: 'https://91iam-inst.9n1m.com', // 租户端的鉴权域名
+    'inst-web': 'https://91iam-inst.9n1m.com', // 租户端的登录域名
+    mgmt: 'https://91iam-mgmt.9n1m.com', // 平台端的鉴权域名
+    'mgmt-web': 'https://91iam-mgmt.9n1m.com', // 平台端的登录域名
   },
   //iam组件env  管理端mgmt  用户端inst
   VUE_APP_ENV: 'inst',
-  // 租户端   平台端 /iam/api
+  // 租户端 	 平台端 /iam/api
   // 在管理端查看租户端或平台端的访问路径，这样的设置以后iam鉴权请求就会带上这个路径
-  API_PREFIX: "",
+  API_PREFIX: '/iam/consoleApi',
   // 跳转登录的path，点击跳转登录
   loginPath: '/account#/login',
-}
+  PREFIX_URL:'/',
+  VUE_APP_RESOURCE:[],
+};
+// window._CONFIG = {
+//   CURRENT_URL: "",
+//   TITLE: '几何BI',
+//   PREFIX_URL:'/bi/',
+//   VUE_APP_RESOURCE:[],
+//   SENSORS_HOST: 'https://bireport-openresty-pre.9n1m.com',
+//   //多用户端的业务网关对外域名
+//   SHARE_HOST: 'https://bireport-pre.9n1m.com',
+//   // iam相关
+//   //接口地址
+//   APIHead: 'https://iam-gw-pre.9n1m.com/bireport',
+//   //应用编码
+//   APP_CODING: 'bireport',
+//   //iam组件base_urls
+//   VUE_APP_BASE_URLS: {
+//     "inst": "https://iam-gw-pre.9n1m.com/iam/api",// 租户端的鉴权网关域名
+//     "inst-web": "https://iam-pre.9n1m.com",// 租户端的登录域名
+//     "mgmt": "https://iam-gw-mg-pre.9n1m.com",// 平台端的鉴权网关域名
+//     "mgmt-web": "https://iam-mg-pre.9n1m.com",// 平台端的登录域名
+//   },
+//   //iam组件env  管理端mgmt  用户端inst
+//   VUE_APP_ENV: 'inst',
+//   // 租户端   平台端 /iam/api
+//   // 在管理端查看租户端或平台端的访问路径，这样的设置以后iam鉴权请求就会带上这个路径
+//   API_PREFIX: "",
+//   // 跳转登录的path，点击跳转登录
+//   loginPath: '/account#/login',
+// }

src/store/modules/setting.js

@@ -1,11 +1,15 @@
 let tags = localStorage.getItem('routerTags')
 import router from "@/router";
+let userInfo = JSON.parse(localStorage.getItem('userInfo') || '{}')
+let {instType, isAdmin, userId} = userInfo
 export default {
   namespaced: true,
   state: () => ({
     menuOpen: false,
     tags: JSON.parse(tags || '[]'),
     inner: false,
+    isSingle: instType === 1,
+    // isSingle: 1,
   }),
   mutations: {
     toggleMenu(state) {

src/util/auth.js

@@ -23,7 +23,7 @@ export function getCookie(key) {
 export function getToken() {
   if (process.env.NODE_ENV === "development") {
     // return 'eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJza3k5MTEiLCJpbnN0SWQiOiIxNzM5OTMxNjQxMjY4MjYwODY5Iiwia2lkIjoibXhrX2F1dGhfandrIiwiaXNzIjoiaHR0cHM6Ly9xZXZvYy5jb20vIiwic3R5bGUiOiJ3ZWIiLCJleHAiOjE3MzIyMzI2OTcsImlhdCI6MTcyODYzMjY5NywidXNlcklkIjoiMTczOTkyNzcxNDEyMDQ1NDIzNyIsImp0aSI6IjEwNDIxNDI4MDk2MjYyNDcxNjgifQ.HiKLCVWE4-jaP8CCPhp35GiFjW1eIs2Nu6X4bfY6rBwAh5UtQ7KzmzggqwLy829zEMKScyQreKPOEFAzPfbXpA'
-    return 'eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJtMTgwMDAwMzc1MDEiLCJpbnN0SWQiOiIxNzM4MDA5MzAwMTc0NTMzNjI3Iiwia2lkIjoibXhrX2F1dGhfandrIiwiaXNzIjoiaHR0cHM6Ly9xZXZvYy5jb20vIiwic3R5bGUiOiJ3ZWIiLCJleHAiOjE3MzYxNTczNTAsImlhdCI6MTczMjU1NzM1MCwidXNlcklkIjoiMTc4MzQxNDQxNzAxOTQwODQwOCIsImp0aSI6IjEwNTg2MDQwOTc0OTE0MzU1MjAifQ.x3sfyeGAFsKrigv36dVpuieOyVBktbAgaVIqtoPN_vQ78AxQGWGXgRG7FgKUojxiUxxQGbq3dIzm-Sri2q_c4A'
+    return 'eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJza3k5MTEiLCJpbnN0SWQiOiIxNzM5OTI3NzE0MTg3NTYzMDc0Iiwia2lkIjoibXhrX2F1dGhfandrIiwiaXNzIjoiaHR0cHM6Ly9xZXZvYy5jb20vIiwic3R5bGUiOiJ3ZWIiLCJleHAiOjE3MzYzNjY4NzUsImlhdCI6MTczMjc2Njg3NSwidXNlcklkIjoiMTczOTkyNzcxNDEyMDQ1NDIzNyIsImp0aSI6IjEwNTk0ODI5MDkwMTE4Njk2OTYifQ.5rhNfxijK0S8isMkElJ6yAddWcGluq_0F8VRPfuHKZZiXQAEr75cLT807eee8zVK9IQDGmqWtZpN8L5wXPj3pQ'
   } else {
     return getCookie('congress')
   }

src/views/batchInstance/list.vue

@@ -235,7 +235,7 @@ import {
   jobList,
   instanceDetailList
 } from '@/api/batch'
-import {nextTick, onActivated, onMounted, reactive, ref} from "vue";
+import {computed, nextTick, onActivated, onMounted, reactive, ref} from "vue";
 import {ElMessage, ElMessageBox} from "element-plus";
 import util from "@/util";
 import moment, {max} from "moment";
@@ -263,7 +263,6 @@ const state = reactive({
   batchList: []
 })
 const codeMirror = ref()
-
 onMounted(() => {
   let date = new Date()
   state.time[1] = moment(date).format('YYYY-MM-DD')

src/views/batchTask/edit.vue

@@ -463,7 +463,7 @@
     <el-form label-width='100px'>
       <el-form-item label='是否公开'>
         <el-radio-group v-model='state.form.publicStatus'>
-          <el-radio :label='1'>公开</el-radio>
+          <el-radio :label='1'>企业公开</el-radio>
           <el-radio :label='0'>权限组控制</el-radio>
         </el-radio-group>
       </el-form-item>
@@ -633,6 +633,7 @@ const funcSelected = computed(() => {
   })
 })
 let reservedFieldListData = []
+let isSingle = computed(() => store.state.setting.isSingle)
 onMounted(() => {
   getFuncAttr()
   store.dispatch('ds/getDsList', 0).then(() => {
@@ -641,13 +642,15 @@ onMounted(() => {
     });
   })
   store.dispatch('getBatchCate')
-  getMineAuthGroup().then(res => {
-    state.mineAuthGroup = res.data.map(i => {
-      let {dpList, roleList, userList, blackUserList} = JSON.parse(i.permJson);
-      blackUserList = blackUserList || [];
-      return {...i, dpList, roleList, userList, blackUserList, select: true};
+  if (!isSingle.value) {
+    getMineAuthGroup().then(res => {
+      state.mineAuthGroup = res.data.map(i => {
+        let {dpList, roleList, userList, blackUserList} = JSON.parse(i.permJson);
+        blackUserList = blackUserList || [];
+        return {...i, dpList, roleList, userList, blackUserList, select: true};
+      });
     });
-  });
+  }
   onInit()
 })
 
@@ -821,7 +824,7 @@ const saveAndRun = () => {
 // 保存前检查
 const beforeSave = (check, saveType) => {
   checkData().then(() => {
-    if (check && !state.form.id) {
+    if (!isSingle.value && check && !state.form.id) {
       state.showAuthGroup = true
     } else {
       if (saveType === 'save') {

src/views/batchTask/list.vue

@@ -118,7 +118,8 @@
                   </el-icon>
                   修改任务调度
                 </div>
-                <div class="my-popper-item" @click="onSetAuth(scope.row)" v-auth="'1822843949266677765'">
+                <div class="my-popper-item" v-if="!isSingle" @click="onSetAuth(scope.row)"
+                     v-auth="'1822843949266677765'">
                   <el-icon>
                     <Setting/>
                   </el-icon>
@@ -161,7 +162,7 @@
       <el-form v-if="state.nowJob" label-width="100px" size="mini">
         <el-form-item label="是否公开">
           <el-radio-group v-model="state.nowJob.publicStatus">
-            <el-radio :label="1">公开</el-radio>
+            <el-radio :label="1">企业公开</el-radio>
             <el-radio :label="0">权限组控制</el-radio>
           </el-radio-group>
         </el-form-item>
@@ -255,7 +256,7 @@ const selectedAuth = computed(() => {
   let ids = state.selectedIds;
   return state.allAuthList.reduce((r, i) => r.concat(i.children), []).filter(i => ids.includes(i.id));
 })
-
+let isSingle = computed(() => store.state.setting.isSingle)
 onMounted(() => {
   getData()
   typeList().then(res => {

src/views/job/edit.vue

@@ -142,7 +142,7 @@
       <el-form label-width='100px'>
         <el-form-item label='是否公开'>
           <el-radio-group v-model='jobForm.publicStatus'>
-            <el-radio :label='1'>公开</el-radio>
+            <el-radio :label='1'>企业公开</el-radio>
             <el-radio :label='0'>权限组控制</el-radio>
           </el-radio-group>
         </el-form-item>
@@ -202,7 +202,7 @@
   </div>
 </template>
 <script>
-import {defineComponent} from "vue";
+import {computed, defineComponent} from "vue";
 import {getTeleport} from "@antv/x6-vue-shape";
 import {getVerify, nodeLib} from '@/etlNodes'
 import util from "@/util";
@@ -229,6 +229,9 @@ export default defineComponent({
     },
     nodeErrorData() {
       return store.state.nodeError.nodeError
+    },
+    isSingle() {
+      return store.state.setting.isSingle
     }
   },
   components: {CustomHeader, TeleportContainer, nodeError, cateAdd},
@@ -274,6 +277,7 @@ export default defineComponent({
     }
   },
   created() {
+    console.log(this.isSingle)
     getMineAuthGroup().then(res => {
       this.mineAuthGroup = res.data.map(i => {
         let {dpList, roleList, userList, blackUserList} = JSON.parse(i.permJson);
@@ -488,7 +492,7 @@ export default defineComponent({
       if (!jobName) return ElMessage.error('请输入流程名称')
       if (!/^[a-zA-Z0-9_\u4e00-\u9fa5]+$/.test(jobName)) return ElMessage.error('流程名称含有非法字符，请重新输入')
       if (!categoryId) return ElMessage.error('请选择流程分类')
-      if (check && !this.jobForm.id) {
+      if (!this.isSingle && check && !this.jobForm.id) {
         this.showAuthGroup = true
       } else {
         if (saveType === 'save') {

src/views/job/list.vue

@@ -112,7 +112,8 @@
                   </el-icon>
                   修改任务调度
                 </div>
-                <div class="my-popper-item" @click="onSetAuth(scope.row)" v-auth="'1822839350342365234'">
+                <div class="my-popper-item" v-if="!isSingle" @click="onSetAuth(scope.row)"
+                     v-auth="'1822839350342365234'">
                   <el-icon>
                     <Setting/>
                   </el-icon>
@@ -156,7 +157,7 @@
     <el-form v-if="state.nowJob" label-width="100px" size="mini">
       <el-form-item label="是否公开">
         <el-radio-group v-model="state.nowJob.publicStatus">
-          <el-radio :label="1">公开</el-radio>
+          <el-radio :label="1">企业公开</el-radio>
           <el-radio :label="0">权限组控制</el-radio>
         </el-radio-group>
       </el-form-item>
@@ -212,7 +213,6 @@
 </template>
 <script setup>
 import {computed, onMounted, reactive, ref, watch} from "vue";
-import router from "@/router";
 import {ArrowDown, Plus, Search} from "@element-plus/icons-vue";
 import {jobCheck, jobList, jobRun, jobScheduleSet} from "@/api/job";
 import {ElMessage, ElMessageBox} from "element-plus";
@@ -221,26 +221,28 @@ import jobCategory from '@/components/jobCategory'
 import myPage from '@/components/myPage'
 import vue3Cron from '@/components/cronComp/cron.vue'
 import {deleteJob} from '@/api/job'
-import {async} from "@antv/x6/lib/registry/marker/async";
 import {getAuthByEtl, typeList, groupPage, saveAuthByEtl} from '@/api/system'
 import util from "@/util";
+let isSingle = computed(() => store.state.setting.isSingle)
 onMounted(() => {
   getData()
-  typeList().then(res => {
-    let types = res.data.map(i => ({value: i.id, label: i.typeName, children: []}));
-    groupPage({size: 10000, current: 1}).then(res => {
-      let auths = res.data.records;
-      auths = auths.map(i => {
-        let {dpList, roleList, userList, blackUserList} = JSON.parse(i.permJson);
-        blackUserList = blackUserList || [];
-        return {...i, dpList, roleList, userList, blackUserList, value: i.id, label: i.permName};
+  if (!isSingle.value) {
+    typeList().then(res => {
+      let types = res.data.map(i => ({value: i.id, label: i.typeName, children: []}));
+      groupPage({size: 10000, current: 1}).then(res => {
+        let auths = res.data.records;
+        auths = auths.map(i => {
+          let {dpList, roleList, userList, blackUserList} = JSON.parse(i.permJson);
+          blackUserList = blackUserList || [];
+          return {...i, dpList, roleList, userList, blackUserList, value: i.id, label: i.permName};
+        });
+        types.forEach(type => {
+          type.children = auths.filter(i => i.typeId == type.value);
+        });
+        state.allAuthList = types;
       });
-      types.forEach(type => {
-        type.children = auths.filter(i => i.typeId == type.value);
-      });
-      state.allAuthList = types;
     });
-  });
+  }
 })
 const category = ref(null)
 const state = reactive({