lilei 2 лет назад
Родитель
Сommit
248eaaba20

+ 2 - 1
src/views/equipmentManage/network/network.vue

@@ -64,6 +64,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
+      :scroll="{ x: 1720}"
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
@@ -132,7 +133,7 @@ export default {
         { title: '详细地址', dataIndex: 'address', width: 200, align: 'center' },
         { title: '兑换规则', dataIndex: 'exRuleName', width: 200, align: 'center' },
         { title: '投放时间段名称', dataIndex: 'timeRuleName', width: 200, align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center',fixed:'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 4 - 4
src/views/power/OperateJournal/OperateJournal.vue

@@ -101,12 +101,12 @@ export default {
 		    searchData.endDate = ''
 		  }
         return journalList(searchData).then(res => {
-          const no = (res.data.data.pageNo - 1) * res.data.data.pageSize
-          for (let i = 0; i < res.data.data.list.length; i++) {
-            const _item = res.data.data.list[i]
+          const no = (res.data.pageNo - 1) * res.data.pageSize
+          for (let i = 0; i < res.data.list.length; i++) {
+            const _item = res.data.list[i]
             _item.no = no + i + 1
           }
-          return res.data.data
+          return res.data
         })
       }
     }

+ 2 - 2
vue.config.js

@@ -108,8 +108,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.16.103:8301/gc-admin/',
-        target: 'https://lese.test.sxzxyj.net/gc-admin/',
+        target: 'http://60.205.185.108:8889/gc-admin/',
+        // target: 'https://lese.test.sxzxyj.net/gc-admin/',
         ws: false,
         changeOrigin: true,
         pathRewrite: {