diff --git a/app/components/auto-import/TiptapEditor.vue b/app/components/auto-import/TiptapEditor.vue index ad93ea4..ab88bcf 100755 --- a/app/components/auto-import/TiptapEditor.vue +++ b/app/components/auto-import/TiptapEditor.vue @@ -249,7 +249,7 @@ function generateDetailsHtml(item) { let html = `
`; html += ``; if (item.tag) { - html += ``; + html += ` ${item.tag} `; } html += `${escapeHtml(item.title) || "بدون عنوان"}`; diff --git a/app/components/lazy-load/data-entry/RelationEdit.vue b/app/components/lazy-load/data-entry/RelationEdit.vue index 394a11b..a6b398c 100644 --- a/app/components/lazy-load/data-entry/RelationEdit.vue +++ b/app/components/lazy-load/data-entry/RelationEdit.vue @@ -40,15 +40,19 @@ const setDataEditor = async () => { console.log("setDataEditor ", response); let _source = response._source; - let base_url = - window.location.origin + - "/entity/show/view/qasection/{{qanon_id}}?jump_id={{section_id}}"; + + let base_url = window.location.origin; + base_url = base_url.replace("localhost:3007", "localhost:8082"); + base_url = base_url.replace("majles.tavasi.ir", "jedit.tavasi.ir"); + + base_url += "/entity/show/view/qasection/{{qanon_id}}?jump_id={{section_id}}"; accordionItems.value = []; + let node = {} if (_source.previous_info) { let item = _source.previous_info; - accordionItems.value.push({ + node = { isOpen: false, id: item.section_mom_id, title: "قانون مقدم : " + item.qanon_title + " > " + item.full_path, @@ -58,12 +62,32 @@ const setDataEditor = async () => { link_url: base_url .replace("{{qanon_id}}", item.qanon_id) .replace("{{section_id}}", item.section_mom_id), + children: [], + }; + + node["children"].push({ + isOpen: false, + id: item.context_id, + title: "متن کامل با اجزاء دیگر مورد توجه : ", + content: _source.context1, + }); + + accordionItems.value.push(node); + + item.rule_ids.forEach((rule_id) => { + let content = _source.rules_content[rule_id] ?? ""; + accordionItems.value.push({ + isOpen: false, + id: rule_id, + title: "حکم مورد استناد طرف مقدم با شناسه : " + rule_id, + content: content, + }); }); } if (_source.next_info) { let item = _source.next_info; - accordionItems.value.push({ + node = { isOpen: false, id: item.section_mom_id, title: "قانون موخر : " + item.qanon_title + " > " + item.full_path, @@ -73,9 +97,73 @@ const setDataEditor = async () => { link_url: base_url .replace("{{qanon_id}}", item.qanon_id) .replace("{{section_id}}", item.section_mom_id), + children: [], + }; + node["children"].push({ + isOpen: false, + id: item.context_id, + title: "متن کامل با اجزاء دیگر مورد توجه : ", + content: _source.context1, + }); + + accordionItems.value.push(node); + + item.rule_ids.forEach((rule_id) => { + let content = _source.rules_content[rule_id] ?? ""; + accordionItems.value.push({ + isOpen: false, + id: rule_id, + title: "حکم مورد استناد طرف موخر با شناسه : " + rule_id, + content: content, + }); }); } + /////-------------وحدت موضوع---------------------- + node = { + isOpen: true, + id: 11, + title: "توضیح هوشمند برای وجود وحدت موضوع بین احکام استنادی ", + content: _source.subject_unity.reason, + children: [], + } + + if(_source.subject_unity.description){ + + node["children"].push({ + isOpen: false, + id: item.context_id, + title: "شرط اعتبار وحدت موضوع : ", + content: _source.subject_unity.description, + }); + + } + + accordionItems.value.push(node); + /////-------------توضیح تخالف---------------------- + node = { + isOpen: true, + id: 11, + title: "توضیح وجود تخالف بین دو ماده ", + content: _source.conflict_detection.description, + children: [], + } + + accordionItems.value.push(node); + /////-------------بیان نوع تخالف---------------------- + node = { + isOpen: true, + id: 11, + title: "بیان نوع تخالف بین دو ماده : " + _source.conflict_relation_identification.main_type, + content: _source.conflict_relation_identification.description, + children: [], + } + + accordionItems.value.push(node); + /////----------------------------------- + + + console.log("accordionItems", accordionItems.value); };