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

src/components/comments-pagination.vue

@@ -3,7 +3,7 @@
     <div class="total_info">
       <span>{{ `共${total}个条目` }}</span>
     </div>
-    <div class="page_size_action">
+    <div class="page_size_action" v-if="pageSizes.length">
       <span>每页行数：</span>
       <el-select :value="pageSize" @change="sizeChange">
         <el-option

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

@@ -27,7 +27,7 @@
           <div>规格：日访问次数：{{ cellItem.spec_svc_count }}次，日访问量：{{ cellItem.spec_svc_pv }}</div>
           <div
             class="cell_specification_type"
-          >申请方式：{{ cellItem.duration_unit == 1 ? $t('lang.byYear') : $t('lang.byMonth') }}</div>
+          >申请方式：{{ cellItem.duration_unit == 1 ? $t('lang.byMonth') : $t('lang.byYear') }}</div>
         </div>
       </el-col>
       <el-col :span="4" class="approval_status">

src/components/table/table-um.vue

@@ -50,6 +50,7 @@
       <el-table
         :data="selectedTabsPage"
         :size="size"
+        :height="height"
         :border="border"
         @select="select"
         @select-all="selectAll"
@@ -139,6 +140,7 @@
               v-else-if="item.type == 'href'"
               :header="item"
               :row="scope.row"
+              :ids="item.id"
               :detailsUrl="detailsUrl"
             ></v-apaas-table-umhref>
             <!-- could edit -->
@@ -264,6 +266,7 @@ export default {
     "v-apaas-table-filter": TableFilter
   },
   props: {
+    height:'',
     //是否滚动加载
     asyn_load1: { type: Boolean, default: false },
     // 表格型号：mini,medium,small
@@ -433,6 +436,7 @@ export default {
     //本地删除
     deleteLocal(val) {
       this.selectedTabsPage.splice(val.$index, 1);
+      this.$emit('changeTable',this.selectedTabsPage)
     },
     // get data
     getDataFromApiSync() {

src/components/table/table-umhref.vue

 <template>
   <div>
-    <span v-if="this.row.id" class="href" @click="goHref(baseVal)">{{ text }}</span>
+    <span v-if="this.row.id||ids" class="href" @click="goHref(baseVal)">{{ text }}</span>
     <span v-else>{{text}}</span>
   </div>
 </template>
@@ -10,7 +10,7 @@ import helper from "@/services/helper";
 import format from "string-format";
 
 export default {
-  props: ["header", "row", "detailsUrl"],
+  props: ["header", "row", "detailsUrl","ids"],
   computed: {
     text: function() {
       let text = helper.GetProperty(this.row, this.header.prop);
@@ -21,13 +21,24 @@ export default {
       let baseVal = helper.GetProperty(this.row, "id");
       return baseVal;
     },
+  },
+  created(){
+
   },
   methods: {
     // Jump routing using id as parameter
     goHref(val) {
+      if(this.ids){
+        if(this.ids.indexOf('.')==-1){
+          this.$router.push(this.detailsUrl + this.row[this.ids])
+        }else{
+          this.$router.push(this.detailsUrl + this.row[this.ids.split('.')[0]][this.ids.split('.')[1]])
+        }
+      }else{
         this.$router.push(this.detailsUrl + val)
       }
     }
+  }
 };
 </script>
 <style scoped>

src/pages/authority/organization/organizationdetail.vue

 <template>
   <div class="detail_contain">
-    <p class="now_page_title">权限管理 / 组织用户 / <span>用户管理</span></p>
+    <p class="now_page_title" v-if="now_user==2">权限管理 / 组织用户 / <span>用户管理</span></p>
     <div class="info_contain">
       <service-header
         v-if="service_header_arr.name"
@@ -39,6 +39,7 @@ import serviceHeader from "@/components/service-header";
 import apassTable from "@/components/apass-table";
 import dialogAction from "@/components/dialog-action";
 import ListPagination from "@/components/comments-pagination";
+import { mapGetters,mapState } from 'vuex'
 export default {
   props: [],
   components: {
@@ -52,6 +53,7 @@ export default {
       table_url: "",
       listTotal: 0,
       currentPage: 1,
+      now_user: 2, //0：普通用户，1：组织管理员，2：超级管理员
       pageSize: 10,
       pageSizes: [10, 50, 100],
       service_header_arr: {
@@ -98,13 +100,36 @@ export default {
       }, 1000);
     },
   },
-  computed: {},
+  computed: {
+    ...mapGetters([
+      'level',
+    ]),
+    ...mapState(['userInfo']),
+  },
   created() {
     this.get_user();
     this.get_list();
+    if(this.userInfo){
+      this.now_user = this.level
+    }else{
+      this.getCurrentUser()
+    }
   },
   mounted() {},
   methods: {
+    getCurrentUser() {
+      this.$api.user.getNowUser().then(({ data }) => {
+        if (data.success == 1) {
+          console.log("--- user info ---");
+          console.log(data.data);
+          console.log("--- user info ---");
+          this.$store.commit("userInfofun", data.data);
+          this.now_user = this.level
+        } else {
+          console.log(data.errMsg);
+        }
+      });
+    },
     changePageSize(value) {
       this.pageSize = value;
       this.currentPage = 1;

src/pages/user/user_info.vue

@@ -56,7 +56,7 @@
           >
             <p>当前用户类型：</p>
             <el-input v-model="user_data.userTypeName" :disabled="true"></el-input>
-            <el-button v-if="user_data.userType == 3" class="option_btn" @click="upLevel">升级为开发者</el-button>
+            <el-button v-if="user_data.userType == 3" :disabled="!couldUp" :class="couldUp ? 'option_btn':'option_btn_gray'" @click="upLevel">升级为开发者</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -207,7 +207,8 @@ export default {
     blackAddShow: false,
     newIpWhite: "",
     newIpBlack: "",
-    diaPassWord: false
+    diaPassWord: false,
+    couldUp: true
   }),
   mounted() {
     this.getCurrentUser();
@@ -274,6 +275,7 @@ export default {
       } else if (this.activeName == 1) {
         query = {
           pageType: "systemFile", // this page is system info
+          user_id: this.user_data.accountNo,
           system_name: this.formBusiness.businessSystemName,
           domain_name: this.formBusiness.domainName,
           ip_whitelist: this.formBusiness.ip_white,
@@ -354,6 +356,7 @@ export default {
             message: "申请升级开发者成功",
             type: "success"
           });
+          this.couldUp = false;
         } else {
           this.$message({
             message: "申请升级开发者失败",

src/pages/workbench/fwgl/approval_service_detail.vue

@@ -352,7 +352,8 @@ export default {
             this.$set(this.list_arr[5], "info", data.service_apply_info.business_url);
             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);
+            debugger
+            this.$set(this.list_arr[8], "info", data.service_apply_info.duration+(data.service_apply_info.duration_unit==1?'月':'年'));
             this.$set(this.list_arr[9], "info",  "访问次数："+data.service_apply_info.request_spcs.pv+"/日 访问量："+data.service_apply_info.request_spcs.count+"/日");
             this.id = data.service_apply_info.id
             if(data.service_apply_info.approval_status!==0){

src/pages/workbench/fwgl/serviceDetail.vue

@@ -608,7 +608,7 @@ export default {
             );
             this.$set(this.servicead_arr[2], "info", data.req_fields);
             this.$set(this.servicead_arr[3], "info", data.encode_method);
-            this.code_arr = data.res_fields;
+            this.code_arr = data.res_fields_example;
             this.res_data = JSON.parse(data.res_fields);
             this.service_size_data = data.request_spcs_info;
             this.size_arr_down = data.request_spcs_info;

src/request/api/service_shop.js

@@ -26,10 +26,10 @@ Page=${params.Page}&Size=${params.Size}`);
         return axios.get(`/apaas/hubApi/market/appTypes`)
     },
     getAppOrg() {
-        return axios.get(`/apaas/hubApi/market/departments`)
+        return axios.get(`/apaas/hubApi/appShop/orgSource`)
     },
     getAppList(params) {
-        return axios.get(`/apaas/hubApi/market/list?online_state=${params.online_state}&appTypes=${params.appTypes}&
+        return axios.get(`/apaas/hubApi/appShop/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}`);
     },
 

static/workpalce.json

@@ -70,23 +70,23 @@
         "fwlxdata":[
             {
                 "name": "数据服务",
-                "value": 10
+                "value": 40
               },
               {
                 "name": "感知服务",
-                "value": 10
+                "value": 3
               },
               {
                 "name": "视频服务",
-                "value": 10
+                "value": 2
               },
               {
                 "name": "时空服务",
-                "value": 10
+                "value": 50
               },
               {
                 "name": "综合服务",
-                "value": 10
+                "value": 0
               }
         ],
         "yylxdata":[