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/css/index.css b/src/assets/css/index.css index dbcd2f727726cbceb7230d1395bb89c83b7d1a2f..6772c5e1d72ef52c3e6e90ace81f1b3c033ee13b 100644 --- a/src/assets/css/index.css +++ b/src/assets/css/index.css @@ -609,10 +609,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; 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_yulan.png b/src/assets/imgs/ic_yulan.png new file mode 100644 index 0000000000000000000000000000000000000000..ac66513b398c28618bb40acf47787817c831c68b Binary files /dev/null and b/src/assets/imgs/ic_yulan.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_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_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/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/shop_ic_huoqu.png b/src/assets/imgs/shop_ic_huoqu.png index 7cb9a91a533a88db1db4ebb7656f3f51d1720856..51f20bdd87dedc20e0ea87cfc9c910d542b4c68d 100644 Binary files a/src/assets/imgs/shop_ic_huoqu.png and b/src/assets/imgs/shop_ic_huoqu.png differ diff --git a/src/assets/imgs/shop_icon_liulan.png b/src/assets/imgs/shop_icon_liulan.png index 6c966c360643420b16f291e66754eee3a7e8bf14..854a60ba8e5d0cd67cf460a3935ab45ea0c8a15a 100644 Binary files a/src/assets/imgs/shop_icon_liulan.png and b/src/assets/imgs/shop_icon_liulan.png differ diff --git a/src/components/apass-dialog.vue b/src/components/apass-dialog.vue index 34ff0378d71e3d43147355362157d44431e4a4e4..cd2ddb7602d25800de3da2407ca824d599721a16 100644 --- a/src/components/apass-dialog.vue +++ b/src/components/apass-dialog.vue @@ -4,7 +4,6 @@ class="apass_dialog" :visible.sync="showDialog" :width="width" - top="25vh" >

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/apass-table.vue b/src/components/apass-table.vue index 74988caafcaa09347e6f7dc6f565e863368fca19..cfdbada9632e2539c180cf222080ae5ba3fdd3c6 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,32 @@ :styles="item.prop == 'cpu' ? spCurveStyles2 : spCurveStyles3" /> - {{ scope.row["cpu_use"] }}.00mm - 0mm - {{ scope.row["memory_use"] }}Mi - 0Mi
@@ -210,6 +243,22 @@ + + @@ -257,6 +306,12 @@ export default { strokeOpacity: 0, strokeDasharray: "2, 2", }, + moreActionList: [], + showMoreActionList: false, + moreActionStyle: { + top: 0, + left: 0, + }, }; }, mounted() { @@ -266,7 +321,7 @@ export default { ); }, methods: { - change_tag(index, val) { + changeTag(index, val) { this.$set(this.tag_flag_arr, index, val); }, sortChange(value) { @@ -278,6 +333,42 @@ export default { getPercent(num) { return Math.round(num * 100) + "%"; }, + mouseenter($event, moreActionList, row) { + let _self = this; + + _self.moreActionList = []; + _self.showMoreActionList = true; + _self.moreActionList = moreActionList.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 +480,48 @@ 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: -14px; + right: calc(50% - 14px); + width: 28px; + height: 14px; +} +.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/e-charts/line_chart.vue b/src/components/e-charts/line_chart.vue index 6c37c8625065eda6d1ab97fe1d371950e7a24ca4..d4ec73cc11242b368eab73f575fcee6b386d90eb 100644 --- a/src/components/e-charts/line_chart.vue +++ b/src/components/e-charts/line_chart.vue @@ -28,7 +28,11 @@ export default { targetValue: { type: Number, default: () => 0 - } + }, + area_flag:{ + type: Boolean, + default: true + }, }, components: {}, data() { @@ -87,7 +91,7 @@ export default { }, areaStyle: { normal: { - color: new echarts.graphic.LinearGradient( + color:this.area_flag? new echarts.graphic.LinearGradient( 0, 0, 0, @@ -103,7 +107,7 @@ export default { } ], false - ), + ):'rgba(0,0,0,0)', shadowColor: hexToRgba(color[idx], 0.1), shadowBlur: 10 } @@ -118,10 +122,10 @@ export default { }); var option = { - backgroundColor: bgColor, + // backgroundColor: bgColor, color: color, legend: { - // show:false,//是否显示图例 + show:yarr.length>=2,//是否显示图例 right: "center", bottom: 0, itemWidth: 10, @@ -144,7 +148,7 @@ export default { left: 15, right: 30, bottom: 30, - containLabel: true + containLabel: true, }, xAxis: [ { @@ -161,7 +165,7 @@ export default { } }, splitArea: { - show: true, + show: this.area_flag, areaStyle: { color: ["#fff", "#f8f9fd"], opacity: 0.5 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; +} + + diff --git a/src/components/service-info/service-info.vue b/src/components/service-info/service-info.vue index 103dff09773066a5d4ba1a6da5181eca2a65fe67..200f818964cc922d184975030bc90ed9c2adb7a5 100644 --- a/src/components/service-info/service-info.vue +++ b/src/components/service-info/service-info.vue @@ -19,6 +19,10 @@
+
    @@ -118,8 +122,12 @@ diff --git a/src/components/service-list/service_list.vue b/src/components/service-list/service_list.vue index a007695ab28617f2b0bc0b4e53516763971a82e1..4ce49226367d6c9e445a0b00b1775aab261d8a56 100644 --- a/src/components/service-list/service_list.vue +++ b/src/components/service-list/service_list.vue @@ -9,9 +9,11 @@
    - {{ + + {{ $t("lang.service_shop") - }} + }} + {{ name }}
    @@ -26,11 +28,7 @@
    -
    +
    全部 + >全部
  • {{ items.name }} + >{{ items.name }} 收起 展开 - - + +
    • @@ -155,8 +145,7 @@ ? 'classification_act' : '' " - >{{ itemChildren.name }} + >{{ itemChildren.name }}
@@ -181,12 +170,9 @@ size="small" :class="index == activeBtn ? 'button_filter_act' : 'button_filter'" @click="clickButtonFilter(index)" - >{{ item.name }} + >{{ item.name }}
- 支持二次开发 + 支持二次开发
@@ -441,7 +427,9 @@ export default { let list = this.filterLists; for (let i = 0; i < list.length; i++) { if (list[i].childDomains.length != 0) { - let offHeight = Math.ceil(document.getElementById(list[i].id).offsetHeight); + let offHeight = Math.ceil( + document.getElementById(list[i].id).offsetHeight + ); if (offHeight > 60) { list[i].showOpen = true; this.openList[i] = "up"; @@ -669,11 +657,26 @@ export default { .button_filter { background-color: #e6eefe; color: #626de9; - font-size: 10px; + border: 1px solid #e6eefe; + font-size: 12px; +} +.button_filter:hover { + border: 1px solid rgb(198, 226, 255); +} +.button_filter:focus { + border: 1px solid rgb(58, 142, 230); } .button_filter_act { background-color: #515fe7; + border: 1px solid #515fe7; color: #f8f9fd; + font-size: 12px; +} +.button_filter_act:hover { + border: 1px solid #414fd7; +} +.button_filter_act:focus { + border: 1px solid #313fc7; } .btn_group { margin-bottom: 15px; diff --git a/src/components/service-list/service_shop_menu.vue b/src/components/service-list/service_shop_menu.vue index 60ffb6c0b6f3a760b8ffb42226d64158a06782d9..99c1444c344f335ba272c76fb6a560ec4a5afc1a 100644 --- a/src/components/service-list/service_shop_menu.vue +++ b/src/components/service-list/service_shop_menu.vue @@ -119,7 +119,7 @@ export default { .service_shop_menu_list > li { padding: 16px 10px 8px 22px; border-left: 5px solid #0d1847; - font-size: 16px; + font-size: 15px; line-height: 24px; cursor: pointer; } diff --git a/src/components/service-tabs/service-tab-detail.vue b/src/components/service-tabs/service-tab-detail.vue index 3f51a69a7868e84949d52e2484c8358b23ca444d..b64c18d5d0b7af89195fb97d41d2de08159105ed 100644 --- a/src/components/service-tabs/service-tab-detail.vue +++ b/src/components/service-tabs/service-tab-detail.vue @@ -91,6 +91,7 @@ export default { margin-bottom: 3px; } .detail-item .detail-text { + word-break: break-all; font-size: 14px; line-height: 25px; color: #242c43; diff --git a/src/components/service-tabs/service-tabs.vue b/src/components/service-tabs/service-tabs.vue index 1612eb21b4b5c5241587650ba8c68c1ee975faa4..b855e73eafd83a51215162a4f7664047e9871f4f 100644 --- a/src/components/service-tabs/service-tabs.vue +++ b/src/components/service-tabs/service-tabs.vue @@ -180,4 +180,7 @@ export default { .service_info_tab .detail-list .el-table__row:nth-child(odd) td { background-color: #fff; } +.service_info_tab.el-tabs--border-card > .el-tabs__header .el-tabs__item:hover { + color: #e56600; +} diff --git a/src/components/shop-car-apply/apply_form.vue b/src/components/shop-car-apply/apply_form.vue index aefb4dee6357bea768330665ebc94157efb5e6c6..ed889c6bb42c988b79ff08e178e6f93e3c00bfee 100644 --- a/src/components/shop-car-apply/apply_form.vue +++ b/src/components/shop-car-apply/apply_form.vue @@ -48,7 +48,8 @@ export default { }, rules: { preson: [ - { required: true, message: "请输入部门联系人", trigger: "blur" } + { required: true, message: "请输入部门联系人", trigger: "blur" }, + {max:16, message: "不能超过16个字符", trigger: "blur" } ], phone: [ { required: true, message: "请输入联系电话", trigger: "blur" }, diff --git a/src/components/shop-car-apply/apply_service_state.vue b/src/components/shop-car-apply/apply_service_state.vue index 0edefe28c9d96c0d3ad23eba01bb6f3ec0aad1a2..6edcffb2b0ebf0eac71d40975bd4264b0f36fe5b 100644 --- a/src/components/shop-car-apply/apply_service_state.vue +++ b/src/components/shop-car-apply/apply_service_state.vue @@ -53,7 +53,7 @@

应用场景：

- +

-

+

- + - + +

-

- +

+

- - + +

- + - +
@@ -52,27 +69,27 @@ export default { props: { data: { type: Object, - default: () => {} + default: () => {}, }, detailPath: { type: String, - required: true + required: true, }, showImg: { type: Boolean, - default: false - } + default: false, + }, }, data() { return { - helper + helper, }; }, methods: { intoDetail() { this.$router.push(this.detailPath + this.data.id); - } - } + }, + }, }; @@ -101,7 +118,6 @@ export default { .shop_card-title { height: 42px; font-size: 16px; - font-weight: bold; color: #0d1847; line-height: 21px; cursor: pointer; @@ -116,16 +132,11 @@ export default { display: flex; justify-content: space-between; align-items: center; + color: #58617a; } .shop_card-text.under_text > span:nth-child(2) { flex-shrink: 0; margin-left: 10px; -} -.shop_card-text.under_text > span:nth-child(2) > i { - font-size: 20px; - color: #fac266; -} -.shop_card-text.under_text > span:nth-child(2) > span { font-family: Arial; font-size: 18px; font-weight: bold; @@ -152,9 +163,9 @@ export default { align-items: center; padding-top: 11px; border-top: 1px solid #ededed; + color: #58617a; } .shop_card-text.access > span > * { - width: 15px; vertical-align: middle; } .shop_card-text.access > span > img { diff --git a/src/components/shop-list.vue b/src/components/shop-list.vue index d655f832b1ba4a5ec9874d8f86bf803176f42fbd..d0ce49e6440374441c39e508683a495f6c327ad4 100644 --- a/src/components/shop-list.vue +++ b/src/components/shop-list.vue @@ -2,14 +2,16 @@

- - - +

  • - +
@@ -20,37 +22,37 @@ import shopCard from "./shop-card"; export default { components: { - shopCard + shopCard, }, props: { name: { type: String, - required: true + required: true, }, to: { type: String, - required: true + required: true, }, detailPath: { type: String, - required: true + required: true, }, data: { type: Array, - default: () => [] + default: () => [], }, showImg: { type: Boolean, - default: false - } + default: false, + }, }, methods: { goto() { if (this.to) { this.$router.push(this.to); } - } - } + }, + }, }; @@ -59,26 +61,25 @@ export default { margin: 13px 20px; } .shop_list-title > span { + display: inline-block; + vertical-align: middle; font-size: 18px; font-weight: bold; color: #0d1847; line-height: 27px; } .shop_list-title > a { - display: inline-flex; - justify-content: center; - align-items: center; + display: inline-block; + vertical-align: middle; + background-image: url("../assets/imgs/home_btn_enter.png"); width: 28px; height: 28px; - background-color: #fff; - border: 1px solid #edeff6; - border-radius: 5px; - overflow: hidden; - margin-left: 10px; + background-size: 100%; + vertical-align: -9px; + margin-left: 5px; } -.shop_list-title > a > i { - font-weight: bolder; - color: #1e3595; +.shop_list-title > a:hover { + background-image: url("../assets/imgs/home_btn_enter_hov.png"); } .shop_cards { display: flex; diff --git a/src/components/table/table-um.vue b/src/components/table/table-um.vue index 8b1de09a6bcb5e133c755a83fa59558e1b581e55..46ec67705a093dac837dcfb9b47cc2617a50b2dd 100644 --- a/src/components/table/table-um.vue +++ b/src/components/table/table-um.vue @@ -200,6 +200,7 @@ {{ scope.row[item.prop] }} + {{ scope.row[item.prop] }} {{ scope.row[item.prop] }} @@ -458,6 +459,9 @@ export default { } }); }, + gotopage(url,id){ + this.$router.push(`/fwgl/0/0/servicedetail/${id}`) + }, //本地删除 deleteLocal(val) { this.selectedTabsPage.splice(val.$index, 1); diff --git a/src/components/work-flow/super-flow.vue b/src/components/work-flow/super-flow.vue new file mode 100644 index 0000000000000000000000000000000000000000..ee1010f491cae73f18848a9c545bf2a0ab128322 --- /dev/null +++ b/src/components/work-flow/super-flow.vue @@ -0,0 +1,385 @@ + + + + + + + + \ 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/data-analysis/data-analysis.vue b/src/pages/data-analysis/data-analysis.vue index bf32bedc977e35b049dd6c895e560a2005d73f00..b41d9986620a8ec77776166a85c42544824b9619 100644 --- a/src/pages/data-analysis/data-analysis.vue +++ b/src/pages/data-analysis/data-analysis.vue @@ -28,6 +28,22 @@ export default { { name: "我的应用数据分析", path: `/data_analysis/my_application` + }, + { + name: "组织服务数据分析", + path: `/data_analysis/org_service` + }, + { + name: "组织应用数据分析", + path: `/data_analysis/org_application` + }, + { + name: "运行概况-组织", + path: `/data_analysis/operation_overview` + }, + { + name: "服务管控-组织", + path: `/data_analysis/service_control` } ], navList: [] diff --git a/src/pages/data-analysis/operation-overview.vue b/src/pages/data-analysis/operation-overview.vue new file mode 100644 index 0000000000000000000000000000000000000000..ca7d11d170bf94ebe19bc6d9eac8b694aeff4afd --- /dev/null +++ b/src/pages/data-analysis/operation-overview.vue @@ -0,0 +1,13 @@ + + + diff --git a/src/pages/data-analysis/org-application.vue b/src/pages/data-analysis/org-application.vue new file mode 100644 index 0000000000000000000000000000000000000000..75b4c371e5a7d2746a13807f154ae8db0280d867 --- /dev/null +++ b/src/pages/data-analysis/org-application.vue @@ -0,0 +1,13 @@ + + + diff --git a/src/pages/data-analysis/org-service.vue b/src/pages/data-analysis/org-service.vue new file mode 100644 index 0000000000000000000000000000000000000000..fa628a1b400a4b43e96145d794f5293de265dde0 --- /dev/null +++ b/src/pages/data-analysis/org-service.vue @@ -0,0 +1,13 @@ + + + diff --git a/src/pages/data-analysis/service-control.vue b/src/pages/data-analysis/service-control.vue new file mode 100644 index 0000000000000000000000000000000000000000..1d1ec49846c6e5f6693445fc5a752dc7f926038f --- /dev/null +++ b/src/pages/data-analysis/service-control.vue @@ -0,0 +1,13 @@ + + + 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-eidt.vue b/src/pages/message-management/recommended/recommended-eidt.vue index f0753d9c7ce8db1f27087ba59f3bae786b9ce4fa..a217a568aa1848c02e82cc2d328e61150b39f453 100644 --- a/src/pages/message-management/recommended/recommended-eidt.vue +++ b/src/pages/message-management/recommended/recommended-eidt.vue @@ -181,7 +181,11 @@ export default { .get(`/apaas/service/v3/recommend/manage/featured/services/${this.$route.query.ad_type}`) .then((response) => { if (response.data.success) { - this.selected_arr = response.data.data; + if( response.data.data){ + this.selected_arr = response.data.data; + }else{ + this.selected_arr = []; + } } }); }, 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/services_shop.vue b/src/pages/service_shop/services_shop.vue index a0dbe0d648ec02eaf5211fac4da5f0cd775494f6..82f81a136a665ed1c6023c67005151794b5db2bf 100644 --- a/src/pages/service_shop/services_shop.vue +++ b/src/pages/service_shop/services_shop.vue @@ -88,7 +88,7 @@ export default { { name: "服务请求次数", value: 0, - icon: require("@/assets/imgs/shop_ic_fuwuzs.png") + icon: require("@/assets/imgs/shop_ic_fuwuqqcs.png") } ], hot_datas: [], 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..d020d115a406d179e950c5669eaa62fdb07a961e --- /dev/null +++ b/src/pages/user/notice/notice.vue @@ -0,0 +1,448 @@ + + + + + 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/user/order/order_detail.vue b/src/pages/user/order/order_detail.vue index 653c027bd9fc3025d1e0a2fd29b3fe48018a3b54..6a2641a5d346b3d1b1a4d9b8f54e7be19adbfc60 100644 --- a/src/pages/user/order/order_detail.vue +++ b/src/pages/user/order/order_detail.vue @@ -25,7 +25,10 @@ class="detail_head_cell_val text_red" v-else-if="(orderDetail.approval_first_level == -1 || orderDetail.approval_second_level == -1) && orderDetail.pay_status != -1" >审核未通过

-

订单已取消

+

订单已取消

订单编号

@@ -181,11 +184,11 @@
应用简介：
-
{{ orderDetail.scene }}
+
{{ orderDetail.app_desc }}
功能简介：
-
{{ orderDetail.scene }}
+
{{ orderDetail.app_func }}
应用场景：
@@ -256,7 +259,7 @@ export default { BlockRadius, ProcessCard, TableUm, - InfoList + InfoList, }, data: () => ({ helper: helper, @@ -275,21 +278,21 @@ export default { { title: "审批时间：", type: "time", - info: "" + info: "", }, { title: "审批单位：", - info: "" + info: "", }, { title: "审批人：", - info: "" + info: "", }, { title: "审批意见：", - info: "" - } - ] + info: "", + }, + ], }, { title: "二级审批", @@ -298,21 +301,21 @@ export default { { title: "审批时间：", type: "time", - info: "" + info: "", }, { title: "审批单位：", - info: "" + info: "", }, { title: "审批人：", - info: "" + info: "", }, { title: "审批意见：", - info: "" - } - ] + info: "", + }, + ], }, { title: "三级审批", @@ -321,76 +324,76 @@ export default { { title: "审批时间：", type: "time", - info: "" + info: "", }, { title: "审批单位：", - info: "" + info: "", }, { title: "审批人：", - info: "" + info: "", }, { title: "审批意见：", - info: "" - } - ] - } + info: "", + }, + ], + }, ], header_arr: [ { prop: "name", label: "字段编码", minWidth: "10%", - align: "center" + align: "center", }, { prop: "show_type", label: "字段类型", width: "120px", - align: "center" + align: "center", }, { prop: "label", label: "字段名称", minWidth: "20%", - align: "center" + align: "center", }, { prop: "descript", label: "字段说明", minWidth: "40%", - align: "center" + align: "center", }, { prop: "example", label: "字段示例", minWidth: "20%", - align: "center" - } + align: "center", + }, ], list_arr: [ { title: "申请人：", - info: "" + info: "", }, { title: "联系方式：", - info: "" + info: "", }, { title: "申请单位：", - info: "" + info: "", }, { title: "申请文件：", info: "", url: "", - type: "down" - } + type: "down", + }, ], - data: [] + data: [], }), mounted() { this.getOrderDetail(); @@ -404,7 +407,7 @@ export default { getOrderDetail() { this.$api.user .getOrderDetail({ order_id: this.$route.params.id }) - .then(response => { + .then((response) => { if (response.data.success == 1) { this.orderDetail = response.data.data; if (this.orderDetail.res_fields != "") { @@ -421,12 +424,14 @@ export default { getOrderUser() { this.$api.user .getOrderUser({ order_id: this.$route.params.id }) - .then(response => { + .then((response) => { if (response.data.success == 1) { this.list_arr[0].info = response.data.data.name; this.list_arr[1].info = response.data.data.phone_number; this.list_arr[2].info = response.data.data.organization; - this.list_arr[3].info = response.data.data.apply_file; + this.list_arr[3].info = helper.downloadFileFormat( + response.data.data.apply_file + ); this.list_arr[3].url = response.data.data.apply_file; } else { console.log(response.data.errMsg); @@ -437,9 +442,9 @@ export default { this.$api.user .getOrderApproval({ apply_id: this.orderDetail.apply_id, - kind: this.orderDetail.order_type + kind: this.orderDetail.order_type, }) - .then(response => { + .then((response) => { if (response.data.success == 1) { let data = response.data.data || []; for (let i = 0; i < data.length; i++) { @@ -462,36 +467,36 @@ export default { service_id: parseFloat(this.orderDetail.service_id), spec_id: this.orderDetail.svc_spec_id, duration: this.orderDetail.duration, - duration_unit: this.orderDetail.duration_unit + duration_unit: this.orderDetail.duration_unit, }; } else if (this.orderDetail.order_type == 2) { query = { app_id: parseFloat(this.orderDetail.app_id), spec_id: this.orderDetail.spec_app, duration: this.orderDetail.duration, - duration_unit: this.orderDetail.duration_unit + duration_unit: this.orderDetail.duration_unit, }; } window.sessionStorage.setItem("shoppingCart", JSON.stringify(query)); this.$router.push({ path: "/shop/shop_car_apply", - query: query + query: query, }); }, cancelDetail() { this.$api.user .cancelOrder({ order_id: this.orderDetail.order_id }) - .then(response => { + .then((response) => { if (response.data.success == 1) { this.$message({ message: "取消订单成功", - type: "success" + type: "success", }); this.$router.push({ name: "orderList" }); } else { this.$message({ message: "取消订单失败", - type: "error" + type: "error", }); } }); @@ -500,34 +505,34 @@ export default { if (this.orderDetail.order_type == 1) { this.$api.user .getServiceEvaluation({ apply_id: this.orderDetail.apply_id }) - .then(response => { + .then((response) => { if (response.data.success == 1) { this.message = response.data.data; this.showMsgBox = true; } else { this.$message({ message: "获取评价失败", - type: "error" + type: "error", }); } }); } else if (this.orderDetail.order_type == 2) { this.$api.user .getAppEvaluation({ apply_id: this.orderDetail.apply_id }) - .then(response => { + .then((response) => { if (response.data.success == 1) { this.message = response.data.data; this.showMsgBox = true; } else { this.$message({ message: "获取评价失败", - type: "error" + type: "error", }); } }); } - } - } + }, + }, }; + + 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..fba663ba0c388f879208f6ec4fc675b6119af8db --- /dev/null +++ b/src/pages/workbench/component-center/process-management/designer/detail.vue @@ -0,0 +1,439 @@ + + + + + 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..4998334fa1417c915722734fd0418db8e1ddd671 --- /dev/null +++ b/src/pages/workbench/component-center/process-management/designer/index.vue @@ -0,0 +1,252 @@ + + + + + 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..de50adcb934181a873c436e577e298c5579b17e2 --- /dev/null +++ b/src/pages/workbench/component-center/process-management/index.vue @@ -0,0 +1,73 @@ + + + + + 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..13aa9b54e55ac910886bd146720e678641c313cf --- /dev/null +++ b/src/pages/workbench/component-center/process-management/process-design/index.vue @@ -0,0 +1,72 @@ + + + + + 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 4f257c0cd74cdf53408abf513ab4e79cc0de59ee..bf9dfb2c2910cbf4d8d6e3c45c22ef00791c31b4 100644 --- a/src/pages/workbench/fwgl/apply_service_detail.vue +++ b/src/pages/workbench/fwgl/apply_service_detail.vue @@ -183,6 +183,8 @@ export default { ], service_arr:['服务基本信息','接口详细信息','申请审批信息'], service_header_arr:{ + id: "", + isMap: false, name:'', first:[ { @@ -339,8 +341,9 @@ export default { this.$message.error(response.data.errMsg) return } - console.log(response.data.data); let data = response.data.data; + 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); this.$set(this.service_header_arr['first'][1], 'text', data.service_apply_info.approval_status==1?'待审批':data.service_apply_info.approval_status==2?'审批中':data.service_apply_info.approval_status==3?'审批通过':'审批未通过'); diff --git a/src/pages/workbench/fwgl/approval_service_detail.vue b/src/pages/workbench/fwgl/approval_service_detail.vue index e2fd1ec67281e16dac59c6b1bec15cd3c2697e13..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' } ] }, @@ -158,6 +158,8 @@ export default { ], color_arr:['#e15260','"#ef9433','#515fe7'], service_header_arr: { + id: "", + isMap: false, name: "", first: [ { @@ -307,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, @@ -337,6 +342,8 @@ export default { return } let data = response.data.data; + 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); this.$set(this.service_header_arr['first'][1], 'text', data.sectors_name); diff --git a/src/pages/workbench/fwgl/cloud-detail.vue b/src/pages/workbench/fwgl/cloud-detail.vue index 27439ed78c221e6061ca469ae512310bce025206..04c91f09ac08d35cd52ed99e5a18bab8a383913c 100644 --- a/src/pages/workbench/fwgl/cloud-detail.vue +++ b/src/pages/workbench/fwgl/cloud-detail.vue @@ -81,7 +81,7 @@
数据盘：
-
{{ cloudDteail.disk }}
+
{{ cloudDteail.disk != "" ? cloudDteail.disk : "无" }}