Merge branch 'ldx' into dev

src/assets/i18n/language-zh.js

@@ -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/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/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/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,7 @@ export default {
       let end_id = "";
       let start_before = 0;
       let end_after = 0;
-      data.nodeList.forEach(item => {
+      data.nodeList.forEach((item) => {
         if (item.meta.type == 0) {
           start_num++;
           start_id = item.id;
@@ -33,40 +145,97 @@ export default {
           end_id = item.id;
         }
       });
-      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",
         });
       }
-    }
-  }
+    },
+    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/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
         },
         {