xinyilu/postdischarge-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
辉 2024-06-17 10:32:58 +08:00
commit 5cfe6f4168
2 changed files with 1740 additions and 1740 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/views/system/Scriptpreview/index.vue
View File

@ -264,14 +264,14 @@
</div> </div>
</section> </section>
</div> </div>
</template> </template>
<script> <script>
import G6Editor from "@antv/g6-editor"; import G6Editor from "@antv/g6-editor";
import mixin from "../mianview/mixin"; import mixin from "../mianview/mixin";
import { selectScriptEdgeNode } from "@/api/system/preview"; import { selectScriptEdgeNode } from "@/api/system/preview";
import { construct } from "netflix-conductor-json-tree/dist/index"; import { construct } from "netflix-conductor-json-tree/dist/index";
import Cookies from 'js-cookie' import Cookies from 'js-cookie'
export default { export default {
name: "VueG6Editor", name: "VueG6Editor",
mixins: [mixin], mixins: [mixin],
data() { data() {
@ -648,7 +648,7 @@
// console.log(this.form,'this.form') // console.log(this.form,'this.form')
}) })
}, },
// 初始化 // 初始化
initG6Editor() { initG6Editor() {
const _this = this; const _this = this;
@ -891,10 +891,9 @@
console.log(JSON.stringify(res, null, 2)); console.log(JSON.stringify(res, null, 2));
} }
} }
}; };
</script> </script>
<style lang="less">
@import url("../mianview/index.less");
</style>
<style lang="less">
@import url("../mianview/index.less");
</style>

27
src/views/system/preview/index.vue
View File

@ -461,14 +461,14 @@
</div> </div>
</section> </section>
</div> </div>
</template> </template>
<script> <script>
import G6Editor from "@antv/g6-editor"; import G6Editor from "@antv/g6-editor";
import mixin from "../mianview/mixin"; import mixin from "../mianview/mixin";
import { insertScriptEdgeNode,selectScriptEdgeNode } from "@/api/system/preview"; import { insertScriptEdgeNode,selectScriptEdgeNode } from "@/api/system/preview";
import Cookies from 'js-cookie' import Cookies from 'js-cookie'
import { construct } from "netflix-conductor-json-tree/dist/index"; import { construct } from "netflix-conductor-json-tree/dist/index";
export default { export default {
name: "VueG6Editor", name: "VueG6Editor",
mixins: [mixin], mixins: [mixin],
data() { data() {
@ -880,9 +880,10 @@ export default {
console.log(JSON.stringify(res, null, 2)); console.log(JSON.stringify(res, null, 2));
} }
} }
}; };
</script> </script>
<style lang="less">
@import url("../mianview/index.less");
</style>
<style lang="less">
@import url("../mianview/index.less");
</style>