diff --git a/src/G6/nodeConfig.ts b/src/G6/nodeConfig.ts index d76d545..2c77245 100644 --- a/src/G6/nodeConfig.ts +++ b/src/G6/nodeConfig.ts @@ -120,20 +120,20 @@ export const breakdownNode: ShapeOptions = { stroke: "#5B8FF9", fill: "#D7DCF1", lineWidth: 2, - cursor: "pointer", + // cursor: "pointer", }, name: "root-node-key-shape", }); group.addShape("text", { attrs: { - text: textWrapping(cfg.label as string, 200), + text: textWrapping(cfg.label as string, 300), fill: "#000", fontSize: 12, x: 2 * r, // y: -r / 2, textAlign: "left", textBaseline: "middle", - cursor: "pointer", + // cursor: "pointer", }, name: "root-text-shape", }); diff --git a/src/api/mock.ts b/src/api/mock.ts index eb5c8d7..0ade641 100644 --- a/src/api/mock.ts +++ b/src/api/mock.ts @@ -18,7 +18,7 @@ export const fetchJob = (task: string) => ), ), }), - 100, + 500, ); }); @@ -34,6 +34,6 @@ export const fetchTool = (_toolId: string) => ), ), }), - 100, + 500, ); }); diff --git a/src/components/Case.vue b/src/components/Case.vue new file mode 100644 index 0000000..cef94af --- /dev/null +++ b/src/components/Case.vue @@ -0,0 +1,28 @@ + + + + + {{ props.name }} + + + + diff --git a/src/components/Question.vue b/src/components/Question.vue index 101cca4..c3ff07f 100644 --- a/src/components/Question.vue +++ b/src/components/Question.vue @@ -3,23 +3,25 @@ import { Promotion } from "@element-plus/icons-vue"; import { useSessionStore } from "../store/session.ts"; const sessionStore = useSessionStore(); -sessionStore.session.question = "Calculation of Flood Affected Area"; -sessionStore.chatted(); +// sessionStore.session.question = "Calculation of Flood Affected Area"; +// sessionStore.chatted(); - - - - - - - + + + + + + + + + diff --git a/src/components/taskConfig/index.vue b/src/components/taskConfig/index.vue index 300e6b4..354800e 100644 --- a/src/components/taskConfig/index.vue +++ b/src/components/taskConfig/index.vue @@ -49,7 +49,7 @@ function onCancel() { - {{ sessionStore.session.question }} - - + + + Question + + + {{ sessionStore.session.question }} + + + + + Breakdown + + + + @@ -20,25 +32,24 @@ const sessionStore = useSessionStore(); diff --git a/src/pages/Home/components/RightBox.vue b/src/pages/Home/components/RightBox.vue index 31fbd54..86dfd42 100644 --- a/src/pages/Home/components/RightBox.vue +++ b/src/pages/Home/components/RightBox.vue @@ -20,6 +20,6 @@ const sessionStore = useSessionStore(); diff --git a/src/pages/Home/components/TopBox.vue b/src/pages/Home/components/TopBox.vue index 06b016d..64e157a 100644 --- a/src/pages/Home/components/TopBox.vue +++ b/src/pages/Home/components/TopBox.vue @@ -12,7 +12,7 @@ justify-content: center; align-items: center; height: 100%; - background-color: #fff; + //background-color: #fff; .title { font-size: 20px; } diff --git a/src/pages/Home/index.less b/src/pages/Home/index.less index 46b765c..2ff9d01 100644 --- a/src/pages/Home/index.less +++ b/src/pages/Home/index.less @@ -1,17 +1,34 @@ .el-container { .el-header { - border-bottom: 1px solid #e4e7ed; - background-color: #fff; + //box-shadow: 2px 2px #e4e7ed; + background-color:#FFF; + border-bottom: 1px solid rgba(6,7,9,0.1); + //box-shadow: 0 6px 8px 0 rgba(29,28,35,.06),0 0 2px 0 rgba(29,28,35,.18); + z-index: 2; } .el-aside { + position: relative; height: calc(100vh - 60px); background-color: #f7f9fb; - border-right: 1px solid #e4e7ed; + //border-right: 2px solid #e4e7ed; + //border-right: 1px solid rgba(6,7,9,0.1); + box-shadow: 6px 0 8px 0 rgba(29,28,35,.06),0 0 2px 0 rgba(29,28,35,.18); + z-index: 1; } .el-main { position: relative; height: calc(100vh - 60px); - background-color: #f3f4f6; + //background-color: #f7f9fb; + background-color:#F4F4F6; padding: 0; } } +.case-button { + position: absolute; + bottom: 20px; + left: 20px; +} +.question-button{ + position: absolute; + bottom: 20px; +} \ No newline at end of file diff --git a/src/pages/Home/index.vue b/src/pages/Home/index.vue index c19fe15..2b3ea16 100644 --- a/src/pages/Home/index.vue +++ b/src/pages/Home/index.vue @@ -3,6 +3,7 @@ import TopBox from "@/pages/Home/components/TopBox.vue"; import LeftBox from "@/pages/Home/components/LeftBox.vue"; import RightBox from "@/pages/Home/components/RightBox.vue"; import Question from "@/components/Question.vue"; +import Case from "@/components/Case.vue"; @@ -14,10 +15,11 @@ import Question from "@/components/Question.vue"; + - + diff --git a/src/store/session.ts b/src/store/session.ts index 953c1d4..11225cf 100644 --- a/src/store/session.ts +++ b/src/store/session.ts @@ -18,12 +18,14 @@ export const useSessionStore = defineStore("session", () => { question: "", }); const graphShow = ref(false); + const questionShow = ref(true); // TODO chatted? async function chatted() { await jobStore.updateData(session.question); graphShow.value = true; + questionShow.value = false; } - return { session, graphShow, chatted }; + return { session, graphShow, questionShow, chatted }; });