admin/src/components/Pagination/index.vue

@@ -1,17 +1,6 @@
 <template>
   <div :class="{'hidden':hidden}" class="pagination-container">
-    <el-pagination
-      :background="background"
-      :current-page.sync="currentPage"
-      :page-size.sync="pageSize"
-      :layout="layout"
-      :page-sizes="pageSizes"
-      :pager-count="pagerCount"
-      :total="total"
-      v-bind="$attrs"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-    />
+    <el-pagination :background="background" :current-page.sync="currentPage" :page-size.sync="pageSize" :layout="layout" :page-sizes="pageSizes" :pager-count="pagerCount" :total="total" v-bind="$attrs" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
   </div>
 </template>
 
@@ -35,7 +24,7 @@ export default {
     },
     pageSizes: {
       type: Array,
-      default() {
+      default () {
         return [10, 20, 30, 50]
       }
     },
@@ -61,30 +50,30 @@ export default {
       default: false
     }
   },
-  data() {
+  data () {
     return {
     };
   },
   computed: {
     currentPage: {
-      get() {
+      get () {
         return this.page
       },
-      set(val) {
+      set (val) {
         this.$emit('update:page', val)
       }
     },
     pageSize: {
-      get() {
+      get () {
         return this.limit
       },
-      set(val) {
+      set (val) {
         this.$emit('update:limit', val)
       }
     }
   },
   methods: {
-    handleSizeChange(val) {
+    handleSizeChange (val) {
       if (this.currentPage * val > this.total) {
         this.currentPage = 1
       }
@@ -93,7 +82,7 @@ export default {
         scrollTo(0, 800)
       }
     },
-    handleCurrentChange(val) {
+    handleCurrentChange (val) {
       this.$emit('pagination', { page: val, limit: this.pageSize })
       if (this.autoScroll) {
         scrollTo(0, 800)

admin/src/views/dataPage/feedback/index.vue

@@ -8,31 +8,12 @@
           <!--                        <el-input v-model="searchForm.phone" placeholder="手机号"/>-->
           <!--                    </el-form-item>-->
           <el-form-item label="产品名称">
-            <el-select
-              v-model="searchForm.spid"
-              filterable
-              clearable
-              placeholder="请选择"
-            >
-              <el-option
-                v-for="item in prductLIst"
-                :key="item.spid"
-                :label="`${item.productName}/${item.spid}`"
-                :value="item.spid"
-              />
+            <el-select v-model="searchForm.spid" filterable clearable placeholder="请选择">
+              <el-option v-for="item in prductLIst" :key="item.spid" :label="`${item.productName}/${item.spid}`" :value="item.spid" />
             </el-select>
           </el-form-item>
           <el-form-item label="时间范围">
-            <el-date-picker
-              v-model="value2"
-              type="datetimerange"
-              :picker-options="pickerOptions"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              align="right"
-              @change="dateChange"
-            />
+            <el-date-picker v-model="value2" type="datetimerange" :picker-options="pickerOptions" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right" @change="dateChange" />
           </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="searchBtn">查询</el-button>
@@ -53,15 +34,7 @@
           <el-table-column prop="createTime" label="反馈时间" width="160" />
         </el-table>
         <div class="block">
-          <el-pagination
-            :current-page.sync="searchForm['pageNum']"
-            :page-sizes="[20, 50, 100, 300]"
-            :page-size="searchForm['pageSize']"
-            layout="total, sizes, pager"
-            :total="total"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
+          <el-pagination :current-page.sync="searchForm['pageNum']" :page-sizes="[20, 50, 100, 300]" :page-size="searchForm['pageSize']" layout="total, sizes, pager" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
         </div>
       </el-main>
     </el-container>
@@ -76,7 +49,7 @@ import { getToken } from "../../../utils/auth";
 
 export default {
   name: "RunData",
-  data() {
+  data () {
     return {
       searchForm: {
         spid: "",
@@ -91,7 +64,7 @@ export default {
         shortcuts: [
           {
             text: "最近一周",
-            onClick(picker) {
+            onClick (picker) {
               const end = new Date();
               const start = new Date();
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
@@ -100,7 +73,7 @@ export default {
           },
           {
             text: "最近一个月",
-            onClick(picker) {
+            onClick (picker) {
               const end = new Date();
               const start = new Date();
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
@@ -109,7 +82,7 @@ export default {
           },
           {
             text: "最近三个月",
-            onClick(picker) {
+            onClick (picker) {
               const end = new Date();
               const start = new Date();
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
@@ -120,7 +93,7 @@ export default {
       },
     };
   },
-  created() {
+  created () {
     var that = this;
     get("/productInfo/list", { parentId: 0, pageSize: 9999, pageNum: 1 }).then(
       (res) => {
@@ -130,7 +103,7 @@ export default {
     that.search();
   },
   methods: {
-    async search() {
+    async search () {
       // 同步搜索
       // console.log(this.searchForm);
       await get("/feedbackRecord/page", this.searchForm)
@@ -142,11 +115,11 @@ export default {
           console.log(err);
         });
     },
-    searchBtn() {
+    searchBtn () {
       // 搜索按钮
       this.search();
     },
-    reset() {
+    reset () {
       // 重置
       this.searchForm = {
         phone: "",
@@ -155,7 +128,7 @@ export default {
       };
       this.search();
     },
-    download() {
+    download () {
       if (this.value2 === "") {
         let date = new Date();
         let y = date.getFullYear() - 1;
@@ -205,16 +178,16 @@ export default {
         }
       });
     },
-    dateChange(e) {
+    dateChange (e) {
       this.searchForm.beginTime = filter.frDateTime(e[0]);
       this.searchForm.endTime = filter.frDateTime(e[1]);
     },
-    handleSizeChange(e) {
+    handleSizeChange (e) {
       // 单页数量
       this.searchForm.pageSize = e;
       this.search();
     },
-    handleCurrentChange(e) {
+    handleCurrentChange (e) {
       // 跳页
       this.searchForm.pageNum = e;
       this.search();

admin/src/views/dataPage/orderData/index.vue

@@ -3,12 +3,7 @@
     <el-container>
       <!--搜索-->
       <el-header class="searchBox">
-        <el-form
-          :inline="true"
-          :model="searchForm"
-          class="demo-form-inline"
-          size="small"
-        >
+        <el-form :inline="true" :model="searchForm" class="demo-form-inline" size="small">
           <el-form-item label="产品名称">
             <el-input v-model="searchForm.productName" placeholder="产品名称" />
           </el-form-item>
@@ -31,16 +26,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="时间范围">
-            <el-date-picker
-              v-model="value2"
-              type="datetimerange"
-              :picker-options="pickerOptions"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              align="right"
-              @change="dateChange"
-            />
+            <el-date-picker v-model="value2" type="datetimerange" :picker-options="pickerOptions" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right" @change="dateChange" />
           </el-form-item>
 
           <el-form-item size="mini">
@@ -78,11 +64,7 @@
           <el-table-column prop="createTime" label="订购时间" width="160" />
         </el-table>
         <div class="block">
-          <pagination
-            :total="total"
-            :page="searchForm.pageNo"
-            :limit="searchForm.pageSize"
-          />
+          <pagination v-show="total>0" :total="total" :page.sync="searchForm.pageNo" :limit.sync="searchForm.pageSize" @pagination="search" />
         </div>
       </el-main>
     </el-container>
@@ -92,9 +74,8 @@
 <script>
 import { exportAccess, accessList } from "./api.js";
 import filter from "@/common/filter";
-// import { get } from 'xe-utils';
 export default {
-  data() {
+  data () {
     return {
       searchForm: {
         // productName: '',
@@ -104,17 +85,17 @@ export default {
         // handleResult: '',
         // startTime: '',
         // endTime: '',
-        pageSize: 3,
+        pageSize: 20,
         pageNo: 1,
       },
       value2: "",
       tableData: [],
-      total: 10,
+      total: 100,
       pickerOptions: {
         shortcuts: [
           {
             text: "最近一周",
-            onClick(picker) {
+            onClick (picker) {
               const end = new Date();
               const start = new Date();
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
@@ -123,7 +104,7 @@ export default {
           },
           {
             text: "最近一个月",
-            onClick(picker) {
+            onClick (picker) {
               const end = new Date();
               const start = new Date();
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
@@ -132,7 +113,7 @@ export default {
           },
           {
             text: "最近三个月",
-            onClick(picker) {
+            onClick (picker) {
               const end = new Date();
               const start = new Date();
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
@@ -143,55 +124,45 @@ export default {
       },
     };
   },
-  created() {
+  created () {
     this.search();
   },
   methods: {
     // 改变页码触发
-    pagination(page) {
+    pagination (page) {
       this.pageNo = page.page;
-      console.log(this.pageNo);
       // 重新获取列表数据
       this.search();
     },
-    search() {
+    search () {
       // 同步搜索
       accessList(this.searchForm).then((res) => {
         this.tableData = res.data.list;
-        console.log(res);
         this.total = res.data.total;
       });
     },
-    searchBtn() {
+    searchBtn () {
       // 搜索按钮
       this.search();
     },
-    reset() {
+    reset () {
       // 重置
       this.searchForm = {
         cpid: "",
         categoryName: "",
-        pageSize: 3,
+        pageSize: 20,
         pageNo: 1,
       };
       this.search();
     },
-    dateChange(e) {
+    dateChange (e) {
       console.log(e);
       this.searchForm.startTime = filter.frDateTime(e[0]);
       this.searchForm.endTime = filter.frDateTime(e[1]);
     },
-    handleSizeChange(e) {
-      // 单页数量
-      this.searchForm.pageSize = e;
-      this.search();
-    },
-    handleCurrentChange(e) {
-      // 跳页
-      this.searchForm.pageNum = e;
-      this.search();
-    },
-    download() {
+
+
+    download () {
       // 导出
       this.$modal
         .confirm("是否确认导出所有渠道数据")

admin/src/views/dataPage/receData/api.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+//获取会员领取列表
+export function receList(query) {
+  return request({
+    url: '/record/activity-record/page',
+    method: 'get',
+    params: query
+  })
+}
+//获取产品信息列表
+export function productList(query) {
+  return request({
+    url: '/product/info/page',
+    method: 'get',
+    params: query
+  })
+}

admin/src/views/dataPage/receData/index.vue

@@ -1,5 +1,6 @@
 <template>
   <div>
+
     <el-container>
       <!--搜索-->
       <el-header class="searchBox">
@@ -83,33 +84,32 @@
           <el-table-column prop="createTime" label="订购时间" width="160" />
         </el-table>
         <div class="block">
-          <el-pagination :current-page.sync="searchForm['pageNum']" :page-sizes="[20, 50, 100, 300]" :page-size="searchForm['pageSize']" layout="total, sizes, pager" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+          <pagination v-show="total>0" :total="total" :page.sync="searchForm.pageNo" :limit.sync="searchForm.pageSize" @pagination="pagination" />
         </div>
       </el-main>
     </el-container>
   </div>
-
 </template>
 
 <script>
-import { get, post } from '@/api/common'
+import { receList, productList } from './api'
+import { post } from '@/api/common'
 import filter from '@/common/filter'
-import { receList } from '../orderData/api'
 
 export default {
   name: 'RunData',
   data () {
     return {
       searchForm: {
-        productName: '',
-        fullCode: '',
-        phone: '',
-        handleType: '',
-        handleResult: '',
-        startTime: '',
-        endTime: '',
+        // productName: '',
+        // fullCode: '',
+        // phone: '',
+        // handleType: '',
+        // handleResult: '',
+        // startTime: '',
+        // endTime: '',
         pageSize: 20,
-        pageNum: 1
+        pageNo: 1
       },
       memberForm: {},
       productInfoList: {},
@@ -157,12 +157,19 @@ export default {
   created () {
     var that = this
     that.search()
-    get('/product/info/page', { 'pageSize': 100, 'pageNum': 1 }).then(res => {
+    productList({ 'pageSize': 100, 'pageNo': 1 }).then(res => {
       this.productInfoList = res.data.list
-    });
+    })
 
   },
   methods: {
+    // 改变页码触发
+    pagination (page) {
+      this.pageNo = page.page;
+      // 重新获取列表数据
+      this.search();
+    },
+
     giveMenmber (formName) {
       this.$confirm('您确定为这些手机号领取会员么？当前操作不可逆', '提示', {
         confirmButtonText: '确定',
@@ -228,7 +235,7 @@ export default {
         cpid: '',
         categoryName: '',
         pageSize: 20,
-        pageNum: 1
+        pageNo: 1
       }
       this.search()
     },
@@ -237,14 +244,7 @@ export default {
       this.searchForm.startTime = filter.frDateTime(e[0])
       this.searchForm.endTime = filter.frDateTime(e[1])
     },
-    handleSizeChange (e) { // 单页数量
-      this.searchForm.pageSize = e
-      this.search()
-    },
-    handleCurrentChange (e) { // 跳页
-      this.searchForm.pageNum = e
-      this.search()
-    }
+
   }
 }
 </script>

admin/src/views/dataPage/returnData/index.vue

@@ -0,0 +1,264 @@
+<template>
+  <div>
+    <el-container>
+      <!--搜索-->
+      <el-header class="searchBox">
+        <el-form :inline="true" :model="searchForm" class="demo-form-inline">
+          <!--                    <el-form-item label="手机号">-->
+          <!--                        <el-input v-model="searchForm.phone" placeholder="手机号"/>-->
+          <!--                    </el-form-item>-->
+          <el-form-item label="产品名称">
+            <el-input v-model="searchForm.productName" placeholder="请输入产品名称"></el-input>
+            <!-- <el-select
+              v-model="searchForm.spid"
+              filterable
+              clearable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in prductLIst"
+                :key="item.spid"
+                :label="`${item.productName}/${item.spid}`"
+                :value="item.spid"
+              />
+            </el-select> -->
+          </el-form-item>
+          <el-form-item label="时间范围">
+            <el-date-picker v-model="value2" type="datetimerange" :picker-options="pickerOptions" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right" @change="dateChange" />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="searchBtn">查询</el-button>
+            <el-button @click="reset">重置</el-button>
+            <el-button type="warning" @click="download">导出</el-button>
+          </el-form-item>
+        </el-form>
+      </el-header>
+
+      <!--表格-->
+      <el-main class="tableBox">
+        <el-table :data="tableData" stripe style="width: 100%">
+          <el-table-column prop="phone" label="手机号" width="120" />
+          <el-table-column prop="reason" label="退订原因" />
+          <el-table-column prop="content" label="详情" />
+          <el-table-column prop="productName" label="产品名称" />
+          <el-table-column prop="channelName" label="渠道名称" />
+          <el-table-column prop="orderTime" label="订购时间" width="160" />
+          <el-table-column prop="createTime" label="反馈时间" width="160" />
+        </el-table>
+        <div class="block">
+          <el-pagination :current-page.sync="searchForm['pageNum']" :page-sizes="[20, 50, 100, 300]" :page-size="searchForm['pageSize']" layout="total, sizes, pager" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+        </div>
+      </el-main>
+    </el-container>
+  </div>
+</template>
+
+<script>
+import { get, post } from "@/api/common";
+import filter from "@/common/filter";
+import axios from "axios";
+import { getToken } from "../../../utils/auth";
+
+export default {
+  name: "RunData",
+  data () {
+    return {
+      searchForm: {
+        productName: "",
+        pageSize: 20,
+        pageNum: 1,
+      },
+      value2: "",
+      tableData: [],
+      total: 5000,
+      prductLIst: {},
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick (picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick (picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick (picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+    };
+  },
+  created () {
+    var that = this;
+    // get("/productInfo/list", { parentId: 0, pageSize: 9999, pageNum: 1 }).then(
+    //   (res) => {
+    //     this.prductLIst = res.data.list;
+    //   }
+    // );
+    that.search();
+  },
+  methods: {
+    async search () {
+      // 同步搜索
+      // console.log(this.searchForm);
+      await get("/help/record/page", this.searchForm).then((res) => {
+        this.tableData = res.data.list;
+        this.total = res.data.total;
+      });
+    },
+    searchBtn () {
+      // 搜索按钮
+      this.search();
+    },
+    reset () {
+      // 重置
+      this.value2 = ""
+      this.searchForm = {
+        phone: "",
+        pageSize: 20,
+        pageNum: 1,
+      };
+      this.search();
+    },
+    download () {
+      if (this.value2 === "") {
+        let date = new Date();
+        let y = date.getFullYear() - 1;
+        let m = date.getMonth() + 1;
+        let mm = m > 0 ? m : "0" + m;
+        let d = date.getDate() + 2;
+        let dd = d > 0 ? d : "0" + d;
+        let h = date.getHours();
+        let M = date.getMinutes();
+        let s = date.getSeconds();
+        this.searchForm.beginTime = `${y}-${mm}-${dd} ${h}:${M}:${s}`;
+        this.searchForm.endTime = filter.frDateTime(new Date());
+      }
+      let formData = new FormData();
+      formData.append("beginTime", this.searchForm.beginTime);
+      formData.append("endTime", this.searchForm.endTime);
+      if (this.searchForm.productName) {
+        formData.append("productName", this.searchForm.productName);
+      }
+      let loading = this.$loading({
+        lock: true,
+        text: "下载量较大,请耐心等待",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+      axios({
+        method: "post",
+        url: process.env.VUE_APP_BASE_API + "/help/record/download",
+        data: formData,
+        responseType: "blob",
+        headers: {
+          "Content-Type": "multipart/form-data",
+          token: getToken(),
+        },
+      }).then((res) => {
+        if (res.data) {
+          loading.close();
+          let a = document.createElement("a");
+          let blob = new Blob([res.data], {
+            type: "application/vnd.ms-excel",
+          });
+          let objectUrl = URL.createObjectURL(blob);
+          a.setAttribute("href", objectUrl);
+          a.setAttribute("download", "退订原因.xlsx");
+          a.click();
+          URL.revokeObjectURL(a.objectUrl);
+        }
+      });
+    },
+    dateChange (e) {
+      this.searchForm.beginTime = filter.frDateTime(e[0]);
+      this.searchForm.endTime = filter.frDateTime(e[1]);
+    },
+    handleSizeChange (e) {
+      // 单页数量
+      this.searchForm.pageSize = e;
+      this.search();
+    },
+    handleCurrentChange (e) {
+      // 跳页
+      this.searchForm.pageNum = e;
+      this.search();
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.searchBox {
+  background-color: #fff;
+  border-radius: 4px;
+  box-shadow: #bfbfbf 0 0 2px;
+  height: unset !important;
+
+  form {
+    margin: auto;
+
+    .el-form-item {
+      margin: 5px 5px;
+    }
+  }
+}
+
+.el-header {
+  padding: 20px;
+}
+
+.el-form-item {
+  margin-bottom: unset;
+}
+
+.tableBox {
+  margin-top: 10px;
+  background-color: #fff;
+  border-radius: 4px;
+  box-shadow: #bfbfbf 0 0 2px;
+}
+
+.block {
+  margin-top: 20px;
+  float: right;
+}
+
+.demo-drawer__content {
+  padding: 20px 5%;
+  line-height: 32px;
+
+  .el-form-item {
+    margin-top: 20px;
+  }
+
+  .demo-drawer__footer {
+    position: fixed;
+    bottom: 30px;
+    width: 45%;
+    margin-top: 20px;
+    display: flex;
+
+    button {
+      flex: 1;
+    }
+  }
+}
+</style>

admin/src/views/dataPage/runData/index.vue

@@ -1,191 +0,0 @@
-<template>
-  <div>
-    <el-container>
-      <!--搜索-->
-      <el-header class="searchBox">
-        <el-form :inline="true" :model="searchForm" class="demo-form-inline">
-          <el-form-item label="渠道key">
-            <el-input v-model="searchForm.channelKey" placeholder="渠道key" />
-          </el-form-item>
-          <el-form-item label="客户来源">
-            <el-input v-model="searchForm.fromSource" placeholder="客户来源" />
-          </el-form-item>
-          <el-form-item label="产品名称">
-            <el-input v-model="searchForm.productName" placeholder="产品名称" />
-          </el-form-item>
-          <el-form-item label="时间范围">
-            <el-date-picker
-              v-model="searchForm.date"
-              type="date"
-              placeholder="选择日期"
-              value-format="yyyy-MM-dd">
-            </el-date-picker>
-          </el-form-item>
-
-          <el-form-item>
-            <el-button type="primary" @click="searchBtn">查询</el-button>
-            <el-button @click="reset">重置</el-button>
-          </el-form-item>
-        </el-form>
-      </el-header>
-
-      <!--表格-->
-      <el-main class="tableBox">
-        <el-table :data="tableData" stripe style="width: 100%">
-          <el-table-column prop="prouductName" label="产品名称" />
-          <el-table-column prop="spid" label="spid" />
-          <el-table-column prop="fullCode" label="渠道编码" />
-          <el-table-column prop="pvNum" label="PV" />
-          <el-table-column prop="uvNum" label="UV" />
-          <el-table-column prop="fromSource " label="获客来源" />
-          <el-table-column prop="orderNum" label="订单数" />
-          <el-table-column prop="orderProfit" label="订单收益" />
-          <el-table-column prop="refundOrderNum" label="退单数" />
-          <el-table-column prop="primaryConversionRate" label="分类名称" />
-          <el-table-column prop="seconfaryConversionRate" label="分类名称" />
-          <el-table-column prop="thirdConversionRate" label="分类名称" />
-          <el-table-column prop="data" label="创建时间" width="160" />
-        </el-table>
-        <div class="block">
-          <el-pagination
-            :current-page.sync="searchForm['pageNum']"
-            :page-sizes="[20, 50, 100, 300]"
-            :page-size="searchForm['pageSize']"
-            layout="total, sizes, pager"
-            :total="total"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div>
-      </el-main>
-    </el-container>
-  </div>
-
-</template>
-
-<script>
-import { post, get } from '@/api/common'
-export default {
-  name: 'RunData',
-  data() {
-    return {
-      searchForm: {
-        channelKey: '',
-        date: '',
-        fromSource: '',
-        productName: '',
-        pageSize: 20,
-        pageNum: 1
-      },
-      tableData: [],
-      total: 5000,
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      }
-    }
-  },
-  created() {
-    var that = this
-    that.search()
-  },
-  methods: {
-    async search() { // 同步搜索
-      await get('/sysData/dataReport', this.searchForm)
-        .then((res) => {
-          this.tableData = res.data.list
-          this.total = res.data.total
-        }).catch((err) => {
-          console.log(err)
-        })
-    },
-    searchBtn() { // 搜索按钮
-      this.search()
-    },
-    reset() { // 重置
-      this.searchForm = {
-        cpid: '',
-        categoryName: '',
-        pageSize: 20,
-        pageNum: 1
-      }
-      this.search()
-    },
-    handleSizeChange(e) { // 单页数量
-      this.searchForm.pageSize = e
-      this.search()
-    },
-    handleCurrentChange(e) { // 跳页
-      this.searchForm.pageNum = e
-      this.search()
-    }
-  }
-}
-</script>
-
-<style scoped lang="scss">
-.searchBox {
-  background-color: #fff;
-  border-radius: 4px;
-  box-shadow: #bfbfbf 0 0 2px;
-  height: unset !important;
-  form {
-    margin: auto;
-    .el-form-item {
-      margin: 5px 5px;
-    }
-  }
-}
-.el-header {padding: 20px}
-.el-form-item {margin-bottom: unset}
-.tableBox{
-  margin-top: 10px;
-  background-color: #fff;
-  border-radius: 4px;
-  box-shadow: #bfbfbf 0 0 2px;
-}
-.block {
-  margin-top: 20px;
-  float: right;
-}
-.demo-drawer__content {
-  padding: 20px 5%;
-  line-height: 32px;
-  .el-form-item {
-    margin-top: 20px;
-  }
-  .demo-drawer__footer {
-    position: fixed;
-    bottom: 30px;
-    width: 45%;
-    margin-top: 20px;
-    display: flex;
-    button {
-      flex: 1;
-    }
-  }
-}
-</style>

admin/src/views/produce/produceClass/index.vue

@@ -2,18 +2,9 @@
   <!-- 产品分类 -->
   <div class="abtestIndex">
     <!--搜索-->
-    <el-form
-      :inline="true"
-      :model="searchForm"
-      size="small"
-      class="demo-form-inline"
-    >
+    <el-form :inline="true" :model="searchForm" size="small" class="demo-form-inline">
       <el-form-item label="分类名称">
-        <el-input
-          v-model="searchForm.categoryName"
-          placeholder="分类名称"
-          clearable
-        />
+        <el-input v-model="searchForm.categoryName" placeholder="分类名称" clearable />
       </el-form-item>
       <el-form-item label="CPID">
         <el-input v-model="searchForm.cpid" placeholder="CPID" clearable />
@@ -26,14 +17,7 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="add"
-          >新增</el-button
-        >
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="add">新增</el-button>
       </el-col>
     </el-row>
     <!--表格-->
@@ -45,44 +29,16 @@
       <el-table-column prop="createTime" label="创建时间" />
       <el-table-column fixed="right" label="操作" width="100">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="mini"
-            @click="edit(scope.row.id, scope.row)"
-            icon="el-icon-edit"
-            >编辑</el-button
-          >
-          <el-button
-            type="text"
-            size="mini"
-            @click="dele(scope.row.id)"
-            icon="el-icon-delete"
-            >删除</el-button
-          >
+          <el-button type="text" size="mini" @click="edit(scope.row.id, scope.row)" icon="el-icon-edit">编辑</el-button>
+          <el-button type="text" size="mini" @click="dele(scope.row.id)" icon="el-icon-delete">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      class="mt10"
-      v-show="total > 0"
-      :total="total"
-      :page="searchForm.pageNo"
-      :limit="searchForm.pageSizes"
-      @pagination="pagination"
-    />
+    <pagination class="mt10" v-show="total > 0" :total="total" :page="searchForm.pageNo" :limit="searchForm.pageSize" @pagination="pagination" />
 
     <!--新增抽屉-->
-    <el-drawer
-      ref="addDrawer"
-      title="编辑产品分类"
-      size="50%"
-      :before-close="addHandleClose"
-      :with-header="false"
-      :visible.sync="addDialog"
-      direction="rtl"
-      custom-class="demo-drawer"
-    >
+    <el-drawer ref="addDrawer" title="编辑产品分类" size="50%" :before-close="addHandleClose" :with-header="false" :visible.sync="addDialog" direction="rtl" custom-class="demo-drawer">
       <div class="demo-drawer__content">
         <span>编辑产品分类</span>
         <el-form :model="addForm">
@@ -96,36 +52,18 @@
             <el-input v-model="addForm.parentCategory" autocomplete="off" />
           </el-form-item>
           <el-form-item label="会员pwd" label-width="80px">
-            <el-input
-              v-model="addForm.pwd"
-              placeholder="科创会员兑换专用pwd，根据映射表填写"
-              autocomplete="off"
-            />
+            <el-input v-model="addForm.pwd" placeholder="科创会员兑换专用pwd，根据映射表填写" autocomplete="off" />
           </el-form-item>
         </el-form>
         <div class="demo-drawer__footer">
           <el-button @click="cancelForm">取 消</el-button>
-          <el-button
-            type="primary"
-            :loading="loading"
-            @click="$refs.addDrawer.closeDrawer()"
-            >{{ loading ? "提交中 ..." : "确 定" }}</el-button
-          >
+          <el-button type="primary" :loading="loading" @click="$refs.addDrawer.closeDrawer()">{{ loading ? "提交中 ..." : "确 定" }}</el-button>
         </div>
       </div>
     </el-drawer>
 
     <!--编辑抽屉-->
-    <el-drawer
-      ref="editDrawer"
-      title="编辑产品分类"
-      size="50%"
-      :before-close="editHandleClose"
-      :with-header="false"
-      :visible.sync="editDialog"
-      direction="rtl"
-      custom-class="demo-drawer"
-    >
+    <el-drawer ref="editDrawer" title="编辑产品分类" size="50%" :before-close="editHandleClose" :with-header="false" :visible.sync="editDialog" direction="rtl" custom-class="demo-drawer">
       <div class="demo-drawer__content">
         <span>编辑产品分类</span>
         <el-form :model="editForm">
@@ -139,21 +77,12 @@
             <el-input v-model="editForm.parentCategory" autocomplete="off" />
           </el-form-item>
           <el-form-item label="会员pwd" label-width="80px">
-            <el-input
-              v-model="editForm.pwd"
-              placeholder="科创会员兑换专用pwd，根据映射表填写"
-              autocomplete="off"
-            />
+            <el-input v-model="editForm.pwd" placeholder="科创会员兑换专用pwd，根据映射表填写" autocomplete="off" />
           </el-form-item>
         </el-form>
         <div class="demo-drawer__footer">
           <el-button @click="cancelForm">取 消</el-button>
-          <el-button
-            type="primary"
-            :loading="loading"
-            @click="$refs.editDrawer.closeDrawer()"
-            >{{ loading ? "提交中 ..." : "确 定" }}</el-button
-          >
+          <el-button type="primary" :loading="loading" @click="$refs.editDrawer.closeDrawer()">{{ loading ? "提交中 ..." : "确 定" }}</el-button>
         </div>
       </div>
     </el-drawer>
@@ -164,7 +93,7 @@
 import { listProduct, addProduct, delProduct, editProduct } from "../api.js";
 import getTime from "@/utils/getTime.js";
 export default {
-  data() {
+  data () {
     return {
       loading: false,
       editDialog: false,
@@ -193,18 +122,18 @@ export default {
     };
   },
 
-  created() {
+  created () {
     this.getList();
   },
   methods: {
     // 改变页码触发
-    pagination(page) {
+    pagination (page) {
       this.pageNo = page.page;
       // 重新获取列表数据
       this.getList();
     },
 
-    getTimeStr(timeStamp) {
+    getTimeStr (timeStamp) {
       var now = new Date(timeStamp),
         y = now.getFullYear(),
         m = ("0" + (now.getMonth() + 1)).slice(-2),
@@ -212,7 +141,7 @@ export default {
       return y + "-" + m + "-" + d + " " + now.toTimeString().substr(0, 8);
     },
     //获取列表
-    getList() {
+    getList () {
       listProduct(this.searchForm).then((response) => {
         this.tableData = response.data.list;
         this.tableData.forEach((item) => {
@@ -223,7 +152,7 @@ export default {
       });
     },
 
-    searchBtn() {
+    searchBtn () {
       // 搜索按钮
       if (!this.searchForm.categoryName || !this.searchForm.cpid) {
         this.$message.error("请输入内容");
@@ -231,7 +160,7 @@ export default {
         this.getList();
       }
     },
-    reset() {
+    reset () {
       // 重置
       this.searchForm = {};
       this.editForm = {
@@ -242,7 +171,7 @@ export default {
         id: "",
       };
     },
-    add() {
+    add () {
       // 新增
       this.addDialog = true;
       this.bannerList = [];
@@ -253,7 +182,7 @@ export default {
       this.getList();
     },
 
-    addHandleClose(done) {
+    addHandleClose (done) {
       //   // 新增数据
       if (this.loading) return;
       this.$confirm("确定要提交吗？").then((_) => {
@@ -271,13 +200,13 @@ export default {
         });
       });
     },
-    edit(id, e) {
+    edit (id, e) {
       // 编辑
       this.editForm.id = id;
       this.editForm = e;
       this.editDialog = true;
     },
-    editHandleClose(done) {
+    editHandleClose (done) {
       // 修改数据
       if (this.loading) return;
       this.$confirm("确定要提交吗？")
@@ -300,7 +229,7 @@ export default {
           this.editDialog = false;
         });
     },
-    dele(id) {
+    dele (id) {
       // 删除
       this.$confirm("确定要删除么？").then((_) => {
         delProduct({ id: id }).then((res) => {
@@ -309,7 +238,7 @@ export default {
         });
       });
     },
-    cancelForm() {
+    cancelForm () {
       // 关闭抽屉
 
       this.loading = false;
@@ -317,16 +246,7 @@ export default {
       this.addDialog = false;
       clearTimeout(this.timer);
     },
-    handleSizeChange(e) {
-      // 单页数量
-      this.searchForm.pageSize = e;
-      // this.search()
-    },
-    handleCurrentChange(e) {
-      // 跳页
-      this.searchForm.pageNum = e;
-      // this.search()
-    },
+
   },
 };
 </script>

admin/src/views/schemeGlobal/api.js

@@ -0,0 +1,29 @@
+import request from '@/utils/request'
+
+//获取全局策略管理列表
+export function listSchemeGlobal(query) {
+  return request({
+    url: '/strategy/global-info/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取控制项列表
+export function listItem(query) {
+  return request({
+    url: '/record/strategy-global-record/page',
+    method: 'get',
+    params: query
+  })
+}
+
+//新建全局策略
+
+export function addchemeGlobal(params) {
+  return request({
+    url: "/strategy/global-info/create",
+    method: 'post',
+    data: params
+  })
+}

admin/src/views/schemeGlobal/index.vue

@@ -1,323 +1,313 @@
 <template>
-    <div>
-        <!--开关盒子-->
-        <div class="topBox">
-            <el-row :gutter="20">
-                <el-col class="itemList" v-for="item in itemList" :span="6">
-                    <div>
-                        <span>{{item.name}}：</span>
-                        <el-button v-if="item.status === 0" size="mini" type="primary" plain @click="open(item)">申请开启
-                        </el-button>
-                        <el-button v-else size="mini" type="warning" plain @click="close(item)">申请关闭</el-button>
-                    </div>
-                </el-col>
-            </el-row>
-        </div>
-        <!--表格-->
-        <div class="tableBox">
-            <vxe-toolbar>
-                <template #buttons>
-                    <vxe-button @click="init()">刷新</vxe-button>
-                </template>
-            </vxe-toolbar>
-            <vxe-table
-                    border
-                    resizable
-                    keep-source
-                    show-overflow
-                    highlight-hover-row
-                    ref="xTable"
-                    :data="tableData"
-                    :edit-config="{trigger: 'click', mode: 'cell', showStatus: true, }"
-                    :row-class-name="rowClassName"
-            >
-                <vxe-table-column
-                        field="name"
-                        title="名称"
-                        width="160"
-                />
-                <vxe-table-column
-                        field="operDetail"
-                        title="操作"
-                        width="100"
-                >
-                    <template #default="{ row }">
-                        {{ strStatus[row.operDetail] }}
-                    </template>
-                </vxe-table-column>
-                <vxe-table-column
-                        field="applicant"
-                        title="申请人"
-                        width="100"
-                />
-                <vxe-table-column
-                        field="status"
-                        title="状态"
-                        width="100"
-                >
-                    <template #default="{ row }">
-                        {{ strategyStatus[row.status] }}
-                    </template>
-                </vxe-table-column>
-                <vxe-table-column
-                        field="applyReason"
-                        title="申请原因"
-                />
-                <vxe-table-column
-                        field="createTime"
-                        title="申请时间"
-                        width="200"
-                />
-                <vxe-table-column
-                        field="modifyTime"
-                        title="审核时间"
-                        width="200"
-                />
-
-                <vxe-table-column title="操作" width="220">
-                    <template #default="{ row }">
+  <div>
+    <!--开关盒子-->
+    <div class="topBox">
+      <el-row :gutter="20">
+        <el-col class="itemList" v-for="item in itemList" :span="6">
+          <div>
+            <span>{{item.name}}:</span>
+            <el-button v-if="item.status === 0" size="mini" type="primary" plain @click="open(item)">申请开启
+            </el-button>
+            <el-button v-else size="mini" type="warning" plain @click="close(item)">申请关闭</el-button>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+    <!--表格-->
+    <div class="tableBox">
 
-                        <template v-if="userName === '系统管理员' || userName === '张凯'">
-                            <vxe-button v-show="row.status === 1" @click="audit({row, status:3})">通过</vxe-button>
-                            <vxe-button v-show="row.status === 1" @click="audit({row, status:4})">驳回</vxe-button>
-                        </template>
-                        <template v-if="userName === row.applicant && row.status === 1">
-                            <vxe-button @click="audit({row, status:2})">撤回</vxe-button>
-                        </template>
-                    </template>
-                </vxe-table-column>
-            </vxe-table>
-            <vxe-pager
-                    :loading="loading"
-                    :current-page="searchForm.pageNum"
-                    :page-size="searchForm.pageSize"
-                    :total="searchForm.totalResult"
-                    :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
-                    @page-change="handlePageChange"
-            />
-        </div>
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="init()">刷新</el-button>
+        </el-col>
+      </el-row>
 
-        <!--申请原因-->
-        <vxe-modal v-model="value5" width="60%" :title='this.strStatus[form.operDetail]+form.name'>
-            <el-input
-                    type="textarea"
-                    :autosize="{ minRows: 2, maxRows: 4}"
-                    placeholder="请输入申请原因"
-                    v-model="form.applyReason">
-            </el-input>
-            <el-row style="margin-top: 30px;display: flex;justify-content: flex-end">
-                <el-button @click="value5 = false">取消</el-button>
-                <el-button type="primary" @click="onSubmit">提交</el-button>
-            </el-row>
-        </vxe-modal>
+      <el-table :data="tableData" ref="xTable" highlight-current-row :row-class-name="rowClassName">
+        <el-table-column prop="name" label="名称" />
+        <el-table-column prop="operDetail" label="操作">
+          <template slot-scope="scope">
+            {{ strStatus[scope.row.operDetail] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="applicant" label="申请人" />
+        <el-table-column prop="status" label="状态">
+          <template slot-scope="scope">
+            {{ strategyStatus[scope.row.status] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="applyReason" label="申请原因" />
+        <el-table-column prop="createTime" label="申请时间" />
+        <el-table-column prop="modifyTime" label="审核时间" />
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <template v-if="userName === '系统管理员' || userName === '张凯'">
+              <el-button v-show="scope.row.status === 1" @click="audit({row, status:3})">通过</el-button>
+              <el-button v-show="scope.row.status === 1" @click="audit({row, status:4})">驳回</el-button>
+            </template>
+            <template v-if="userName === scope.row.applicant && scope.row.status === 1">
+              <el-button @click="audit({row, status:2})">撤回</el-button>
+            </template>
+          </template>
+        </el-table-column>
+      </el-table>
 
+      <pagination class="mt10" v-show="total > 0" :total="total" :page="searchForm.pageNo" :limit="searchForm.pageSize" @pagination="pagination" />
     </div>
 
+    <!--申请原因-->
+    <vxe-modal v-model="value5" width="60%" :title='this.strStatus[form.operDetail]+form.name'>
+      <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4}" placeholder="请输入申请原因" v-model="form.applyReason">
+      </el-input>
+      <el-row style="margin-top: 30px;display: flex;justify-content: flex-end">
+        <el-button @click="value5 = false">取消</el-button>
+        <el-button type="primary" @click="onSubmit">提交</el-button>
+      </el-row>
+    </vxe-modal>
+
+  </div>
+
 </template>
 
 <script>
-    import {post, get} from '@/api/common'
+import { listSchemeGlobal, listItem } from './api'
+import { post, get, put } from '@/api/common'
+import getTime from "@/utils/getTime.js";
+
+export default {
+  name: 'Index',
+  data () {
+    return {
+      //搜索相关
+      searchForm: {
+        pageNo: 1,
+        pageSize: 10,
+        totalResult: 0
+      },
+      // 表格数据
+      loading: false,
+      total: 100,
+      tableData: [],
+      itemList: [],
+      strategyStatus: ['--', '待审核', '撤回', '通过', '驳回'],
+      strStatus: ['申请关闭', '申请开启'],
+      userName: '',
+      form: {
+        applicant: "11",
+        id: 0,
+        applyReason: "",
+        infoId: "",
+        name: "",
+        operDetail: 1,
+        status: "",
+        applyReason: '',
+        tag: "",
+      },
+      value5: false
+    }
+  },
+  created () {
+    console.log('用户：', this.$store.state.user.name)
+    this.userName = this.$store.state.user.name
+  },
+  mounted () {
+    this.init()
+    this.getItemList()
+  },
+  methods: {
+    // 改变页码触发
+    pagination (page) {
+      this.pageNo = page.page;
+      // 重新获取列表数据
+      this.init();
+    },
+    // 提交申请
+    onSubmit () {
+      this.$confirm('确定提交申请么, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        console.log(this.form)
+        post('/strategy-global-record/create', this.form).then(res => {
+
+          this.$message({
+            message: res.message,
+            type: 'success',
+            duration: 3000,
+            offset: 360
+          })
+          this.value5 = false
+          this.init()
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
+    },
+    // 控制项列表
+    getItemList () {
+
+      listSchemeGlobal({ pageNo: 1, pageSize: 100, }).then(res => {
+        console.log(res.data.list)
+        this.itemList = res.data.list
+        // that.itemList = res.data.list / strategy - global - record / page
+        console.log(itemList)
 
-    export default {
-        name: 'Index',
-        data() {
-            return {
-                //搜索相关
-                searchForm: {
-                    pageNum: 1,
-                    pageSize: 10,
-                    totalResult: 0
-                },
-                // 表格数据
-                loading: false,
-                tableData: [],
-                itemList: [],
-                strategyStatus: ['--', '待审核', '撤回', '通过', '驳回'],
-                strStatus: ['申请关闭', '申请开启'],
-                userName: '',
-                form: {
-                    applicant: "",
-                    applyReason: "",
-                    infoId: "",
-                    name: "",
-                    operDetail: 1,
-                    status: 1,
-                    applyReason: '',
-                    tag: ""
-                },
-                value5: false
-            }
-        },
-        created() {
-            console.log('用户：', this.$store.state.user.name)
-            this.userName = this.$store.state.user.name
-        },
-        mounted() {
-            this.init()
-            this.getItemList()
-        },
-        methods: {
-            // 提交申请
-            onSubmit() {
-                this.$confirm('确定提交申请么, 是否继续?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    post('/strategyglobalrecord/create', this.form).then(res => {
-                        this.$message({
-                            message: res.message,
-                            type: 'success',
-                            duration: 3000,
-                            offset: 360
-                        })
-                        this.value5 = false
-                        this.init()
-                    })
-                }).catch(() => {
-                    this.$message({
-                        type: 'info',
-                        message: '已取消删除'
-                    });
-                });
-            },
-            // 控制项列表
-            getItemList() {
-                var that = this
-                get('/strategyglobalinfo/page', {pageNum: 1, pageSize: 9999,}).then(res => {
-                    that.itemList = res.data.list
-                })
-            },
-            // 订单列表
-            init() {
-                get('/strategyglobalrecord/page', this.searchForm).then(res => {
-                    this.tableData = res.data.list
-                    this.total = res.data.total
-                    this.searchForm.totalResult = res.data.total
-                })
-            },
-            // 新增打开申请
-            open(row) {
-                this.form = {
-                    applicant: this.userName,
-                    applyReason: "",
-                    infoId: row.id,
-                    name: row.name,
-                    operDetail: 1,
-                    status: 1,
-                    tag: row.tag
-                }
-                this.value5 = true
-            },
-            // 新增关闭申请
-            close(row) {
-                this.form = {
-                    applicant: this.userName,
-                    applyReason: "",
-                    infoId: row.id,
-                    name: row.name,
-                    operDetail: 0,
-                    status: 0,
-                    tag: row.tag
-                }
-                this.value5 = true
-            },
+      })
 
+    },
+    // 订单列表
+    init () {
+      listItem(this.searchForm).then(res => {
+        this.tableData = res.data.list
+        this.total = res.data.total
+        this.searchForm.totalResult = res.data.total
 
-            // 新增关闭申请
-            audit({row,status}) {
-                this.$confirm(`确定${this.strategyStatus[status]}该申请么, 是否继续?`, '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    let update = {
-                        applicant: row.applicant,
-                        applyReason: row.applyReason,
-                        infoId: row.infoId,
-                        name: row.name,
-                        operDetail: row.operDetail,
-                        status: status,
-                        tag: row.tag
-                    }
-                    post('/strategyglobalrecord/update/'+row.id, update).then(res => {
-                        this.$message({
-                            message: res.message,
-                            type: 'success',
-                            duration: 3000,
-                            offset: 360
-                        })
-                        this.init()
-                        this.getItemList()
-                    })
-                }).catch(() => {
-                    this.$message({
-                        type: 'info',
-                        message: '已取消'
-                    });
-                });
-            },
+        this.tableData.forEach((item) => {
+          item.createTime = getTime(item.createTime);
+        });
 
-            // 翻页
-            handlePageChange({currentPage, pageSize}) {
-                this.searchForm.pageNum = currentPage
-                this.searchForm.pageSize = pageSize
-                this.init()
-            },
+      })
+    },
+    getTimeStr (timeStamp) {
+      var now = new Date(timeStamp),
+        y = now.getFullYear(),
+        m = ("0" + (now.getMonth() + 1)).slice(-2),
+        d = ("0" + now.getDate()).slice(-2);
+      return y + "-" + m + "-" + d + " " + now.toTimeString().substr(0, 8);
+    },
+    // 新增打开申请
+    open (row) {
+      console.log(row)
+      this.form = {
+        // applicant: this.userName,
+        applicant: 11,
+        applyReason: "",
+        infoId: row.id,
+        name: row.name,
+        operDetail: 1,
+        status: 1,
+        tag: row.tag,
+        id: row.id
+      }
+      this.value5 = true
+    },
+    // 新增关闭申请
+    close (row) {
+      console.log(row)
+      this.form = {
+        // applicant: this.userName,
+        applicant: 11,
+        applyReason: "",
+        infoId: row.id,
+        name: row.name,
+        operDetail: 0,
+        status: 0,
+        tag: row.tag,
+        id: row.id
+      }
+      this.value5 = true
+    },
 
-            // 行颜色
-            rowClassName({ row, rowIndex }) {
-                console.log(row)
-                if (row.status === 1) {
-                    return 'row-green'
-                }
-            }
 
+    // 新增关闭申请
+    audit ({ row, status }) {
+      this.$confirm(`确定${this.strategyStatus[status]}该申请么, 是否继续?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let update = {
+          // applicant: row.applicant,
+          applicant: 11,
+          applyReason: row.applyReason,
+          infoId: row.infoId,
+          name: row.name,
+          operDetail: row.operDetail,
+          status: status,
+          tag: row.tag,
+          id: row.id
         }
+        put('/strategy/global-info/update', update).then(res => {
+          this.$message({
+            message: res.message,
+            type: 'success',
+            duration: 3000,
+            offset: 360
+          })
+          this.init()
+          this.getItemList()
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消'
+        });
+      });
+    },
+
+    // 翻页
+    handlePageChange ({ currentPage, pageSize }) {
+      this.searchForm.pageNo = currentPage
+      this.searchForm.pageSize = pageSize
+      this.init()
+    },
+
+    // 行颜色
+    rowClassName ({ row, rowIndex }) {
+      // console.log(row)
+      if (row.status === 1) {
+        return 'row-green'
+      }
     }
+
+  }
+}
 </script>
 
 <style lang="scss">
-    .searchBox {
-        background-color: #fff;
-        border-radius: 4px;
-        box-shadow: #bfbfbf 0 0 2px;
-        height: unset !important;
-        padding: 10px 10px;
+.searchBox {
+  background-color: #fff;
+  border-radius: 4px;
+  box-shadow: #bfbfbf 0 0 2px;
+  height: unset !important;
+  padding: 10px 10px;
 
-        form {
-            margin: auto;
+  form {
+    margin: auto;
 
-            .el-form-item {
-                margin: 5px 5px;
-            }
-        }
+    .el-form-item {
+      margin: 5px 5px;
     }
+  }
+}
 
-    .topBox {
-        padding: 20px;
+.topBox {
+  padding: 20px;
 
-        .itemList {
-            padding: 10px 0
-        }
-    }
+  .itemList {
+    padding: 10px 0;
+  }
+}
 
-    .tableBox {
-        padding: 20px;
-        margin-top: 10px;
-        background-color: #fff;
-        box-shadow: #bfbfbf 0 0 1px;
+.tableBox {
+  padding: 20px;
+  margin-top: 10px;
+  background-color: #fff;
+  box-shadow: #bfbfbf 0 0 1px;
 
-        .row-green {
-            color: #e07010;
-            font-weight: 600;
-        }
+  .row-green {
+    color: #e07010;
+    font-weight: 600;
+  }
 
-        .block {
-            .el-pagination {
-                margin-top: 30px;
-                float: right;
-            }
-        }
+  .block {
+    .el-pagination {
+      margin-top: 30px;
+      float: right;
     }
+  }
+}
 </style>

admin/src/views/schemeGlobal/itemEdit.vue

@@ -1,143 +1,157 @@
 <template>
-    <div>
-        <el-container>
-            <el-main>
-                <el-form :model="form" :rules="rules" ref="ruleForm" label-width="100px">
-                    <el-form-item label="名称" prop="name">
-                        <el-input style="width: 300px" v-model="form.name"/>
-                    </el-form-item>
-                    <el-form-item label="标识" prop="tag">
-                        <el-input style="width: 300px" v-model="form.tag"/>
-                    </el-form-item>
-                </el-form>
-            </el-main>
-            <el-footer>
-                <div class="bodyBox">
-                    <div style="display: flex;">
-                        <el-button type="primary" @click="onSubmit('ruleForm')">
-                            {{btn}}
-                        </el-button>
-                        <el-button @click="close">
-                            取消
-                        </el-button>
-                    </div>
-                </div>
-            </el-footer>
-        </el-container>
-    </div>
+  <div>
+    <el-container>
+      <el-main>
+        <el-form :model="form" :rules="rules" ref="ruleForm" label-width="100px">
+          <el-form-item label="名称" prop="name">
+            <el-input style="width: 300px" v-model="form.name" />
+          </el-form-item>
+          <el-form-item label="标识" prop="tag">
+            <el-input style="width: 300px" v-model="form.tag" />
+          </el-form-item>
+        </el-form>
+      </el-main>
+      <el-footer>
+        <div class="bodyBox">
+          <div style="display: flex;">
+            <el-button type="primary" @click="onSubmit('ruleForm')">
+              {{btn}}
+            </el-button>
+            <el-button @click="close">
+              取消
+            </el-button>
+          </div>
+        </div>
+      </el-footer>
+    </el-container>
+  </div>
 </template>
 
 <script>
-    import {post, get} from '@/api/common'
-    export default {
-        name: "itemEdit",
-        data() {
-            return {
-                form: {
-                    name: '',
-                    tag: '',
-                    status: 0
-                },
-                rules: {
-                    name: [
-                        {required: true, message: '请输入名称', trigger: 'blur'},
-                    ],
-                    tag: [
-                        {required: true, message: '请输入标签', trigger: 'blur'},
-                    ]
-                },
-                btn: '新建',
-            }
-        },
-        created() {
-            document.title = '管理项登记'
+import { post, get } from '@/api/common'
+import { addchemeGlobal } from './api'
+export default {
+  name: "itemEdit",
+  data () {
+    return {
+      form: {
+        name: '',
+        tag: '',
+        status: 0
+      },
+      rules: {
+        name: [
+          { required: true, message: '请输入名称', trigger: 'blur' },
+        ],
+        tag: [
+          { required: true, message: '请输入标签', trigger: 'blur' },
+        ]
+      },
+      btn: '新建',
+    }
+  },
+  created () {
+    document.title = '管理项登记'
+    if (this.$route.query.id) {
+      get('/strategyglobalinfo/page', { 'id': this.$route.query.id }).then(res => {
+        res = res.data.list[0];
+        this.form = res;
+        console.log(this.form)
+
+      });
+      this.btn = '修改'
+    }
+  },
+  methods: {
+    // 提交按钮
+    onSubmit: function (formName) {
+      this.$confirm('您确定编辑该项？当前操作会影响所有相关测试', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
             if (this.$route.query.id) {
-                get('/strategyglobalinfo/page', {'id': this.$route.query.id}).then(res => {
-                    res = res.data.list[0];
-                    this.form = res;
-                    console.log(this.form)
+              post('/strategyglobalinfo/update/' + this.$route.query.id, this.form).then(res => {
+                this.$message({
+                  message: res.message,
+                  type: 'success',
+                  duration: 3000,
+                  offset: 360
+                })
+                setTimeout(() => { this.$router.back()() }, 1200)
+              }).catch(error => {
+                console.log(error)
+              })
+            } else {
+              let updata = {
+                name: this.form.name,
+                tag: this.form.tag,
+                status: 0,
+              };
+              addchemeGlobal(updata).then(res => {
+                console.log(res)
+                this.$message({
+                  message: res.message,
+                  type: 'success',
+                  duration: 3000,
+                  offset: 360
+                })
+                setTimeout(() => { this.$router.back() }, 1200)
+              }).catch(error => {
+                console.log(error)
+              })
 
-                });
-                this.btn = '修改'
+              // post('/strategyglobalinfo/create', updata).then(res => {
+              //   console.log(res)
+              //   this.$message({
+              //     message: res.message,
+              //     type: 'success',
+              //     duration: 3000,
+              //     offset: 360
+              //   })
+              //   setTimeout(() => { this.$router.back()}, 1200)
+              // }).catch(error => {
+              //   console.log(error)
+              // })
             }
-        },
-        methods: {
-            // 提交按钮
-            onSubmit: function (formName) {
-                this.$confirm('您确定编辑该项？当前操作会影响所有相关测试', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    this.$refs[formName].validate((valid) => {
-                        if (valid) {
-                            if (this.$route.query.id) {
-                                post('/strategyglobalinfo/update/'+this.$route.query.id, this.form).then(res => {
-                                    this.$message({
-                                        message: res.message,
-                                        type: 'success',
-                                        duration: 3000,
-                                        offset: 360
-                                    })
-                                    setTimeout(() => {this.$router.back()()}, 1200)
-                                }).catch(error => {
-                                    console.log(error)
-                                })
-                            } else {
-                                let updata = {
-                                    name : this.form.name,
-                                    tag : this.form.tag,
-                                    status : 0,
-                                };
-                                post('/strategyglobalinfo/create', updata).then(res => {
-                                    console.log(res)
-                                    this.$message({
-                                        message: res.message,
-                                        type: 'success',
-                                        duration: 3000,
-                                        offset: 360
-                                    })
-                                    setTimeout(() => {this.$router.back()()}, 1200)
-                                }).catch(error => {
-                                    console.log(error)
-                                })
-                            }
-                        } else {
-                            console.log('error submit!!');
-                            return false;
-                        }
-                    });
-                }).catch(() => {
-                    this.$message({
-                        type: 'info',
-                        message: '已取消'
-                    });
-                });
-            },
+          } else {
+            console.log('error submit!!');
+            return false;
+          }
+        });
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消'
+        });
+      });
+    },
 
-            // 取消按钮
-            close() {
-                this.$confirm('此操作不会保存已编辑数据, 是否继续?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    window.location.href = 'about:blank'
-                    this.$router.back()()
-                }).catch(() => {
-                    this.$message({
-                        type: 'info',
-                        message: '已取消'
-                    });
-                });
-            }
-        }
+    // 取消按钮
+    close () {
+      this.$confirm('此操作不会保存已编辑数据, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        window.location.href = 'about:blank'
+        this.$router.back()()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消'
+        });
+      });
     }
+  }
+}
 </script>
 
 <style lang="scss">
-    .avatar {
-        width: 100%;
-        max-width: 500px;
-    }
+.avatar {
+  width: 100%;
+  max-width: 500px;
+}
 </style>

admin/src/views/schemeGlobal/itemGlobal.vue

@@ -16,17 +16,7 @@
             <vxe-button @click="init()">刷新</vxe-button>
           </template>
         </vxe-toolbar>
-        <vxe-table
-          border
-          resizable
-          keep-source
-          show-overflow
-          highlight-hover-row
-          ref="xTable"
-          :data="tableData"
-          :edit-config="{ trigger: 'click', mode: 'cell', showStatus: true }"
-          @edit-closed="editClosedEvent"
-        >
+        <vxe-table border resizable keep-source show-overflow highlight-hover-row ref="xTable" :data="tableData" :edit-config="{ trigger: 'click', mode: 'cell', showStatus: true }" @edit-closed="editClosedEvent">
           <vxe-table-column field="name" title="名称" />
           <vxe-table-column field="tag" title="标识" />
           <vxe-table-column field="createtime" title="创建时间" width="200" />
@@ -43,21 +33,14 @@
             </template>
           </vxe-table-column>
         </vxe-table>
-        <vxe-pager
-          :loading="loading"
-          :current-page="searchForm.pageNum"
-          :page-size="searchForm.pageSize"
-          :total="searchForm.totalResult"
-          :layouts="[
+        <vxe-pager :loading="loading" :current-page="searchForm.pageNum" :page-size="searchForm.pageSize" :total="searchForm.totalResult" :layouts="[
             'PrevPage',
             'JumpNumber',
             'NextPage',
             'FullJump',
             'Sizes',
             'Total',
-          ]"
-          @page-change="handlePageChange"
-        />
+          ]" @page-change="handlePageChange" />
       </el-main>
     </el-container>
   </div>
@@ -65,9 +48,10 @@
 
 <script>
 import { post, get } from "@/api/common";
+import { listItem, listSchemeGlobal } from './api'
 export default {
   name: "Index",
-  data() {
+  data () {
     return {
       //搜索相关
       searchForm: {
@@ -85,22 +69,25 @@ export default {
       userName: "",
     };
   },
-  created() {
+  created () {
     console.log("用户：", this.$store.state.user.name);
     this.userName = this.$store.state.user.name;
+    this.init();
   },
-  mounted() {
+  mounted () {
     this.init();
   },
   methods: {
-    init() {
-      get("/strategyglobalinfo/page", this.searchForm).then((res) => {
+    init () {
+      console.log(111111111)
+      listSchemeGlobal(this.searchForm).then(res => {
         this.tableData = res.data.list;
         this.total = res.data.total;
         this.searchForm.totalResult = res.data.total;
-      });
+
+      })
     },
-    editClosedEvent({ row, column }) {
+    editClosedEvent ({ row, column }) {
       const $table = this.$refs.xTable;
       const field = column.property;
       const cellValue = row[field];
@@ -120,15 +107,16 @@ export default {
         }, 300);
       }
     },
-    toAdd(e) {
+    toAdd (e) {
       //   const routeUrl = this.$router.resolve({
       //     path: "/schemeGlobal/itemEdit",
       //     query: { id: e.id },
       //   });
       //   window.open(routeUrl.href, "_blank");
+
       this.$router.push("/schemeGlobal/itemEdit");
     },
-    del(row) {
+    del (row) {
       this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -138,7 +126,7 @@ export default {
           const $table = this.$refs.xTable;
           $table.remove(row);
           post("/strategyglobalinfo/delete", { ids: [row.id] }).then(
-            (res) => {}
+            (res) => { }
           );
         })
         .catch(() => {
@@ -148,7 +136,7 @@ export default {
           });
         });
     },
-    handlePageChange({ currentPage, pageSize }) {
+    handlePageChange ({ currentPage, pageSize }) {
       this.searchForm.pageNum = currentPage;
       this.searchForm.pageSize = pageSize;
       this.init();

admin/src/views/schemeV2/index.vue

@@ -1,93 +1,91 @@
 <template>
-  <div>
-    <el-container>
-      <!--搜索-->
-      <el-header class="searchBox">
-        <el-form :inline="true" :model="searchForm" ref="searchForm" class="demo-form-inline">
-          <el-form-item label="策略名称">
-            <el-input v-model="searchForm.strategyName" name="searchForm.strategyName" placeholder="策略名称" size="mini" />
-          </el-form-item>
-          <el-form-item label="策略类型">
-            <el-select v-model="searchForm.strategyType" filterable placeholder="请选择" size="mini">
-              <el-option label="基本" :value="0" />
-              <el-option label="活动" :value="1" />
-              <el-option label="测试" :value="2" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="生效状态">
-            <el-select v-model="searchForm.strategyStatus" filterable placeholder="请选择" size="mini">
-              <el-option label="生效中" :value="1" />
-              <el-option label="未生效" :value="0" />
-            </el-select>
-          </el-form-item>
+  <div class="app-container">
+    <!--搜索-->
+    <el-form :inline="true" :model="searchForm" ref="searchForm" class="demo-form-inline">
+      <el-form-item label="策略名称">
+        <el-input v-model="searchForm.strategyName" name="searchForm.strategyName" placeholder="策略名称" size="mini" />
+      </el-form-item>
+      <el-form-item label="策略类型">
+        <el-select v-model="searchForm.strategyType" filterable placeholder="请选择" size="mini">
+          <el-option label="基本" :value="0" />
+          <el-option label="活动" :value="1" />
+          <el-option label="测试" :value="2" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="生效状态">
+        <el-select v-model="searchForm.strategyStatus" filterable placeholder="请选择" size="mini">
+          <el-option label="生效中" :value="1" />
+          <el-option label="未生效" :value="0" />
+        </el-select>
+      </el-form-item>
 
-          <el-form-item style="float: right">
-            <el-button type="primary" @click="init()" size="mini">搜索</el-button>
-            <el-button @click="reset('searchForm')" size="mini">重置</el-button>
-          </el-form-item>
-        </el-form>
-      </el-header>
+      <el-form-item>
+        <el-button type="primary" @click="init()" size="mini">搜索</el-button>
+        <el-button @click="reset('searchForm')" size="mini">重置</el-button>
+      </el-form-item>
+    </el-form>
 
-      <vxe-toolbar>
-        <template #buttons>
-          <vxe-button icon="fa fa-plus" @click="toAdd" size="mini">新增</vxe-button>
-          <vxe-button @click="init()" size="mini">刷新</vxe-button>
-          <vxe-button status="primary" style="float: right" icon="fa fa-plus" @click="value5 = true" size="mini">历史记录</vxe-button>
+    <el-form>
+      <el-form-item>
+        <el-button @click="toAdd" size="mini" type="primary" plain icon="el-icon-plus">新增</el-button>
+        <el-button @click="init()" size="mini" icon="el-icon-delete">刷新</el-button>
+        <el-button @click="value5 = true" size="mini" icon="fa fa-plus" type="primary">历史记录</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!--表格-->
+    <el-table :data="tableData">
+      <el-table-column prop="strategyName" label="策略名称"></el-table-column>
+      <el-table-column prop="maskText" label="策略备注" align="center"></el-table-column>
+      <el-table-column prop="strategyType" label="策略类型" align="center">
+        <template slot-scope="scope">
+          {{ strategyType[scope.row.strategyType].label }}
         </template>
-      </vxe-toolbar>
-      <!--表格-->
-      <el-table :data="tableData" row-key="id" ref="xTable" :edit-config="{ trigger: 'click', mode: 'cell', showStatus: true }">
-        <el-table-column prop="strategyName" label="策略名称" :edit-render="{ name: 'input' }"></el-table-column>
-        <el-table-column prop="maskText" label="策略备注" align="center"></el-table-column>
-        <el-table-column prop="strategyType" label="策略类型" align="center">
-          <template slot-scope="scope">
-            {{ strategyType[scope.row.strategyType].label }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="strategyStatus" label="状态" align="center">
-          <template slot-scope="scope">
-            <el-switch :value="scope.row.strategyStatus" :active-value="1" :inactive-value="0"></el-switch>
-          </template>
-        </el-table-column>
+      </el-table-column>
+      <el-table-column prop="strategyStatus" label="状态" align="center">
+        <template slot-scope="scope">
+          <el-switch :value="scope.row.strategyStatus" :active-value="1" :inactive-value="0"></el-switch>
+        </template>
+      </el-table-column>
 
-        <el-table-column prop="templateId" label="使用模板" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.templateName }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
-        <el-table-column label="操作" align="center">
-          <template slot-scope="scope">
+      <el-table-column prop="templateId" label="使用模板" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.templateName }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
+      <el-table-column label="操作" align="center">
+        <template slot-scope="scope">
+
+          <el-button @click="toEdit(scope.row.id)" icon="el-icon-edit" size="mini" type="text">编辑</el-button>
+          <el-button @click="toCopy(scope.row.id)" size="mini" icon="el-icon-set-up" type="text">复制</el-button>
+          <el-button @click="del(scope.row.id)" size="mini" icon="el-icon-delete" type="text">删除</el-button>
 
-            <el-button @click="toEdit(scope.row.id)" size="mini">编辑</el-button>
-            <el-button @click="toCopy(scope.row.id)" size="mini">复制</el-button>
-            <el-button @click="del(scope.row.id)" size="mini">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
 
+    <!-- 历史记录 -->
+    <vxe-modal v-model="value5" width="60%" title="历史记录">
+      <template #default>
+        <vxe-toolbar>
+          <template #buttons>
+            <vxe-input v-model="schemelogParam.notes" type="search" clearable placeholder="搜索操作记录"></vxe-input>
+            <vxe-input v-model="schemelogParam.userName" type="search" clearable placeholder="搜索操作人"></vxe-input>
+            <vxe-button @click="searchEvent" content="搜索"></vxe-button>
           </template>
-        </el-table-column>
-      </el-table>
+        </vxe-toolbar>
 
-      <!-- 历史记录 -->
-      <vxe-modal v-model="value5" width="60%" title="历史记录">
-        <template #default>
-          <vxe-toolbar>
-            <template #buttons>
-              <vxe-input v-model="schemelogParam.notes" type="search" clearable placeholder="搜索操作记录"></vxe-input>
-              <vxe-input v-model="schemelogParam.userName" type="search" clearable placeholder="搜索操作人"></vxe-input>
-              <vxe-button @click="searchEvent" content="搜索"></vxe-button>
+        <vxe-table auto-resize height="600" :data="schemelog">
+          <vxe-table-column field="createTime" title="时间"></vxe-table-column>
+          <vxe-table-column field="notes" title="操作记录">
+            <template slot-scope="props">
+              <div v-html="props.row.notes"></div>
             </template>
-          </vxe-toolbar>
-
-          <vxe-table auto-resize height="600" :data="schemelog">
-            <vxe-table-column field="createTime" title="时间"></vxe-table-column>
-            <vxe-table-column field="notes" title="操作记录">
-              <template slot-scope="props">
-                <div v-html="props.row.notes"></div>
-              </template>
-            </vxe-table-column>
-            <vxe-table-column field="userName" title="操作人"></vxe-table-column>
-          </vxe-table>
-          <vxe-pager :loading="loading" :current-page="schemelogParam.pageNum" :page-size="schemelogParam.pageSize" :total="schemelogParam.totalResult" :layouts="[
+          </vxe-table-column>
+          <vxe-table-column field="userName" title="操作人"></vxe-table-column>
+        </vxe-table>
+        <vxe-pager :loading="loading" :current-page="schemelogParam.pageNum" :page-size="schemelogParam.pageSize" :total="schemelogParam.totalResult" :layouts="[
                 'PrevPage',
                 'JumpNumber',
                 'NextPage',
@@ -95,10 +93,9 @@
                 'Sizes',
                 'Total',
               ]" @page-change="handlePageChangeChannelog" />
-        </template>
-      </vxe-modal>
+      </template>
+    </vxe-modal>
 
-    </el-container>
   </div>
 </template>
 
@@ -166,7 +163,7 @@ export default {
       'pageSize': 100,
       'pageNum': 1
     }).then(res => {
-      console.log(res)
+      // console.log(res)
       res.data.list.map(res => {
         res.templatePhoto = process.env.VUE_APP_BASE_IMG_URL + res.templatePhoto
         res.label = res.templateName
@@ -270,33 +267,4 @@ export default {
 </script>
 
 <style lang="scss">
-.searchBox {
-  background-color: #fff;
-  border-radius: 4px;
-  box-shadow: #bfbfbf 0 0 2px;
-  height: unset !important;
-  padding: 10px 10px;
-
-  form {
-    margin: auto;
-
-    .el-form-item {
-      margin: 5px 5px;
-    }
-  }
-}
-
-.tableBox {
-  margin-top: 10px;
-  background-color: #fff;
-  border-radius: 4px;
-  box-shadow: #bfbfbf 0 0 2px;
-
-  .block {
-    .el-pagination {
-      margin-top: 30px;
-      float: right;
-    }
-  }
-}
 </style>