bug修复

public/config.js

@@ -19,4 +19,5 @@ window._CONFIG = {
   API_PREFIX: "/iam/api",// 在管理端查看租户端或平台端的访问路径，这样的设置以后iam鉴权请求就会带上这个路径
   loginPath: '/console/#/login', // 跳转登录的path，点击跳转登录
   VUE_APP_RESOURCE:[],
+  PREFIX_URL:'/',
 };

src/main.ts

@@ -36,7 +36,7 @@ const mgmtComponentConfig = {
   srcPath: '@',
   viewRoot: "views",
   dynamicStatus: true,//设置为true 说明从接口获取数据
-  PREFIX_URL: "/",
+  PREFIX_URL: window._CONFIG.PREFIX_URL,
   env: window._CONFIG.VUE_APP_ENV,
   API_PREFIX: window._CONFIG.API_PREFIX,
   loginPath: window._CONFIG.loginPath,

src/views/temp/chartsTemp.vue

@@ -161,7 +161,7 @@
           <el-icon style="color: #fc4b1b;margin-right: 5px;">
             <WarningFilled/>
           </el-icon>
-          是否通过该组件模板审核？
+          {{ state.auditByOpen ? '是否启用该组件模板？' : '是否通过该组件模板审核？' }}
         </div>
       </template>
       <el-form label-width="80px" size="default">
@@ -298,6 +298,7 @@ const state = reactive({
   saveAuditLoading: false,
   savePublishLoading: false,
   showParams: false,
+  auditByOpen: false,
 })
 onMounted(() => {
   resetDate()
@@ -382,7 +383,10 @@ const onAuditConfirm = () => {
     ElMessage({type: 'success', message: '已提交'})
     state.showAudit = false
     getData()
-  }).finally(() => state.saveAuditLoading = false)
+  }).finally(() => {
+    state.saveAuditLoading = false
+    state.auditByOpen = false
+  })
 }
 // 组件模板审核
 const onAudit = template => {
@@ -393,6 +397,7 @@ const onAudit = template => {
     category: 0,
   }
   state.showAudit = true
+  state.auditByOpen = false
 }
 // 禁用组件模板
 const onPublish = temp => {
@@ -407,6 +412,7 @@ const onPublish = temp => {
       category: temp.category || 0,
     }
     state.showAudit = true
+    state.auditByOpen = true
   }
 }
 // 提交禁用

src/views/temp/visualTemp.vue

@@ -160,7 +160,7 @@
           <el-icon style="color: #fc4b1b;margin-right: 5px;">
             <WarningFilled/>
           </el-icon>
-          是否通过该模板审核？
+          {{ state.auditByOpen ? '是否启用该模板？' : '是否通过该模板审核？' }}
         </div>
       </template>
       <el-form label-width="80px" size="default">
@@ -297,6 +297,7 @@ const state = reactive({
   saveAuditLoading: false,
   savePublishLoading: false,
   showParams: false,
+  auditByOpen: false,
 })
 onMounted(() => {
   resetDate()
@@ -381,7 +382,10 @@ const onAuditConfirm = () => {
     ElMessage({type: 'success', message: '已提交'})
     state.showAudit = false
     getData()
-  }).finally(() => state.saveAuditLoading = false)
+  }).finally(() => {
+    state.saveAuditLoading = false
+    state.auditByOpen = false
+  })
 }
 // 发起模板审核
 const onAudit = template => {
@@ -392,6 +396,7 @@ const onAudit = template => {
     category: 0,
   }
   state.showAudit = true
+  state.auditByOpen = false
 }
 // 提交模板禁用
 const onPublishConfirm = () => {
@@ -420,6 +425,7 @@ const onPublish = temp => {
       category: temp.category || 0,
     }
     state.showAudit = true
+    state.auditByOpen = true
   }
 }
 // 重置列表筛选条件

src/views/visual/reportList.vue

@@ -62,12 +62,12 @@
               </template>
             </template>
           </el-table-column>
-<!--          <el-table-column label="备注" show-overflow-tooltip>-->
-<!--            <template v-slot="{row}">-->
-<!--              <span v-if="row.status===0">{{ row.disableReason || '-'  }}</span>-->
-<!--              <span v-else>{{ row.disableReason || '-' }}</span>-->
-<!--            </template>-->
-<!--          </el-table-column>-->
+          <!--          <el-table-column label="备注" show-overflow-tooltip>-->
+          <!--            <template v-slot="{row}">-->
+          <!--              <span v-if="row.status===0">{{ row.disableReason || '-'  }}</span>-->
+          <!--              <span v-else>{{ row.disableReason || '-' }}</span>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
           <el-table-column label="审核状态" width="90px">
             <template v-slot="{row}">
               <div class="status-box" v-if="row.reviewStatus===0">
@@ -124,7 +124,10 @@
       </div>
       <iframe id="preview" name="preview" :src="state.previewSrc"></iframe>
     </div>
-    <el-dialog v-model="state.showAudit" append-to-body width="500px" title="报表审核">
+    <el-dialog
+      v-model="state.showAudit" append-to-body width="500px"
+      :title="state.auditByOpen?'报表启用':'报表审核'"
+    >
       <el-form label-width="70px">
         <el-form-item label="是否通过">
           <el-radio-group v-model="state.auditForm.pass">
@@ -221,6 +224,7 @@ const state = reactive({
   publishForm: {},
   saveAuditLoading: false,
   savePublishLoading: false,
+  auditByOpen: false,
 })
 onMounted(() => {
   getData()
@@ -271,6 +275,7 @@ const onAuditConfirm = () => {
 }
 // 发起报表审核
 const onAudit = visual => {
+  state.auditByOpen = false
   state.auditForm = {
     id: visual.id,
     reason: '',
@@ -280,12 +285,22 @@ const onAudit = visual => {
 }
 // 发起报表禁用
 const onPublish = visual => {
-  state.publishForm = {
-    id: visual.id,
-    status: visual.status === 0 ? 1 : 0,
-    disableReason: '',
+  if (visual.status === 1) {
+    state.publishForm = {
+      id: visual.id,
+      status: 0,
+      disableReason: '',
+    }
+    state.showPublish = true
+  } else {
+    state.auditForm = {
+      id: visual.id,
+      reason: '',
+      pass: 1,
+    }
+    state.showAudit = true
+    state.auditByOpen = true
   }
-  state.showPublish = true
 }
 // 提交报表禁用信息
 const onPublishConfirm = () => {

src/views/visual/visualList.vue

@@ -62,12 +62,12 @@
               </template>
             </template>
           </el-table-column>
-<!--          <el-table-column label="备注" show-overflow-tooltip>-->
-<!--            <template v-slot="{row}">-->
-<!--              <span v-if="row.status===0">{{ row.disableReason || '-'  }}</span>-->
-<!--              <span v-else>{{ row.disableReason || '-' }}</span>-->
-<!--            </template>-->
-<!--          </el-table-column>-->
+          <!--          <el-table-column label="备注" show-overflow-tooltip>-->
+          <!--            <template v-slot="{row}">-->
+          <!--              <span v-if="row.status===0">{{ row.disableReason || '-'  }}</span>-->
+          <!--              <span v-else>{{ row.disableReason || '-' }}</span>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
           <el-table-column label="审核状态" width="90px">
             <template v-slot="{row}">
               <div class="status-box" v-if="row.reviewStatus===0">
@@ -124,7 +124,10 @@
       </div>
       <iframe id="preview" name="preview" :src="state.previewSrc"></iframe>
     </div>
-    <el-dialog v-model="state.showAudit" append-to-body width="500px" title="大屏审核">
+    <el-dialog
+      v-model="state.showAudit" append-to-body width="500px"
+      :title="state.auditByOpen?'大屏启用':'大屏审核'"
+    >
       <el-form label-width="70px">
         <el-form-item label="是否通过">
           <el-radio-group v-model="state.auditForm.pass">
@@ -221,6 +224,7 @@ const state = reactive({
   publishForm: {},
   saveAuditLoading: false,
   savePublishLoading: false,
+  auditByOpen: false,
 })
 onMounted(() => {
   getData()
@@ -272,6 +276,7 @@ const onAuditConfirm = () => {
 }
 // 发起大屏审核
 const onAudit = visual => {
+  state.auditByOpen = false
   state.auditForm = {
     id: visual.id,
     reason: '',
@@ -281,12 +286,22 @@ const onAudit = visual => {
 }
 // 发起大屏禁用
 const onPublish = visual => {
-  state.publishForm = {
-    id: visual.id,
-    status: visual.status === 0 ? 1 : 0,
-    disableReason: '',
+  if (visual.status === 1) {
+    state.publishForm = {
+      id: visual.id,
+      status: 0,
+      disableReason: '',
+    }
+    state.showPublish = true
+  } else {
+    state.auditForm = {
+      id: visual.id,
+      reason: '',
+      pass: 1,
+    }
+    state.showAudit = true
+    state.auditByOpen = true
   }
-  state.showPublish = true
 }
 // 提交禁用信息
 const onPublishConfirm = () => {