Merge branch 'ldx' into dev

src/components/cropper.vue

 <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>
 

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);
         }

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"

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) {

src/components/upload_file.vue

 <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);
     }
   }
 };

src/i18n/language-zh.js

-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

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

+<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>

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

+<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

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

+<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

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;

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

src/pages/user/user.vue

@@ -17,7 +17,7 @@ export default {
   data: () => ({
     userNav: [
       {
-        name: "哪来的我个人档案",
+        name: "个人档案",
         path: `/user/user_info`
       },
       {

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() {},

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;

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);

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;

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"),
+            }
+          ]
+        }
       ],
     },
     {