Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager-ui/admin/src/config/default/setting.config.js

@@ -18,7 +18,7 @@ module.exports = {
   multiPage: true, //多页签模式，true:开启，false:不开启
   cachePage: true, //是否缓存页面数据，仅多页签模式下生效，true 缓存, false 不缓存
   hideSetting: false, //隐藏设置抽屉，true:隐藏，false:不隐藏
-  systemName: "智慧政务一体化综合管理平台", //系统名称
+  systemName: "基础设置平台", //系统名称
   copyright: "2021 ICZER 信宏翔科技有限公司", //copyright
   asyncRoutes: false, //异步加载路由，true:开启，false:不开启
   showPageTitle: true, //是否显示页面标题（PageLayout 布局中的页面标题），true:显示，false:不显示

base-manager-ui/admin/src/layouts/Layouts.vue

@@ -4,8 +4,8 @@
     <a-layout-header class="header">
       <div class="flex aic">
         <router-link to="/" class="flex aic">
-          <!-- <img width="32" src="@/assets/img/logo.png" /> -->
-          <h1>{{ systemName }}</h1>
+          <img class="mr10" width="32" src="@/assets/img/logo.png" />
+          <h1 class="title">基础设置平台</h1>
         </router-link>
         <HeaderSite class="ml20"></HeaderSite>
       </div>
@@ -72,11 +72,12 @@ export default {
 <style lang="less" scoped>
 .ant-layout-header {
   padding: 0px 24px;
-  background-color: #2681e8;
+  // background-color: #2681e8;
   font-size: 14px;
   display: flex;
   align-items: center;
   justify-content: space-between;
+  background: linear-gradient(90deg, #1845c6 0%, #2999ff 100%);
   h1 {
     color: #fff;
     font-size: 16px;
@@ -85,6 +86,10 @@ export default {
   a {
     color: #fff;
   }
+  .title {
+    font-size: 20px;
+    font-weight: bold;
+  }
 }
 .main {
   height: calc(100vh - 64px);

base-manager-ui/admin/src/layouts/header/HeaderSite.vue

@@ -157,7 +157,7 @@ export default {
 <style lang="less" scoped>
 .ant-dropdown-link {
   padding: 0 20px;
-  font-size: 14px;
+  font-size: 16px;
   min-width: 200px;
   display: inline-block;
   color: #fff;

portal-manager-ui/admin/src/api/thePlatformIsSet.js

@@ -57,3 +57,19 @@ export function deleteDocument(params) {
 //-------------xj: --------------------
 
 
+// 产品接口
+export function getInterfaceList(params) {
+    return http.post(`${baseURL}/zwfw/product/interface/list`, params);
+}
+// 新增编辑产品接口
+export function getInterfaceSave(params) {
+    return http.post(`${baseURL}/zwfw/product/interface/save`, params);
+}
+// 查看产品接口
+export function getInterfaceInfo(params) {
+    return http.get(`${baseURL}/zwfw/product/interface/info`, params);
+}
+// 删除产品接口
+export function getInterfaceDelete(params) {
+    return http.get(`${baseURL}/zwfw/product/interface/delete`, params);
+}
\ No newline at end of file

portal-manager-ui/admin/src/views/thePlatformIsSet/components/productManage/components/InterfaceManage/alerting.vue

@@ -2,14 +2,14 @@
   <div class="PoliticsShow-Container">
     <div class="header_box">
       <div>
-        <button class="add_btn">
+        <button class="add_btn" @click="openDetails('新增',{})">
           <span>新增</span>
         </button>
       </div>
       <span>
         <a-input
           allowClear
-          v-model="searchName"
+          v-model="query.interfaceName"
           placeholder="请输入接口名称查询"
         >
           <a-icon slot="prefix" type="search" />
@@ -67,14 +67,14 @@
         :dataSource="tableSourceData"
       >
         <template slot="operation" slot-scope="text, record, index">
-          <a-button type="link" @click="openDetails"
-            >详情{{ index + 1 }}</a-button
+          <a-button type="link" @click="openDetails('详情',record)"
+            >详情</a-button
           >
-          <a-button type="link" @click="openDetails"
-            >编辑{{ index + 1 }}</a-button
+          <a-button type="link" @click="openDetails('编辑',record)"
+            >编辑</a-button
           >
           <a-button type="link" style="color: #ff4420"
-            >删除{{ index + 1 }}</a-button
+            >删除</a-button
           >
         </template>
       </a-table>
@@ -86,6 +86,7 @@
 <script>
 import table from "@/mixins/table";
 import Details from "./components/Details.vue";
+import {getInterfaceList} from '@/api/thePlatformIsSet.js'
 export default {
   mixins: [table],
   name: "PortalAdminVueAlerting",
@@ -103,42 +104,47 @@ export default {
         {
           title: "API名称",
           align: "center",
-          dataIndex: "API名称",
+          dataIndex: "interfaceName",
         },
         {
           title: "请求类型",
           align: "center",
-          dataIndex: "请求类型",
+          dataIndex: "requestType",
+		  customRender: (text, record, index) => `${record.requestType == 1 ? 'POST' : 'GET'}`,
         },
         {
           title: "标签",
           align: "center",
-          dataIndex: "标签",
+          dataIndex: "interfaceTag",
         },
         {
           title: "请求协议",
           align: "center",
-          dataIndex: "请求协议",
+          dataIndex: "requestProtocol",
+		  customRender: (text, record, index) => `${record.requestProtocol == 1 ? 'HTTP' : 'HTTPS'}`,
         },
         {
           title: "版本",
           align: "center",
-          dataIndex: "版本",
+          dataIndex: "versionNumber",
         },
         {
           title: "来源",
           align: "center",
-          dataIndex: "来源",
+          dataIndex: "interfaceSource",
+		  customRender: (text, record, index) => `${record.interfaceSource == 1 ? '自有' : '非自有'}`,
         },
         {
           title: "策略",
           align: "center",
-          dataIndex: "策略",
+          dataIndex: "limitStrategy",
+		  customRender: (text, record, index) => `${record.limitStrategy == 1 ? '分钟' : '小时'}`,
         },
         {
           title: "访问网络",
           align: "center",
-          dataIndex: "访问网络",
+          dataIndex: "network",
+		  customRender: (text, record, index) => `${record.network == 1 ? '互联网' : '政务网'}`,
         },
 
         {
@@ -151,29 +157,26 @@ export default {
           },
         },
       ],
-      searchName: undefined,
+	  query:{
+		interfaceName: undefined,  
+		page:1,
+		size:10,
+	  },
+	  total:0
     };
   },
   components: {
     Details,
   },
   mounted() {
-    this.setMoment();
-    for (let key = 0; key < 20; key++) {
-      this.tableSourceData.push({
-        id: `00${key + 1}`,
-        API名称: `排队信息查询接口${key + 1}`,
-        请求类型: `POST${key + 1}`,
-        标签: `政务外网${key + 1}`,
-        请求协议: `HTTP${key + 1}`,
-        版本: `v1.0${key + 1}`,
-        来源: `自有${key + 1}`,
-        策略: `--${key + 1}`,
-        访问网络: `互联网${key + 1}`,
-      });
-    }
+    this.getList();
   },
   methods: {
+	getList() {
+		getInterfaceList(this.query).then(res=>{
+			this.tableSourceData = res.data.data
+		})
+	},
     QueueState(type) {
       switch (type) {
         case 0:
@@ -185,8 +188,8 @@ export default {
           return "type0";
       }
     },
-    openDetails() {
-      this.$refs.Details.modalInfo.title = "新增接口";
+    openDetails(type) {
+      this.$refs.Details.modalInfo.title = type;
       this.$refs.Details.modalInfo.visible = true;
       this.$refs.Details.modalInfo.width = "55%";
     },