Merge branch 'dev' of https://cloud.wodcloud.com/git/apaas/apaas-v3-ui into dev

src/assets/css/index.css

-[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 */
@@ -152,56 +152,56 @@ div{
   padding: 0 20px;
 }
 /* 设置抽屉的样式 */
-.el-drawer__header{
+.el-drawer__header {
   display: none;
 }
-.from_return{
+.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;
 }
-.el-dialog__body{
+.el-dialog__body {
   font-size: 18px;
   color: #242c43;
   text-align: center;
@@ -213,23 +213,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 +276,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 {
@@ -347,8 +349,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 +374,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 +414,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 +457,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,7 +468,7 @@ 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;
 }
@@ -508,7 +511,6 @@ width: 620px!important;
   margin: 0 auto;
 }
 
-
 /* common */
 .apass_breadcrumb > .el-breadcrumb {
   padding: 15px 0;
@@ -519,7 +521,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;
 }
@@ -564,11 +569,11 @@ width: 620px!important;
 .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 {
@@ -831,4 +836,10 @@ width: 620px!important;
 .meassage_detail_dialog .detail_item .full_content .item_content {
   margin: 0;
 }
+.no_wrap .apass_table td .cell {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  word-break: break-all;
+  white-space: nowrap;
+}
 /* 详情页公共样式 by xuyiming ~~~end */

src/assets/i18n/language-zh.js

@@ -22,9 +22,9 @@ export const lang = {
     cloud_resources_detail: "云资源详情",
 
     // data analysis
-    data_analysis: "数据分析中心",
-    my_service_data_analysis: "我的服务数据分析",
-    my_application_data_analysis: "我的应用数据分析",
+    data_analysis: "运营管控中心",
+    my_service_data_analysis: "服务分析",
+    my_application_data_analysis: "应用分析",
 
     // message
     message: "消息与推送管理",
@@ -33,4 +33,10 @@ export const lang = {
     message_alert: "消息提醒管理",
     banner: "banner管理",
     message_template: "消息模板管理",
+
+    //online component tool
+    online_component_tool: "在线组件中心",
+    process_design: "流程设计",
+    process_management: "流程管理",
+    new: "新建"
 }
\ No newline at end of file

src/components/app-build-steps/app-build-step.vue

@@ -20,6 +20,10 @@ export default {
       type: String,
       default: () => "",
     },
+    stepTitle: {
+      type: String,
+      default: "",
+    },
   },
   data: () => ({}),
   computed: {

src/components/app-build-steps/app-build-steps.vue

@@ -25,7 +25,12 @@
           </div>
           <div class="step_icon" v-else></div>
           <div class="step_info">
-            <p class="step_state">
+            <p v-if="item.stepTitle != ''" class="step_state">
+              <span>
+                {{ item.stepTitle }}
+              </span>
+            </p>
+            <p v-else class="step_state">
               <span v-if="item.step < activeStep || done">
                 已完成
               </span>

src/components/general/upload_file.vue

@@ -24,6 +24,7 @@
         :readOnly="readOnly"
         :data="anotherData"
         :drag="drag"
+        :disabled="disabled"
       >
         <div v-if="drag">
           <i class="el-icon-upload"></i>
@@ -92,6 +93,10 @@ export default {
       type: Boolean,
       default: true,
     },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
   },
   watch: {
     list(value) {

src/components/message-steps/select-service.vue

@@ -22,6 +22,7 @@
 </template>
 
 <script>
+import helper from "@/services/helper.js";
 import screenType from "@/components/recommen/screen-type";
 import recommenBox from "@/components/recommen/recommen-box";
 
@@ -119,7 +120,14 @@ export default {
         })
         .then(({ data }) => {
           if (data.success == 1) {
-            this.serviceList = data.data || [];
+            let datas = data.data || [];
+
+            datas.forEach((item) => {
+              let update_date = item.update_date || "";
+              
+              item.update_date = helper.dateStringTransform(update_date);
+            });
+            this.serviceList = datas;
           }
         });
     },

src/components/message-steps/select-template.vue

@@ -336,6 +336,10 @@ export default {
       this.keyword = "";
       this.updateTime = "";
 
+      if (this.tpl_types.length > 0) {
+        this.type = this.tpl_types[0].value;
+      }
+
       this.getTemplateList();
     },
     selectTemplate(item) {

src/components/order-list/order-list-com.vue

@@ -10,14 +10,12 @@
     </el-tabs>
     <div class="list_options">
       <div class="button_group">
-        <el-button
-          size="mini"
+        <span
           v-for="(item, index) in buttonList"
           :key="'btn' + index"
-          :class="item.state ? 'btn_actice':''"
-          round
+          :class="item.state ? 'btn_default btn_actice':'btn_default'"
           @click="btnClick(index)"
-        >{{ item.name }}</el-button>
+        >{{ item.name }}</span>
       </div>
       <div class="input_right">
         <el-input
@@ -224,6 +222,22 @@ export default {
 .button_group {
   padding: 17px 10px;
 }
+.btn_default {
+  display: inline-block;
+  padding: 6px 15px;
+  border-radius: 14px;
+  font-size: 12px;
+  margin-right: 6px;
+  cursor: pointer;
+}
+.btn_default:hover {
+  background-color: #515fe7;
+  color: #fff;
+}
+.btn_default:focus {
+  background-color: #fff;
+  color: #606266;
+}
 .btn_actice {
   background-color: #515fe7;
   color: #fff;

src/components/service-info/app-info.vue

@@ -170,6 +170,7 @@ export default {
   background-color: #f9fafc;
   padding: 18px;
   margin-top: 15px;
+  border-radius: 8px;
 }
 .application_base_info:not(:last-child) {
   margin-right: 50px;
@@ -222,17 +223,12 @@ export default {
   width: 220px;
   margin-left: 20px;
 }
-.application_info .el-button--primary {
+</style>
+
+<style>
+.application_info.apaas_button .el-button--primary {
+  color: #fff;
   background-color: #515fe7;
   border-color: #515fe7;
 }
-.application_info .el-button--warning.is-plain {
-  background-color: #fcefd6;
-  border-color: #fac266;
-  color: #e56600;
-}
-.application_info .el-button--warning {
-  background-color: #e56600;
-  border-color: #e56600;
-}
 </style>

src/components/service-info/service-info.vue

@@ -98,7 +98,7 @@
             ></el-input-number>
           </div>
         </div>
-        <div class="apaas_button commodity_action">
+        <div class=" commodity_action">
           <el-button
             type="warning"
             plain
@@ -339,12 +339,13 @@ export default {
   vertical-align: middle;
 }
 .service_title > .service_access_info > img {
-  width: 15px;
+  width: 19px;
   margin-right: 5px;
 }
 .service_base_info {
   padding: 18px;
   background-color: #f9fafc;
+  border-radius: 8px;
 }
 .service_base_info > li,
 .commodity_information {
@@ -398,3 +399,11 @@ export default {
   margin-left: 20px;
 }
 </style>
+
+<style>
+.service_info.apaas_button .el-button--primary {
+  color: #fff;
+  background-color: #515fe7;
+  border-color: #515fe7;
+}
+</style>

src/components/service-tabs/service-tab-detail.vue

@@ -33,6 +33,7 @@
         :data="item.value.datas"
         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
       >
+        <el-table-column width="30"></el-table-column>
         <el-table-column
           v-for="(v, i) in item.value.columns"
           :key="'table_column_' + index + '_' + i"

src/components/service-tabs/service-tabs.vue

@@ -160,6 +160,7 @@ export default {
 }
 .service_info_tab .el-table {
   width: 100%;
+  text-align: left;
 }
 .service_info_tab .el-table__row:nth-child(odd) td {
   background-color: #f8f9fd;

src/components/shopping-cart/shopping-cart-cell.vue

@@ -54,7 +54,7 @@
             <div class="shopping_cell_specification_edit">
               <el-popover
                 placement="right-start"
-                width="280"
+                width="300"
                 v-model="visible"
                 @show="setSpecificationPop"
               >
@@ -70,7 +70,14 @@
                         :class="specificationPop == item.id ? 'shopping_cell_specification_btn active' : 'shopping_cell_specification_btn'"
                         size="mini"
                         @click="changeSpecification(item.id)"
-                      >{{ index + 1 + ". " + item.des }}</el-button>
+                      >
+                        {{ index + 1 + ". " + "访问次数：" +
+                        item.pv +
+                        "/日，" +
+                        "访问量：" +
+                        item.count +
+                        "/日" }}
+                      </el-button>
                     </div>
                     <div class="no_option" v-else>暂无规格</div>
                   </div>
@@ -151,25 +158,26 @@ export default {
     cellIndex: { type: Number, default: null },
     cellCheck: {
       type: Boolean,
-      default: false
+      default: false,
     },
     readOnly: {
       type: Boolean,
-      default: false
+      default: false,
     },
     cellIsService: {
-      type: Boolean
-    }
+      type: Boolean,
+    },
   },
   watch: {
-    cellCheck: function(val) {
+    cellCheck: function (val) {
       this.checkedItem = val;
     },
     cellItem: {
       immediate: true, // 这句重要
       handler(val) {
         this.cellItems = val;
-        this.cellItems.is_subscribe = this.cellItems.is_subscribe == 1 ? true : false;
+        this.cellItems.is_subscribe =
+          this.cellItems.is_subscribe == 1 ? true : false;
         if (this.cellIsService) {
           if (this.cellItems.service.buy_method == 1) {
             this.specificationApplicationBtns = [{ id: 1, value: "按月" }];
@@ -178,12 +186,12 @@ export default {
           } else {
             this.specificationApplicationBtns = [
               { id: 1, value: "按月" },
-              { id: 2, value: "按年" }
+              { id: 2, value: "按年" },
             ];
           }
         }
-      }
-    }
+      },
+    },
   },
   data: () => ({
     cellItems: {},
@@ -195,12 +203,12 @@ export default {
     specificationApplicationPop: 1,
     appSpecificationBtns: [
       { id: 1, value: "部署" },
-      { id: 2, value: "开发" }
+      { id: 2, value: "开发" },
     ],
     specificationApplicationBtns: [
       { id: 1, value: "按月" },
-      { id: 2, value: "按年" }
-    ]
+      { id: 2, value: "按年" },
+    ],
   }),
   computed: {
     getSpecification() {
@@ -211,14 +219,20 @@ export default {
           this.cellItems.service.request_spcs_info.length != 0
         ) {
           let requestArr = this.cellItems.service.request_spcs_info;
-          requestArr.forEach(item => {
+          requestArr.forEach((item) => {
             arr.push(item.id);
           });
         }
         let num = arr.indexOf(this.cellItems.spec_id);
         let specification = "";
         if (num != -1) {
-          specification = this.cellItems.service.request_spcs_info[num].des;
+          specification =
+            "访问次数：" +
+            this.cellItems.service.request_spcs_info[num].pv +
+            "/日，" +
+            "访问量：" +
+            this.cellItems.service.request_spcs_info[num].count +
+            "/日";
         }
         return specification;
       } else {
@@ -228,7 +242,7 @@ export default {
           return "开发";
         }
       }
-    }
+    },
   },
   mounted() {},
   methods: {
@@ -263,23 +277,23 @@ export default {
     changeCellItem() {
       this.$emit("changeCellMsg", {
         index: this.cellIndex,
-        data: this.cellItems
+        data: this.cellItems,
       });
     },
     delCellItem() {
       this.$api.serviceShop
         .delShoppingCart([this.cellItems.id])
-        .then(response => {
+        .then((response) => {
           if (response.data.success == 1) {
             this.$message({
               message: this.cellIsService ? "删除该服务成功" : "删除该应用成功",
-              type: "success"
+              type: "success",
             });
             this.$emit("updateList");
           } else {
             this.$message({
               message: this.cellIsService ? "删除该服务失败" : "删除该应用失败",
-              type: "error"
+              type: "error",
             });
           }
         });
@@ -290,16 +304,16 @@ export default {
         duration: this.cellItems.duration,
         spec_id: this.cellItems.spec_id,
         duration_method: this.cellItems.duration_method,
-        is_subscribe: Number(this.cellItems.is_subscribe)
+        is_subscribe: Number(this.cellItems.is_subscribe),
       };
-      this.$api.serviceShop.updateShoppingCart(query).then(response => {
+      this.$api.serviceShop.updateShoppingCart(query).then((response) => {
         if (response.data.success == 1) {
         } else {
           console.log(response.data.errMsg);
         }
       });
-    }
-  }
+    },
+  },
 };
 </script>
 
@@ -437,6 +451,14 @@ export default {
 }
 .shopping_cell_specification_btn {
   margin: 0 10px 10px;
+  max-width: calc(100% - 20px);
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+.shopping_cell_specification_btn:hover {
+  background-color: #b2baf5;
+  color: #f4f7fc;
 }
 .shopping_cell_specification_btn.active {
   background-color: #515fe7;

src/pages/data-analysis/data-analysis.vue

 <template>
   <div class="fwgl_container">
     <side-nav-bar
-      title="数据分析中心"
+      title="运营管控中心"
       imgSrc="tool_fuwu"
       :nav-list="navList"
       :title-path="navList[0] && navList[0].path"
@@ -17,50 +17,62 @@ import sideNavBar from "@/components/side-nav-bar";
 
 export default {
   components: {
-    sideNavBar
+    sideNavBar,
   },
   data: () => ({
     userNav: [
       {
-        name: "我的服务数据分析",
-        path: `/data_analysis/my_service`
+        name: "服务分析",
+        path: `/data_analysis/my_service`,
       },
       {
-        name: "我的应用数据分析",
-        path: `/data_analysis/my_application`
+        name: "应用分析",
+        path: `/data_analysis/my_application`,
       },
+    ],
+    userNav1: [
       {
         name: "组织服务数据分析",
-        path: `/data_analysis/org_service`
+        path: `/data_analysis/org_service`,
       },
       {
         name: "组织应用数据分析",
-        path: `/data_analysis/org_application`
+        path: `/data_analysis/org_application`,
       },
       {
         name: "运行概况-组织",
-        path: `/data_analysis/operation_overview`
+        path: `/data_analysis/operation_overview`,
       },
       {
         name: "服务管控-组织",
-        path: `/data_analysis/service_control`
-      }
+        path: `/data_analysis/service_control`,
+      },
     ],
-    navList: []
+    userNav1: [],
+    navList: [],
   }),
   watch: {
     "$route.fullPath"(path) {
       this.initNavList();
-    }
+    },
   },
   methods: {
     initNavList() {
+      if (
+        this.$store.state.userInfo.is_admin == 3 ||
+        this.$store.state.userInfo.is_admin == 4
+      ) {
         this.navList = this.userNav;
+      } else if (this.$store.state.userInfo.is_admin == 2) {
+        this.navList = this.userNav1;
+      } else if (this.$store.state.userInfo.is_admin == 1) {
+        this.navList = this.userNav2;
       }
     },
+  },
   mounted() {
     this.initNavList();
-  }
+  },
 };
 </script>
 

src/pages/message-management/banner/banner-detail.vue

@@ -93,6 +93,7 @@
             @getNewList="getNewList"
             ref="servicepic"
             directory="manage"
+            :disabled="disabled"
           ></upload-file>
         </el-form-item>
       </el-form>

src/pages/message-management/banner/banner-list.vue

@@ -2,6 +2,7 @@
   <div class="list_container">
     <apass-list
       ref="list"
+      class="no_wrap"
       :list-header="listHeader"
       :list-data="listData"
       :list-total="listTotal"

src/pages/message-management/directed-push/directed-push-list.vue

@@ -2,6 +2,7 @@
   <div class="list_container">
     <apass-list
       ref="list"
+      class="no_wrap"
       :list-header="listHeader"
       :list-data="listData"
       :list-total="listTotal"

src/pages/message-management/message-alert/message-alert-list.vue

@@ -2,6 +2,7 @@
   <div class="list_container">
     <apass-list
       ref="list"
+      class="no_wrap"
       :list-header="listHeader"
       :list-data="listData"
       :list-total="listTotal"

src/pages/message-management/message-template/message-template-list.vue

@@ -2,6 +2,7 @@
   <div class="list_container">
     <apass-list
       ref="list"
+      class="no_wrap"
       :list-header="listHeader"
       :list-data="listData"
       :list-total="listTotal"

src/pages/message-management/recommended/recommended-list.vue

@@ -2,6 +2,7 @@
   <div class="list_container">
     <apass-list
       ref="list"
+      class="no_wrap"
       :list-header="listHeader"
       :list-data="listData"
       :list-total="listTotal"

src/pages/service_shop/sjfwDetail.vue

@@ -120,7 +120,6 @@ export default {
                   {
                     prop: "name",
                     label: "字段编码",
-                    align: "center",
                     width: 240,
                   },
                   {
@@ -163,7 +162,6 @@ export default {
                   {
                     prop: "name",
                     label: "字段编码",
-                    align: "center",
                     width: 240,
                   },
                   {

src/pages/workbench/component-center/process-management/designer/index.vue

@@ -264,10 +264,10 @@ export default {
       this.copyTempItem = null;
     },
     addNewProcess() {
-      this.$router.push("/progress/designs");
+      this.$router.push("/progress/designer/design");
     }, // FIXME: 新建流程
     editItem(item) {
-      this.$router.push("/progress/designs");
+      this.$router.push("/progress/designer/design");
     }, // FIXME: 编辑流程
     detailItem(item) {
       this.$router.push(`/progress/designer/detail/${item.workflows_id}`);

src/pages/workbench/component-center/process-management/index.vue

@@ -29,10 +29,6 @@ export default {
         name: "流程监控",
         path: `/progress/monitoring`,
       },
-      {
-        name: "流程设计",
-        path: `/progress/designs`,
-      }
     ],
     navList: [],
   }),

src/pages/workbench/component-center/process-management/process-design/index.vue

 <template>
   <div class="design_contain">
-    <el-button @click="getData">获取参数</el-button>
-    <WorkFlow ref="workFlow" />
+    <el-breadcrumb separator="/" class="bread_crumb1">
+      <el-breadcrumb-item :to="{ path: '/workplace' }">{{ $t("lang.online_component_tool") }}</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/progress/designer' }">{{ $t("lang.process_design") }}</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/progress/designer' }">{{ $t("lang.process_management") }}</el-breadcrumb-item>
+      <el-breadcrumb-item>{{ $t("lang.new") }}</el-breadcrumb-item>
+    </el-breadcrumb>
+    <BlockRadius class="block_item">
+      <steps
+        :active-step="step"
+        :done="done"
+        :show-done="true"
+        done-title="保存成功"
+        done-sub-title="可返回流程管理列表查看该流程，并进行流程的部署和发布。"
+        class="apaas_steps"
+      >
+        <step
+          title="基本信息"
+          :step="0"
+          :active-icon="require('@/assets/imgs/progress_ic_xinxitx.png')"
+          class="apaas_step"
+        >
+          <div class="step_in">
+            <el-form :model="basic_form" :rules="rules" ref="basicInformation" class="form_left">
+              <el-form-item>
+                <p class="formname">流程名称：</p>
+                <el-input v-model="basic_form.name" placeholder="请输入流程名称"></el-input>
+              </el-form-item>
+              <el-form-item prop="preson">
+                <p class="formname">工作区域：</p>
+                <el-select
+                  v-model="basic_form.workplace"
+                  @change="changeWorkPlace"
+                  placeholder="请选择工作区域"
+                >
+                  <el-option v-for="item in workplace_list" :label="item" :value="item" :key="item"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item prop="phone">
+                <p class="formname">流程描述：</p>
+                <el-input
+                  type="textarea"
+                  :autosize="{ minRows: 6, maxRows: 10}"
+                  v-model="basic_form.desc"
+                  placeholder="请输入流程描述"
+                ></el-input>
+              </el-form-item>
+            </el-form>
+            <div class="btn_footer">
+              <el-button class="cancel" @click="cancel">取消</el-button>
+              <el-button class="next" @click="next">下一步</el-button>
+            </div>
+          </div>
+        </step>
+        <step
+          title="流程设计"
+          :step="1"
+          :active-icon="require('@/assets/imgs/progress_ic_liucheng.png')"
+          class="apaas_step"
+        >
+          <div class="step_in">
+            <WorkFlow ref="workFlow" class="work_flow" />
+            <div class="btn_footer">
+              <el-button class="cancel" @click="cancel">取消</el-button>
+              <div>
+                <el-button class="cancel" @click="back">上一步</el-button>
+                <el-button class="next" @click="complete">完成</el-button>
+              </div>
+            </div>
+          </div>
+        </step>
+        <step
+          title
+          step-title="完成"
+          :step="2"
+          :active-icon="require('@/assets/imgs/progress_ic_wancheng.png')"
+          class="apaas_step"
+        ></step>
+
+        <template slot="action">
+          <el-button type="primary" @click="backToList">返回列表</el-button>
+        </template>
+      </steps>
+    </BlockRadius>
   </div>
 </template>
 
 <script>
 import WorkFlow from "@/components/work-flow/super-flow";
+import BlockRadius from "@/components/general/block-radius";
+import Steps from "@/components/app-build-steps/app-build-steps";
+import Step from "@/components/app-build-steps/app-build-step";
 
 export default {
   components: {
-    WorkFlow
+    WorkFlow,
+    BlockRadius,
+    Steps,
+    Step,
+  },
+  data: () => {
+    return {
+      step: 0,
+      done: false,
+      basic_form: {
+        name: "",
+        workplace: "",
+        desc: "",
+      },
+      rules: {
+        name: [
+          { required: true, message: "请输入流程名称", trigger: "blur" },
+          { max: 16, message: "不能超过16个字符", trigger: "blur" },
+        ],
+        workplace: [
+          { required: true, message: "请选择工作区域", trigger: "blur" },
+        ],
+        desc: [
+          { required: true, message: "请输入流程描述", trigger: "blur" },
+          { max: 400, message: "不能超过400个字符", trigger: "blur" },
+        ],
+      },
+      workplace_list: [],
+    };
   },
   methods: {
-    getData() {
+    verification() {
       let self = this;
       let data = self.$refs.workFlow.getData();
       console.log(data);
@@ -23,7 +135,9 @@ export default {
       let end_id = "";
       let start_before = 0;
       let end_after = 0;
-      data.nodeList.forEach(item => {
+      let in_edge = 0;
+      let out_edge = 0;
+      data.nodeList.forEach((item) => {
         if (item.meta.type == 0) {
           start_num++;
           start_id = item.id;
@@ -32,41 +146,118 @@ export default {
           end_num++;
           end_id = item.id;
         }
+        if (
+          data.linkList.findIndex((el) => {
+            return el.startId == item.id;
+          }) == -1 &&
+          item.id != end_id
+        ) {
+          in_edge++;
+        } else if (
+          data.linkList.findIndex((el) => {
+            return el.endId == item.id;
+          }) == -1 &&
+          item.id != start_id
+        ) {
+          out_edge++;
+        }
       });
-      data.linkList.forEach(item => {
+      data.linkList.forEach((item) => {
         if (start_id == item.endId) {
           start_before++;
         }
         if (end_id == item.startId) {
           end_after++;
         }
-
       });
       if (start_num != 1 || end_num != 1) {
         this.$message({
           message: "开始节点与结束节点均应有且只有一个",
-          type: "warning"
+          type: "warning",
         });
       } else if (start_before != 0) {
         this.$message({
           message: "开始节点前面不应连接其它节点",
-          type: "warning"
+          type: "warning",
         });
       } else if (end_after != 0) {
         this.$message({
           message: "结束节点后面不应连接其它节点",
-          type: "warning"
+          type: "warning",
+        });
+      } else if (in_edge != 0 || out_edge != 0) {
+        this.$message({
+          message: "请保证每个节点都被连接",
+          type: "warning",
         });
       }
-    }
-  }
+    },
+    backToList() {
+      this.$router.push("/message/directed_push");
+    },
+    changeWorkPlace() {},
+    cancel() {
+      this.$router.go(-1);
+    },
+    next() {
+      this.step++;
+    },
+    back() {
+      this.step--;
+    },
+    complete() {
+      this.verification();
+    },
+  },
 };
 </script>
 
 <style scoped>
 .design_contain {
   width: 100%;
+  height: calc(100% - 20px);
   padding: 0 20px;
-  margin-bottom: 20px;
+}
+.block_item {
+  height: calc(100% - 56px);
+}
+.step_in {
+  height: 100%;
+}
+.form_left {
+  width: 55%;
+  height: calc(100% - 70px);
+}
+.btn_footer {
+  width: calc(100% - 20px);
+  height: 40px;
+  padding: 0 10px;
+  display: flex;
+  justify-content: space-between;
+}
+.cancel {
+  background-color: #e3e5ef;
+  color: #0f2683;
+}
+.next {
+  background-color: #0f2683;
+  color: #f8f9fd;
+}
+.work_flow {
+  height: calc(100% - 70px);
+}
+</style>
+<style>
+.block_item .el-textarea__inner {
+  border-radius: 8px;
+  background-color: #e3e5ef;
+  border: solid 1px #e3e5ef;
+}
+.block_item .el-input__inner {
+  background-color: #e3e5ef;
+  border: solid 1px #e3e5ef;
+}
+.block_item .el-select {
+  width: 100%;
 }
 </style>

src/pages/workbench/fwgl/approval_service_detail.vue

@@ -231,15 +231,15 @@ export default {
           info: ""
         },
         {
-          title: "场景描述：",
+          title: "业务系统名称：",
           info: ""
         },
         {
-          title: "调用业务系统：",
+          title: "业务系统访问地址：",
           info: ""
         },
         {
-          title: "业务系统域名：",
+          title: "场景描述：",
           info: ""
         },
         {
@@ -354,9 +354,9 @@ export default {
             this.$set(this.list_arr[0], "info", data.service_apply_info.apply_user_info.department_name);
             this.$set(this.list_arr[1], "info", data.service_apply_info.apply_user_info.user_name);
             this.$set(this.list_arr[2], "info", data.service_apply_info.apply_user_info.phone);
-            this.$set(this.list_arr[3], "info", data.descript);
-            this.$set(this.list_arr[4], "info", data.service_apply_info.business_name);
-            this.$set(this.list_arr[5], "info", data.service_apply_info.business_url);
+            this.$set(this.list_arr[3], "info", data.service_apply_info.business_name);
+            this.$set(this.list_arr[4], "info", data.service_apply_info.business_url);
+            this.$set(this.list_arr[5], "info", data.descript);
             this.$set(this.list_arr[6], "info", data.service_apply_info.apply_file.split('/')[data.service_apply_info.apply_file.split('/').length - 1]);
             this.$set(this.list_arr[6], "url", data.service_apply_info.apply_file);
             this.$set(this.list_arr[8], "info", data.service_apply_info.duration+(data.service_apply_info.duration_unit==1?'月':'年'));

src/pages/workbench/fwzc_fwcs.vue

@@ -355,10 +355,7 @@
       </block-radius>
     </div>
     <div style="display: none">
-      <iframe
-        id="listener"
-        :src="addPortalItemUrl"
-      ></iframe>
+      <iframe id="listener" :src="addPortalItemUrl"></iframe>
     </div>
     <apass-dialog
       ref="alertChange"
@@ -388,7 +385,8 @@ export default {
   },
   data() {
     return {
-      addPortalItemUrl: gisServiceUrl + '/portal/apaasplat/viewer/addPortalItem.html',
+      addPortalItemUrl:
+        gisServiceUrl + "/portal/apaasplat/viewer/addPortalItem.html",
       btnList: [],
       activeBtn: null,
       serviceUrl: "",
@@ -552,6 +550,7 @@ export default {
       },
       is_portal: false,
       portal_id: "",
+      dataType: "",
     };
   },
   computed: {},
@@ -687,12 +686,14 @@ export default {
       this.$api.workbench.fwzcFwcs(query).then((response) => {
         if (response.data.success == 1) {
           let data = response.data.data;
+          this.body_fields = data.body_fields;
+          this.param_fields = data.param_fields;
           if (data.body_fields && data.body_fields.length != 0) {
             this.datasQqcs = data.body_fields;
-            this.param_fields = data.param_fields;
+            this.dataType = "body";
           } else {
             this.datasQqcs = data.param_fields;
-            this.body_fields = [];
+            this.dataType = "param";
           }
           this.datasFhcs = data.response_fields;
           this.resSuccess = true;
@@ -886,9 +887,13 @@ export default {
                 method: this.select,
                 url: this.serviceUrl,
                 request_fields:
-                  this.body_fields.length == 0 ? [] : this.request_fields,
+                  this.dataType == "body"
+                    ? this.request_fields
+                    : this.body_fields,
                 request_query_fields:
-                  this.param_fields.length == 0 ? [] : this.request_fields,
+                  this.dataType == "param"
+                    ? this.request_fields
+                    : this.param_fields,
                 response_fields: this.response_fields,
                 content_type: contentType,
                 portal_id: this.portal_id,

src/pages/workbench/workPlace.vue

@@ -998,7 +998,7 @@ export default {
           pic: require("@/assets/imgs/home_tool_ic_kshbb.png"),
           bg: "#fff2e2",
           color: "#ea7d19",
-          url: "/bi",
+          url: "/bi/",
           target: 1
         },
         {

src/router/index.js

@@ -274,8 +274,8 @@ export default new Router({
               component: () => import("@/pages/workbench/component-center/process-management/monitoring/index"),
             }, // 流程监控
             {
-              path: "/progress/designs",
-              name: "process_designs",
+              path: "/progress/designer/design",
+              name: "process_design",
               component: () => import("@/pages/workbench/component-center/process-management/process-design/index"),
             }, // 流程设计
           ],