Merge branch 'ldx' into dev

src/App.vue

@@ -10,7 +10,7 @@ import bdMenu from "./components/menu";
 export default {
   data: () => ({}),
   components: {
-    bdMenu,
+    bdMenu
   },
   methods: {
     getCurrentUser() {
@@ -20,15 +20,18 @@ export default {
           console.log(data.data);
           console.log("--- --- ---");
           this.$store.commit("userInfofun", data.data);
+          if (data.data.is_admin == 1 || data.data.is_admin == 2) {
+            this.$router.push({ name: "workPlace" });
+          }
         } else {
           console.log(data.errMsg);
         }
       });
-    },
+    }
   },
   created() {
     this.getCurrentUser();
-  },
+  }
 };
 </script>
 

src/components/e-charts/bar-chart.vue

@@ -16,8 +16,8 @@ export default {
       }
     },
     bar_width: {
-      type: String,
-      default: "12px"
+      type: Number,
+      default: 12
     },
     colors: {
       type: Array,

src/components/e-charts/dashboard.vue

@@ -100,9 +100,9 @@ export default {
                 self.data.data > 75
                   ? "#00beb2" //green
                   : self.data.data > 50
-                  ? "#ff7200" //yellow
+                  ? "#38aef9" //blue
                   : self.data.data > 25
-                  ? "#da4251" //red
+                  ? "#ff7200" //yellow
                   : "#da4251" //red
             }
           }
@@ -167,9 +167,9 @@ export default {
                         : self.data.data > 75
                         ? "#d5f7e8"
                         : self.data.data > 50
-                        ? "#ffd98f"
+                        ? "#e5f4fe"
                         : self.data.data > 25
-                        ? "#f7f1d5"
+                        ? "#ffd98f"
                         : "#f7f1d5"
                   },
                   {
@@ -186,9 +186,9 @@ export default {
                         : self.data.data > 75
                         ? "#00beb2" //green
                         : self.data.data > 50
-                        ? "#ff7200" //yellow
+                        ? "#38aef9" //blue
                         : self.data.data > 25
-                        ? "#da4251" //red
+                        ? "#ff7200" //yellow
                         : "#da4251" //red
                   }
                 ])

src/components/e-charts/water-polo.vue

@@ -56,12 +56,12 @@ export default {
               }
             ],
             radius: "50%",
-            center: ["50%", "25%"],
+            center: ["50%", "20%"],
             outline: {
-              borderDistance: 5,
+              borderDistance: 2,
               itemStyle: {
-                borderWidth: 5,
-                borderColor: "#e56600",
+                borderWidth: 3,
+                borderColor: "#274fee",
                 shadowBlur: 0
               }
             },
@@ -79,14 +79,14 @@ export default {
                 colorStops: [
                   {
                     offset: 1,
-                    color: ["#e6ebfe"] // 0% 处的颜色
+                    color: ["#c9d3fc"]
                   },
                   {
                     offset: 0,
-                    color: ["#515fe7"] // 100% 处的颜色
+                    color: ["#515fe7"]
                   }
                 ],
-                global: false // 缺省为 false
+                global: false
               },
               opacity: 1,
               shadowBlur: 0
@@ -114,11 +114,11 @@ export default {
               }
             ],
             radius: "50%",
-            center: ["50%", "75%"],
+            center: ["50%", "70%"],
             outline: {
-              borderDistance: 5,
+              borderDistance: 2,
               itemStyle: {
-                borderWidth: 5,
+                borderWidth: 3,
                 borderColor: "#e56600",
                 shadowBlur: 0
               }
@@ -137,14 +137,14 @@ export default {
                 colorStops: [
                   {
                     offset: 1,
-                    color: ["#e6ebfe"] // 0% 处的颜色
+                    color: ["#f9ddba"]
                   },
                   {
                     offset: 0,
-                    color: ["#515fe7"] // 100% 处的颜色
+                    color: ["#ef9433"]
                   }
                 ],
-                global: false // 缺省为 false
+                global: false
               },
               opacity: 1,
               shadowBlur: 0

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

@@ -60,7 +60,7 @@
             :disabled="pagination.page == 1"
           ></el-button>
           &nbsp;&nbsp;第{{ pagination.page }}页 / 共{{
-          Math.floor(pagination.total / pagination.rowsPerPage) + 1
+          Math.cell((pagination.total == 0 ? 1 : pagination.total) / pagination.rowsPerPage)
           }}页
           <el-button
             icon="el-icon-arrow-right"
@@ -69,7 +69,7 @@
             @click="handleCurrentChange(1)"
             :disabled="
             pagination.page >=
-              Math.floor(pagination.total / pagination.rowsPerPage) + 1
+              Math.cell((pagination.total == 0 ? 1 : pagination.total) / pagination.rowsPerPage)
           "
           ></el-button>
         </div>

src/components/service-list/commodity-list.vue

@@ -47,7 +47,7 @@
             :disabled="pagination.page == 1"
           ></el-button>
           &nbsp;&nbsp;第{{ pagination.page }}页 / 共{{
-          Math.floor(pagination.total / pagination.rowsPerPage) + 1
+          Math.cell((pagination.total == 0 ? 1 : pagination.total) / pagination.rowsPerPage)
           }}页
           <el-button
             icon="el-icon-arrow-right"
@@ -56,7 +56,7 @@
             @click="handleCurrentChange(1)"
             :disabled="
             pagination.page >=
-              Math.floor(pagination.total / pagination.rowsPerPage) + 1
+              Math.cell((pagination.total == 0 ? 1 : pagination.total) / pagination.rowsPerPage)
           "
           ></el-button>
         </div>

src/components/table/table-um.vue

@@ -236,7 +236,7 @@
             :disabled="pagination.page == 1"
           ></el-button>
           &nbsp;&nbsp;第{{ pagination.page }}页 / 共{{
-          Math.floor(pagination.total / pagination.rowsPerPage) + 1
+          Math.cell((pagination.total == 0 ? 1 : pagination.total) / pagination.rowsPerPage)
           }}页
           <el-button
             icon="el-icon-arrow-right"
@@ -245,7 +245,7 @@
             @click="handleCurrentChange(1)"
             :disabled="
               pagination.page >=
-                Math.floor(pagination.total / pagination.rowsPerPage) + 1
+                Math.cell((pagination.total == 0 ? 1 : pagination.total) / pagination.rowsPerPage)
             "
           ></el-button>
         </div>

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

@@ -16,29 +16,35 @@
                     <img :src="require('@/assets/imgs/data_img_service.gif')" class="left_1_img" />
                     <div class="left_1_msg">
                       <div class="left_1_title">服务总数</div>
-                      <div class="left_1_num">2222</div>
+                      <div class="left_1_num">4</div>
                     </div>
                   </div>
                   <div class="chain">
                     月环比
-                    <span class="chain_mid" :class="overview.month_chain >= 0 ? 'chain_up' : 'chain_down'">
-                      {{ Math.abs(overview.month_chain) }}
+                    <span
+                      class="chain_mid"
+                      :class="overview.month_chain >= 0 ? 'chain_up' : 'chain_down'"
+                    >
+                      {{ Math.abs(overview.month_chain) }}%
                       <img
                         :src="overview.month_chain >= 0 ? require('@/assets/imgs/icon_up.png') : require('@/assets/imgs/icon_down.png')"
                       />
                     </span>周环比
                     <span :class="overview.week_chain >= 0 ? 'chain_up' : 'chain_down'">
-                      {{ Math.abs(overview.week_chain) }}
+                      {{ Math.abs(overview.week_chain) }}%
                       <img
                         :src="overview.week_chain >= 0 ? require('@/assets/imgs/icon_up.png') : require('@/assets/imgs/icon_down.png')"
                       />
                     </span>
                   </div>
                   <div class="left_1_line"></div>
-                  <div class="left_1_l_bottom">日均被部署次数<span class="left_1_l_bottom_msg">12432</span>（次）</div>
+                  <div class="left_1_l_bottom">
+                    日均被部署次数
+                    <span class="left_1_l_bottom_msg">12432</span>（次）
+                  </div>
                 </div>
                 <div class="left_1_right">
-                  <WaterPolo />
+                  <WaterPolo class="water_polo" />
                 </div>
               </div>
             </block-radius>
@@ -58,7 +64,7 @@
             <block-radius
               :show_header="true"
               title="应用类型分析"
-              :buttons_arr="['发布的应用', '调用的应用']"
+              :buttons_arr="['构建的应用', '申请的应用 ']"
               @changeButton="changeServiceTypeBtn"
               class="block"
             >
@@ -69,15 +75,25 @@
       </el-col>
       <el-col :span="12" class="in_center">
         <el-row>
-          <el-col :span="24" class="in_block">
-            <block-radius class="block"></block-radius>
-          </el-col>
           <el-col :span="24" class="in_block">
             <block-radius
               :show_header="true"
-              title="应用热门搜索"
+              title="应用使用领域统计"
+              :buttons_arr="['构建的应用', '申请的应用']"
+              @changeButton="changeServiceTypeBtn"
               class="block"
             >
+              <BarChart
+                :data="bar_data_org"
+                :colors="['#1034eb', '#4274f8']"
+                :bar_border_radius="[20, 20, 0, 0]"
+                :bar_width="26"
+                :show_split="true"
+              />
+            </block-radius>
+          </el-col>
+          <el-col :span="24" class="in_block">
+            <block-radius :show_header="true" title="应用热门搜索" class="block">
               <div class="block-radius-content service-hot-search">
                 <div class="left-content">
                   <div class="hot-line">
@@ -94,11 +110,11 @@
                   </div>
                 </div>
                 <div class="right-content">
-                  <apass-table 
-                    class="hot-search-table" 
+                  <apass-table
+                    class="hot-search-table"
                     :header="hotSearchHeader"
-                    :data="hotSearchData" 
-                    :padding-left="0" 
+                    :data="hotSearchData"
+                    :padding-left="0"
                     @sort-change="hotSearchSortChange"
                   ></apass-table>
                 </div>
@@ -106,7 +122,7 @@
             </block-radius>
           </el-col>
           <el-col :span="24" class="in_block">
-            <block-radius 
+            <block-radius
               class="block"
               :show_header="true"
               title="应用总数变化趋势"
@@ -148,20 +164,16 @@
                 class="block-radius-content"
                 :data="commentlistData"
               ></commentlist>
-              <starlist 
-                v-else 
-                class="block-radius-content" 
-                :options="starlistData" 
+              <starlist
+                v-else
+                class="block-radius-content"
+                :options="starlistData"
                 style="margin-top: 30px;height: calc(100% - 51px);"
               ></starlist>
             </block-radius>
           </el-col>
           <el-col :span="24" class="in_block">
-            <block-radius 
-              class="block"
-              :show_header="true"
-              title="应用在线区域统计"
-            >
+            <block-radius class="block" :show_header="true" title="应用在线区域统计">
               <single-circle class="block-radius-content" :data="single_data"></single-circle>
             </block-radius>
           </el-col>
@@ -170,7 +182,7 @@
       <!-- 不可横向铺满，一般为最后一行 -->
       <el-col :span="6" class="in_block">
         <block-radius :show_header="true" title="应用来源机构分析" class="block">
-          <BarChart :data="bar_data_org" :colors="['#e56600', '#e56600']" />
+          <BarChart :data="bar_data_org" :colors="['#274fee', '#274fee']" :x_router="30" />
         </block-radius>
       </el-col>
       <el-col :span="18" class="in_block default">
@@ -394,33 +406,33 @@ export default {
         hotIndex: 1,
         name: "地图视频融合应用1",
         count: 666,
-        increases: 1.28,
+        increases: 1.28
       },
       {
         hotIndex: 2,
         name: "地图视频融合应用2",
         count: 666,
-        increases: 0.03,
+        increases: 0.03
       },
       {
         hotIndex: 3,
         name: "地图视频融合应用3",
         count: 666,
-        increases: 0.58,
+        increases: 0.58
       },
       {
         hotIndex: 4,
         name: "地图视频融合应用4",
         count: 666,
-        increases: -0.28,
+        increases: -0.28
       },
       {
         hotIndex: 5,
         name: "地图视频融合应用5",
         count: 666,
-        increases: -0.58,
-      },
-    ], // 热门搜索 数据
+        increases: -0.58
+      }
+    ] // 热门搜索 数据
   }),
   mounted() {
     this.hotSearchHeader = [
@@ -428,19 +440,19 @@ export default {
         label: "排名",
         type: "hot-index",
         width: 100,
-        align: "center",
+        align: "center"
       },
       {
         label: "应用名称",
         prop: "name",
         type: "button",
-        callback: this.detailHotSearch,
+        callback: this.detailHotSearch
       },
       {
         label: "搜索次数",
         prop: "count",
         width: 100,
-        align: "center",
+        align: "center"
       },
       {
         label: "日涨幅",
@@ -448,9 +460,9 @@ export default {
         width: 100,
         sortType: "0", // 0：升序 1：降序
         sortable: true,
-        align: "center",
-      },
-    ]
+        align: "center"
+      }
+    ];
   },
   methods: {
     detailHotSearch(item) {
@@ -512,7 +524,7 @@ export default {
   justify-content: space-between;
 }
 .left_block {
-  width: 70%;
+  width: 280px;
   height: 100%;
   padding: 10px 0 0 0;
 }
@@ -537,8 +549,7 @@ export default {
 .chain {
   color: #58617a;
   font-size: 14px;
-  padding: 10px 0;
-  text-align: center;
+  padding: 10px;
 }
 .chain_down {
   background-color: #fbe8e8;
@@ -546,6 +557,7 @@ export default {
   padding: 2px 4px;
   font-size: 12px;
   margin-left: 8px;
+  color: #e15260;
 }
 .chain_up {
   background-color: #e7fdfc;
@@ -553,6 +565,7 @@ export default {
   padding: 1px 4px;
   font-size: 12px;
   margin-left: 8px;
+  color: #25bdb1;
 }
 .chain_mid {
   margin-right: 20px;
@@ -576,10 +589,14 @@ export default {
   background-color: #f2f2f2;
 }
 .left_1_right {
-  width: 30%;
+  width: 180px;
   height: 100%;
   display: inline-block;
 }
+.water_polo {
+  width: 140px;
+  margin: 0 auto 20px;
+}
 .default {
   text-align: center;
 }
@@ -625,7 +642,7 @@ export default {
 </style>
 
 <style>
-.hot-search-table .el-table td, 
+.hot-search-table .el-table td,
 .hot-search-table .el-table th {
   padding: 6px 0;
 }

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

@@ -22,7 +22,7 @@
                 <div ref="left_1_l" class="left_1_l">
                   <img :src="require('@/assets/imgs/data_img_service.gif')" class="left_1_img" />
                   <div class="left_1_title">服务总数</div>
-                  <div class="left_1_num">2222</div>
+                  <div class="left_1_num">4</div>
                 </div>
                 <dashboard ref="left_1_r" :data="das_data" :is_word="true" class="left_1_r"></dashboard>
               </div>
@@ -248,7 +248,7 @@ export default {
       ]
     },
     das_data: {
-      data: 40,
+      data: 90,
       text: "健康占比"
     },
     bar_data: {

src/pages/user/order/order_detail.vue

@@ -322,25 +322,25 @@ export default {
     header_arr: [
       {
         prop: "name",
-        label: "微服务名称",
+        label: "字段编码",
         minWidth: "20%",
         align: "left"
       },
       {
-        prop: "is_sensituve",
-        label: "健康状态",
+        prop: "show_type",
+        label: "字段类型",
         width: "120px",
         align: "center"
       },
       {
-        prop: "is_must",
-        label: "接口链接",
+        prop: "label",
+        label: "字段名称",
         minWidth: "40%",
         align: "center"
       },
       {
         prop: "descript",
-        label: "微服务描述",
+        label: "字段说明",
         minWidth: "40%",
         align: "left"
       }

src/pages/workbench/fwzc_fwcs.vue

@@ -128,7 +128,7 @@
             <el-button v-if="activeBtn == 1" @click="clickFwcs()" class="fwcs_btn_fwcs">服务测试</el-button>
           </div>
         </div>
-        <div v-if="activeBtn == 4">
+        <div v-if="activeBtn == 4 && zhyyVal != 34">
           <el-tabs v-model="activeZh" class="fwcs_tabs" @tab-click="clickTab">
             <el-tab-pane label="请求参数" name="0">
               <ces-table

src/request/api/service_shop.js

@@ -13,7 +13,7 @@ const serviceShop = {
 serviceName=${params.serviceName}&serviceType1=${params.serviceType1}&
 serviceType2s=${params.serviceType2s}&dataDomains=${params.dataDomains}&
 organizeIds=${params.organizeIds}&orderBy=${params.orderBy}&
-Page=${params.Page}&Size=${params.Size}`);
+page=${params.Page}&size=${params.Size}`);
     },
     getServiceShopDetail(params) {
         return axios.get(`/apaas/serviceapp/v3/servicemarket/detail?serviceId=`)