فهرست منبع

修改请求连接

yangg 6 ماه پیش
والد
کامیت
96f7fdf93b

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

@@ -86,11 +86,10 @@ export function searchTemplate(data) {
 
 
 
-export function getTemplateInfo(data) {
+export function getTemplateInfo(id) {
   return request({
-    url: '/template/info',
-    method: 'post',
-    data
+    url: `/document/block/info/${id}`,
+    method: 'get',
   })
 }
 

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

@@ -70,7 +70,7 @@
                         placeholder="请填写模块名称"
                       />v-else -->
                       <span @click="enableName(it)" style="cursor: pointer">{{
-                        it.name
+                        it.dcb_name
                       }}</span>
                     </el-form-item>
                   </el-col>
@@ -477,7 +477,8 @@ export default {
       if (data.category) {
         delete data.category;
       }
-      data.attrs = JSON.stringify(data.attrs);
+      data.dcb_nr = data.content
+      data.dcb_attrs = JSON.stringify(data.dcb_attrs);
       data.code = data.name;
       data.status = 5;
       // 检查 category_id 是否为数组
@@ -489,9 +490,9 @@ export default {
         data.category_id = e.category_id;
       }
 
-      if (data.id == undefined || this.saveAs) {
+      if (data.dcb_id == undefined || this.saveAs) {
         createTemplate(data).then((res) => {
-          if (res.status != 200) return;
+          if (res.code != 200) return;
           data.id = res.data;
           e.id = res.data;
 
@@ -504,7 +505,7 @@ export default {
         });
       } else {
         updateTemplate(data).then((res) => {
-          if (res.status != 200) return;
+          if (res.code != 200) return;
           _this.$alert("模块信息更新成功");
           _this.$emit("onRefresh");
           data.selDisabled = false;
@@ -657,12 +658,12 @@ export default {
     // 新增 filterAttrs 方法
     filterAttrs(item) {
       // 从 content 中提取所有 {{}} 包裹的 ID
-      const contentIds = (item.content.match(/{{([^}]+)}}/g) || []).map(
+      const contentIds = (item.dcb_nr.match(/{{([^}]+)}}/g) || []).map(
         (match) => match.slice(2, -2).trim()
       );
 
       // 过滤 attrs,只保留在 content 中出现的 ID
-      item.attrs = item.attrs.filter((attr) => contentIds.includes(attr.id));
+      item.attrs = item.dcb_attrs.filter((attr) => contentIds.includes(attr.id));
     },
     onAdd(e) {
       e.preventDefault();

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

@@ -233,12 +233,12 @@ export default {
                 key:"pager",
                 name:"分页",
                 icon:"insertPage",
-              }, */
+              },
             {
               key: "ai",
               name: "AI模块",
               icon: "AI",
-            },
+            }, */
              /* {
                 key:"searchEs",
                 name:"检索",

+ 7 - 7
ui/src/views/system/document/create.vue

@@ -135,8 +135,8 @@
       <div class="natural">
         <div class="resource-header-title">
           <div class="title-left">
-            <span>请选择可用的资源</span>
-            <span class="resource-count">[资源明细] 资源数量:474</span>
+            <span>请选择可用的模块</span>
+           <!--  <span class="resource-count">[资源明细] 资源数量:474</span> -->
           </div>
           <i class="el-icon-menu"></i>
         </div>
@@ -149,22 +149,22 @@
               clearable
             >
             </el-input>
-            <div class="action-btns">
+           <!--  <div class="action-btns">
               <el-button type="primary" @click="createResource"
                 >新建资源</el-button
               >
               <el-button type="primary" @click="createResourceCategory"
                 >新建资源分类</el-button
               >
-            </div>
+            </div> -->
           </div>
 
-          <div class="resource-status">
+          <!-- <div class="resource-status">
             已打开1个资源,已选择3个资源
             <el-button size="small" plain @click="refreshResources"
               >更新</el-button
             >
-          </div>
+          </div> -->
 
           <div class="resource-content">
             <el-collapse v-model="activeCategories">
@@ -1556,7 +1556,7 @@ export default {
     async loadTemplateInfo(id) {
       try {
         // 获取模板信息
-        const { data } = await getTemplateInfo({ id });
+        const { data } = await getTemplateInfo(id);
 
         // 设置默认值
         if (!data.attrs || !data.type) {

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

@@ -36,9 +36,9 @@
       <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)"
               ><svg-icon icon-class="edit" />编辑</el-button
             >

+ 54 - 28
ui/src/views/system/template/components/dataList.vue

@@ -5,12 +5,17 @@
       header-row-class-name="headerBg"
       empty-text="没有项目信息"
       :max-height="tableMaxHeight"
+      align="center"
     >
-      <el-table-column prop="dcb_id" label="ID" align="center" width="80" />
+      <el-table-column prop="dcb_id" label="ID"  width="80" />
       <!--  <el-table-column prop="code" label="引用名" align="center" width="180"/> -->
-      <el-table-column prop="dcb_name" label="文档块名称" align="center" />
-<!--       <el-table-column prop="dcb_share" label="所属分类" align="left" />
-      <el-table-column prop="create_time" label="创建时间" align="center" /> -->
+      <el-table-column prop="dcb_name" label="文档块名称"  />
+      <el-table-column prop="category_id" label="所属分类" >
+        <template #default="scope">
+          {{ getCategoryName(scope.row.category_id) }}
+        </template>
+      </el-table-column>
+      <!--     <el-table-column prop="create_time" label="创建时间" align="center" /> -->
       <el-table-column prop="dcb_share" label="共享类型" align="center">
         <template #default="scope">
           <div v-if="scope.row.dcb_share == 1">官方</div>
@@ -81,7 +86,7 @@
           ></el-input>
         </el-form-item>
         <el-form-item label="共享类型:" prop="dcb_share">
-         <!--  <el-cascader
+          <!--  <el-cascader
             v-model="moduleForm.category_id"
             clearable
             :options="categoryList"
@@ -105,21 +110,21 @@
             />
           </el-select>
         </el-form-item>
-        <!-- <el-form-item label="模块状态:" prop="status">
+        <el-form-item label="模块分类:" prop="category_id">
           <el-select
-            v-model="moduleForm.status"
+            v-model="moduleForm.category_id"
             class="m-2"
-            placeholder="请选择模板块态"
+            placeholder="请选择模块分类"
             size="large"
           >
             <el-option
-              v-for="item in statusOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              v-for="item in categoryList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
             />
           </el-select>
-        </el-form-item> -->
+        </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="closeModule">取 消</el-button>
@@ -132,7 +137,13 @@
 <script>
 import { mapGetters } from "vuex";
 
-import { deleteTemplate, pageTemplate,getAllList,updateTemplate,treeCategory } from "@/api/template";
+import {
+  deleteTemplate,
+  pageTemplate,
+  getAllList,
+  updateTemplate,
+  treeCategory,
+} from "@/api/template";
 import dataInfo from "./dataInfo.vue";
 import elDragDialog from "@/directive/el-drag-dialog";
 /* import Editor from "@/views/document/com/editor.vue"; */
@@ -178,12 +189,18 @@ export default {
       moduleForm: {
         name: "",
         dcb_share: "",
+        category_id: "",
       },
       moduleRules: {
-        dcb_name: [{ required: true, message: "请输入文档块名称", trigger: "blur" }],
+        dcb_name: [
+          { required: true, message: "请输入文档块名称", trigger: "blur" },
+        ],
         dcb_share: [
           { required: true, message: "请选择共享类型", trigger: "change" },
         ],
+        category_id: [
+          { required: true, message: "请选择模块分类", trigger: "change" },
+        ],
       },
       props: {
         value: "id",
@@ -205,7 +222,7 @@ export default {
           label: "停用",
         },
       ],
-      categoryList:[],
+      categoryList: [],
       tableMaxHeight: 500, // Add this line
 
       /* 共享类型 */
@@ -230,17 +247,23 @@ export default {
     this.initCategoryList();
   },
   methods: {
+    /* 所属分类 */
+    getCategoryName(categoryId) {
+      const category = this.categoryList.find((item) => item.id === categoryId);
+      return category ? category.name : "";
+    },
     refreshList() {
-    this.search();
-  },
+      this.search();
+    },
     /* 选择模块分类 */
-    onChangeCategory(){},
-     /* 取消修改 */
-     closeModule() {
+    onChangeCategory() {},
+    /* 取消修改 */
+    closeModule() {
       this.dialogVisible = false;
       this.moduleForm = {
         dcb_name: "",
         dcb_share: "",
+        category_id: "",
       };
     },
     /* 确定修改模块*/
@@ -254,10 +277,11 @@ export default {
             this.moduleForm = {
               dcb_name: "",
               dcb_share: "",
+              category_id: "",
             };
             //this.onSubmit()
-             // 修改这里:直接调用 search 方法而不是 onSubmit
-        this.search();
+            // 修改这里:直接调用 search 方法而不是 onSubmit
+            this.search();
           });
         }
       });
@@ -269,9 +293,9 @@ export default {
       this.categoryList = res.data; //this.processDataForCascader(res.data);
     },
 
-    EditorInfo(item){
-      this.dialogVisible=true
-      this.moduleForm =item
+    EditorInfo(item) {
+      this.dialogVisible = true;
+      this.moduleForm = item;
     },
     checkAuth(path) {
       if (this.roleInfo.is_admin == 1) {
@@ -313,8 +337,10 @@ export default {
 
     //编辑
     btnEdit(e) {
-      this.$router.push("/document/system/document/create?templateId=" + e + "&type=module");
-     /*  let _this = this;
+      this.$router.push(
+        "/document/system/document/create?templateId=" + e + "&type=module"
+      );
+      /*  let _this = this;
       var a = document.createElement("a");
       a.href = "#/document/create?templateId=" + e + "&type=module";
       a.target = "_blank";

+ 25 - 4
ui/src/views/system/template/components/dataSearch.vue

@@ -23,7 +23,7 @@
           />
         </el-select>
       </el-form-item>
-     <!--  <el-form-item label="模块状态:">
+      <!--  <el-form-item label="模块状态:">
         <el-select
           v-model="queryForm.status"
           class="m-2"
@@ -96,6 +96,21 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="模块分类:" prop="category_id">
+          <el-select
+            v-model="moduleForm.category_id"
+            class="m-2"
+            placeholder="请选择模块分类"
+            size="large"
+          >
+            <el-option
+              v-for="item in categoryList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
         <!--  <el-form-item label="模块状态:" prop="status">
           <el-select
             v-model="moduleForm.status"
@@ -143,6 +158,7 @@ export default {
           pageSize: 10,
           dcb_name: "",
           dcb_share: "",
+          category_id: "",
           /*           status: "", */
         };
       },
@@ -170,6 +186,7 @@ export default {
         dcb_name: "",
         /*  status: 5, */
         dcb_share: "",
+        category_id: "",
       },
       props: {
         value: "id",
@@ -181,7 +198,9 @@ export default {
         dcb_name: [
           { required: true, message: "请输模块名称", trigger: "blur" },
         ],
-        /*  status: [{ required: true, message: "请选择状态", trigger: "change" }], */
+        category_id: [
+          { required: true, message: "请选择模块状态", trigger: "change" },
+        ],
         dcb_share: [
           { required: true, message: "请选择分类", trigger: "change" },
         ],
@@ -214,6 +233,7 @@ export default {
       this.moduleForm = {
         dcb_name: "",
         dcb_share: "",
+        category_id: "",
       };
     },
     /* 确定新增模块*/
@@ -229,6 +249,7 @@ export default {
               dcb_name: "",
               /*    status: 5, */
               dcb_share: "",
+              category_id: "",
             };
             //this.$emit('refresh-list');
             this.onSubmit();
@@ -261,13 +282,13 @@ export default {
     },
 
     //搜索
-   // 修改 onSubmit 方法
+    // 修改 onSubmit 方法
     onSubmit() {
       // 更新查询条件
       this.$emit("bindSetQuery", this.queryForm);
       // 触发刷新列表
       this.$emit("search");
-    }
+    },
   },
 };
 </script>