智能制图

src/pages/message-management/banner/banner-list.vue

@@ -122,26 +122,26 @@ export default {
         type: "image-tooltip",
         getImage(item) {
           return [
-            require("@/assets/imgs/ic_guoqi.png"),
-            require("@/assets/imgs/ic_failed.png"),
             require("@/assets/imgs/ic_true.png"),
-          ][item.state + 1];
+            require("@/assets/imgs/ic_failed.png"),
+            require("@/assets/imgs/ic_guoqi.png"),
+          ][item.state - 1];
         },
         getTooltip(item) {
-          return ["已过期", "已下架", "已上架"][item.state + 1];
+          return ["已上架", "已下架", "已过期"][item.state - 1];
         },
         align: "center",
         width: 60,
       },
       {
         label: "排序",
-        prop: "index",
+        prop: "ordid",
         width: 60,
         align: "center",
       },
       {
         label: "banner编码",
-        prop: "code",
+        prop: "serial_num",
         width: 180,
       },
       {
@@ -157,9 +157,9 @@ export default {
       },
       {
         label: "图片大小",
-        prop: "size",
+        prop: "image_size",
         getText(item) {
-          let value = item.size || 0;
+          let value = item.image_size || 0;
           return (value / 1024).toFixed(2) + "KB";
         },
         width: 100,
@@ -222,123 +222,23 @@ export default {
 
       console.log(fullFilter);
 
-      this.listTotal = 55;
-      this.listData = [
-        {
-          state: 1,
-          index: "01",
-          code: "BN202004542001",
-          name: "多元数据可视化分析宣传图片",
-          url: "https://apaasgis.wodcloud.com/portal",
-          size: 131072,
-          up_time: "2020-07-18T14:25:09+08:00",
-          down_time: "2020-07-18T14:25:09+08:00",
-        },
-        {
-          state: -1,
-          index: "01",
-          code: "BN202004542001",
-          name: "多元数据可视化分析宣传图片",
-          url: "https://apaasgis.wodcloud.com/portal",
-          size: 131072,
-          up_time: "2020-07-18T14:25:09+08:00",
-          down_time: "2020-07-18T14:25:09+08:00",
-        },
-        {
-          state: 0,
-          index: "01",
-          code: "BN202004542001",
-          name: "多元数据可视化分析宣传图片",
-          url: "https://apaasgis.wodcloud.com/portal",
-          size: 131072,
-          up_time: "2020-07-18T14:25:09+08:00",
-          down_time: "2020-07-18T14:25:09+08:00",
-        },
-        {
-          state: 0,
-          index: "01",
-          code: "BN202004542001",
-          name: "多元数据可视化分析宣传图片",
-          url: "https://apaasgis.wodcloud.com/portal",
-          size: 131072,
-          up_time: "2020-07-18T14:25:09+08:00",
-          down_time: "2020-07-18T14:25:09+08:00",
-        },
-        {
-          state: -1,
-          index: "01",
-          code: "BN202004542001",
-          name: "多元数据可视化分析宣传图片",
-          url: "https://apaasgis.wodcloud.com/portal",
-          size: 131072,
-          up_time: "2020-07-18T14:25:09+08:00",
-          down_time: "2020-07-18T14:25:09+08:00",
-        },
-        {
-          state: 1,
-          index: "01",
-          code: "BN202004542001",
-          name: "多元数据可视化分析宣传图片",
-          url: "https://apaasgis.wodcloud.com/portal",
-          size: 131072,
-          up_time: "2020-07-18T14:25:09+08:00",
-          down_time: "2020-07-18T14:25:09+08:00",
-        },
-        {
-          state: -1,
-          index: "01",
-          code: "BN202004542001",
-          name: "多元数据可视化分析宣传图片",
-          url: "https://apaasgis.wodcloud.com/portal",
-          size: 131072,
-          up_time: "2020-07-18T14:25:09+08:00",
-          down_time: "2020-07-18T14:25:09+08:00",
-        },
-        {
-          state: 0,
-          index: "01",
-          code: "BN202004542001",
-          name: "多元数据可视化分析宣传图片",
-          url: "https://apaasgis.wodcloud.com/portal",
-          size: 131072,
-          up_time: "2020-07-18T14:25:09+08:00",
-          down_time: "2020-07-18T14:25:09+08:00",
-        },
-        {
-          state: 0,
-          index: "01",
-          code: "BN202004542001",
-          name: "多元数据可视化分析宣传图片",
-          url: "https://apaasgis.wodcloud.com/portal",
-          size: 131072,
-          up_time: "2020-07-18T14:25:09+08:00",
-          down_time: "2020-07-18T14:25:09+08:00",
-        },
-        {
-          state: -1,
-          index: "01",
-          code: "BN202004542001",
-          name: "多元数据可视化分析宣传图片",
-          url: "https://apaasgis.wodcloud.com/portal",
-          size: 131072,
-          up_time: "2020-07-18T14:25:09+08:00",
-          down_time: "2020-07-18T14:25:09+08:00",
-        },
-      ];
-
-      /* this.$http
-        .get("/apaas/service/v3/resource/apply/approveList", {
+      this.$http
+        .get("/apaas/service/v3/recommend/manage/banners/list", {
           params: {
-            search: filter.keyword,
+            name: filter.keyword,
             page: filter.page,
-            limit: filter.size,
+            size: filter.size,
             state: filter.state,
+            up_time_s:fullFilter.up_time?fullFilter.up_time[0]:'',
+            up_time_e:fullFilter.up_time?fullFilter.up_time[1]:'',
+            down_time_s:fullFilter.down_time?fullFilter.down_time[0]:'',
+            down_time_e:fullFilter.down_time?fullFilter.down_time[1]:''
           },
         })
         .then(({ data }) => {
           if (data.success == 1) {
-            this.listTotal = data.total;
-            this.listData = data.data;
+            this.listTotal = data.data.total;
+            this.listData = data.data.data;
           } else {
             this.$message({
               message: data.errMsg || "获取列表失败",
@@ -348,8 +248,8 @@ export default {
         })
         .catch((error) => {
           console.log(error);
-        }); */
-    }, // TODO: 列表待调试
+        });
+    },
     topFilterAction() {
       this.initList(this.tempFilter);
     },

src/pages/workbench/intelligent_drawing.vue

@@ -7,7 +7,9 @@
       </el-breadcrumb>
     </div>
 
-    <div class="main-container"></div>
+    <div class="main-container">
+      <iframe width="100%" height="100%" scrolling="no" src="https://apaasgis.wodcloud.com/portal/apaasplat/viewer/mapViewer.html" frameborder="0"></iframe>
+    </div>
   </div>
 </template>
 
@@ -26,7 +28,7 @@ export default {
   margin: -157px 40px 20px;
 }
 .main-container {
-  min-height: calc(100vh - 150px - 43px);
+  height: calc(100vh - 150px - 43px);
   border-radius: 12px;
   background-color: #fff;
   padding: 30px;

src/pages/workbench/workPlace.vue

@@ -965,8 +965,8 @@ export default {
           pic: require("@/assets/imgs/home_tool_ic_znht.png"),
           bg: "#e5f4fe",
           color: "#38aef9",
-          url: "https://apaasgis.wodcloud.com/portal/nologoplat/viewer/mapViewer.html",
-          target: 1
+          url: "/intelligent_drawing",
+          target: 0
         },
         {
           text: "数据开发",