diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index 4a6deead6f233e011064dcb1358980404c4197a8..c7ff2b9ce8bcec5b032cfb451183a8769ff57884 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -48,7 +48,7 @@ module.exports = { loader: 'url-loader', exclude: [resolve('src/icons')], options: { - limit: 10000, + limit: 1000000, name: utils.assetsPath('img/[name].[hash:7].[ext]') } }, diff --git a/config/index.js b/config/index.js index f9159cbcaee73b723f8558e2e8c3c26a323d5f1d..5ee0fdcdf683d80bc92c37dbf5d75b79953e1253 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..105e700fe996e9db3e790f0b6692c4f91e402d76 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - apaas 3.0 + Beagle aPaaS Platform v3.0 +
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/css/index.css b/src/assets/css/index.css index dbcd2f727726cbceb7230d1395bb89c83b7d1a2f..b79bed552394d8fe0084b3168bc16a2f8696843d 100644 --- a/src/assets/css/index.css +++ b/src/assets/css/index.css @@ -1,69 +1,69 @@ -[v-cloak]{ - display: none -} +[v-cloak] { + display: none; +} /* 新增按钮颜色 */ -.form-group .el-button--primary{ - background-color: #264dd9!important; - border-color: #264dd9!important; +.form-group .el-button--primary { + background-color: #264dd9 !important; + border-color: #264dd9 !important; } /* 返回按钮颜色 */ -.from_return>.el-button--primary{ - background-color: #edf0ff!important; - border-color: #edf0ff!important; - color:#264dd9!important; +.from_return > .el-button--primary { + background-color: #edf0ff !important; + border-color: #edf0ff !important; + color: #264dd9 !important; } /* 取消按钮颜色 */ -.form_c{ - background-color: #dde4ff!important; - border-color: #dde4ff!important; - color:#264dd9!important ; +.form_c { + background-color: #dde4ff !important; + border-color: #dde4ff !important; + color: #264dd9 !important ; } /* 确定按钮颜色 */ -.form_t{ - background-color: #264dd9!important; - border-color: #264dd9!important; - color:#f4f7fc!important ; +.form_t { + background-color: #264dd9 !important; + border-color: #264dd9 !important; + color: #f4f7fc !important ; } /* 搜索框颜色 */ -.form-group .el-input__inner{ - border-radius: 28px!important; - border: 1px solid #bcc1d0!important; - background: #f4f7fc!important; - color: #8890a7!important; -} -.drawer_return .el-input__inner{ - border-radius: 28px!important; - border: 1px solid #bcc1d0!important; - background: #f4f7fc!important; - color: #8890a7!important; +.form-group .el-input__inner { + border-radius: 28px !important; + border: 1px solid #bcc1d0 !important; + background: #f4f7fc !important; + color: #8890a7 !important; +} +.drawer_return .el-input__inner { + border-radius: 28px !important; + border: 1px solid #bcc1d0 !important; + background: #f4f7fc !important; + color: #8890a7 !important; } /* 多行文本框样式 */ -.jbxx_desc textarea{ - height: 150px!important; - border-radius: 8px!important; - border-color: #bcc1d0!important; - outline: none!important; - resize: none!important; +.jbxx_desc textarea { + height: 150px !important; + border-radius: 8px !important; + border-color: #bcc1d0 !important; + outline: none !important; + resize: none !important; } /* 面包屑文字大小 */ -.el-breadcrumb{ +.el-breadcrumb { font-size: 14px; color: #898d9e; } /* 编辑颜色*/ -.primary-edit{ +.primary-edit { color: #264dd9; cursor: pointer; } /* 删除颜色 */ -.primary-del{ +.primary-del { color: #264dd9; cursor: pointer; } -.space_bet{} +.space_bet { +} /* reset */ html { - } body { margin: 0; @@ -87,7 +87,7 @@ h5 { font-weight: normal; } -div{ +div { box-sizing: border-box; } /* reset end */ @@ -141,7 +141,7 @@ div{ } .ss_card > .sc_right_container > .sc_info { display: flex; - justify-content: space-between; + justify-content: space-between; } .form-group { padding: 20px 20px 15px; @@ -152,56 +152,66 @@ div{ padding: 0 20px; } /* 设置抽屉的样式 */ -.el-drawer__header{ - display: none; +.el-drawer__header { + display: none; } -.from_return{ - text-align: center; - padding: 18px 20px 10px; - border-bottom: 1px solid #edf0ff; - position: relative; +.from_return { + text-align: center; + padding: 18px 20px 10px; + border-bottom: 1px solid #edf0ff; + position: relative; } -.from_return>.el-button--primary{ +.from_return > .el-button--primary { position: absolute; top: 15px; left: 20px; } -.from_return>span{ - color:#1a2236; +.from_return > span { + color: #1a2236; font-size: 16px; } -.demo-drawer__content .el-form-item__label{ +.demo-drawer__content .el-form-item__label { color: #242c43; } -.demo-drawer__content .el-input__inner{ +.demo-drawer__content .el-input__inner { border: 1px solid #bcc1d0; border-radius: 17px; color: #58617a; background: #fff; } -.demo-drawer__footer{ +.demo-drawer__footer { text-align: right; padding-right: 40px; margin-top: 40px; } -.el-form-item__error{ - font-size:11px; +.el-form-item__error { + font-size: 11px; } /* 设置提示弹窗的样式 */ -.el-dialog{ +.el-dialog { border-radius: 10px; } .el-dialog__header { border-bottom: 1px solid #edf0ff; } -.el-dialog__title{ +.el-dialog__title { font-size: 16px; font-weight: 700; color: #1d1e20; - border-left: 4px solid #0367f6; padding-left: 8px; + position: relative; +} +.el-dialog__title::before { + content: ""; + position: absolute; + width: 4px; + height: 16px; + border-radius: 2px; + background-color: #515fe7; + left: 0; + top: 2px; } -.el-dialog__body{ +.el-dialog__body { font-size: 18px; color: #242c43; text-align: center; @@ -213,23 +223,22 @@ div{ .el-tabs__item { font-size: 16px; color: #8890a7; - line-height: 24px!important; + line-height: 24px !important; } .el-tabs__nav-scroll .el-tabs__item { - line-height: 40px!important; + line-height: 40px !important; } .el-tabs__item:hover { color: #687087; - } .el-tabs__item.is-active { color: #e56600 !important; } -.el-tabs__active-bar{ +.el-tabs__active-bar { height: 3px; - background-color:#e56600 !important; + background-color: #e56600 !important; } -.el-tabs__nav-wrap::after{ +.el-tabs__nav-wrap::after { height: 1px; background-color: #edf0ff; } @@ -277,51 +286,54 @@ border-radius:8px; } */ /* 左右布局 */ .flex { -height: 100%; -display: -webkit-box; /* Chrome 4+, Safari 3.1, iOS Safari 3.2+ */ -display: -moz-box; /* Firefox 17- */ -display: -webkit-flex; /* Chrome 21+, Safari 6.1+, iOS Safari 7+, Opera 15/16 */ -display: -moz-flex; /* Firefox 18+ */ -display: -ms-flexbox; /* IE 10 */ -display: flex; /* Chrome 29+, Firefox 22+, IE 11+, Opera 12.1/17/18, Android 4.4+ */ + height: 100%; + display: -webkit-box; /* Chrome 4+, Safari 3.1, iOS Safari 3.2+ */ + display: -moz-box; /* Firefox 17- */ + display: -webkit-flex; /* Chrome 21+, Safari 6.1+, iOS Safari 7+, Opera 15/16 */ + display: -moz-flex; /* Firefox 18+ */ + display: -ms-flexbox; /* IE 10 */ + display: flex; /* Chrome 29+, Firefox 22+, IE 11+, Opera 12.1/17/18, Android 4.4+ */ } .flex-left { -width: 178px; -background-color: #1a2236; -height: 100%; + width: 178px; + background-color: #1a2236; + height: 100%; } .flex-right { -padding: 0 20px 20px; -box-sizing: border-box; --webkit-box-flex: auto; --ms-flex: auto; --webkit-flex: auto; -flex: 1; -overflow-y: auto; + padding: 0 20px 20px; + box-sizing: border-box; + -webkit-box-flex: auto; + -ms-flex: auto; + -webkit-flex: auto; + flex: 1; + overflow-y: auto; } -.flex-right-box{ -width: 100%; -height: 100%; -position: relative; +.flex-right-box { + width: 100%; + height: 100%; + position: relative; } -.ces-main{ -position: absolute; -width: 100%; +.ces-main { + position: absolute; + width: 100%; } -.v-modal{ -background: #000a2b!important; +.v-modal { + background: #000a2b !important; } -.drawer600{ -width: 600px!important; +.drawer600 { + width: 600px !important; } -.drawer620{ -width: 620px!important; +.drawer620 { + width: 620px !important; } -.drawer1202{ - width: 1202px!important; +.drawer1202 { + width: 1202px !important; } -.el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap>.el-form-item__label:before, .el-form-item.is-required:not(.is-no-asterisk)>.el-form-item__label:before{ - content:"" +.el-form-item.is-required:not(.is-no-asterisk) + .el-form-item__label-wrap + > .el-form-item__label:before, +.el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label:before { + content: ""; } /* 设置switch的样式 */ .switchStyle1 .el-switch__label { @@ -338,7 +350,7 @@ width: 620px!important; /*关闭时文字位置设置*/ .switchStyle1 .el-switch__label--left { z-index: 1; - left: 28px; + left: 28px; top: 1px; } .switchStyle1 .el-switch__label.is-active { @@ -347,8 +359,8 @@ width: 620px!important; .switchStyle1.el-switch .el-switch__core, .switchStyle1.el-switch .el-switch__label { width: 62px !important; - height: 28px!important; - border-radius: 28px!important; + height: 28px !important; + border-radius: 28px !important; } .switchStyle1 .el-switch__core { background: #f8f9fd !important; @@ -372,7 +384,7 @@ width: 620px!important; right: 0; top: 2.1px; } -.switchStyle1.el-switch.is-checked .el-switch__core::after{ +.switchStyle1.el-switch.is-checked .el-switch__core::after { margin-left: -25px; } .switchStyle1 .el-switch__label * { @@ -412,7 +424,8 @@ width: 620px!important; .el-input__inner { border-radius: 8px; } -.el-input-group__append, .el-input-group__prepend { +.el-input-group__append, +.el-input-group__prepend { border-radius: 8px; } .el-button { @@ -454,10 +467,10 @@ width: 620px!important; .el-scrollbar { border-radius: 8px; } -.el-popper[x-placement^=bottom] .popper__arrow::after { +.el-popper[x-placement^="bottom"] .popper__arrow::after { border-bottom-color: transparent; } -.el-popper[x-placement^=top] .popper__arrow::after { +.el-popper[x-placement^="top"] .popper__arrow::after { border-top-color: transparent; } /* 单选激活样式 */ @@ -465,13 +478,13 @@ width: 620px!important; border-color: #838383; background-color: #fff; } -.el-radio__input.is-checked+.el-radio__label { +.el-radio__input.is-checked + .el-radio__label { color: #1a2236; font-weight: 700; } .el-radio__inner::after { width: 8px; - height: 8px; + height: 8px; } .el-radio__input.is-checked .el-radio__inner::after { background-color: #e56600; @@ -508,7 +521,6 @@ width: 620px!important; margin: 0 auto; } - /* common */ .apass_breadcrumb > .el-breadcrumb { padding: 15px 0; @@ -519,7 +531,10 @@ width: 620px!important; color: #898d9e; line-height: 23px; } -.apass_breadcrumb > .el-breadcrumb .el-breadcrumb__item:last-child .el-breadcrumb__inner { +.apass_breadcrumb + > .el-breadcrumb + .el-breadcrumb__item:last-child + .el-breadcrumb__inner { color: #242c43; font-weight: normal; } @@ -527,7 +542,7 @@ width: 620px!important; min-width: 90px; color: #0f2683; } -.apaas_button .el-button--mini, +.apaas_button .el-button--mini, .apaas_button .el-button--mini.is-round { padding: 10px 15px; } @@ -546,8 +561,8 @@ width: 620px!important; background-color: #e15260; border-color: #e15260; } -.apaas_button .el-button.is-disabled, -.apaas_button .el-button.is-disabled:focus, +.apaas_button .el-button.is-disabled, +.apaas_button .el-button.is-disabled:focus, .apaas_button .el-button.is-disabled:hover { cursor: not-allowed; } @@ -559,16 +574,16 @@ width: 620px!important; .apaas_button .el-button--warning { background-color: #e56600; border-color: #e56600; - color: #fff; + color: #fcefd6; } .apaas_button .el-button.is-disabled, .apaas_button .el-button.is-disabled:focus, .apaas_button .el-button.is-disabled:hover { - color: #C0C4CC; + color: #c0c4cc; cursor: not-allowed; background-image: none; - background-color: #FFF; - border-color: #EBEEF5; + background-color: #fff; + border-color: #ebeef5; } .apass_table .el-table th > .cell { @@ -609,10 +624,14 @@ width: 620px!important; color: #999; cursor: not-allowed; } +.apass_table .row_action .disabled.hide { + opacity: 0; + cursor: auto; +} .apass_table .row_action .interval_line { - font-size: 14px; - color: #dde4ff; - margin: 0 20px; + font-size: 14px; + color: #dde4ff; + margin: 0 20px; } .apass_table .border-active td { padding: 10px 0; @@ -658,7 +677,7 @@ width: 620px!important; padding: 0 20px; } .apaas_detail_container .main_contaner { - min-height: calc(100vh - 84px - 83px); + min-height: calc(100vh - 58px - 83px); flex-grow: 1; display: flex; flex-direction: column; @@ -673,11 +692,11 @@ width: 620px!important; justify-content: space-between; } .apaas_detail_container .main_contaner.locked_height { - height: calc(100vh - 84px - 83px); + height: calc(100vh - 58px - 83px); min-height: 400px; } .apaas_detail_container .main_contaner.locked_height_900 { - height: calc(100vh - 84px - 83px); + height: calc(100vh - 58px - 83px); min-height: 900px; } .apaas_detail_container .detail_action { @@ -827,4 +846,10 @@ width: 620px!important; .meassage_detail_dialog .detail_item .full_content .item_content { margin: 0; } -/* 详情页公共样式 by xuyiming ~~~end */ \ No newline at end of file +.no_wrap .apass_table td .cell { + overflow: hidden; + text-overflow: ellipsis; + word-break: break-all; + white-space: nowrap; +} +/* 详情页公共样式 by xuyiming ~~~end */ diff --git a/src/assets/i18n/language-zh.js b/src/assets/i18n/language-zh.js index f368162f74ac353b52e4a6b10b5415724f8c5855..1e64e6fe8b7aabb34eb1a1a5e58847a1e9f7f7b0 100644 --- a/src/assets/i18n/language-zh.js +++ b/src/assets/i18n/language-zh.js @@ -22,9 +22,13 @@ export const lang = { cloud_resources_detail: "云资源详情", // data analysis - data_analysis: "数据分析中心", - my_service_data_analysis: "我的服务数据分析", - my_application_data_analysis: "我的应用数据分析", + data_analysis: "运营管控中心", + operational_analysis: "运营分析", + operation_control: "运行管控", + service_data_analysis: "服务分析", + application_data_analysis: "应用分析", + operation_overview: "运行概况", + service_control: "服务管控", // message message: "消息与推送管理", @@ -33,4 +37,14 @@ export const lang = { message_alert: "消息提醒管理", banner: "banner管理", message_template: "消息模板管理", + + //online component tool + online_component_tool: "在线组件中心", + process_design: "流程设计", + process_management: "流程管理", + new: "新建", + edit: "编辑", + + // technical-support + technical_support: "技术支持" } \ No newline at end of file diff --git a/src/assets/imgs/data_img_liucheng.gif b/src/assets/imgs/data_img_liucheng.gif new file mode 100644 index 0000000000000000000000000000000000000000..2e255becbc8eb399953800c3b354ed8a0a5b0b67 Binary files /dev/null and b/src/assets/imgs/data_img_liucheng.gif differ diff --git a/src/assets/imgs/ic_xitong.png b/src/assets/imgs/ic_xitong.png index f03d86264f40198869675c461d733c04de01e637..d96cf22198a5c7bb804d28797897574bcce4ca9d 100644 Binary files a/src/assets/imgs/ic_xitong.png and b/src/assets/imgs/ic_xitong.png differ diff --git a/src/assets/imgs/icon_liuchengsj.png b/src/assets/imgs/icon_liuchengsj.png new file mode 100644 index 0000000000000000000000000000000000000000..28265d09936a1187456c02d0b56a8109692fd9bf Binary files /dev/null and b/src/assets/imgs/icon_liuchengsj.png differ diff --git a/src/assets/imgs/img_default_quesheng.png b/src/assets/imgs/img_default_quesheng.png new file mode 100644 index 0000000000000000000000000000000000000000..f0629854c0cf9c1dbd80016229183aed58d05ea4 Binary files /dev/null and b/src/assets/imgs/img_default_quesheng.png differ diff --git a/src/assets/imgs/img_head.png b/src/assets/imgs/img_head.png index df8e3e35771c570a1e1df076bb36f02a6654ee0f..801b461b0f444967d8b1e0b45e7a3a7e64d5ae4f 100644 Binary files a/src/assets/imgs/img_head.png and b/src/assets/imgs/img_head.png differ diff --git a/src/assets/imgs/img_liuchengsheji.png b/src/assets/imgs/img_liuchengsheji.png new file mode 100644 index 0000000000000000000000000000000000000000..cdce0c882d91533ff4ed5e1978b16ed49fa046ee Binary files /dev/null and b/src/assets/imgs/img_liuchengsheji.png differ diff --git a/src/assets/imgs/lcsj_btn_delete.png b/src/assets/imgs/lcsj_btn_delete.png new file mode 100644 index 0000000000000000000000000000000000000000..4a304ca53a904c156467c116334f9870e5b6739f Binary files /dev/null and b/src/assets/imgs/lcsj_btn_delete.png differ diff --git a/src/assets/imgs/lcsj_btn_node_delete.png b/src/assets/imgs/lcsj_btn_node_delete.png new file mode 100644 index 0000000000000000000000000000000000000000..a5890b34360b2d968221d7825f5459fc3d4cb82b Binary files /dev/null and b/src/assets/imgs/lcsj_btn_node_delete.png differ diff --git a/src/assets/imgs/lcsj_ic_chajian.png b/src/assets/imgs/lcsj_ic_chajian.png new file mode 100644 index 0000000000000000000000000000000000000000..62380ce85c1dcc0c8b85ec83b842a7674257d630 Binary files /dev/null and b/src/assets/imgs/lcsj_ic_chajian.png differ diff --git a/src/assets/imgs/lcsj_ic_chaoshi.png b/src/assets/imgs/lcsj_ic_chaoshi.png new file mode 100644 index 0000000000000000000000000000000000000000..efe9c43cd366d002579e3083bdd9167233fa88fd Binary files /dev/null and b/src/assets/imgs/lcsj_ic_chaoshi.png differ diff --git a/src/assets/imgs/lcsj_ic_jiekou.png b/src/assets/imgs/lcsj_ic_jiekou.png new file mode 100644 index 0000000000000000000000000000000000000000..ee09572a0ea71c72ca1b485eba31fe1bed2ee65a Binary files /dev/null and b/src/assets/imgs/lcsj_ic_jiekou.png differ diff --git a/src/assets/imgs/lcsj_ic_liucheng.png b/src/assets/imgs/lcsj_ic_liucheng.png new file mode 100644 index 0000000000000000000000000000000000000000..3a58c220b4d42bba08cb9d47c3790d6860efe898 Binary files /dev/null and b/src/assets/imgs/lcsj_ic_liucheng.png differ diff --git a/src/assets/imgs/lcsj_ic_set.png b/src/assets/imgs/lcsj_ic_set.png new file mode 100644 index 0000000000000000000000000000000000000000..27545a36e76df250a2d44305cc5609c2224bb9dc Binary files /dev/null and b/src/assets/imgs/lcsj_ic_set.png differ diff --git a/src/assets/imgs/liucheng_ic_chaoshi.png b/src/assets/imgs/liucheng_ic_chaoshi.png new file mode 100644 index 0000000000000000000000000000000000000000..033c7da9d7c131d95b9899c398e519a2c3b89334 Binary files /dev/null and b/src/assets/imgs/liucheng_ic_chaoshi.png differ diff --git a/src/assets/imgs/liucheng_ic_haoshi.png b/src/assets/imgs/liucheng_ic_haoshi.png new file mode 100644 index 0000000000000000000000000000000000000000..270be30f44803528f1b0ec9da154134b8ce4075e Binary files /dev/null and b/src/assets/imgs/liucheng_ic_haoshi.png differ 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/assets/imgs/nav_ic_ganzhifw.png b/src/assets/imgs/nav_ic_ganzhifw.png new file mode 100644 index 0000000000000000000000000000000000000000..46e453368ef4690847825e493a3bcb447e420a43 Binary files /dev/null and b/src/assets/imgs/nav_ic_ganzhifw.png differ diff --git a/src/assets/imgs/nav_ic_ganzhifw_sel.png b/src/assets/imgs/nav_ic_ganzhifw_sel.png new file mode 100644 index 0000000000000000000000000000000000000000..a77e34363eded0a8bf34459cb4566edd6b84e354 Binary files /dev/null and b/src/assets/imgs/nav_ic_ganzhifw_sel.png differ diff --git a/src/assets/imgs/nav_ic_shikongfw.png b/src/assets/imgs/nav_ic_shikongfw.png new file mode 100644 index 0000000000000000000000000000000000000000..f5df0f4b28cb437ab14082d473a31fb3c8f1bb9c Binary files /dev/null and b/src/assets/imgs/nav_ic_shikongfw.png differ diff --git a/src/assets/imgs/nav_ic_shikongfw_sel.png b/src/assets/imgs/nav_ic_shikongfw_sel.png new file mode 100644 index 0000000000000000000000000000000000000000..1271f35b935bfb938ea1a3895dfd06b1944180d1 Binary files /dev/null and b/src/assets/imgs/nav_ic_shikongfw_sel.png differ diff --git a/src/assets/imgs/nav_ic_shipinfw.png b/src/assets/imgs/nav_ic_shipinfw.png new file mode 100644 index 0000000000000000000000000000000000000000..0c7e2619233cc50c0421224cf44efa734aca5500 Binary files /dev/null and b/src/assets/imgs/nav_ic_shipinfw.png differ diff --git a/src/assets/imgs/nav_ic_shipinfw_sel.png b/src/assets/imgs/nav_ic_shipinfw_sel.png new file mode 100644 index 0000000000000000000000000000000000000000..47c9454353c51719678febf45158cd9d50ecd047 Binary files /dev/null and b/src/assets/imgs/nav_ic_shipinfw_sel.png differ diff --git a/src/assets/imgs/nav_ic_shujufw.png b/src/assets/imgs/nav_ic_shujufw.png new file mode 100644 index 0000000000000000000000000000000000000000..1dc9b626c6b7c972060a68e487aa9b56e4913ff4 Binary files /dev/null and b/src/assets/imgs/nav_ic_shujufw.png differ diff --git a/src/assets/imgs/nav_ic_shujufw_sel.png b/src/assets/imgs/nav_ic_shujufw_sel.png new file mode 100644 index 0000000000000000000000000000000000000000..047aa4fd024222b43bab0ec0e9e279728ae1cfb1 Binary files /dev/null and b/src/assets/imgs/nav_ic_shujufw_sel.png differ diff --git a/src/assets/imgs/nav_ic_zonghefw.png b/src/assets/imgs/nav_ic_zonghefw.png new file mode 100644 index 0000000000000000000000000000000000000000..1f99ddd7e1ff16f22c9a66ab8091d72dc2e2f903 Binary files /dev/null and b/src/assets/imgs/nav_ic_zonghefw.png differ diff --git a/src/assets/imgs/nav_ic_zonghefw_sel.png b/src/assets/imgs/nav_ic_zonghefw_sel.png new file mode 100644 index 0000000000000000000000000000000000000000..e148a203f4c9321da83af5e2f1af40245e52ae2f Binary files /dev/null and b/src/assets/imgs/nav_ic_zonghefw_sel.png differ diff --git a/src/assets/imgs/progress_ic_liucheng.png b/src/assets/imgs/progress_ic_liucheng.png new file mode 100644 index 0000000000000000000000000000000000000000..0934d70b9dcc4f8007d0cb2618418584de5dae8b Binary files /dev/null and b/src/assets/imgs/progress_ic_liucheng.png differ diff --git a/src/assets/imgs/progress_ic_wancheng.png b/src/assets/imgs/progress_ic_wancheng.png new file mode 100644 index 0000000000000000000000000000000000000000..ace9a5ea0b67d9bd6859df8ffb05d6bd7ef9a352 Binary files /dev/null and b/src/assets/imgs/progress_ic_wancheng.png differ diff --git a/src/assets/imgs/yxgk_ic_fuwuzs.png b/src/assets/imgs/yxgk_ic_fuwuzs.png new file mode 100644 index 0000000000000000000000000000000000000000..a3a9b39ab1b4b63a91bfe978d3c9b4b3d92edfdb Binary files /dev/null and b/src/assets/imgs/yxgk_ic_fuwuzs.png differ diff --git a/src/assets/imgs/yxgk_ic_yingyongzs.png b/src/assets/imgs/yxgk_ic_yingyongzs.png new file mode 100644 index 0000000000000000000000000000000000000000..69407f059681f978b53923c13fafb92b42367ad9 Binary files /dev/null and b/src/assets/imgs/yxgk_ic_yingyongzs.png differ diff --git a/src/assets/imgs/yxgk_ic_zaixianyh.png b/src/assets/imgs/yxgk_ic_zaixianyh.png new file mode 100644 index 0000000000000000000000000000000000000000..58ce6125e825e99dbd50d459544b23a8ff35dc56 Binary files /dev/null and b/src/assets/imgs/yxgk_ic_zaixianyh.png differ diff --git a/src/assets/imgs/yxgk_ic_zuzhiyh.png b/src/assets/imgs/yxgk_ic_zuzhiyh.png new file mode 100644 index 0000000000000000000000000000000000000000..d7544dad6132d2590c3c89fe60963498893462a8 Binary files /dev/null and b/src/assets/imgs/yxgk_ic_zuzhiyh.png differ diff --git a/src/components/apass-list.vue b/src/components/apass-list.vue index 50e405f139c1068f524bb6e5702df772fe25f960..68b2f517c4784a4a0d343aae1abf39af3afb3592 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); @@ -244,7 +250,7 @@ export default { padding: 0 20px 15px; background-color: #fff; border-radius: 10px; - margin-bottom: 40px; + margin-bottom: 30px; } .header-container { padding-top: 20px; diff --git a/src/components/apass-table.vue b/src/components/apass-table.vue index 74988caafcaa09347e6f7dc6f565e863368fca19..5590a1269d07844caf76bbaeec12e928ac7b33b5 100644 --- a/src/components/apass-table.vue +++ b/src/components/apass-table.vue @@ -25,6 +25,7 @@ @@ -42,8 +43,24 @@ v-if="i < item.actionList.length - 1" class="interval_line" :key="'line_' + index + '_' + i" - >| + | + + +
@@ -94,7 +111,7 @@ tag_flag_arr[scope.$index] == 0 && scope.row[item.prop].length > 2 " - @click.stop="change_tag(scope.$index, 1)" + @click.stop="changeTag(scope.$index, 1)" >
2 " - @click.stop="change_tag(scope.$index, 0)" + @click.stop="changeTag(scope.$index, 0)" >
@@ -115,16 +132,34 @@ :styles="item.prop == 'cpu' ? spCurveStyles2 : spCurveStyles3" /> - {{ scope.row["cpu_use"] }}.00mm - 0mm + {{ scope.row["cpu_use"] }}.00mm + + - {{ scope.row["memory_use"] }}Mi + - + 0Mi
@@ -175,6 +210,12 @@ :class="'index_' + scope.row.hotIndex" v-text="'TOP' + scope.row.hotIndex" > + {{ getPercent(scope.row[item.prop]) }} @@ -185,6 +226,16 @@ + + {{ scope.row[item.prop] + "%" }} + + + + + + + @@ -257,6 +324,12 @@ export default { strokeOpacity: 0, strokeDasharray: "2, 2", }, + moreActionList: [], + showMoreActionList: false, + moreActionStyle: { + top: 0, + left: 0, + }, }; }, mounted() { @@ -266,7 +339,7 @@ export default { ); }, methods: { - change_tag(index, val) { + changeTag(index, val) { this.$set(this.tag_flag_arr, index, val); }, sortChange(value) { @@ -278,6 +351,50 @@ export default { getPercent(num) { return Math.round(num * 100) + "%"; }, + mouseenter($event, moreActionList, row) { + let _self = this; + + _self.moreActionList = []; + _self.showMoreActionList = true; + _self.moreActionList = moreActionList + .filter((item) => { + if (item.showRule) { + return item.showRule(row); + } else { + return true; + } + }) + .map((item) => ({ + id: row.id, + label: item.label, + callback() { + _self.showMoreActionList = false; + _self.moreActionList = []; + + item.callback && item.callback(row); + }, + })); + + _self.$nextTick(() => { + let targetInfo = $event.target.getBoundingClientRect(); + let containerInfo = _self.$refs.moreActionList.getBoundingClientRect(); + + _self.moreActionStyle = { + top: targetInfo.y + targetInfo.height + 15 + "px", + left: + targetInfo.x - (containerInfo.width - targetInfo.width) / 2 + "px", + }; + }); + }, + mouseleave() { + this.showMoreActionList = false; + }, + enterMoreActionList() { + this.showMoreActionList = true; + }, + leaveMoreActionList() { + this.showMoreActionList = false; + }, }, }; @@ -389,4 +506,49 @@ export default { .selected_icon.selected > span { display: block; } +.more_action_list { + position: fixed; +} +.more_action_list > li { + padding: 5px 20px; + background-color: #0f2683; + font-size: 12px; + line-height: 20px; + color: #fff; + cursor: pointer; + position: relative; +} +.more_action_list > li:first-child { + border-top-left-radius: 5px; + border-top-right-radius: 5px; +} +.more_action_list > li:first-child::before { + content: ""; + position: absolute; + top: -20px; + right: calc(50% - 20px); + width: 40px; + height: 20px; + /* background-color: red; */ +} +.more_action_list > li:first-child::after { + content: ""; + position: absolute; + top: -14px; + right: calc(50% - 7px); + border-top: 0 solid transparent; + border-right: 7px solid transparent; + border-bottom: 14px solid #0f2683; + border-left: 7px solid transparent; +} +.more_action_list > li:last-child { + border-bottom-left-radius: 5px; + border-bottom-right-radius: 5px; +} +.more_action_list > li:hover { + background-color: #3f4f9c; +} +.more_action_list > li:first-child:hover::after { + border-bottom: 14px solid #3f4f9c; +} diff --git a/src/components/app-build-steps/app-build-step.vue b/src/components/app-build-steps/app-build-step.vue index 51422948d78d09353e79c38505a5f577d93b3a11..b7cf24895b9856db9eac2a8bad97097d44845317 100644 --- a/src/components/app-build-steps/app-build-step.vue +++ b/src/components/app-build-steps/app-build-step.vue @@ -20,6 +20,10 @@ export default { type: String, default: () => "", }, + stepTitle: { + type: String, + default: "", + }, }, data: () => ({}), computed: { diff --git a/src/components/app-build-steps/app-build-steps.vue b/src/components/app-build-steps/app-build-steps.vue index 3568024c09bb5a92c8629ede0a38ec3734c04da2..3c7340cd878c93537be5fe04d379957afa1f8c88 100644 --- a/src/components/app-build-steps/app-build-steps.vue +++ b/src/components/app-build-steps/app-build-steps.vue @@ -25,7 +25,12 @@
-

+

+ + {{ item.stepTitle }} + +

+

已完成 diff --git a/src/components/app-list/app-card.vue b/src/components/app-list/app-card.vue index f0fbdd7d524ca723b0b529a82c14de5dfb617e48..e06354d74a3376d4996a447c8688802a5f10dabf 100644 --- a/src/components/app-list/app-card.vue +++ b/src/components/app-list/app-card.vue @@ -101,11 +101,17 @@ export default { margin-right: 18px; cursor: pointer; } +.app_card > .app_card-icon .el-avatar--square { + border: 3px solid #f6f7fb; + border-radius: 8px; + overflow: hidden; +} .app_card > .app_card-info { width: calc(100% - 56px - 20px); } .app_card-info > .app_card-name { font-size: 18px; + font-weight: 600; line-height: 32px; color: #0d1847; cursor: pointer; 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/bar-chart-two.vue b/src/components/e-charts/bar-chart-two.vue new file mode 100644 index 0000000000000000000000000000000000000000..2db68ca474e18265a6b779af858b8012a27a58e3 --- /dev/null +++ b/src/components/e-charts/bar-chart-two.vue @@ -0,0 +1,215 @@ + + + + diff --git a/src/components/e-charts/bar-chart.vue b/src/components/e-charts/bar-chart.vue index 1a9efdb08afccd46b42986cd20f31a8beb46e0af..20e77dea7a47bece10445c5993c2ad16fd4db8fc 100644 --- a/src/components/e-charts/bar-chart.vue +++ b/src/components/e-charts/bar-chart.vue @@ -11,47 +11,63 @@ export default { default: () => { return { legendData: [], - seriesData: [] + seriesData: [], }; - } + }, }, bar_width: { type: Number, - default: 12 + default: 12, }, colors: { type: Array, default: () => { return ["#274fee", "#274fee"]; - } + }, }, bar_border_radius: { type: Array, default: () => { return [10, 10, 10, 10]; - } + }, }, show_split: { type: Boolean, - default: false + default: false, }, x_router: { type: Number, - default: 0 - } + default: 0, + }, + xAxis_text_length: { + type: Number, + default: 0, + }, }, data: () => ({}), mounted() {}, methods: { bar() { let self = this; + return { + tooltip: { + trigger: "axis", + formatter: function(params) { + var htmlStr = ""; + for (var i = 0; i < params.length; i++) { + htmlStr += params[i].name + " : "; + htmlStr += params[i].value; + } + return htmlStr; + }, + }, grid: { left: 10, right: 10, bottom: 25, top: 25, - containLabel: true + containLabel: true, }, xAxis: [ { @@ -61,62 +77,71 @@ export default { margin: 20, color: "#0d1847", textStyle: { - fontSize: 12 + fontSize: 12, }, interval: 0, rotate: self.x_router, formatter: function(value) { - let valueTxt = ""; - if (value.length > 6) { - valueTxt = value.substring(0, 5) + "..."; + let maxLen = self.xAxis_text_length; + + if (maxLen > 1) { + let valueTxt = ""; + if (value.length > maxLen) { + valueTxt = value.substring(0, maxLen - 1) + "..."; + } else { + valueTxt = value; + } + return valueTxt; } else { - valueTxt = value; + return value; } - return valueTxt; - } + }, }, axisLine: { lineStyle: { - color: "#f2f2f2" - } + color: "#f2f2f2", + }, }, axisTick: { - show: false + show: false, }, splitArea: { show: true, areaStyle: { color: ["#fff", "#f8f9fd"], - opacity: 0.5 + opacity: 0.5, }, - interval: 0 + interval: 0, + }, + axisPointer: { + type: "shadow", }, - } + }, ], yAxis: [ { axisLabel: { color: "#a9aec0", textStyle: { - fontSize: 12 - } + fontSize: 12, + }, }, minInterval: 1, axisLine: { lineStyle: { - color: "rgba(0, 0, 0, 0)" - } + color: "rgba(0, 0, 0, 0)", + }, }, axisTick: { - show: false + show: false, }, splitLine: { lineStyle: { color: "#f2f2f2", - type: "solid" - } - } - } + type: "solid", + }, + }, + }, ], series: [ { @@ -134,24 +159,24 @@ export default { [ { offset: 0, - color: self.colors[0] // 0% 处的颜色 + color: self.colors[0], // 0% 处的颜色 }, { offset: 1, - color: self.colors[1] // 100% 处的颜色 - } + color: self.colors[1], // 100% 处的颜色 + }, ], false ); }, - barBorderRadius: self.bar_border_radius - } - } - } - ] + barBorderRadius: self.bar_border_radius, + }, + }, + }, + ], }; - } - } + }, + }, }; \ No newline at end of file + diff --git a/src/components/e-charts/commentlist.vue b/src/components/e-charts/commentlist.vue index 6a5d05709760278cb2e725dcc08bce95af07f442..cadc72f128d1cab1455abba9849d6d6751213c7d 100644 --- a/src/components/e-charts/commentlist.vue +++ b/src/components/e-charts/commentlist.vue @@ -1,13 +1,27 @@