Compare commits

..

No commits in common. "f5accd1f615af75cd3ea8f59096df636716856ea" and "0fca3e1ec47946e2ff5826e6190bd0d1261fe9f6" have entirely different histories.

6 changed files with 62 additions and 83 deletions

View File

@ -47,7 +47,6 @@
"benz-amr-recorder": "^1.1.5", "benz-amr-recorder": "^1.1.5",
"bpmn-js-token-simulation": "0.10.0", "bpmn-js-token-simulation": "0.10.0",
"clipboard": "2.0.8", "clipboard": "2.0.8",
"code-brick-zj": "^1.0.2",
"core-js": "^3.26.0", "core-js": "^3.26.0",
"crypto-js": "^4.0.0", "crypto-js": "^4.0.0",
"echarts": "5.4.0", "echarts": "5.4.0",

View File

@ -1,94 +1,80 @@
import Vue from 'vue'; import Vue from 'vue'
import Element from 'element-ui'; import Element from 'element-ui'
import './assets/styles/element-variables.scss'; import './assets/styles/element-variables.scss'
import '@/assets/styles/index.scss'; // global css
import '@/assets/styles/ruoyi.scss'; // ruoyi css
import App from './App';
import store from './store';
import router from './router';
import directive from './directive'; // directive
import plugins from './plugins'; // plugins
import './assets/icons'; // icon import '@/assets/styles/index.scss' // global css
import './permission'; // permission control import '@/assets/styles/ruoyi.scss' // ruoyi css
import App from './App'
import store from './store'
import router from './router'
import directive from './directive' // directive
import plugins from './plugins' // plugins
import './assets/icons' // icon
import './permission' // permission control
// import './tongji' // 百度统计 // import './tongji' // 百度统计
import { getDicts } from '@/api/system/dict/data'; import { getDicts } from "@/api/system/dict/data";
import { getConfigKey } from '@/api/infra/config'; import { getConfigKey } from "@/api/infra/config";
import { import { parseTime, resetForm, handleTree, addBeginAndEndTime, divide} from "@/utils/ruoyi";
parseTime, import Pagination from "@/components/Pagination";
resetForm,
handleTree,
addBeginAndEndTime,
divide,
} from '@/utils/ruoyi';
import Pagination from '@/components/Pagination';
// 自定义表格工具扩展 // 自定义表格工具扩展
import RightToolbar from '@/components/RightToolbar'; import RightToolbar from "@/components/RightToolbar"
// 代码高亮插件 // 代码高亮插件
// import hljs from 'highlight.js' // import hljs from 'highlight.js'
// import 'highlight.js/styles/github-gist.css' // import 'highlight.js/styles/github-gist.css'
import { import {DICT_TYPE, getDictDataLabel, getDictDatas, getDictDatas2} from "@/utils/dict";
DICT_TYPE,
getDictDataLabel,
getDictDatas,
getDictDatas2,
} from '@/utils/dict';
import './theme/index.css'; // 自定义主题包 - code-brick-zj
// 全局方法挂载 // 全局方法挂载
Vue.prototype.getDicts = getDicts; Vue.prototype.getDicts = getDicts
Vue.prototype.getConfigKey = getConfigKey; Vue.prototype.getConfigKey = getConfigKey
Vue.prototype.parseTime = parseTime; Vue.prototype.parseTime = parseTime
Vue.prototype.resetForm = resetForm; Vue.prototype.resetForm = resetForm
Vue.prototype.getDictDatas = getDictDatas; Vue.prototype.getDictDatas = getDictDatas
Vue.prototype.getDictDatas2 = getDictDatas2; Vue.prototype.getDictDatas2 = getDictDatas2
Vue.prototype.getDictDataLabel = getDictDataLabel; Vue.prototype.getDictDataLabel = getDictDataLabel
Vue.prototype.DICT_TYPE = DICT_TYPE; Vue.prototype.DICT_TYPE = DICT_TYPE
Vue.prototype.handleTree = handleTree; Vue.prototype.handleTree = handleTree
Vue.prototype.addBeginAndEndTime = addBeginAndEndTime; Vue.prototype.addBeginAndEndTime = addBeginAndEndTime
Vue.prototype.divide = divide; Vue.prototype.divide = divide
// 全局组件挂载 // 全局组件挂载
Vue.component('DictTag', DictTag); Vue.component('DictTag', DictTag)
Vue.component('DocAlert', DocAlert); Vue.component('DocAlert', DocAlert)
Vue.component('Pagination', Pagination); Vue.component('Pagination', Pagination)
Vue.component('RightToolbar', RightToolbar); Vue.component('RightToolbar', RightToolbar)
// 字典标签组件 // 字典标签组件
import DictTag from '@/components/DictTag'; import DictTag from '@/components/DictTag'
import DocAlert from '@/components/DocAlert'; import DocAlert from '@/components/DocAlert'
// 头部标签插件 // 头部标签插件
import VueMeta from 'vue-meta'; import VueMeta from 'vue-meta'
import CodeBrickZj from 'code-brick-zj';
Vue.use(CodeBrickZj) Vue.use(directive)
Vue.use(directive); Vue.use(plugins)
Vue.use(plugins); Vue.use(VueMeta)
Vue.use(VueMeta);
// Vue.use(hljs.vuePlugin); // Vue.use(hljs.vuePlugin);
// bpmnProcessDesigner 需要引入 // bpmnProcessDesigner 需要引入
import MyPD from '@/components/bpmnProcessDesigner/package/index.js'; import MyPD from "@/components/bpmnProcessDesigner/package/index.js";
Vue.use(MyPD); Vue.use(MyPD);
import '@/components/bpmnProcessDesigner/package/theme/index.scss'; import "@/components/bpmnProcessDesigner/package/theme/index.scss";
import 'bpmn-js/dist/assets/diagram-js.css'; import "bpmn-js/dist/assets/diagram-js.css";
import 'bpmn-js/dist/assets/bpmn-font/css/bpmn.css'; import "bpmn-js/dist/assets/bpmn-font/css/bpmn.css";
import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css'; import "bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css";
import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css'; import "bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css";
// Form Generator 组件需要使用到 tinymce // Form Generator 组件需要使用到 tinymce
import Tinymce from '@/components/tinymce/index.vue'; import Tinymce from '@/components/tinymce/index.vue'
Vue.component('tinymce', Tinymce); Vue.component('tinymce', Tinymce)
import '@/assets/icons'; import '@/assets/icons'
import request from '@/utils/request'; // 实现 form generator 使用自己定义的 axios request 对象 import request from "@/utils/request" // 实现 form generator 使用自己定义的 axios request 对象
console.log(request); console.log(request)
Vue.prototype.$axios = request; Vue.prototype.$axios = request
import '@/styles/index.scss'; import '@/styles/index.scss'
// 默认点击背景不关闭弹窗 // 默认点击背景不关闭弹窗
import ElementUI from 'element-ui'; import ElementUI from 'element-ui'
ElementUI.Dialog.props.closeOnClickModal.default = false; ElementUI.Dialog.props.closeOnClickModal.default = false
/** /**
* If you don't want to use mock-server * If you don't want to use mock-server
@ -100,14 +86,14 @@ ElementUI.Dialog.props.closeOnClickModal.default = false;
*/ */
Vue.use(Element, { Vue.use(Element, {
size: localStorage.getItem('size') || 'medium', // set element-ui default size size: localStorage.getItem("size") || "medium", // set element-ui default size
}); });
Vue.config.productionTip = false; Vue.config.productionTip = false
new Vue({ new Vue({
el: '#app', el: '#app',
router, router,
store, store,
render: (h) => h(App), render: h => h(App)
}); })

Binary file not shown.

Binary file not shown.

File diff suppressed because one or more lines are too long

View File

@ -2994,11 +2994,6 @@ coa@^2.0.2:
chalk "^2.4.1" chalk "^2.4.1"
q "^1.1.2" q "^1.1.2"
code-brick-zj@^1.0.2:
version "1.0.2"
resolved "https://registry.npmmirror.com/code-brick-zj/-/code-brick-zj-1.0.2.tgz#f9f5fa97faa65262e887a3a15014827ac95b1fea"
integrity sha512-V8XwYqXjIPMfPCaZMja4I2MJPT45EEnzRmTL1Ps6aMsmUQ/PhZ48OwUvddBFNqNZeVV13aPm1b5K1c3ogfad8Q==
collection-visit@^1.0.0: collection-visit@^1.0.0:
version "1.0.0" version "1.0.0"
resolved "https://registry.npmmirror.com/collection-visit/-/collection-visit-1.0.0.tgz" resolved "https://registry.npmmirror.com/collection-visit/-/collection-visit-1.0.0.tgz"