CzRger 6 mēneši atpakaļ
vecāks
revīzija
b58061083f

+ 9 - 0
src/assets/svg/tips.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 128 128" style="enable-background:new 0 0 128 128;" xml:space="preserve">
+<path class="st0" d="M64,7.7C32.9,7.7,7.7,32.9,7.7,64c0,0,0,0,0,0c0,31.1,25.2,56.3,56.3,56.3c31.1,0,56.3-25.2,56.3-56.3
+	c0,0,0,0,0,0C120.3,32.9,95.1,7.7,64,7.7z M58.9,76.8V33.3c0-2.8,2.3-5.1,5.1-5.1s5.1,2.3,5.1,5.1v43.5c0,2.8-2.3,5.1-5.1,5.1
+	S58.9,79.6,58.9,76.8C58.9,76.8,58.9,76.8,58.9,76.8z M64,99.8C64,99.8,64,99.8,64,99.8c-2.8,0-5.1-2.3-5.1-5.1
+	c0-2.8,2.3-5.1,5.1-5.1c2.8,0,5.1,2.3,5.1,5.1S66.8,99.8,64,99.8z"/>
+</svg>

+ 0 - 1
src/components/HeadMenu/index.vue

@@ -59,7 +59,6 @@ const switchMenu = () => {
       window.open(routerUrl.href, "_blank");
     }
   }
-  console.log(route)
 }
 </script>
 

+ 0 - 1
src/components/cus/CusTable.vue

@@ -225,7 +225,6 @@ const initDrag = () => {
           const targetRow = d[oldIndex]
           d.splice(oldIndex, 1)
           d.splice(newIndex, 0, targetRow)
-          console.log(d)
           emit('update:data', [...d])
           state.dragRefresh = false
           setTimeout(() => {

+ 0 - 1
src/plugins/initDirect.ts

@@ -20,7 +20,6 @@ export default {
 		Vue.directive('drag', {
 			mounted(el: HTMLElement, bind) {
 				el.onmousedown = async function (e: any) {
-					console.log(333, e.target?.className)
 					if (['INPUT', 'TEXTAREA', 'CANVAS'].includes(e.target.nodeName) || (typeof e.target?.className === "string" && e.target?.className?.includes('el-slider'))) {
 						return;
 					}

+ 0 - 1
src/utils/util.ts

@@ -590,7 +590,6 @@ export const covers24Hours = (arr) =>{
     }
     result += Math.abs(end - start);
   }
-  console.log(result);
   return result === 86400 || result === 86399;
 }
 

+ 12 - 1
src/views/manage/theme/relation-detail.vue

@@ -68,7 +68,15 @@
           required
           label="关系描述"
           v-model:param="state.form.relationDescription"
-        />
+        >
+          <template #label>
+            <el-tooltip content="输入\n可换行">
+              <div style="display: flex;align-items: center;">
+                <SvgIcon name="tips" color="var(--cus-text-color-2)" size="14"/>关系描述
+              </div>
+            </el-tooltip>
+          </template>
+        </CusFormColumn>
         <CusFormColumn
           :span="12"
           label="节点图标"
@@ -321,4 +329,7 @@ const initDictionary = () => {
 </script>
 
 <style lang="scss" scoped>
+:deep(.upload-layout-card_item) {
+  background-color: #999999;
+}
 </style>

+ 0 - 1
src/views/manage/theme/style.vue

@@ -114,7 +114,6 @@ const titleCpt = computed(() => {
   return t
 })
 const onSubmit = () => {
-  console.log(state.form)
   ref_form.value.submit().then(() => {
     ElMessageBox.confirm("是否提交?", "提示", {
       confirmButtonText: "确定",

+ 3 - 3
src/views/web/archive/index.vue

@@ -199,8 +199,8 @@ const themeConfigCpt = computed(() => {
     },
     tabs: new Map(),
     chart: {
-      nodes: [],
-      edges: [],
+      nodes: <any>[],
+      edges: <any>[],
     }
   }
   state.themeDetail.indexDtos?.forEach(v => {
@@ -232,7 +232,7 @@ const themeConfigCpt = computed(() => {
         searchParam: getSearchParam(v),
         tableHead: getTableHead(v)
       })
-      res.chart.edges.push({source: String(v.relateIndexId), target: String(v.id)})
+      res.chart.edges.push({source: String(v.relateIndexId), target: String(v.id), labelText: v.description || '关系描述'})
     } else {
       res.tabs.set(v.indexTableName, {
         indexName: v.indexName,

+ 3 - 3
src/views/web/archive/relation-chart.vue

@@ -29,7 +29,7 @@ const setNodes = (data) => {
 const setEdges = (data) => {
   data.edges.forEach(v => {
     v.style = {
-      labelText: '关系描述'
+      labelText: v.labelText.replace(/\\n/g, '\n')
     }
   })
 }
@@ -55,7 +55,7 @@ const initChart = () => {
         focusNode: '3',
         linkDistance: 200,
         preventOverlap: true,
-        unitRadius: 200,
+        unitRadius: 250,
         maxPreventOverlapIteration: 100,
         strictRadial: false
       },
@@ -103,7 +103,7 @@ const initChart = () => {
           stroke: mainColor,
           labelAutoRotate: false,
           labelFill: '#ffffff',
-          labelPadding: [2, 4, 0, 4],
+          labelPadding: [4, 8, 2, 8],
           labelBackground: true,
           labelBackgroundFill: mainColor,
           labelBackgroundRadius: 20,