Browse Source

借分类接口 修改部分提示

yangg 6 months ago
parent
commit
dbaa108aaf

+ 3 - 4
ui/src/api/document.js

@@ -123,11 +123,10 @@ export function getDocumentCategoryInfo(data) {
 
 
 
-export function deleteDocumentCategory(data) {
+export function deleteDocumentCategory(id) {
   return request({
-    url: '/document/category/delete',
-    method: 'post',
-    data
+    url: `/document/category/delete/${id}`,
+    method: 'get'
   })
 }
 

+ 3 - 4
ui/src/api/template.js

@@ -58,11 +58,10 @@ export function getTemplateCategoryInfo(data) {
 
 
 
-export function deleteTemplateCategory(data) {
+export function deleteTemplateCategory(id) {
   return request({
-    url: '/template/category/delete',
-    method: 'post',
-    data
+    url: `/template/category/delete/${id}`,
+    method: 'get'
   })
 }
 

+ 2 - 2
ui/src/views/system/document/category/components/dataInfo.vue

@@ -91,14 +91,14 @@ export default {
 
       if (_this.dataForm.id > 0) {
         updateDocumentCategory(_this.dataForm).then((res) => {
-          if (res.code !== 200) return;
+          if (res.status !== 200) return;
           _this.$message.success("文档分类更新成功");
           _this.$emit("onClose");
           _this.$emit("refresh-list");
         });
       } else {
         createDocumentCategory(_this.dataForm).then((res) => {
-          if (res.code !== 200) return;
+          if (res.status !== 200) return;
           _this.$message.success("文档分类创建成功");
           _this.$emit("onClose");
           _this.$emit("refresh-list");

+ 1 - 1
ui/src/views/system/document/category/components/dataList.vue

@@ -120,7 +120,7 @@
           type: 'warning',
         }).then((res)=>{
           // console.log("AAA")
-             deleteDocumentCategory(par).then(res=>{
+             deleteDocumentCategory(e).then(res=>{
                _this.search();
              })
         }).catch(()=>{

+ 2 - 1
ui/src/views/system/document/com/components/TextArea/index.vue

@@ -12,7 +12,7 @@
           :config="editorConfig"
           :editorUrl="editorUrl"
         ></ckeditor>
-       <!--  <CanvasEditor
+        <!-- <CanvasEditor
           ref="wordEditor"
           :edit-mode="Modetype"
           :html-data="htmlData"
@@ -105,6 +105,7 @@ export default {
         if (val.content == undefined || val.content == null) return;
         try {
           let res = await _this.replaceData(val.content);
+         /*  _this.htmlData=res */
           _this.content = res;
           _this.$nextTick(() => {
             _this.bindEvents();

+ 17 - 7
ui/src/views/system/document/com/editor.vue

@@ -97,7 +97,6 @@
                           placement="top"
                         >
                           <el-button
-                            size="mini"
                             @click="onSaveTemplate(it)"
                             icon="el-icon-document-add"
                             circle
@@ -121,15 +120,14 @@
                         </el-tooltip> && type !== 'document'-->
                         <el-button
                           circle
-                          size="mini"
                           v-if="it.isEdit !== 1"
                           @click="onEdit(index, 1)"
+                          icon="el-icon-edit"
                         >
-                          <svg-icon icon-class="edit" />
+                          <!-- <svg-icon icon-class="edit" /> -->
                         </el-button>
                         <el-button
                           circle
-                          size="mini"
                           @click="onEdit(index, 2)"
                           icon="el-icon-view"
                           v-else
@@ -144,7 +142,6 @@
                         >
                           <el-button
                             circle
-                            size="mini"
                             @click="onRemove(index)"
                             icon="el-icon-delete"
                           >
@@ -280,7 +277,7 @@ export default {
             // 确保 name 使用 dcb_name
             name: item.dcb_name || item.name,
           };
-          console.log("processedItem:",processedItem);
+          console.log("processedItem:", processedItem);
           // 确保 content 和 dcb_nr 同步
           if (processedItem.content !== processedItem.dcb_nr) {
             processedItem.dcb_nr = processedItem.content;
@@ -656,7 +653,20 @@ export default {
       _this.$emit("onRebuild", _this.coms);
     },
     onRemove(index) {
-      this.$emit("onDelete", index);
+      this.$confirm("此操作将删除该模块, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$emit("onDelete", index);
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
     },
     onEdit(e, state) {
       this.comList = this.comList.map((it, index) => {

+ 2 - 2
ui/src/views/system/document/com/menus.vue

@@ -193,11 +193,11 @@ export default {
               disabled: () =>this.typeMenu === "module" || this.typeMenu === undefined,
             },
 
-            {
+           /*  {
                 key:"SourceData",
                 name:"源数据",
                 icon:"sourceData",
-              },
+              }, */
             {
               key: "formual",
               name: "公式",

+ 16 - 4
ui/src/views/system/document/create.vue

@@ -151,7 +151,7 @@
               placeholder="请输入选择"
               prefix-icon="el-icon-search"
               clearable
-               @keyup.enter.native="handleTemplateSearch"
+              @keyup.enter.native="handleTemplateSearch"
               @clear="handleResourceClear"
             >
             </el-input>
@@ -501,7 +501,6 @@
             </el-tab-pane>
             <el-tab-pane label="模板内容" name="template">
               <div class="template-content">
-              
                 <!-- <div class="search-box">
                   <el-input
                     v-model="templateSearchKey"
@@ -1608,7 +1607,20 @@ export default {
       this.showViewForm = true;
     },
     onClose() {
-      this.$router.back();
+      this.$confirm("是否要关闭文档?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$router.back();
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消",
+          });
+        });
     },
 
     loadArticle(e) {
@@ -2964,7 +2976,7 @@ export default {
     },
     // 处理模板搜索
     async handleTemplateSearch() {
-     /*  if (!this.templateSearchKey.trim()) {
+      /*  if (!this.templateSearchKey.trim()) {
         return;
       } */
       console.log(12);

+ 3 - 8
ui/src/views/system/template/category/components/dataList.vue

@@ -19,12 +19,7 @@
       empty-text="没有分类信息"
     >
       <el-table-column prop="id" label="ID" width="180" />
-      <el-table-column
-        prop="name"
-        label="分类名称"
-        align="left"
-       
-      >
+      <el-table-column prop="name" label="分类名称" align="left">
       </el-table-column>
       <el-table-column prop="create_time" label="创建时间" align="center" />
       <el-table-column prop="status" label="分类状态" align="center">
@@ -36,7 +31,7 @@
       <el-table-column label="操作" fixed="right" align="center" width="300">
         <template #default="scope">
           <div class="btns">
-           <!--  <el-button type="primary" size="small" @click="Subclass(scope.row)"
+            <!--  <el-button type="primary" size="small" @click="Subclass(scope.row)"
               ><svg-icon icon-class="edit" />创建子类</el-button
             > -->
             <el-button type="primary" size="small" @click="btnEdit(scope.row)"
@@ -367,7 +362,7 @@ export default {
           type: "warning",
         })
         .then((res) => {
-          deleteTemplateCategory(par).then((res) => {
+          deleteTemplateCategory(e).then((res) => {
             _this.search();
           });
         })