From 6c23830c4ea31a8cae01603f0abec1d56fe55ead Mon Sep 17 00:00:00 2001
From: liudianxin <liudianxin@bd-apaas.com>
Date: Thu, 11 Jun 2020 19:04:18 +0800
Subject: [PATCH] =?UTF-8?q?fix=E8=A3=81=E5=89=AA=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=EF=BC=8C+=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=EF=BC=8C=E6=9C=8D=E5=8A=A1=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/cropper.vue                 |  36 +-
 src/components/menu.vue                    |   6 +-
 src/components/table/table-input.vue       |   2 +-
 src/components/table/table-um.vue          |   2 +-
 src/components/upload_file.vue             |   7 +-
 src/i18n/language-zh.js                    |  12 +-
 src/pages/data-analysis/data-analysis.vue  |  69 +++
 src/pages/data-analysis/my-application.vue |  21 +
 src/pages/data-analysis/my-service.vue     |  21 +
 src/pages/service_shop/shop_list.vue       |   2 +-
 src/pages/user/order/order_list.vue        |   1 -
 src/pages/user/user.vue                    |   2 +-
 src/pages/user/user_info.vue               |   5 +-
 src/pages/workbench/fwzc_fwcs.vue          | 488 +++++++++++----------
 src/request/api/authority.js               |   5 +-
 src/request/api/service_shop.js            |   1 +
 src/request/api/workbench.js               |   7 +-
 src/router/index.js                        |  18 +
 18 files changed, 435 insertions(+), 270 deletions(-)
 create mode 100644 src/pages/data-analysis/data-analysis.vue
 create mode 100644 src/pages/data-analysis/my-application.vue
 create mode 100644 src/pages/data-analysis/my-service.vue

diff --git a/src/components/cropper.vue b/src/components/cropper.vue
index 7fcdfd8..edda744 100644
--- a/src/components/cropper.vue
+++ b/src/components/cropper.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="img_crop">
-    <div v-for="(item, index) in fileArray" :key="'img' + index" class="list_img">
+    <div v-for="(item, index) in fileArr" :key="'img' + index" class="list_img">
       <div class="list_img_back">
         <i class="el-icon-refresh-right img_replace"></i>
         <input
@@ -12,7 +12,7 @@
       </div>
       <el-image class="list_img_item" :src="item.url" :fit="fit"></el-image>
     </div>
-    <div class="add_img" v-if="fileArray.length <= max - 1">
+    <div class="add_img" v-if="fileArr.length <= max - 1">
       <div class="add_pic">
         <i class="el-icon-plus add_icon"></i>
         <input
@@ -66,7 +66,7 @@
 import { VueCropper } from "vue-cropper";
 export default {
   components: {
-    VueCropper,
+    VueCropper
   },
   props: {
     fileArray: {
@@ -84,6 +84,13 @@ export default {
       default: 1
     }
   },
+  watch: {
+    fileArray: {
+      handler(val) {
+        this.fileArr = val;
+      }
+    }
+  },
   data() {
     return {
       dialogVisible: false,
@@ -93,7 +100,7 @@ export default {
         canMoveBox: true, //截图框不能拖动
         autoCropWidth: 200, //截图框宽度
         autoCropHeight: 200, //截图框高度
-        centerBox: false, //截图框被限制在图片里面
+        centerBox: false //截图框被限制在图片里面
       },
       previews: {}, //实时预览图数据
       attach: {
@@ -101,10 +108,11 @@ export default {
         userId: "",
         customaryUrl: "", //原图片路径
         laterUrl: "", //裁剪后图片路径
-        attachType: "photo", //附件类型
+        attachType: "photo" //附件类型
       },
       fileName: "", //本机文件地址
       uploadImgRelaPath: "", //上传后图片地址
+      fileArr: []
     };
   },
   methods: {
@@ -119,9 +127,6 @@ export default {
     //加载图片信息
     find() {
       this.userId = sessionStorage.getItem("userId");
-      this.$http.post("ssapi", this.attach).then((res) => {
-        console.log(res);
-      });
     },
     //选择本地图片
     uploadImg(e, num) {
@@ -134,7 +139,7 @@ export default {
       //fileReader 接口，用于异步读取文件数据
       var reader = new FileReader();
       reader.readAsDataURL(file); //重要 以dataURL形式读取文件
-      reader.onload = (e) => {
+      reader.onload = e => {
         // data = window.URL.createObjectURL(new Blob([e.target.result])) 转化为blob格式
 
         let data = e.target.result;
@@ -149,23 +154,24 @@ export default {
     //确认截图,上传
     cut(type) {
       var formData = new FormData();
-      this.$refs.cropper.getCropBlob((res) => {
+      this.$refs.cropper.getCropBlob(res => {
         //res是裁剪后图片的bolb对象
         formData.append("file", res, this.userId);
         formData.append("directory", "image");
-        let url = "/awecloud/static/image/upload";
+        let url = "/apaas/static/image/upload";
         this.$http
           .post(url, formData, {
-            headers: { "Content-Type": "multipart/form-data" },
+            headers: { "Content-Type": "multipart/form-data" }
           })
-          .then((res) => {
+          .then(res => {
+            this.fileArr = [{ name: res.data.data, url: res.data.data }];
             // 上传图片后服务器返回访问路径
             this.$emit("getNewUrl", res.data.data);
             this.handleClose();
           });
       });
-    },
-  },
+    }
+  }
 };
 </script>
 
diff --git a/src/components/menu.vue b/src/components/menu.vue
index 89e5829..4d2b1ad 100644
--- a/src/components/menu.vue
+++ b/src/components/menu.vue
@@ -137,7 +137,7 @@ export default {
         { name: "个人档案", path: "/user/user_info" },
         { name: "消息通知", path: "/user/message" },
         { name: "收银中心", path: "/authority" },
-        { name: "关于BD-aPaaS", path: "" },
+        { name: "关于BD-aPaaS", path: "/data_analysis" },
         { name: "退出登录", path: "" }
       ],
       shopping_list: []
@@ -195,7 +195,9 @@ export default {
       this.$api.serviceShop.getShoppingCart().then(response => {
         if (response.data.success == "1") {
           console.log(response.data.data);
-          this.shopping_list = response.data.data.valid ? response.data.data.valid.slice(0, 3):[];
+          this.shopping_list = response.data.data.valid
+            ? response.data.data.valid.slice(0, 3)
+            : [];
         } else {
           console.log(response.data.message);
         }
diff --git a/src/components/table/table-input.vue b/src/components/table/table-input.vue
index 98fd657..7aff3da 100644
--- a/src/components/table/table-input.vue
+++ b/src/components/table/table-input.vue
@@ -24,7 +24,7 @@
       >
         <el-upload
           slot="append"
-          action="/awecloud/static/image/upload"
+          action="/apaas/static/image/upload"
           :file-list="fileArray"
           :limit="1"
           :multiple="false"
diff --git a/src/components/table/table-um.vue b/src/components/table/table-um.vue
index d4aa394..6fb067b 100644
--- a/src/components/table/table-um.vue
+++ b/src/components/table/table-um.vue
@@ -697,7 +697,7 @@ export default {
       for (let i = 0; i < arr.length; i++) {
         if (arr[i].id == id) {
           arr[i][header] = input;
-          arr[i].file_url = url;
+          arr[i].file_url = window.location.href + url;
           return false;
         }
         if (arr[i].children && arr[i].children.length != 0) {
diff --git a/src/components/upload_file.vue b/src/components/upload_file.vue
index a5d7aaf..bb899a7 100644
--- a/src/components/upload_file.vue
+++ b/src/components/upload_file.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div v-if="type == 'cropper'">
-      <cropper :max="max" :readOnly="readOnly" :fileArray="fileArray" :fit="fit"></cropper>
+      <cropper :max="max" :readOnly="readOnly" :fileArray="fileArray" :fit="fit" @getNewUrl="getNewUrl"></cropper>
     </div>
     <div v-else>
       <el-upload
@@ -174,9 +174,8 @@ export default {
       this.$emit("getNewList", this.fileArray);
     },
     getNewUrl(val) {
-      this.fileArray = { name: val, url: val };
-      this.$emit("getNewList", this.fileArray);
-      console.log(this.fileArray);
+      let fileObj = { name: val, url: val };
+      this.$emit("getNewList", fileObj);
     }
   }
 };
diff --git a/src/i18n/language-zh.js b/src/i18n/language-zh.js
index 36caa85..eedef54 100644
--- a/src/i18n/language-zh.js
+++ b/src/i18n/language-zh.js
@@ -1,4 +1,4 @@
-export const lang={
+export const lang = {
     // bread crunbs
     // .
     // .
@@ -13,5 +13,13 @@ export const lang={
     byMonth: "按月",
 
     // service shop menu item
-    serviceShop: "服务超市"
+    serviceShop: "服务超市",
+
+    // work bench
+    workBench: "工作台",
+
+    // data analysis
+    dataAnalysis: "数据分析中心",
+    myServiceDataAnalysis: "我的服务数据分析",
+    myApplicationDataAnalysis: "我的应用数据分析"
 }
\ No newline at end of file
diff --git a/src/pages/data-analysis/data-analysis.vue b/src/pages/data-analysis/data-analysis.vue
new file mode 100644
index 0000000..bf32bed
--- /dev/null
+++ b/src/pages/data-analysis/data-analysis.vue
@@ -0,0 +1,69 @@
+<template>
+  <div class="fwgl_container">
+    <side-nav-bar
+      title="数据分析中心"
+      imgSrc="tool_fuwu"
+      :nav-list="navList"
+      :title-path="navList[0] && navList[0].path"
+    ></side-nav-bar>
+    <div class="main_container">
+      <router-view :key="'type_' + $route.params.type"></router-view>
+    </div>
+  </div>
+</template>
+
+<script>
+import sideNavBar from "@/components/side-nav-bar";
+
+export default {
+  components: {
+    sideNavBar
+  },
+  data: () => ({
+    userNav: [
+      {
+        name: "我的服务数据分析",
+        path: `/data_analysis/my_service`
+      },
+      {
+        name: "我的应用数据分析",
+        path: `/data_analysis/my_application`
+      }
+    ],
+    navList: []
+  }),
+  watch: {
+    "$route.fullPath"(path) {
+      this.initNavList();
+    }
+  },
+  methods: {
+    initNavList() {
+      this.navList = this.userNav;
+    }
+  },
+  mounted() {
+    this.initNavList();
+  }
+};
+</script>
+
+<style scoped>
+.fwgl_container {
+  height: calc(100vh - 84px);
+  display: flex;
+  justify-content: flex-start;
+  align-items: stretch;
+}
+.side_nav_bar {
+  width: 180px;
+  flex-shrink: 0;
+}
+.main_container {
+  width: calc(100% - 180px);
+  flex-grow: 1;
+  flex-shrink: 1;
+  background-color: #f6f7fb;
+  overflow: auto;
+}
+</style>
diff --git a/src/pages/data-analysis/my-application.vue b/src/pages/data-analysis/my-application.vue
new file mode 100644
index 0000000..2fc4f2c
--- /dev/null
+++ b/src/pages/data-analysis/my-application.vue
@@ -0,0 +1,21 @@
+<template>
+  <div>
+    <el-breadcrumb separator="/" class="bread_crumb1">
+      <el-breadcrumb-item :to="{ path: '/data_analysis' }">{{ $t("lang.dataAnalysis") }}</el-breadcrumb-item>
+      <el-breadcrumb-item>{{ $t("lang.myApplicationDataAnalysis") }}</el-breadcrumb-item>
+    </el-breadcrumb>
+  </div>
+</template>
+
+<script>
+export default {
+  components: {},
+  data: () => ({
+    navList: []
+  }),
+  mounted() {},
+  methods: {}
+};
+</script>
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/pages/data-analysis/my-service.vue b/src/pages/data-analysis/my-service.vue
new file mode 100644
index 0000000..24310e7
--- /dev/null
+++ b/src/pages/data-analysis/my-service.vue
@@ -0,0 +1,21 @@
+<template>
+  <div>
+    <el-breadcrumb separator="/" class="bread_crumb1">
+      <el-breadcrumb-item :to="{ path: '/data_analysis' }">{{ $t("lang.dataAnalysis") }}</el-breadcrumb-item>
+      <el-breadcrumb-item>{{ $t("lang.myServiceDataAnalysis") }}</el-breadcrumb-item>
+    </el-breadcrumb>
+  </div>
+</template>
+
+<script>
+export default {
+  components: {},
+  data: () => ({
+    navList: []
+  }),
+  mounted() {},
+  methods: {}
+};
+</script>
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/pages/service_shop/shop_list.vue b/src/pages/service_shop/shop_list.vue
index 119ed3d..707ec26 100644
--- a/src/pages/service_shop/shop_list.vue
+++ b/src/pages/service_shop/shop_list.vue
@@ -60,7 +60,7 @@ export default {
           break;
         case "comprehensive_app_list":
           this.name = "综合服务";
-          this.urlFilter = "5";
+          this.urlFilter = "21";
           this.url = "/shop/zhfwDetail";
           this.filterNmaes = ["数据服务类型", "数据领域", "数据来源机构"];
           break;
diff --git a/src/pages/user/order/order_list.vue b/src/pages/user/order/order_list.vue
index 502253f..11f5dde 100644
--- a/src/pages/user/order/order_list.vue
+++ b/src/pages/user/order/order_list.vue
@@ -10,7 +10,6 @@
 
 <script>
 import OrderList from "@/components/order-list/order-list-com";
-import { mapState } from "vuex";
 export default {
   components: {
     OrderList
diff --git a/src/pages/user/user.vue b/src/pages/user/user.vue
index 97bb69d..b19a7d1 100644
--- a/src/pages/user/user.vue
+++ b/src/pages/user/user.vue
@@ -17,7 +17,7 @@ export default {
   data: () => ({
     userNav: [
       {
-        name: "哪来的我个人档案",
+        name: "个人档案",
         path: `/user/user_info`
       },
       {
diff --git a/src/pages/user/user_info.vue b/src/pages/user/user_info.vue
index f3e06b2..6ef28b2 100644
--- a/src/pages/user/user_info.vue
+++ b/src/pages/user/user_info.vue
@@ -219,9 +219,6 @@ export default {
     ]
   }),
   mounted() {
-    // this.imgList.push(
-    //   "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
-    // );
     this.getCurrentUser();
   },
   methods: {
@@ -258,6 +255,8 @@ export default {
     changeTab() {},
     getNewList(val) {
       console.log(val);
+      this.imgList[0] = val.url;
+      console.log(this.imgList);
     },
     previous() {},
     registe() {},
diff --git a/src/pages/workbench/fwzc_fwcs.vue b/src/pages/workbench/fwzc_fwcs.vue
index e1d39c8..f43c4a2 100644
--- a/src/pages/workbench/fwzc_fwcs.vue
+++ b/src/pages/workbench/fwzc_fwcs.vue
@@ -176,6 +176,7 @@
                   :paginationShow="false"
                   :pageSizeShow="false"
                   headerCellClassName="th_pink"
+                  @primary-del="delItemQq"
                 ></ces-table>
               </div>
               <div v-show="zhfwQqt == 'x-www-form-urlencoded'">
@@ -205,7 +206,7 @@
         </div>
       </block-radius>
       <block-radius v-show="resultShow">
-        <div v-show="activeBtn == 0 && resSuccess">
+        <div v-show="(activeBtn == 0 || activeBtn == 4 && zhyyVal == 0) && resSuccess">
           <div class="sjfw_qqcstx">请求参数信息填写：</div>
           <ces-table
             ref="fwcs_sjfw_qqcs"
@@ -226,7 +227,6 @@
             :paginationShow="false"
             :pageSizeShow="false"
             headerCellClassName="th_pink"
-            @primary-del="delItemQq"
           ></ces-table>
           <div class="sjfw_fhcstx">返回参数信息填写：</div>
           <ces-table
@@ -248,10 +248,9 @@
             :paginationShow="false"
             :pageSizeShow="false"
             headerCellClassName="th_pink"
-            @primary-del="delItemFh"
           ></ces-table>
         </div>
-        <div v-show="(activeBtn == 1 || activeBtn == 4) && resSuccess">
+        <div v-show="(activeBtn == 1 || activeBtn == 4 && zhyyVal != 0) && resSuccess">
           <div class="skfw_csfwxx">测试服务信息：</div>
           <div class="test_succ">
             <div class="skcs_jg">
@@ -269,19 +268,19 @@
         </div>
         <div class="btn_footer">
           <el-button class="reset" v-if="activeBtn == 0" @click="resetSjfw">重置</el-button>
-          <el-button :disabled="!resSuccess" class="next" @click="nextJcxx">下一步</el-button>
+          <el-button :disabled="!resSuccess" :class="resSuccess ? 'next':''" @click="nextJcxx">下一步</el-button>
         </div>
       </block-radius>
     </div>
     <div v-else>
       <block-radius>
         <div class="fwcs_add">
-          <el-form ref="form" :model="form" label-width="0px">
-            <el-form-item>
+          <el-form ref="form" :model="form" :rules="rules">
+            <el-form-item prop="name">
               <p class="formname">服务名称：</p>
               <el-input v-model="form.name" placeholder="请输入服务名称，不超过15个字" class="form_in"></el-input>
             </el-form-item>
-            <el-form-item>
+            <el-form-item prop="desc">
               <p class="formname">服务描述：</p>
               <el-input
                 type="textarea"
@@ -290,25 +289,25 @@
                 class="form_in"
               ></el-input>
             </el-form-item>
-            <el-form-item>
+            <el-form-item prop="area">
               <p class="formname">服务领域：</p>
               <el-select v-model="form.area" placeholder="请选择" class="form_in">
                 <el-option
                   v-for="item in optionsArea"
-                  :key="'area' + item.value"
-                  :label="item.label"
-                  :value="item.value"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item>
+            <el-form-item prop="origin">
               <p class="formname">所属组织：</p>
               <el-select v-model="form.origin" placeholder="请选择" class="form_in">
                 <el-option
                   v-for="item in optionsOrganization"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
+                  :key="item.department_id"
+                  :label="item.department_name"
+                  :value="item.department_id"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -319,7 +318,7 @@
                 :max="1"
                 type="cropper"
                 :readOnly="false"
-                :list="imgList"
+                :list="cover"
                 @getNewList="getNewList"
               ></upload-file>
             </el-form-item>
@@ -327,7 +326,7 @@
               <p class="formname">接口编码：</p>
               <el-input v-model="form.code" class="form_in" :disabled="true"></el-input>
             </el-form-item>
-            <el-form-item>
+            <el-form-item prop="resource">
               <p class="formname">开放程度：</p>
               <el-radio-group v-model="form.resource">
                 <el-radio :label="1">共享</el-radio>
@@ -359,193 +358,180 @@ export default {
     "v-apaas-code": Codes,
     uploadFile
   },
-  data: () => ({
-    btnList: [
-      { icon: "", text: "数据服务", id: 0 },
-      { icon: "", text: "时空服务", id: 1 },
-      { icon: "", text: "视频服务", id: 2 },
-      { icon: "", text: "感知服务", id: 3 },
-      { icon: "", text: "综合服务", id: 4 }
-    ],
-    activeBtn: 0,
-    serviceUrl: "",
-    select: "GET",
-    optionType: [
-      { label: "GET", value: "GET" },
-      { label: "POST", value: "POST" },
-      { label: "PUT", value: "PUT" },
-      { label: "DELETE", value: "DELETE" }
-    ],
-    activeName: 0,
-    activeZh: 0,
-    sjfwQqcs: [
-      {
-        label: "请求字段编码",
-        prop: "requestEncoding",
-        type: "input",
-        align: "left"
-      },
-      { label: "请求值", prop: "requestValue", type: "input", align: "left" }
-    ],
-    sjfwQqcstx: [
-      { label: "字段编码", prop: "name", type: "", align: "left" },
-      { label: "示例值", prop: "example", type: "input", align: "left" },
-      {
-        label: "字段类型",
-        prop: "show_type",
-        type: "",
-        align: "left",
-        width: "140"
-      },
-      {
-        label: "字段名称*",
-        prop: "label",
-        type: "input",
-        align: "left"
-      },
-      {
-        label: "是否必须*",
-        prop: "is_must",
-        type: "select",
-        align: "left",
-        width: 100,
-        selectArr: [
-          { label: "是", value: "1" },
-          { label: "否", value: "0" }
-        ]
-      },
-      { label: "字段说明", prop: "descript", type: "input", align: "left" },
-      {
-        label: "操作",
-        type: "Button",
-        align: "center",
-        width: 100,
-        btnList: [
-          {
-            type: "primary-del",
-            label: "删除"
-          }
-        ]
-      }
-    ],
-    sjfwFhcstx: [
-      { label: "字段编码", prop: "name", type: "", align: "left" },
-      { label: "示例值", prop: "example", type: "input", align: "left" },
-      { label: "字段类型", prop: "show_type", type: "", align: "left" },
-      {
-        label: "字段名称*",
-        prop: "label",
-        type: "input",
-        align: "left"
+  data() {
+    return {
+      btnList: [
+        { icon: "", text: "数据服务", id: 0 },
+        { icon: "", text: "时空服务", id: 1 },
+        { icon: "", text: "视频服务", id: 2 },
+        { icon: "", text: "感知服务", id: 3 },
+        { icon: "", text: "综合服务", id: 4 }
+      ],
+      activeBtn: 0,
+      serviceUrl: "",
+      select: "GET",
+      optionType: [
+        { label: "GET", value: "GET" },
+        { label: "POST", value: "POST" },
+        { label: "PUT", value: "PUT" },
+        { label: "DELETE", value: "DELETE" }
+      ],
+      activeName: 0,
+      activeZh: 0,
+      sjfwQqcs: [
+        {
+          label: "请求字段编码",
+          prop: "requestEncoding",
+          type: "input",
+          align: "left"
+        },
+        { label: "请求值", prop: "requestValue", type: "input", align: "left" }
+      ],
+      sjfwQqcstx: [
+        { label: "字段编码", prop: "name", type: "", align: "left" },
+        { label: "示例值", prop: "example", type: "input", align: "left" },
+        {
+          label: "字段类型",
+          prop: "show_type",
+          type: "",
+          align: "left",
+          width: "140"
+        },
+        {
+          label: "字段名称*",
+          prop: "label",
+          type: "input",
+          align: "left"
+        },
+        {
+          label: "是否必须*",
+          prop: "is_must",
+          type: "select",
+          align: "left",
+          width: 100,
+          selectArr: [
+            { label: "是", value: "1" },
+            { label: "否", value: "0" }
+          ]
+        },
+        { label: "字段说明", prop: "descript", type: "input", align: "left" }
+      ],
+      sjfwFhcstx: [
+        { label: "字段编码", prop: "name", type: "", align: "left" },
+        { label: "示例值", prop: "example", type: "input", align: "left" },
+        { label: "字段类型", prop: "show_type", type: "", align: "left" },
+        {
+          label: "字段名称*",
+          prop: "label",
+          type: "input",
+          align: "left"
+        },
+        { label: "字段说明", prop: "descript", type: "input", align: "left" }
+      ],
+      zhfwQqcsForm: [
+        { label: "请求字段编码", prop: "key", type: "input", align: "left" },
+        {
+          label: "参数类型",
+          prop: "field_type",
+          type: "select",
+          align: "center",
+          width: 100,
+          selectArr: [
+            { label: "text", value: "text" },
+            { label: "file", value: "file" }
+          ]
+        },
+        {
+          label: "请求值",
+          prop: "val",
+          type: "upload",
+          align: "center",
+          uploadKey: "field_type"
+        },
+        {
+          label: "操作",
+          type: "Button",
+          align: "center",
+          width: 100,
+          btnList: [
+            {
+              type: "primary-del",
+              label: "删除"
+            }
+          ]
+        }
+      ],
+      datasZhForm: [],
+      datasZhwww: [],
+      emptyText: "暂无数据",
+      resultShow: false,
+      resSuccess: false,
+      optionsSq: [{ label: "Bearer Token", value: "Bearer" }],
+      sqfsVal: "",
+      tokenVal: "",
+      sjfwQqt: "JSON",
+      zhfwQqt: "JSON",
+      skfwRadios: [
+        "ArcGIS Server Web",
+        "文档",
+        "KML",
+        "OGC(WMS)",
+        "OGS(WMTS)",
+        "OGS(WFS)",
+        "OGS(WCS)"
+      ],
+      optionsZhyy: [
+        { label: "模型算法类", value: 0 },
+        { label: "查询验证类", value: 1 },
+        { label: "流程类", value: 2 },
+        { label: "应用类", value: 3 }
+      ],
+      zhyyVal: 0,
+      jcxxtx: false,
+      form: {
+        name: "",
+        desc: "",
+        area: "",
+        origin: "",
+        code: "自动生成",
+        resource: 1
       },
-      { label: "字段说明", prop: "descript", type: "input", align: "left" },
-      {
-        label: "操作",
-        type: "Button",
-        align: "center",
-        width: 100,
-        btnList: [
+      rules: {
+        name: [
+          { required: true, message: "请输入服务名称", trigger: "blur" },
+          { min: 0, max: 15, message: "服务名称不超过15个字", trigger: "blur" }
+        ],
+        desc: [
+          { required: true, message: "请输入服务描述", trigger: "blur" },
           {
-            type: "primary-del",
-            label: "删除"
+            min: 0,
+            max: 200,
+            message: "服务描述不超过200个字",
+            trigger: "blur"
           }
-        ]
-      }
-    ],
-    zhfwQqcsForm: [
-      { label: "请求字段编码", prop: "key", type: "input", align: "left" },
-      {
-        label: "参数类型",
-        prop: "field_type",
-        type: "select",
-        align: "center",
-        width: 100,
-        selectArr: [
-          { label: "text", value: "text" },
-          { label: "file", value: "file" }
+        ],
+        area: [{ required: true, message: "请选择服务领域", trigger: "blur" }],
+        origin: [
+          { required: true, message: "请选择所属组织", trigger: "blur" }
+        ],
+        resource: [
+          { required: true, message: "请选择开放程度", trigger: "blur" }
         ]
       },
-      {
-        label: "请求值",
-        prop: "val",
-        type: "upload",
-        align: "center",
-        uploadKey: "field_type"
-      },
-      {
-        label: "操作",
-        type: "Button",
-        align: "center",
-        width: 100,
-        btnList: [
-          {
-            type: "primary-del",
-            label: "删除"
-          }
-        ]
-      }
-    ],
-    datasZhForm: [],
-    datasZhwww: [],
-    emptyText: "暂无数据",
-    resultShow: false,
-    resSuccess: false,
-    optionsSq: [{ label: "Bearer Token", value: "Bearer" }],
-    sqfsVal: "",
-    tokenVal: "",
-    sjfwQqt: "JSON",
-    zhfwQqt: "JSON",
-    skfwRadios: [
-      "ArcGIS Server Web",
-      "文档",
-      "KML",
-      "OGC(WMS)",
-      "OGS(WMTS)",
-      "OGS(WFS)",
-      "OGS(WCS)"
-    ],
-    optionsZhyy: [
-      { label: "模型算法类", value: 0 },
-      { label: "查询验证类", value: 1 },
-      { label: "流程类", value: 2 },
-      { label: "应用类", value: 3 }
-    ],
-    zhyyVal: 0,
-    jcxxtx: false,
-    form: {
-      name: "",
-      desc: "",
-      area: "",
-      origin: "1",
-      code: "自动生成",
-      resource: 0
-    },
-    imgList: [],
-    optionsArea: [
-      { label: "经济建设", value: 0 },
-      { label: "城市管理", value: 1 },
-      { label: "城市建设", value: 2 },
-      { label: "道路交通", value: 3 },
-      { label: "环境资源", value: 4 },
-      { label: "民生服务", value: 5 },
-      { label: "空间地理", value: 6 },
-      { label: "文化休闲", value: 7 },
-      { label: "社会团体", value: 8 },
-      { label: "教育机构", value: 9 },
-      { label: "其他", value: 10 }
-    ],
-    optionsOrganization: [],
-    datasSj: [],
-    datasZh: [],
-    datasQqcs: [],
-    datasFhcs: [],
-    request_fields: [],
-    response_fields: [],
-    cover: "",
-    noSearchUrl: "",
-    requestRules: 0,
-    responseRules: 0
-  }),
+      cover: [],
+      optionsArea: [],
+      optionsOrganization: [],
+      datasSj: [],
+      datasZh: [],
+      datasQqcs: [],
+      datasFhcs: [],
+      request_fields: [],
+      response_fields: [],
+      noSearchUrl: "",
+      requestRules: 0,
+      responseRules: 0
+    };
+  },
   computed: {},
   watch: {},
   methods: {
@@ -647,10 +633,12 @@ export default {
           if (this.zhfwQqt == "JSON") {
             bodys = this.$refs.zhfwJsonCodes.getCodesVal();
           } else if (this.zhfwQqt == "form-data") {
-            let request = this.$refs.fwcs_zhfw_qq_form.getTableData();
+            let request = this.$refs.fwcs_zhfw_qq_form.getTableData().concat();
+            request.pop();
             bodys = JSON.stringify(request);
           } else if (this.zhfwQqt == "x-www-form-urlencoded") {
-            let request = this.$refs.fwcs_zhfw_www.getTableData();
+            let request = this.$refs.fwcs_zhfw_www.getTableData().concat();
+            request.pop();
             bodys = JSON.stringify(request);
           }
         }
@@ -664,7 +652,6 @@ export default {
         content_type: contentType
       };
       this.$api.workbench.fwzcFwcs(query).then(response => {
-        console.log(response);
         if (response.data.success == 1) {
           let data = response.data.data;
           if (this.activeBtn == 0 && this.activeName == 1) {
@@ -678,7 +665,7 @@ export default {
         } else {
           this.resSuccess = false;
           this.resultShow = true;
-          console.log(response.data.console.error);
+          console.log(response.data.errMsg);
         }
       });
     },
@@ -723,7 +710,7 @@ export default {
     },
     // edit form
     getNewList(val) {
-      this.cover = val;
+      this.cover[0] = val.url;
     },
     previous() {
       this.datasQqcs = this.request_fields;
@@ -731,32 +718,42 @@ export default {
       this.jcxxtx = false;
     },
     registe() {
-      let query = {
-        name: this.form.name,
-        sectors: this.form.area,
-        organization: this.form.origin,
-        cover: this.cover[0].url,
-        openness: this.form.resource,
-        descript: this.form.desc,
-        data_service_type1: this.activeBtn,
-        data_service_type2:
-          this.activeBtn == 1
-            ? this.skfwRadios
-            : this.activeBtn == 4
-            ? this.zhyyVal
-            : 0,
-        encode_method: this.form.code,
-        method: this.select,
-        url: this.serviceUrl,
-        request_fields: this.request_fields,
-        response_fields: this.response_fields
-      };
-      this.$api.workbench.serviceAdd(query).then(response => {
-        if (response.data.success == 1) {
-          this.$message.success("服务注册成功");
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          if (this.cover.length == 0) {
+            let query = {
+              name: this.form.name,
+              sectors: this.form.area,
+              organization: this.form.origin,
+              cover: this.cover[0],
+              openness: this.form.resource,
+              descript: this.form.desc,
+              data_service_type1: this.activeBtn,
+              data_service_type2:
+                this.activeBtn == 1
+                  ? this.skfwRadios
+                  : this.activeBtn == 4
+                  ? this.zhyyVal
+                  : 0,
+              encode_method: this.form.code,
+              method: this.select,
+              url: this.serviceUrl,
+              request_fields: this.request_fields,
+              response_fields: this.response_fields
+            };
+            this.$api.workbench.serviceAdd(query).then(response => {
+              if (response.data.success == 1) {
+                this.$message.success("服务注册成功");
+              } else {
+                console.log(response.data.errMsg);
+                this.$message.error(response.data.errMsg);
+              }
+            });
+          } else {
+            this.$message.error("请上传服务封面");
+          }
         } else {
-          console.log(response.data.errMsg);
-          this.$message.success(response.data.errMsg);
+          this.$message.error("请完善服务基本信息");
         }
       });
     },
@@ -776,11 +773,7 @@ export default {
       this.serviceUrl = this.noSearchUrl + searchDel;
     },
     delItemQq(val) {
-      let arr = this.$refs.fwcs_sjfw_qqcs.getTableData();
-      this.delById(arr, val.id);
-    },
-    delItemFh(val) {
-      let arr = this.$refs.fwcs_sjfw_fhcs.getTableData();
+      let arr = this.$refs.fwcs_zhfw_qq_form.getTableData();
       this.delById(arr, val.id);
     },
     delById(arr, id) {
@@ -799,9 +792,30 @@ export default {
       this.resultShow = false;
       this.resSuccess = false;
     },
-    changeZhfwQqt() {}
+    changeZhfwQqt() {},
+    getOrg() {
+      this.$api.authority.getOrganizationList().then(response => {
+        if (response.data.success == 1) {
+          this.optionsOrganization = response.data.data;
+        } else {
+          console.log(response.data.errMsg);
+        }
+      });
+    },
+    getArea() {
+      this.$api.workbench.getServiceAreaList().then(response => {
+        if (response.data.success == 1) {
+          this.optionsArea = response.data.data;
+        } else {
+          console.log(response.data.errMsg);
+        }
+      });
+    }
   },
-  mounted() {}
+  mounted() {
+    this.getOrg();
+    this.getArea();
+  }
 };
 </script>
 
diff --git a/src/request/api/authority.js b/src/request/api/authority.js
index 096b3ed..aece677 100644
--- a/src/request/api/authority.js
+++ b/src/request/api/authority.js
@@ -22,7 +22,10 @@ const authority = {
         return axios.put(`/apaas/backmgt/menu`, params);
     },
 
-    // 
+    // organization
+    getOrganizationList() {
+        return axios.get(`/apaas/backmgt/department/list`);
+    },
 }
 
 export default authority;
diff --git a/src/request/api/service_shop.js b/src/request/api/service_shop.js
index b9d9547..ec00e0f 100644
--- a/src/request/api/service_shop.js
+++ b/src/request/api/service_shop.js
@@ -32,6 +32,7 @@ Page=${params.Page}&Size=${params.Size}`);
         return axios.get(`/apaas/hubApi/market/list?online_state=${params.online_state}&appTypes=${params.appTypes}&
 businessArea=${params.businessArea}&developable=${params.developable}&orgSource=${params.orgSource}&order=${params.order}&page=${params.page}&limit=${params.limit}&search=${params.search}`);
     },
+    
     // shopping cart
     addShoppingCart(params) {
         return axios.post(`/apaas/serviceapp/v3/shopcart/add`, params);
diff --git a/src/request/api/workbench.js b/src/request/api/workbench.js
index d6dbf10..3985f12 100644
--- a/src/request/api/workbench.js
+++ b/src/request/api/workbench.js
@@ -7,7 +7,12 @@ const workbench = {
     },
     serviceAdd(params) {
         return axios.post(`/apaas/service/v3/service/manager`, params)
-    }
+    },
+
+    // service area
+    getServiceAreaList() {
+        return axios.get(`/apaas/service/v3/service/manager/servarea`)
+    },
 }
 
 export default workbench;
diff --git a/src/router/index.js b/src/router/index.js
index ea97b32..29a3285 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -316,6 +316,24 @@ export default new Router({
             },
           ],
         }, // 权限管理
+        {
+          path: "/data_analysis", // 数据分析中心
+          name: "dataAnalysis",
+          redirect: "/data_analysis/my_service",
+          component: () => import("@/pages/data-analysis/data-analysis"),
+          children: [
+            {
+              path: "/data_analysis/my_service", // 数据分析中心
+              name: "myServiceDataAnalysis",
+              component: () => import("@/pages/data-analysis/my-service"),
+            },
+            {
+              path: "/data_analysis/my_application", // 数据分析中心
+              name: "myApplicationDataAnalysis",
+              component: () => import("@/pages/data-analysis/my-application"),
+            }
+          ]
+        }
       ],
     },
     {
-- 
2.26.0