+
+ + {{ item.stepTitle }} + +
+已完成 diff --git a/src/components/comments-list.vue b/src/components/comments-list.vue index fd41b14a2da50e18d9e7e024120a633ab56762c6..f806f6f830fb6e52c5745ef120a2d18733332fba 100644 --- a/src/components/comments-list.vue +++ b/src/components/comments-list.vue @@ -6,7 +6,7 @@ :key="'comment_' + index" >
-
diff --git a/src/components/e-charts/commentlist.vue b/src/components/e-charts/commentlist.vue
index 6a5d05709760278cb2e725dcc08bce95af07f442..47cff06adf21a7c2c18a281e41ce12bb44ea7051 100644
--- a/src/components/e-charts/commentlist.vue
+++ b/src/components/e-charts/commentlist.vue
@@ -2,7 +2,7 @@
-
-
+ -diff --git a/src/components/e-charts/histogramScroll.vue b/src/components/e-charts/histogramScroll.vue index df6c975680a4b75a5718529d4511b0c217161a55..572f7cd42150dbf0e7939e202814fa16ced9fb9b 100644 --- a/src/components/e-charts/histogramScroll.vue +++ b/src/components/e-charts/histogramScroll.vue @@ -59,11 +59,21 @@ export default { { type: "category", axisLabel: { + interval: 0, textStyle: { color: "#0d1847", fontSize: 12, lineHeight: 20, }, + formatter(value) { + let valueTxt = ""; + if (value.length > 7) { + valueTxt = value.substring(0, 7 - 1) + "..."; + } else { + valueTxt = value; + } + return valueTxt; + }, }, axisTick: { show: false, diff --git a/src/components/e-charts/multiple_circle.vue b/src/components/e-charts/multiple_circle.vue index 0cc073a3f9a5928470027f83a4a51fc5da729322..9cc2f4597a8cb45bdd2426d3dc3ad876b6e5d9c5 100644 --- a/src/components/e-charts/multiple_circle.vue +++ b/src/components/e-charts/multiple_circle.vue @@ -32,6 +32,10 @@ export default { isPercent: { type: Boolean, default: true + }, + color: { + type: Array, + default: null } }, components: {}, diff --git a/src/components/e-charts/process-top-list.vue b/src/components/e-charts/process-top-list.vue new file mode 100644 index 0000000000000000000000000000000000000000..2b2c3d7ba899b5ee9a32b27e0e9ce222cfb4c85e --- /dev/null +++ b/src/components/e-charts/process-top-list.vue @@ -0,0 +1,174 @@ + +
++ + + + + diff --git a/src/components/general/codes.vue b/src/components/general/codes.vue index e9d5ec78f55cf06f33193cb12c7a8714ea83361e..1eb47f2945cfcf8b8d69a49c6640f012a65c152d 100644 --- a/src/components/general/codes.vue +++ b/src/components/general/codes.vue @@ -17,7 +17,7 @@ import ace from "ace-builds"; import "ace-builds/webpack-resolver"; // 在 webpack 环境中使用必须要导入 import "ace-builds/src-noconflict/mode-json"; // 默认设置的语言模式 export default { - props: ["url","datas"], + props: ["url","datas",'readOnly'], data() { return { aceEditor: null, @@ -34,7 +34,8 @@ export default { mode: this.acemodePath, wrap: this.wrap, tabSize: 4, - highlightActiveLine: false + highlightActiveLine: false, + readOnly:this.readOnly?this.readOnly:false }); if (this.url) { this.getValue(); diff --git a/src/components/general/side-nav-bar-class.vue b/src/components/general/side-nav-bar-class.vue new file mode 100644 index 0000000000000000000000000000000000000000..440a6767b0ef5565094871f06bb85d3e46900226 --- /dev/null +++ b/src/components/general/side-nav-bar-class.vue @@ -0,0 +1,108 @@ + +-
+
-
+ ++
+ + {{ option.service_name }} + + +
++ +
+
++ + + + + diff --git a/src/components/general/upload_file.vue b/src/components/general/upload_file.vue index 5e3d904f3bc3a7eac7551c21db59b87e54841856..e1d00846407f1cfd39e7e9470d20bf91b15578a0 100644 --- a/src/components/general/upload_file.vue +++ b/src/components/general/upload_file.vue @@ -24,6 +24,7 @@ :readOnly="readOnly" :data="anotherData" :drag="drag" + :disabled="disabled" >+
++ +
+ + ++@@ -92,6 +93,10 @@ export default { type: Boolean, default: true, }, + disabled: { + type: Boolean, + default: false, + }, }, watch: { list(value) { diff --git a/src/components/message-steps/select-service.vue b/src/components/message-steps/select-service.vue index e96dcbb3f2748d0c43aedb14a5c88386e8a64847..070d7533d3fd0bf2e099fec0b6049fcd07900e0b 100644 --- a/src/components/message-steps/select-service.vue +++ b/src/components/message-steps/select-service.vue @@ -22,6 +22,7 @@ + + - - \ No newline at end of file diff --git a/src/components/work-flow/workflows-view.vue b/src/components/work-flow/workflows-view.vue new file mode 100644 index 0000000000000000000000000000000000000000..5a48f102869549887ea59d0c80938e0c1bed52cd --- /dev/null +++ b/src/components/work-flow/workflows-view.vue @@ -0,0 +1,191 @@ + +++ + + + + + + diff --git a/src/pages/authority/menu/menus.vue b/src/pages/authority/menu/menus.vue index 71f23d30c1cfc5b2d700e9a109c9521c8ea2b8f3..5fd9b3d48d181096de42ef9e1aa63fc47facaae5 100644 --- a/src/pages/authority/menu/menus.vue +++ b/src/pages/authority/menu/menus.vue @@ -143,7 +143,7 @@ export default { rules: { menu_name: [ { required: true, message: "请填写菜单名称", trigger: "blur" }, - { min: 0, max: 8, message: "菜单名称不超过8位", trigger: "blur" } + { min: 0, max: 16, message: "菜单名称不超过16位", trigger: "blur" } ], visit_url: [ { required: true, message: "请填写菜单访问地址", trigger: "blur" }, diff --git a/src/pages/authority/user/organizationuser.vue b/src/pages/authority/user/organizationuser.vue index 0594c3bfbbf991714180f4044b87b595e91e11d5..bb1061b18381efad0046a9f31f1cc8ce9b504ad6 100644 --- a/src/pages/authority/user/organizationuser.vue +++ b/src/pages/authority/user/organizationuser.vue @@ -206,12 +206,12 @@ export default { }, 1000); }; var user_name_pass = (rule, value, callback) => { - var reg = /^[a-z0-9]+$/; + var reg = /^[a-zA-Z0-9|\-|_|\.]+$/; setTimeout(() => { if (reg.test(value)) { callback(); } else { - callback(new Error("只支持小写字母、数字")); + callback(new Error("只支持字母、数字、-、_、.")); } }, 100); }; diff --git a/src/pages/data-analysis/data-analysis.vue b/src/pages/data-analysis/data-analysis.vue index b41d9986620a8ec77776166a85c42544824b9619..a974e672045631600a56e9f83ef630ae3de29da1 100644 --- a/src/pages/data-analysis/data-analysis.vue +++ b/src/pages/data-analysis/data-analysis.vue @@ -1,11 +1,19 @@+ + ++ +++ +++ + +++当前实例数：{{ meta.running_nodes || 0 }}
+当前超时比率：{{ (meta.cur_timeout_rate || 0) * 100 }}%
+总超时比率：{{ (meta.total_timeout_rate || 0) * 100 }}%
+节点平均耗时：{{ meta.avg_elapsed_time || 0 }}分钟
+节点最大耗时：{{ meta.max_elapsed_time || 0 }}分钟
+节点插件：
++ + {{ + ["-", "接口插件", "流程插件", "超时插件"][ + plugin.plugin_type || 0 + ] + }} + +++ + ++-+ > + @@ -14,53 +22,88 @@ diff --git a/src/pages/data-analysis/super-application.vue b/src/pages/data-analysis/super-application.vue new file mode 100644 index 0000000000000000000000000000000000000000..f108a403b532acbc3709df3017806c82939c71e7 --- /dev/null +++ b/src/pages/data-analysis/super-application.vue @@ -0,0 +1,54 @@ + +++ + + + \ No newline at end of file diff --git a/src/pages/data-analysis/super-service.vue b/src/pages/data-analysis/super-service.vue new file mode 100644 index 0000000000000000000000000000000000000000..27a560fa3d30a740cd5c8d9c731e34dd864b0f90 --- /dev/null +++ b/src/pages/data-analysis/super-service.vue @@ -0,0 +1,62 @@ + ++ +{{ $t("lang.data_analysis") }} +{{ $t("lang.my_application_data_analysis") }} ++ +++开发中，敬请期待！
++ 如需技术支持 +
+
请联系管理员 +++ + + + \ No newline at end of file diff --git a/src/pages/index.vue b/src/pages/index.vue index 78be45440281119443cee55df040664cd21dad20..77050b7a2b5c6edfa8535e965c727f0eff3229b4 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -16,7 +16,8 @@ export default { '/intelligent_drawing', '/intelligent_details', '/intelligent_appbuilder', - '/search_engine' + '/search_engine', + '/technical_support' ] }), created(){ diff --git a/src/pages/message-management/banner/banner-detail.vue b/src/pages/message-management/banner/banner-detail.vue index f420b9879461c3fdb389abe28f0de442e35f8957..f09227881a87908f2487c31aa9aa47d8c0a02301 100644 --- a/src/pages/message-management/banner/banner-detail.vue +++ b/src/pages/message-management/banner/banner-detail.vue @@ -93,6 +93,7 @@ @getNewList="getNewList" ref="servicepic" directory="manage" + :disabled="disabled" > @@ -129,13 +130,43 @@ var user_name_pass = (rule, value, callback) => { } }, 100); }; +var rank_rule = (rule, value, callback)=>{ + var reg = /^[1-9][0-9]{0,1}$/; + setTimeout(() => { + if (reg.test(value)) { + callback(); + } else { + callback(new Error("请输入2位内正整数")); + } + }, 100); +} import helper from "@/services/helper.js"; import uploadFile from "@/components/general/upload_file"; export default { components: { uploadFile, }, - data: () => ({ + data(){ + var validateup = (rule, value, callback) => { + if (value === '') { + callback(new Error('请选择上架时间')); + } else { + if (this.detail.down_time !== '') { + this.$refs.detail_form.validateField('down_time'); + } + callback(); + } + }; +var validatedown = (rule, value, callback) => { + if (value === '') { + callback(new Error('请选择下架时间')); + } else if (value.getTime() <= this.detail.up_time.getTime()) { + callback(new Error('下架时间应在上架时间之后')); + } else { + callback(); + } +}; + return{ pageType: 0, // 0：新增，1：编辑，2：详情 detail: { name: "", @@ -176,6 +207,10 @@ export default { message: "请输入排序", trigger: "blur", }, + { + validator: rank_rule, + trigger: 'blur' + } ], up_time: [ { @@ -183,6 +218,10 @@ export default { message: "请选择上架时间", trigger: "change", }, + { + validator:validateup, + trigger: "change", + }, ], fileList: [ { @@ -197,6 +236,10 @@ export default { message: "请选择下架时间", trigger: "change", }, + { + validator:validatedown, + trigger: "change", + }, ], url: [], }, @@ -211,7 +254,8 @@ export default { }, ], submitLoading: false, - }), + } + }, computed: { pageName() { return ["新增", "编辑", "详情"][this.pageType]; @@ -241,6 +285,7 @@ export default { this.detail.fileList = val[0].url; this.detail.size = val[0].size; console.log(this.detail.fileList); + this.$refs.detail_form.validateField('fileList') }, getDetail() { this.$http diff --git a/src/pages/message-management/banner/banner-list.vue b/src/pages/message-management/banner/banner-list.vue index 09a61cb4e7c3b358fa050a45d70dafdc69fa2196..7effcda4f6dd55b170bbb6c522e8d55eeeabb077 100644 --- a/src/pages/message-management/banner/banner-list.vue +++ b/src/pages/message-management/banner/banner-list.vue @@ -2,6 +2,7 @@+ ++ {{ + $t("lang.data_analysis") + }} + ++ {{ + $t("lang.my_service_data_analysis") + }} + ++ +++开发中，敬请期待！
++ 如需技术支持 +
+
请联系管理员 +@@ -14,16 +39,18 @@ - \ No newline at end of file diff --git a/src/pages/service_shop/sjfwDetail.vue b/src/pages/service_shop/sjfwDetail.vue index cd8091c93e14a9eae9128bff5c15d94b697ddb79..0a359eccb5aab6276c961a593a125216123006c9 100644 --- a/src/pages/service_shop/sjfwDetail.vue +++ b/src/pages/service_shop/sjfwDetail.vue @@ -120,7 +120,6 @@ export default { { prop: "name", label: "字段编码", - align: "center", width: 240, }, { @@ -163,7 +162,6 @@ export default { { prop: "name", label: "字段编码", - align: "center", width: 240, }, { diff --git a/src/pages/service_shop/zhfwDetail.vue b/src/pages/service_shop/zhfwDetail.vue index e677e773d051f498c3563fa98ba30ed3c3a36da6..4b06934c20a44d7143c7ce41f0c3785273dd867e 100644 --- a/src/pages/service_shop/zhfwDetail.vue +++ b/src/pages/service_shop/zhfwDetail.vue @@ -4,7 +4,7 @@- + + ++ ++ {{ + $t("lang.service_shop") + }} + +{{ name }} ++ +++开发中，敬请期待！
++ 如需技术支持 +
+
请联系管理员 +服务超市 - 综合应用 + 融合服务 服务详情信息 ++ + + + + diff --git a/src/pages/workbench/component-center/app-build/index.vue b/src/pages/workbench/component-center/app-build/index.vue index 5ec68e61f5624fc1eb2096e4bc0218575fe88eda..4c0be79850ca7e5b4af5be9a579a29a237489d53 100644 --- a/src/pages/workbench/component-center/app-build/index.vue +++ b/src/pages/workbench/component-center/app-build/index.vue @@ -533,6 +533,10 @@ export default { this.step2Loading = false; }, step2Action() { + if (this.step2Loading) { + return; + } + this.$refs.deploy_info_form.validate((valid) => { if (valid) { this.step2Loading = true; @@ -612,6 +616,10 @@ export default { this.image_info.file = ""; }, addImage() { + if (this.addImageLoading) { + return; + } + this.$refs.image_info_form.validate((valid) => { if (valid) { this.addImageLoading = true; diff --git a/src/pages/workbench/component-center/intelligent-drawing/intelligent_appbuilder.vue b/src/pages/workbench/component-center/intelligent-drawing/intelligent_appbuilder.vue index a3aaf5b5f324837af270936bc463357f292097c0..31aa5eca3a11e2273000781e8dd559eaac538271 100644 --- a/src/pages/workbench/component-center/intelligent-drawing/intelligent_appbuilder.vue +++ b/src/pages/workbench/component-center/intelligent-drawing/intelligent_appbuilder.vue @@ -39,7 +39,12 @@ export default { }, }, mounted() { - window.addEventListener('message',event =>{ + this.$nextTick(() => { + window.addEventListener('message',this.postmassageevt); + }) + }, + methods: { + postmassageevt(event){ let data = event.data; // App Builder发布服务 if (data.cmd == 'appbuildermsg'){ @@ -47,9 +52,11 @@ export default { this.$store.commit("setAppBuilderParams", data.params); this.$router.push(`/fwzc/fwcs?map=4`); } - }) + } }, - methods: {}, + destroyed () { + window.removeEventListener('message',this.postmassageevt); + } }; diff --git a/src/pages/workbench/component-center/intelligent-drawing/intelligent_details.vue b/src/pages/workbench/component-center/intelligent-drawing/intelligent_details.vue index 718a85cd616664e2132ae1edfab0b84bcf4e2faa..30d21703d69b9e447d9703c171b9234c2bce0a83 100644 --- a/src/pages/workbench/component-center/intelligent-drawing/intelligent_details.vue +++ b/src/pages/workbench/component-center/intelligent-drawing/intelligent_details.vue @@ -32,19 +32,37 @@ export default { }, mounted() { this.$nextTick(() => { - window.addEventListener('message',event =>{ - let data = event.data; - if (data.cmd == 'mapdetailtoview'){ - console.log(data); - this.$store.commit("setZnztDetailsParams", data.params); - this.$router.push('/intelligent_drawing') - } - }) + window.addEventListener('message',this.postmassageevt) }) }, - methods: {}, + methods: { + postmassageevt(event){ + let data = event.data; + // App Builder页面 -- 新窗口打开 + if (data.cmd == 'mapviewtoapp'){ + let params = { + title: data.params.title, + tags: data.params.tags, + sharewithwebmap:data.params.shareWithWebMap, + webmap:data.params.id, + summary: data.params.summary, + }; + let routeData = this.$router.resolve({ + name: "intelligent_appbuilder", + query: params, + }); + window.open(routeData.href, '_blank'); + // this.$store.commit("setAppBuilderParams", data.params); + }; + if (data.cmd == 'mapdetailtoview'){ + console.log(data); + this.$store.commit("setZnztDetailsParams", data.params); + this.$router.push('/intelligent_drawing') + } + } + }, destroyed () { - // window.removeEventListener('message') + window.removeEventListener('message',this.postmassageevt) } }; diff --git a/src/pages/workbench/component-center/process-management/designer/detail.vue b/src/pages/workbench/component-center/process-management/designer/detail.vue index fba663ba0c388f879208f6ec4fc675b6119af8db..0eb1a73f08c9b5e2346f6258de1663bc864f060f 100644 --- a/src/pages/workbench/component-center/process-management/designer/detail.vue +++ b/src/pages/workbench/component-center/process-management/designer/detail.vue @@ -2,15 +2,16 @@{{ $t("lang.technical_support") }}++ +++开发中，敬请期待！
++ 如需技术支持 +
+
请联系管理员 +@@ -74,11 +76,21 @@在线组件工具 / 流程设计 / 流程管理 / 详情
-@@ -64,6 +65,7 @@ class="block-radius-content" :options="toplistData" :target-value="toplistTargetValue" + unit="min" >+ {{item}}@@ -36,7 +37,7 @@- - 流程++ + @@ -27,7 +28,7 @@@@ -18,7 +19,7 @@
流程实例总数
-2,980万
+{{all_count.total_instances>=10000?all_count.total_instances/10000:all_count.total_instances}}万
流程平均耗时
-35min
+{{all_count.avg_time}}min
流程超时率
-5%
+{{all_count.timeout_rate}}%
流程+ + -
+