lex 1 vuosi sitten
vanhempi
commit
f1c744b83a

+ 7 - 4
src/views/attend-class/model/train-type/index.tsx

@@ -97,12 +97,14 @@ export default defineComponent({
     const reportSrc = ref('');
     const detailVisiable = ref(false);
     const gotoRecode = (row: any) => {
+      if (!row.id) {
+        message.error('暂无评测记录');
+        return;
+      }
       const tockn = userStore.getToken;
       reportSrc.value =
         vaildUrl() +
-        `/instrument/#/evaluat-report?id=${
-          row.id || '1693935536619667457'
-        }&Authorization=${tockn}`;
+        `/instrument/#/evaluat-report?id=${row.id}&Authorization=${tockn}`;
       detailVisiable.value = true;
     };
 
@@ -348,7 +350,8 @@ export default defineComponent({
           {/* 只有评测的时候才有 */}
           {props.isDisabled &&
           !props.isCLassWork &&
-          props.item.trainingType === 'EVALUATION' ? (
+          props.item.trainingType === 'EVALUATION' &&
+          props.item?.recordId ? (
             <>
               <NSpace size={6}>
                 <n-button

+ 6 - 1
src/views/classList/classDetail.tsx

@@ -1,4 +1,4 @@
-import { defineComponent, ref } from 'vue';
+import { defineComponent, onMounted, ref } from 'vue';
 import styles from './index.module.less';
 import { NTabs, NTabPane } from 'naive-ui';
 import { useRoute } from 'vue-router';
@@ -40,6 +40,11 @@ export default defineComponent({
       }
     };
     getClassGroupDetail();
+    onMounted(() => {
+      if (classDetailTabs) {
+        activeTab.value = classDetailTabs;
+      }
+    });
     return () => (
       <div>
         <CBreadcrumb list={routerList.value}></CBreadcrumb>

+ 13 - 0
src/views/natural-resources/components/my-resources/search-group-resources.tsx

@@ -133,6 +133,19 @@ export default defineComponent({
                   }}>
                   完成编辑
                 </NButton>
+                <NButton
+                  type="error"
+                  class={[styles.addTrain, styles.error]}
+                  focusable={false}
+                  strong
+                  onClick={() => {
+                    state.isEdit = false;
+                    state.isSelectAll = false;
+                    emit('edit', state.isEdit);
+                  }}>
+                  {/* <img src={iconDelete} class={styles.iconDelete} /> */}
+                  取消编辑
+                </NButton>
               </>
             ) : (
               <>