diff --git a/config/index.js b/config/index.js index a48b218ddc7079ce9f1a0a98840c34e276578dab..999ea04d392f3ebc39b3ef2ff54d79d5763b5a01 100644 --- a/config/index.js +++ b/config/index.js @@ -8,7 +8,7 @@ module.exports = { dev: { // Paths assetsSubDirectory: "static", - assetsPublicPath: "/", + assetsPublicPath: "/apaas/ui/", proxyTable: { "/apaas": { target: "https://apaas3.wodcloud.com/apaas/", diff --git a/index.html b/index.html index 98912a48968b95125b4566898a95e62f8d82d106..216aa2808b75b6ccf7db06a293125e967372a985 100644 --- a/index.html +++ b/index.html @@ -11,6 +11,7 @@ } +
diff --git a/package.json b/package.json index 895ec122ec356dd66d898c2a408c57f069365f96..0affe91488e91b6a3a67fb796c9f99f5549b01ca 100644 --- a/package.json +++ b/package.json @@ -32,18 +32,19 @@ "vue-i18n": "^8.17.7", "vue-resource": "^1.5.1", "vue-router": "^3.0.2", + "vue-super-flow": "^1.3.2", "vuex": "^3.1.0", "xterm": "^4.7.0", "xterm-addon-fit": "^0.4.0", "yaml2json": "^1.0.2" }, "devDependencies": { + "@babel/compat-data": "7.9.0", "@babel/core": "^7.4.0", "@babel/plugin-syntax-jsx": "^7.2.0", "@babel/plugin-transform-runtime": "^7.4.0", "@babel/preset-env": "^7.4.2", "@babel/runtime": "^7.4.2", - "@babel/compat-data": "7.9.0", "autoprefixer": "^9.5.0", "babel-loader": "^8.0.5", "babel-plugin-syntax-jsx": "^6.18.0", @@ -54,6 +55,8 @@ "file-loader": "^3.0.1", "friendly-errors-webpack-plugin": "^1.7.0", "html-webpack-plugin": "^3.2.0", + "less": "^3.12.2", + "less-loader": "^6.2.0", "mini-css-extract-plugin": "^0.5.0", "node-notifier": "^5.4.0", "optimize-css-assets-webpack-plugin": "^5.0.1", diff --git a/src/App.vue b/src/App.vue index fd0a6058e0c37592ada243bd055bc6de763fa764..77747ce944e84515ce89f225bfc08961edcdd03b 100644 --- a/src/App.vue +++ b/src/App.vue @@ -10,25 +10,37 @@ import bdMenu from "./components/menu"; export default { data: () => ({}), components: { - bdMenu + bdMenu, }, methods: { getCurrentUser() { this.$api.user.getNowUser().then(({ data }) => { if (data.success == 1) { - console.log("--- --- ---"); - console.log(data.data); - console.log("--- --- ---"); this.$store.commit("userInfofun", data.data); } else { console.log(data.errMsg); } }); - } + }, + getMessage() { + this.$http + .get("/apaas/service/v3/mymsg/unread", { + params: { + size: 10, + page: 1, + }, + }) + .then(({ data }) => { + if (data.success === 1) { + this.$store.commit("setUnreadMessageCount", data.data.total || 0); + } + }); + }, }, created() { this.getCurrentUser(); - } + this.getMessage(); + }, }; diff --git a/src/assets/imgs/msg_ic_bbgx.png b/src/assets/imgs/msg_ic_bbgx.png new file mode 100644 index 0000000000000000000000000000000000000000..d515ab5ffdf582fa525fe3523727aa65f8faa31a Binary files /dev/null and b/src/assets/imgs/msg_ic_bbgx.png differ diff --git a/src/assets/imgs/msg_ic_bbgx_visited.png b/src/assets/imgs/msg_ic_bbgx_visited.png new file mode 100644 index 0000000000000000000000000000000000000000..e8c0f627ca113b138ede092553d336c912f3801a Binary files /dev/null and b/src/assets/imgs/msg_ic_bbgx_visited.png differ diff --git a/src/assets/imgs/msg_ic_fwts.png b/src/assets/imgs/msg_ic_fwts.png new file mode 100644 index 0000000000000000000000000000000000000000..4007b0cac4fcb0b0854abb585fce3a007b8e2761 Binary files /dev/null and b/src/assets/imgs/msg_ic_fwts.png differ diff --git a/src/assets/imgs/msg_ic_fwts_visited.png b/src/assets/imgs/msg_ic_fwts_visited.png new file mode 100644 index 0000000000000000000000000000000000000000..e251cae4f3e16b0c26cec9ce8a056bf7cc37b466 Binary files /dev/null and b/src/assets/imgs/msg_ic_fwts_visited.png differ diff --git a/src/assets/imgs/msg_ic_ptwh.png b/src/assets/imgs/msg_ic_ptwh.png new file mode 100644 index 0000000000000000000000000000000000000000..c69ae6ae2296b01131495583780ec1a944bb19af Binary files /dev/null and b/src/assets/imgs/msg_ic_ptwh.png differ diff --git a/src/assets/imgs/msg_ic_ptwh_visited.png b/src/assets/imgs/msg_ic_ptwh_visited.png new file mode 100644 index 0000000000000000000000000000000000000000..7531cee053c2907eded1bbe9f20fbd79017caa8a Binary files /dev/null and b/src/assets/imgs/msg_ic_ptwh_visited.png differ diff --git a/src/assets/imgs/msg_ic_xttz.png b/src/assets/imgs/msg_ic_xttz.png new file mode 100644 index 0000000000000000000000000000000000000000..7cad4ee2ce28ab77d3e74553e27d54ac5e3f9a7b Binary files /dev/null and b/src/assets/imgs/msg_ic_xttz.png differ diff --git a/src/assets/imgs/msg_ic_xttz_visited.png b/src/assets/imgs/msg_ic_xttz_visited.png new file mode 100644 index 0000000000000000000000000000000000000000..686ba2b26b3f51032d2d7752de5415812b3a2f3e Binary files /dev/null and b/src/assets/imgs/msg_ic_xttz_visited.png differ diff --git a/src/assets/imgs/msg_icon_qkxx.png b/src/assets/imgs/msg_icon_qkxx.png new file mode 100644 index 0000000000000000000000000000000000000000..2fb9f9063966845bb3f4453dfbb76cfeb1455730 Binary files /dev/null and b/src/assets/imgs/msg_icon_qkxx.png differ diff --git a/src/assets/imgs/msg_icon_shanchu.png b/src/assets/imgs/msg_icon_shanchu.png new file mode 100644 index 0000000000000000000000000000000000000000..c54fdc987088d88994fe7399bec1876a5357fd21 Binary files /dev/null and b/src/assets/imgs/msg_icon_shanchu.png differ diff --git a/src/assets/imgs/msg_icon_szyd.png b/src/assets/imgs/msg_icon_szyd.png new file mode 100644 index 0000000000000000000000000000000000000000..7f5eb8cba02ebd68d042e342a56e58fd712b1f33 Binary files /dev/null and b/src/assets/imgs/msg_icon_szyd.png differ diff --git a/src/assets/imgs/msg_icon_xxsz.png b/src/assets/imgs/msg_icon_xxsz.png new file mode 100644 index 0000000000000000000000000000000000000000..33499389b45860d82fa9c2c23bae3eedf62626d1 Binary files /dev/null and b/src/assets/imgs/msg_icon_xxsz.png differ diff --git a/src/assets/imgs/msg_icon_yidu.png b/src/assets/imgs/msg_icon_yidu.png new file mode 100644 index 0000000000000000000000000000000000000000..71bf56a97802a1fd4d78ff8e4fa8d09c9fd41c16 Binary files /dev/null and b/src/assets/imgs/msg_icon_yidu.png differ diff --git a/src/components/apass-list.vue b/src/components/apass-list.vue index 50e405f139c1068f524bb6e5702df772fe25f960..5e944ee4f4cc7df2292a72f36264643ff237e2e1 100644 --- a/src/components/apass-list.vue +++ b/src/components/apass-list.vue @@ -181,9 +181,11 @@ export default { } }, searchAction(value) { + this.currentPage = 1; this.listAction(); }, filterChange(filter) { + this.currentPage = 1; this.filter = filter; this.listAction(); }, @@ -196,6 +198,10 @@ export default { this.currentPage = value; this.listAction(); }, + resetCurrentPage(value = 1) { + this.currentPage = value; + this.listAction(); + }, listAction() { if (this.timer) { clearTimeout(this.timer); diff --git a/src/components/infoList.vue b/src/components/infoList.vue index ef7ad083636ce350fd6e781a6ee17b108d10cd30..c9d3772c1b9a876a3d5cc225f3c8a9676b893361 100644 --- a/src/components/infoList.vue +++ b/src/components/infoList.vue @@ -54,6 +54,7 @@ a { .list p { line-height: 32px; color: #8890a7; + word-wrap:break-word; } .list { margin-bottom: 20px; diff --git a/src/components/menu.vue b/src/components/menu.vue index a25e254d91132ebfde55d3f5579a5f48c24b0874..fdf75df8581f573d8810262959a6dab293a2d5d3 100644 --- a/src/components/menu.vue +++ b/src/components/menu.vue @@ -13,11 +13,11 @@ >{{ userInfo.user_name }} 请登录 + +
{{ item.menu_name }}
+ > + {{ item.menu_name }} + +
退出登录
-
+
{{ v.menu_name }}
-
+
@@ -100,6 +115,7 @@ @@ -291,7 +312,7 @@ export default { float: right; width: 185px; font-size: 16px; - height:84px; + height: 84px; text-align: center; cursor: pointer; position: relative; @@ -309,7 +330,7 @@ export default { left: calc(50% - 12px); } .user_menu { - width: 135px; + /* width: 135px; */ background-color: #ffffff; box-shadow: 0px 3px 6px 0px rgba(15, 19, 65, 0.05); border-radius: 8px; @@ -351,10 +372,11 @@ export default { display: block; } .user_menu div { - width: 135px; + /* width: 135px; */ height: 44px; line-height: 44px; - text-align: center; + padding: 0 30px; + text-align: left; color: #0d1847; } .user_menu div:hover { @@ -436,6 +458,34 @@ export default { text-overflow: ellipsis; white-space: nowrap; } +.width_num { + display: inline-block; + vertical-align: middle; + min-width: 30px; + background-color: #e56600; + font-size: 10px; + line-height: 16px; + color: #fff; + padding: 0 8px; + margin-left: 5px; + box-sizing: border-box; + border-radius: 8px; + text-align: center; + overflow: hidden; +} +.user_menu div:hover .width_num { + background-color: #fcefd6; + color: #e56600; +} +.has_msg { + width: 8px; + height: 8px; + border-radius: 50%; + background-color: #e56600; + position: absolute; + top: 23px; + left: 15px; +} + + \ No newline at end of file diff --git a/src/components/work-flow/work-flow.vue b/src/components/work-flow/work-flow.vue new file mode 100644 index 0000000000000000000000000000000000000000..b529aac9c35f6c18bc222fa0ef23095d11da7207 --- /dev/null +++ b/src/components/work-flow/work-flow.vue @@ -0,0 +1,233 @@ + + + + + + + diff --git a/src/main.js b/src/main.js index 8cb174c35f991671dfc24e2ba8d05bb5120f2f26..6d666418d8452389b883fe77956087b67284b20e 100644 --- a/src/main.js +++ b/src/main.js @@ -56,6 +56,10 @@ const i18n = new VueI18n({ } }) +import SuperFlow from 'vue-super-flow' +import 'vue-super-flow/lib/index.css' +Vue.use(SuperFlow) + import api from './request/api' Vue.prototype.$api = api; diff --git a/src/pages/authority/organization/organizationedit.vue b/src/pages/authority/organization/organizationedit.vue index e4a0a7c69d956d64722e66a57d287faa5fda63bc..2c1178882e26e66a647621e5ff4afd832baeb056 100644 --- a/src/pages/authority/organization/organizationedit.vue +++ b/src/pages/authority/organization/organizationedit.vue @@ -124,15 +124,15 @@ export default { rules: { name: [ { required: true, message: "请输入组织机构名称", trigger: "blur" }, - { max: 10, message: "长度小于10个字符", trigger: "blur" }, + { max: 20, message: "长度请小于20个字符", trigger: "blur" }, ], shortname: [ // { required: true, message: '请输入组织机构简称', trigger: 'blur' }, - { max: 10, message: "长度小于10个字符", trigger: "blur" }, + { max: 20, message: "长度请小于20个字符", trigger: "blur" }, ], desc: [ // { required: true, message: '请输入组织说明', trigger: 'blur' }, - { max: 500, message: "长度小于500个字符", trigger: "blur" }, + { max: 500, message: "长度请小于500个字符", trigger: "blur" }, ], fileList: [ // {required: true, message: '请上传图片', trigger: 'change'} diff --git a/src/pages/authority/role/addroles.vue b/src/pages/authority/role/addroles.vue index d63c15d1932a5623c2e1be767bfb5a77168d0fc5..0c550e758009de927aaebb7dc65584a5d1ba4ca8 100644 --- a/src/pages/authority/role/addroles.vue +++ b/src/pages/authority/role/addroles.vue @@ -4,7 +4,7 @@ 权限管理 / 角色管理 / {{ $route.path.indexOf("edit") !== -1 - ? "角色类型" + ? "编辑角色" : $route.path.indexOf("add") !== -1 ? "新增角色" : "分配权限" diff --git a/src/pages/authority/user/organizationuser.vue b/src/pages/authority/user/organizationuser.vue index b60f838fa531c1130bcb6e0717c4d46fa2286ce2..0594c3bfbbf991714180f4044b87b595e91e11d5 100644 --- a/src/pages/authority/user/organizationuser.vue +++ b/src/pages/authority/user/organizationuser.vue @@ -349,10 +349,10 @@ export default { }); }, change_type() { - this.form.systemname = ""; - this.form.domain = ""; - this.form.ip = []; - this.form.origin = ""; + // this.form.systemname = ""; + // this.form.domain = ""; + // this.form.ip = []; + // this.form.origin = ""; }, handleClose(tag) { this.form.ip.splice(this.form.ip.indexOf(tag), 1); @@ -473,18 +473,22 @@ export default { this.$router.back(-1); }, add_user() { + // this.form.systemname = ""; + // this.form.domain = ""; + // this.form.ip = []; + // this.form.origin = ""; var temp = { user_id: this.form.account, // 用户名 password: this.form.password, user_name: this.form.nickname, // 昵称 - system_name: this.form.systemname, //系统名称 + system_name: this.form.type>=2?this.form.systemname:'', //系统名称 phone: this.form.phone + "", // 电话号 email: this.form.email, // 邮箱 - department_id: this.form.origin, // 组织id + department_id: this.form.type>=2?this.form.origin:'', // 组织id is_admin: this.form.type, state: this.form.able, // 用户状态，1——启用，0 禁用 - domain_name: this.form.domain, // - ip_whitelist: this.form.ip, // + domain_name: this.form.type>=3?this.form.domain:'', // + ip_whitelist: this.form.type>=3?this.form.ip:[], // description: this.form.desc, //描述 link_man: this.form.contact, }; @@ -507,14 +511,14 @@ export default { var temp = { user_id: this.form.account, // 用户名 user_name: this.form.nickname, // 昵称 - system_name: this.form.systemname, //系统名称 + system_name: this.form.type>=2?this.form.systemname:'', //系统名称 phone: this.form.phone + "", // 电话号 email: this.form.email, // 邮箱 - department_id: this.form.origin, // 组织id + department_id: this.form.type>=2?this.form.origin:'', // 组织id is_admin: this.form.type, state: this.form.able, // 用户状态，1——启用，0 禁用 - domain_name: this.form.domain, // - ip_whitelist: this.form.ip && this.form.ip.length ? this.form.ip : [], // + domain_name: this.form.type>=3?this.form.domain:'', // + ip_whitelist: this.form.type>=3?this.form.ip && this.form.ip.length ? this.form.ip : []:[], // description: this.form.desc, //描述 link_man: this.form.contact, }; diff --git a/src/pages/example/example_com_flow.vue b/src/pages/example/example_com_flow.vue new file mode 100644 index 0000000000000000000000000000000000000000..bf146811d51e4777237526e2f1b0efd17ba9efbe --- /dev/null +++ b/src/pages/example/example_com_flow.vue @@ -0,0 +1,24 @@ + + + + \ No newline at end of file diff --git a/src/pages/message-management/banner/banner-list.vue b/src/pages/message-management/banner/banner-list.vue index 333ea16abd03e120d2bb7a89a421dd3a0bd1d8f4..09a61cb4e7c3b358fa050a45d70dafdc69fa2196 100644 --- a/src/pages/message-management/banner/banner-list.vue +++ b/src/pages/message-management/banner/banner-list.vue @@ -268,8 +268,11 @@ export default { }); }); }, + resetCurrentPage() { + this.$refs.list.resetCurrentPage(); + }, topFilterAction() { - this.initList(this.tempFilter); + this.resetCurrentPage(); }, topFilterClear() { this.topFilter = { @@ -279,7 +282,7 @@ export default { down_time: "", }; - this.initList(this.tempFilter); + this.resetCurrentPage(); }, showDialog() { this.$refs.dialog.show(); diff --git a/src/pages/message-management/directed-push/directed-push-add.vue b/src/pages/message-management/directed-push/directed-push-add.vue index eadba63f23edade3ccb7ce28338665758a271373..9f4ac784ef8b7f22984f3bba07e705c63ece2b91 100644 --- a/src/pages/message-management/directed-push/directed-push-add.vue +++ b/src/pages/message-management/directed-push/directed-push-add.vue @@ -51,6 +51,7 @@ > diff --git a/src/pages/message-management/directed-push/directed-push-list.vue b/src/pages/message-management/directed-push/directed-push-list.vue index 6dac901cd2661be82a64e18a20f4d82014a6b6ad..e85f6d986419133fe0bcad9bb7b1f460246f6d00 100644 --- a/src/pages/message-management/directed-push/directed-push-list.vue +++ b/src/pages/message-management/directed-push/directed-push-list.vue @@ -260,8 +260,11 @@ export default { }); }); }, + resetCurrentPage() { + this.$refs.list.resetCurrentPage(); + }, topFilterAction() { - this.initList(this.tempFilter); + this.resetCurrentPage(); }, topFilterClear() { this.topFilter = { @@ -270,7 +273,7 @@ export default { push_time: "", }; - this.initList(this.tempFilter); + this.resetCurrentPage(); }, addNew() { this.$router.push("/message/directed_push/add"); diff --git a/src/pages/message-management/message-alert/message-alert-add.vue b/src/pages/message-management/message-alert/message-alert-add.vue index 9c4909d1e5b4b8b8fa12d6d045a6d4b058ddbded..7ffaad3d4a9451bac18fdef055aca7e578ba7079 100644 --- a/src/pages/message-management/message-alert/message-alert-add.vue +++ b/src/pages/message-management/message-alert/message-alert-add.vue @@ -32,6 +32,7 @@ @@ -98,7 +99,7 @@ export default { step: 0, done: false, templateId: "", - templateContent:"", + templateContent: "", targetUserIds: "", }; }, diff --git a/src/pages/message-management/message-alert/message-alert-list.vue b/src/pages/message-management/message-alert/message-alert-list.vue index 93c80b379f90bd755dd40eafd07a72c98929d526..b16d9721af1c0c6e68360c01f8b032ea02c6ba36 100644 --- a/src/pages/message-management/message-alert/message-alert-list.vue +++ b/src/pages/message-management/message-alert/message-alert-list.vue @@ -33,8 +33,9 @@ 状态： - - + + +
@@ -259,8 +260,11 @@ export default { }); }); }, + resetCurrentPage() { + this.$refs.list.resetCurrentPage(); + }, topFilterAction() { - this.initList(this.tempFilter); + this.resetCurrentPage(); }, topFilterClear() { this.topFilter = { @@ -269,7 +273,7 @@ export default { push_time: "", }; - this.initList(this.tempFilter); + this.resetCurrentPage(); }, addNew() { this.$router.push("/message/message_alert/add"); diff --git a/src/pages/message-management/message-template/message-template-list.vue b/src/pages/message-management/message-template/message-template-list.vue index e3bcea1ca75322327867f1289aa28691da47a485..0f42c0e264ed4f4461026886424f28a5a12a7a4a 100644 --- a/src/pages/message-management/message-template/message-template-list.vue +++ b/src/pages/message-management/message-template/message-template-list.vue @@ -235,8 +235,11 @@ export default { }); }); }, + resetCurrentPage() { + this.$refs.list.resetCurrentPage(); + }, topFilterAction() { - this.initList(this.tempFilter); + this.resetCurrentPage(); }, topFilterClear() { this.topFilter = { @@ -245,7 +248,7 @@ export default { update_time: "", }; - this.initList(this.tempFilter); + this.resetCurrentPage(); }, showDialog() { this.$refs.dialog.show(); diff --git a/src/pages/message-management/recommended/recommended-list.vue b/src/pages/message-management/recommended/recommended-list.vue index 2c494c5ec06b7711a1372e0e91f82971c2e4d299..ace80d36f87e5b409cc48bd1de2937b8c4c1b332 100644 --- a/src/pages/message-management/recommended/recommended-list.vue +++ b/src/pages/message-management/recommended/recommended-list.vue @@ -196,8 +196,11 @@ export default { }); }); }, + resetCurrentPage() { + this.$refs.list.resetCurrentPage(); + }, topFilterAction() { - this.initList(this.tempFilter); + this.resetCurrentPage(); }, topFilterClear() { this.topFilter = { @@ -206,7 +209,7 @@ export default { time: "", }; - this.initList(this.tempFilter); + this.resetCurrentPage(); }, detailAction(item) { this.$router.push( diff --git a/src/pages/service_shop/skfwDetail.vue b/src/pages/service_shop/skfwDetail.vue index aec5496b14ba3bd5310c2ff4512601a8daecddf2..6eb82c7e339bf4f53753dbb99b8c3fb6a7f6f24e 100644 --- a/src/pages/service_shop/skfwDetail.vue +++ b/src/pages/service_shop/skfwDetail.vue @@ -74,6 +74,7 @@ export default { []; this.baseInfo = { + portal_id: datas.portal_id || "", // 时空服务id service_id: this.id, app_id: 0, name: datas.name, diff --git a/src/pages/user/notice/notice.vue b/src/pages/user/notice/notice.vue new file mode 100644 index 0000000000000000000000000000000000000000..cb1d838dd78784e49ea522f7356df49c16516181 --- /dev/null +++ b/src/pages/user/notice/notice.vue @@ -0,0 +1,433 @@ + + + + + diff --git a/src/pages/user/notice/setNotice.vue b/src/pages/user/notice/setNotice.vue new file mode 100644 index 0000000000000000000000000000000000000000..ef5c187934ec767e007a214c645fb2243beea2ad --- /dev/null +++ b/src/pages/user/notice/setNotice.vue @@ -0,0 +1,245 @@ + + + + + diff --git a/src/pages/workbench/app_build.vue b/src/pages/workbench/component-center/app-build/index.vue similarity index 96% rename from src/pages/workbench/app_build.vue rename to src/pages/workbench/component-center/app-build/index.vue index aea646a47501cbbbbe7555084b4bd20edf69f2d1..5ec68e61f5624fc1eb2096e4bc0218575fe88eda 100644 --- a/src/pages/workbench/app_build.vue +++ b/src/pages/workbench/component-center/app-build/index.vue @@ -90,21 +90,21 @@ @@ -352,10 +352,11 @@ export default { app_rules: { name: [ { required: true, message: "请输入应用名称", trigger: "blur" }, - { max: 16, message: "长度小于16个字符", trigger: "blur" }, + { max: 400, message: "长度小于16个字符", trigger: "blur" }, ], version: [ { required: true, message: "请输入应用版本", trigger: "blur" }, + { max: 16, message: "长度小于16个字符", trigger: "blur" }, ], ywly: [ { required: true, message: "请选择业务领域", trigger: "change" }, @@ -371,12 +372,15 @@ export default { ], yyjj: [ { required: true, message: "请选择应用简介", trigger: "change" }, + { max: 400, message: "长度小于400个字符", trigger: "blur" }, ], gnjj: [ { required: true, message: "请选择功能简介", trigger: "change" }, + { max: 400, message: "长度小于400个字符", trigger: "blur" }, ], cjsl: [ { required: true, message: "请选择应用场景示例", trigger: "change" }, + { max: 400, message: "长度小于400个字符", trigger: "blur" }, ], }, deploy_info: { @@ -395,8 +399,14 @@ export default { file: "", }, image_rules: { - image_name: [{ validator: image_name_pass, trigger: "blur" }], - tag: [{ required: true, message: "请输入版本数", trigger: "blur" }], + image_name: [ + { validator: image_name_pass, trigger: "blur" }, + { max: 16, message: "长度小于16个字符", trigger: "blur" }, + ], + tag: [ + { required: true, message: "请输入版本数", trigger: "blur" }, + { max: 16, message: "长度小于16个字符", trigger: "blur" }, + ], file: [ { required: true, message: "请选择镜像文件", trigger: "change" }, ], diff --git a/src/pages/workbench/intelligent_appbuilder.vue b/src/pages/workbench/component-center/intelligent-drawing/intelligent_appbuilder.vue similarity index 92% rename from src/pages/workbench/intelligent_appbuilder.vue rename to src/pages/workbench/component-center/intelligent-drawing/intelligent_appbuilder.vue index dc1739b967a697f070dedcc5b44399037c883dc2..a3aaf5b5f324837af270936bc463357f292097c0 100644 --- a/src/pages/workbench/intelligent_appbuilder.vue +++ b/src/pages/workbench/component-center/intelligent-drawing/intelligent_appbuilder.vue @@ -15,10 +15,11 @@ + + + + diff --git a/src/pages/workbench/component-center/process-management/designer/detail.vue b/src/pages/workbench/component-center/process-management/designer/detail.vue new file mode 100644 index 0000000000000000000000000000000000000000..852a545a2822df60de484d23bcf23d2f7d0f8333 --- /dev/null +++ b/src/pages/workbench/component-center/process-management/designer/detail.vue @@ -0,0 +1,278 @@ + + + + + diff --git a/src/pages/workbench/component-center/process-management/designer/index.vue b/src/pages/workbench/component-center/process-management/designer/index.vue new file mode 100644 index 0000000000000000000000000000000000000000..1faa7b96ab41761c1cc6a635b245a73edd979314 --- /dev/null +++ b/src/pages/workbench/component-center/process-management/designer/index.vue @@ -0,0 +1,5 @@ + diff --git a/src/pages/workbench/component-center/process-management/index.vue b/src/pages/workbench/component-center/process-management/index.vue new file mode 100644 index 0000000000000000000000000000000000000000..1f9a87896db5069e646e6a37de8063cab97ea60d --- /dev/null +++ b/src/pages/workbench/component-center/process-management/index.vue @@ -0,0 +1,69 @@ + + + + + diff --git a/src/pages/workbench/component-center/process-management/monitoring/index.vue b/src/pages/workbench/component-center/process-management/monitoring/index.vue new file mode 100644 index 0000000000000000000000000000000000000000..1fb81f36adc54dd391c54cf01dfad9a04ea82190 --- /dev/null +++ b/src/pages/workbench/component-center/process-management/monitoring/index.vue @@ -0,0 +1,5 @@ + diff --git a/src/pages/workbench/component-center/process-management/process-design/index.vue b/src/pages/workbench/component-center/process-management/process-design/index.vue new file mode 100644 index 0000000000000000000000000000000000000000..585efe53e755867dc0b3c944eb409b1f0a7c023a --- /dev/null +++ b/src/pages/workbench/component-center/process-management/process-design/index.vue @@ -0,0 +1,5 @@ + diff --git a/src/pages/workbench/search_act.vue b/src/pages/workbench/component-center/search-engine/index.vue similarity index 99% rename from src/pages/workbench/search_act.vue rename to src/pages/workbench/component-center/search-engine/index.vue index 660cf885486d9f88a67685a10996e50063a411bc..0ad0d3b277b34fc7ee80206ade460b248da15115 100644 --- a/src/pages/workbench/search_act.vue +++ b/src/pages/workbench/component-center/search-engine/index.vue @@ -126,7 +126,7 @@ export default { // ) - temp.push({...e._source,_source:temp_str,index:idx+1+(this.currentPage-1)*10}) + temp.push({...e._source,_source:temp_str,index:idx+1+(this.currentPage-1)*this.pageSize}) }); this.tableData = temp } diff --git a/src/pages/workbench/fwgl/apply_service_detail.vue b/src/pages/workbench/fwgl/apply_service_detail.vue index cc1918394d3e621297a06d0c01a90f0f55d65b74..bf9dfb2c2910cbf4d8d6e3c45c22ef00791c31b4 100644 --- a/src/pages/workbench/fwgl/apply_service_detail.vue +++ b/src/pages/workbench/fwgl/apply_service_detail.vue @@ -342,7 +342,7 @@ export default { return } let data = response.data.data; - this.$set(this.service_header_arr, "id", data.id); // TODO: 时空服务预览 + this.$set(this.service_header_arr, "portal_id", data.portal_id); // 时空服务id this.$set(this.service_header_arr, "isMap", data.data_service_type1 === 6); this.$set(this.service_header_arr, "name", data.name); this.$set(this.service_header_arr['first'][0], 'text', data.data_service_type1_name); diff --git a/src/pages/workbench/fwgl/approval_service_detail.vue b/src/pages/workbench/fwgl/approval_service_detail.vue index 4530baf3ba19028811cf318665df09a5615e521e..8e607842c71f6f649c4d9de57dd03b5783644931 100644 --- a/src/pages/workbench/fwgl/approval_service_detail.vue +++ b/src/pages/workbench/fwgl/approval_service_detail.vue @@ -39,7 +39,7 @@ 提交 - 取消 + 取消
@@ -81,7 +81,7 @@ export default { option:[ { required: true, message: '请输入意见', trigger: 'blur' }, { - min: 10, message: '长度应大于10个字符', trigger: 'blur' + min: 10,max:200, message: '长度应大于10个小于200个字符', trigger: 'blur' } ] }, @@ -309,6 +309,9 @@ export default { } }); }, + backpage(){ + this.$router.back(-1) + }, set_approval(){ this.$http.post('/apaas/service/v3/service/approval/applied/approval',{ apply_id:this.id, @@ -339,7 +342,7 @@ export default { return } let data = response.data.data; - this.$set(this.service_header_arr, "id", data.id); // TODO: 时空服务预览 + this.$set(this.service_header_arr, "portal_id", data.portal_id); // 时空服务id this.$set(this.service_header_arr, "isMap", data.data_service_type1 === 6); this.$set(this.service_header_arr, "name", data.name); this.$set(this.service_header_arr['first'][0], 'text', data.data_service_type1_name); diff --git a/src/pages/workbench/fwgl/fwglList.vue b/src/pages/workbench/fwgl/fwglList.vue index 7c5dbec360aaa95d5c3ac91f2a0870c616dd9650..cbcd6d47626ce975ef595beb582bdccf93d6ca59 100644 --- a/src/pages/workbench/fwgl/fwglList.vue +++ b/src/pages/workbench/fwgl/fwglList.vue @@ -106,6 +106,7 @@ :title="dialogInfo.title" :msg="dialogInfo.msg" :submit="dialogInfo.submit" + :sunbmitText="dialogInfo.sunbmitText" > { if (response.data.success === 1) { let data = response.data.data; - this.$set(this.service_header_arr, "id", data.id); // TODO: 时空服务预览 + this.$set(this.service_header_arr, "portal_id", data.portal_id); // 时空服务id this.$set(this.service_header_arr, "isMap", data.data_service_type1 === 6); this.$set(this.service_header_arr, "name", data.name); this.$set( @@ -750,6 +750,9 @@ export default { padding: 30px 10px 10px 10px; width: 100%; } +.type_box_select >>> .outlist .list p{ + word-wrap:break-word; +} .service_title { font-size: 16px; font-weight: bold; diff --git a/src/pages/workbench/fwgl/serviceEdit.vue b/src/pages/workbench/fwgl/serviceEdit.vue index 18ae70a480d0e2cd5db0487af7c998c0f4d4496f..ac70ac60d1db5dc686611c44e4949fae4ccbf9c9 100644 --- a/src/pages/workbench/fwgl/serviceEdit.vue +++ b/src/pages/workbench/fwgl/serviceEdit.vue @@ -305,9 +305,15 @@ export default { .catch(function(response) {}); }, setService(){ + var reg = /^[1-9][0-9]{0,5}$/ if(this.open){ if(this.maxline){ + if(reg.test(this.maxline)){ + }else{ + this.$message.error('请输入长度小于6的正整数') + return + } }else{ this.$message.error('请输入最大连接数') return @@ -317,10 +323,24 @@ export default { if(!this.maxline1){ this.$message.error('请输入最大连接数') return + }else{ + if(reg.test(this.maxline1)){ + + }else{ + this.$message.error('请输入长度小于6的正整数') + return + } } if(!this.usetime1){ this.$message.error('请输入有效时间') return + }else{ + if(reg.test(this.maxline1)){ + + }else{ + this.$message.error('请输入长度小于6的正整数') + return + } } if(this.timevalue==''){ this.$message.error('请选择时间') @@ -355,7 +375,8 @@ export default { return } this.$message.success('保存成功') - this.getServiceInfo() + // this.getServiceInfo() + this.$router.back(-1) }) .catch(function(response) { @@ -424,6 +445,9 @@ export default { background-color: #f7f8f9; width: 1022px; } +.info_contain .comments_pagination .el-input__inner{ + width: auto; +} .info_contain .el-textarea__inner{ background-color: #f7f8f9; width: 1022px; diff --git a/src/pages/workbench/fwzc_fwcs.vue b/src/pages/workbench/fwzc_fwcs.vue index 1f1d761f94ac10f794addeae77812b86c35bfd8e..83f5eb54e8b4aed5c43de8ca6690926831d6f2e5 100644 --- a/src/pages/workbench/fwzc_fwcs.vue +++ b/src/pages/workbench/fwzc_fwcs.vue @@ -1,7 +1,7 @@ diff --git a/src/pages/workbench/intelligent_drawing.vue b/src/pages/workbench/intelligent_drawing.vue deleted file mode 100644 index aa08d129d6f64b7be8839c02079b61041d0d7d62..0000000000000000000000000000000000000000 --- a/src/pages/workbench/intelligent_drawing.vue +++ /dev/null @@ -1,144 +0,0 @@ - - - - - - - diff --git a/src/pages/workbench/workPlace.vue b/src/pages/workbench/workPlace.vue index abe7786253fe1a33fee6b075b6cf1a2467481b23..5b68073839ad27d88431c4b32c650d4f6689bc97 100644 --- a/src/pages/workbench/workPlace.vue +++ b/src/pages/workbench/workPlace.vue @@ -3,7 +3,7 @@
- + 你好，{{ person }}！{{login_time?'最近登录 ':''}}{{ login_time }}
@@ -357,6 +357,7 @@ export default { helper: helper, service_data: [], app_data: [], + picture_path:'', listTotal: 0, currentPage: 1, listTotal1: 0, @@ -990,8 +991,7 @@ export default { pic: require("@/assets/imgs/home_tool_ic_lcsj.png"), bg: "#e6ebfe", color: "#515fe7", - url: "https://apaas-nologo.wodcloud.com/lcgl/index.html#/", - target: 1 + url: "/progress", }, { text: "可视化图表", @@ -1346,6 +1346,7 @@ export default { this.$router.push("/fwzc/fwcs"); }, getUserData() { + this.picture_path = this.userInfo.picture_path; this.person = this.userInfo.user_name; this.login_time = decodeURIComponent(getCookie("lastLogin")).replace( "+", diff --git a/src/request/api/general.js b/src/request/api/general.js index 648e059b37b23ddce329b48c7f8eeaa64c75a8ad..c639921ba22829fa622229480d6b01b8a2299c46 100644 --- a/src/request/api/general.js +++ b/src/request/api/general.js @@ -3,6 +3,7 @@ import qs from 'qs'; // 根据需求是否导入qs模块 const general = { // general api + // logout is not used logout(params) { return axios.get(`/iam/api/logout?ReturnUrl=${encodeURIComponent(params.returnUrl)}`); }, diff --git a/src/router/index.js b/src/router/index.js index e87e24dbb35c45ca933a9babbd02bf273e78989b..e75de0c8413b94a6c8518fe8f5a75657461b9bbe 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -235,27 +235,55 @@ export default new Router({ { path: "/app_build", name: "app_build", - component: () => import("@/pages/workbench/app_build"), + component: () => import("@/pages/workbench/component-center/app-build/index"), }, // 应用构建（镜像形式） { path: "/intelligent_drawing", name: "intelligent_drawing", - component: () => import("@/pages/workbench/intelligent_drawing"), + component: () => import("@/pages/workbench/component-center/intelligent-drawing/intelligent_drawing"), }, // 智能制图 { path: "/intelligent_details", name: "intelligent_details", - component: () => import("@/pages/workbench/intelligent_details"), + component: () => import("@/pages/workbench/component-center/intelligent-drawing/intelligent_details"), }, // 智能制图--详情页面 { path: "/intelligent_appbuilder", name: "intelligent_appbuilder", - component: () => import("@/pages/workbench/intelligent_appbuilder"), + component: () => import("@/pages/workbench/component-center/intelligent-drawing/intelligent_appbuilder"), }, // 智能制图--应用程序页面 + { + path: "/progress", // 流程设计 + name: "progress", + redirect: "/progress/designer", + component: () => import("@/pages/workbench/component-center/process-management/index"), + children: [ + { + path: "/progress/designer", + name: "process_designer", + component: () => import("@/pages/workbench/component-center/process-management/designer/index"), + }, // 流程设计--列表 + { + path: "/progress/designer/detail/:id", + name: "process_designer_detail/:id", + component: () => import("@/pages/workbench/component-center/process-management/designer/detail"), + }, // 流程设计--详情 + { + path: "/progress/monitoring", + name: "process_monitoring", + component: () => import("@/pages/workbench/component-center/process-management/monitoring/index"), + }, // 流程监控 + { + path: "/progress/design", + name: "process_design", + component: () => import("@/pages/workbench/component-center/process-management/process-design/index"), + }, // 流程监控 + ], + }, // 流程设计 { path: "/search_engine", - name: "search_act", - component: () => import("@/pages/workbench/search_act"), + name: "search_engine", + component: () => import("@/pages/workbench/component-center/search-engine/index"), }, // 搜索引擎 { path: "/user", // 个人中心 @@ -268,6 +296,11 @@ export default new Router({ name: "userInfo", component: () => import("@/pages/user/user_info"), }, + { + path: "/user/notice", // 消息通知 + name: "notice", + component: () => import("@/pages/user/notice/notice"), + }, { path: "/user/order_list", // 订单管理页 name: "orderList", @@ -503,5 +536,10 @@ export default new Router({ name: "example_com_list", component: () => import("@/pages/example/example_com_list"), }, + { + path: "/example_com_flow", // 流程图实例 + name: "example_com_flow", + component: () => import("@/pages/example/example_com_flow"), + }, ], }); diff --git a/src/services/helper.js b/src/services/helper.js index e006e37e9a02e4911706a517bbc8b0f0298b2bec..43b5f04090eea6b88639a72b44e5ee07c094cdac 100644 --- a/src/services/helper.js +++ b/src/services/helper.js @@ -84,4 +84,17 @@ module.exports.CreationDateDesc = function (timestamp) { return date.toLocaleDateString("zh-CN", { timeZone: "Asia/Shanghai" }); +} + +module.exports.getQueryString = function (name, url) { + let search = url.substr(url.indexOf("?")); + let theRequest = new Object(); + if (search.indexOf("?") != -1) { + let str = search.substr(1); + strs = str.split("&"); + for (let i = 0; i < strs.length; i++) { + theRequest[strs[i].split("=")[0]] = unescape(strs[i].split("=")[1]); + } + } + return theRequest[name]; } \ No newline at end of file diff --git a/src/store/index.js b/src/store/index.js index dbde7877b1d86c94b0c010f3d85ae50735d10b9a..e67e4a989ca60507717fb2bab9978646e34559fd 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -27,6 +27,7 @@ const store = new Vuex.Store({ queryType: '', id: '', }, //智能制图服务详情id + unreadMessageCount: 0 }, getters: { // 1：超管 2：组织管理员 3：普通用户 4：开发者 @@ -72,6 +73,9 @@ const store = new Vuex.Store({ setZnztDetailsParams(state, newValue) { state.znztDetailsParams = newValue; }, + setUnreadMessageCount(state, newValue) { + state.unreadMessageCount = newValue; + }, }, }); diff --git a/static/config/configmap.js b/static/config/configmap.js new file mode 100644 index 0000000000000000000000000000000000000000..e95fb2ceaab8d51e7b9d026ab5b1fdabbe3db88c --- /dev/null +++ b/static/config/configmap.js @@ -0,0 +1,3 @@ +window.serviceConfig = { + gisServiceRoot: 'https://apaasgis.wodcloud.com' +}; \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 56293ae5f9fd6a7c5a8b5f9b8b01b8718ce91511..c5d7cbb8e75215d0c663f7fd7fdbf311508dd30f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2022,7 +2022,7 @@ clone@^1.0.2: resolved "https://registry.npm.taobao.org/clone/download/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= -clone@^2.1.1: +clone@^2.1.1, clone@^2.1.2: version "2.1.2" resolved "https://registry.npm.taobao.org/clone/download/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= @@ -2937,7 +2937,7 @@ entities@^2.0.0: resolved "https://registry.npm.taobao.org/entities/download/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f" integrity sha1-XEh+V0Krk8Fau12iJ1m4WQ7AO38= -errno@^0.1.3, errno@~0.1.7: +errno@^0.1.1, errno@^0.1.3, errno@~0.1.7: version "0.1.7" resolved "https://registry.npm.taobao.org/errno/download/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618" integrity sha1-RoTXF3mtOa8Xfj8AeZb3xnyFJhg= @@ -3879,7 +3879,7 @@ ignore@^3.3.5: resolved "https://registry.npm.taobao.org/ignore/download/ignore-3.3.10.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fignore%2Fdownload%2Fignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043" integrity sha1-Cpf7h2mG6AgcYxFg+PnziRV/AEM= -image-size@^0.5.1: +image-size@^0.5.1, image-size@~0.5.0: version "0.5.5" resolved "https://registry.npm.taobao.org/image-size/download/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c" integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w= @@ -4405,6 +4405,31 @@ last-call-webpack-plugin@^3.0.0: lodash "^4.17.5" webpack-sources "^1.1.0" +less-loader@^6.2.0: + version "6.2.0" + resolved "https://registry.npm.taobao.org/less-loader/download/less-loader-6.2.0.tgz?cache=0&sync_timestamp=1593788012269&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fless-loader%2Fdownload%2Fless-loader-6.2.0.tgz#8b26f621c155b342eefc24f5bd6e9dc40c42a719" + integrity sha1-iyb2IcFVs0Lu/CT1vW6dxAxCpxk= + dependencies: + clone "^2.1.2" + less "^3.11.3" + loader-utils "^2.0.0" + schema-utils "^2.7.0" + +less@^3.11.3, less@^3.12.2: + version "3.12.2" + resolved "https://registry.npm.taobao.org/less/download/less-3.12.2.tgz#157e6dd32a68869df8859314ad38e70211af3ab4" + integrity sha1-FX5t0ypohp34hZMUrTjnAhGvOrQ= + dependencies: + tslib "^1.10.0" + optionalDependencies: + errno "^0.1.1" + graceful-fs "^4.1.2" + image-size "~0.5.0" + make-dir "^2.1.0" + mime "^1.4.1" + native-request "^1.0.5" + source-map "~0.6.0" + leven@^3.1.0: version "3.1.0" resolved "https://registry.npm.taobao.org/leven/download/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" @@ -4441,6 +4466,15 @@ loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4 emojis-list "^3.0.0" json5 "^1.0.1" +loader-utils@^2.0.0: + version "2.0.0" + resolved "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0" + integrity sha1-5MrOW4FtQloWa18JfhDNErNgZLA= + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^2.1.2" + locate-path@^2.0.0: version "2.0.0" resolved "https://registry.npm.taobao.org/locate-path/download/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -4538,7 +4572,7 @@ make-dir@^1.0.0: dependencies: pify "^3.0.0" -make-dir@^2.0.0: +make-dir@^2.0.0, make-dir@^2.1.0: version "2.1.0" resolved "https://registry.npm.taobao.org/make-dir/download/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" integrity sha1-XwMQ4YuL6JjMBwCSlaMK5B6R5vU= @@ -4694,7 +4728,7 @@ mime-types@~2.1.17, mime-types@~2.1.24: dependencies: mime-db "1.44.0" -mime@1.6.0: +mime@1.6.0, mime@^1.4.1: version "1.6.0" resolved "https://registry.npm.taobao.org/mime/download/mime-1.6.0.tgz?cache=0&sync_timestamp=1590596706367&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmime%2Fdownload%2Fmime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha1-Ms2eXGRVO9WNGaVor0Uqz/BJgbE= @@ -4889,6 +4923,11 @@ nanomatch@^1.2.1, nanomatch@^1.2.9: snapdragon "^0.8.1" to-regex "^3.0.1" +native-request@^1.0.5: + version "1.0.7" + resolved "https://registry.npm.taobao.org/native-request/download/native-request-1.0.7.tgz#ff742dc555b4c8f2f1c14b548639ba174e573856" + integrity sha1-/3QtxVW0yPLxwUtUhjm6F05XOFY= + negotiator@0.6.2: version "0.6.2" resolved "https://registry.npm.taobao.org/negotiator/download/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -6323,7 +6362,7 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -schema-utils@^2.6.5: +schema-utils@^2.6.5, schema-utils@^2.7.0: version "2.7.0" resolved "https://registry.npm.taobao.org/schema-utils/download/schema-utils-2.7.0.tgz?cache=0&sync_timestamp=1590761195120&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7" integrity sha1-FxUfdtjq5n+793lgwzxnatn078c= @@ -7342,6 +7381,11 @@ vue-style-loader@^4.1.0, vue-style-loader@^4.1.2: hash-sum "^1.0.2" loader-utils "^1.0.2" +vue-super-flow@^1.3.2: + version "1.3.2" + resolved "https://registry.npm.taobao.org/vue-super-flow/download/vue-super-flow-1.3.2.tgz#1de9b8c907b0cbcda9dfca6a36ed95ec9b45f35e" + integrity sha1-Hem4yQewy82p38pqNu2V7JtF814= + vue-template-compiler@^2.6.10: version "2.6.11" resolved "https://registry.npm.taobao.org/vue-template-compiler/download/vue-template-compiler-2.6.11.tgz#c04704ef8f498b153130018993e56309d4698080"