Переглянути джерело

merge feature/1003063 into main

merge "feature/1003063" into "main"
logo替换/查重显示/添加默认起止时间/修复删除bug

Created-by: bia
Author-id: 7031147
MR-id: 11155
Commit-by: Bia
Merged-by: Kevin
Description: merge "feature/1003063" into "main"
logo替换/查重显示/添加默认起止时间/修复删除bug

See merge request: zhcqdn00001/front!51
Kevin 2 роки тому
батько
коміт
c87bfe1f11

BIN
src/assets/logo.png


+ 15 - 2
src/libs/clipboard.lib.ts

@@ -1,8 +1,21 @@
 
 export function useClipboard() {
   function copy(text: string) {
-    return navigator.clipboard.writeText(text)
+    if (navigator.clipboard && window.isSecureContext) {
+      return navigator.clipboard.writeText(text)
+    } else {
+      const textArea = document.createElement("textarea");
+      textArea.value = text
+      textArea.style.position = "absolute";
+      textArea.style.opacity = '0';
+      document.body.appendChild(textArea);
+      textArea.select();
+      return new Promise((resolve, reject) => {
+        document.execCommand("copy") ? resolve('') : reject(new Error("出错了"));
+        textArea.remove()
+      })
+    }
   }
-
+  
   return { copy }
 }

+ 2 - 1
src/views/report/ReportListView.vue

@@ -122,7 +122,8 @@ function onReportDelete(id: number) {
   reportService.remove(id).then((ok) => {
     if (ok) {
       message.success('删除报告成功')
-      fetchReports()
+      currentPage.value = reports.value.length === 1 ? currentPage.value - 1 : currentPage.value
+      fetchReports(companyIdSelected.value, currentPage.value, field.value, keyword.value)
     } else {
       message.success('删除报告失败')
     }

+ 8 - 1
src/views/report/components/ChapterEditor.vue

@@ -42,6 +42,7 @@ const keywordsEditor = ref<HTMLInputElement | null>(null);
 const keywordsEditing = ref(false);
 
 const repetitiveWarning = ref(false);
+const LowRepetitionRate = ref(false);
 
 const fullTitle = ref('');
 // 参考文献抽屉组件ref
@@ -140,6 +141,8 @@ function onSectionRecordUse(sectionId: number) {
 
 function notifyRepetitiveWarning(data: boolean) {
   repetitiveWarning.value = data;
+  LowRepetitionRate.value = false
+  if(!data&&props.data.content) LowRepetitionRate.value = !data;
 }
 
 function test1() {
@@ -203,7 +206,7 @@ defineExpose({
         </a-dropdown>
       </a-col>
     </a-row>
-    <p v-if="contentEditorVisible" :class="{ 'repetitiveWarning': repetitiveWarning }">
+    <p v-if="contentEditorVisible" :class="`${repetitiveWarning?'repetitiveWarning':LowRepetitionRate?'LowRepetitionRate':''}`">
       <ContentEditor :data="data.content || ''" @change="onContentChange" ref="contentEditor" />
     </p>
     <div class="chapter-button-group" v-if="contentEditorVisible">
@@ -254,5 +257,9 @@ defineExpose({
     border: 1px solid red;
     border-radius: 8px;
   }
+  .LowRepetitionRate {
+    border: 1px solid green;
+    border-radius: 8px;
+  }
 }
 </style>

+ 1 - 1
src/views/report/components/ContentEditor.vue

@@ -25,7 +25,7 @@ const toolbar = [
 const editInit = {
   language: 'zh_CN',
   skin: 'small',
-  icons: 'small',
+  // icons: 'small',
   plugins: 'lists link image table code help wordcount fullscreen',
   contextmenu: false,
   toolbar: toolbar.join(' | '),

+ 2 - 2
src/views/report/components/dynamic-meta/DynamicMeta.vue

@@ -59,7 +59,7 @@ function handleMenuClick(e: {key: string}) {
   } else if (e.key === 'date') {
     addDateComponent(index);
   } else if (e.key === 'dateRange') {
-    addDateRangeComponent(index);
+    addDateRangeComponent(index,{ name: '起止时间', value: '', type: 'dateRange' });
   }
 }
 
@@ -121,7 +121,7 @@ onMounted(() => {
         <a-menu @click="handleMenuClick">
           <a-menu-item key="text">文本项</a-menu-item>
           <a-menu-item key="date">日期项</a-menu-item>
-          <a-menu-item key="dateRange">日期范围项</a-menu-item>
+          <a-menu-item key="dateRange">起止时间</a-menu-item>
         </a-menu>
       </template>
       <a-button>