update list response

2022-08-04 14:41:47 +08:00
parent d3752c4f40
commit 3df2939fb4
33 changed files with 79 additions and 76 deletions
--- a/src/mixins/view-module.js
+++ b/src/mixins/view-module.js
@@ -1,7 +1,7 @@
 import Cookies from 'js-cookie'
 import qs from 'qs'
 export default {
-  data () {
+  data() {
    /* eslint-disable */
    return {
      // 设置属性
@@ -29,22 +29,24 @@ export default {
    }
    /* eslint-enable */
  },
-  created () {
+  created() {
    if (this.mixinViewModuleOptions.createdIsNeed) {
      this.query()
    }
  },
-  activated () {
+  activated() {
    if (this.mixinViewModuleOptions.activatedIsNeed) {
      this.query()
    }
  },
  methods: {
    // 获取数据列表
-    query () {
+    query() {
      this.dataListLoading = true
      this.$http.get(
-        this.mixinViewModuleOptions.getDataListURL,
+        this.$http.adornUrl(
+          this.mixinViewModuleOptions.getDataListURL
+        ),
        {
          params: {
            order: this.order,
@@ -68,11 +70,11 @@ export default {
      })
    },
    // 多选
-    dataListSelectionChangeHandle (val) {
+    dataListSelectionChangeHandle(val) {
      this.dataListSelections = val
    },
    // 排序
-    dataListSortChangeHandle (data) {
+    dataListSortChangeHandle(data) {
      if (!data.order || !data.prop) {
        this.order = ''
        this.orderField = ''
@@ -83,13 +85,13 @@ export default {
      this.query()
    },
    // 分页, 每页条数
-    pageSizeChangeHandle (val) {
+    pageSizeChangeHandle(val) {
      this.page = 1
      this.limit = val
      this.query()
    },
    // 分页, 当前页
-    pageCurrentChangeHandle (val) {
+    pageCurrentChangeHandle(val) {
      this.page = val
      this.query()
    },
@@ -98,7 +100,7 @@ export default {
      this.query()
    },
    // 新增 / 修改
-    addOrUpdateHandle (id) {
+    addOrUpdateHandle(id) {
      this.addOrUpdateVisible = true
      this.$nextTick(() => {
        this.$refs.addOrUpdate.dataForm.id = id
@@ -106,7 +108,7 @@ export default {
      })
    },
    // 关闭当前窗口
-    closeCurrentTab (data) {
+    closeCurrentTab(data) {
      var tabName = this.$store.state.contentTabsActiveName
      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name !== tabName)
      if (this.$store.state.contentTabs.length <= 0) {
@@ -118,7 +120,7 @@ export default {
      }
    },
    // 删除
-    deleteHandle (id) {
+    deleteHandle(id) {
      if (this.mixinViewModuleOptions.deleteIsBatch && !id && this.dataListSelections.length <= 0) {
        return this.$message({
          message: this.$t('prompt.deleteBatch'),
@@ -148,11 +150,11 @@ export default {
              this.query()
            }
          })
-        }).catch(() => {})
-      }).catch(() => {})
+        }).catch(() => { })
+      }).catch(() => { })
    },
    // 导出
-    exportHandle () {
+    exportHandle() {
      var params = qs.stringify({
        'token': Cookies.get('token'),
        ...this.dataForm
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -92,7 +92,7 @@ router.beforeEach((to, from, next) => {
    return next()
  }
  // 获取字典列表, 添加并全局变量保存
-  http.get('/sys/dict/type/all').then(({ data: res }) => {
+  http.get(http.adornUrl('/sys/dict/type/all')).then(({ data: res }) => {
    if (res.code !== 0) {
      return
    }
@@ -101,7 +101,7 @@ router.beforeEach((to, from, next) => {
    // console.log("catch /sys/dict/type/all", err)
  })
  // 获取菜单列表, 添加并全局变量保存
-  http.get('/sys/menu/nav').then(({ data: res }) => {
+  http.get(http.adornUrl('/sys/menu/nav')).then(({ data: res }) => {
    if (res.code !== 0) {
      Vue.prototype.$message.error(res.msg)
      return next({ name: 'login' })
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -68,7 +68,7 @@ http.interceptors.response.use(response => {
 */
 http.adornUrl = (actionName) => {
  // 非生产环境 && 开启代理, 接口前缀统一使用[/proxyApi/]前缀做代理拦截!
-  return (process.env.NODE_ENV !== 'production' && process.env.OPEN_PROXY ? '/proxyApi/' : window.SITE_CONFIG.baseUrl) + actionName
+  return (process.env.NODE_ENV !== 'production' && process.env.OPEN_PROXY ? '/proxyApi/' : window.SITE_CONFIG.projURL) + actionName
 }

 /**
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@@ -89,7 +89,7 @@ export default {
        cancelButtonText: this.$t('cancel'),
        type: 'warning'
      }).then(() => {
-        this.$http.post('/doLogout').then(({ data: res }) => {
+        this.$http.post(this.$http.adornUrl('/doLogout')).then(({ data: res }) => {
          if (res.code !== 200) {
            return this.$message.error(res.msg)
          }
--- a/src/views/modules/code/equipmenFile.vue
+++ b/src/views/modules/code/equipmenFile.vue
@@ -187,8 +187,8 @@
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.list
+            this.totalPage = data.total
          } else {
            this.dataList = []
            this.totalPage = 0
--- a/src/views/modules/code/equipmenGroup.vue
+++ b/src/views/modules/code/equipmenGroup.vue
@@ -169,8 +169,8 @@
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.list
+            this.totalPage = data.total
          } else {
            this.dataList = []
            this.totalPage = 0
--- a/src/views/modules/code/equipmenattr.vue
+++ b/src/views/modules/code/equipmenattr.vue
@@ -163,8 +163,8 @@
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.list
+            this.totalPage = data.total
          } else {
            this.dataList = []
            this.totalPage = 0
--- a/src/views/modules/code/equipment.vue
+++ b/src/views/modules/code/equipment.vue
@@ -251,8 +251,8 @@
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.list
+            this.totalPage = data.total
          } else {
            this.dataList = []
            this.totalPage = 0
--- a/src/views/modules/code/equipmentAlarmLog.vue
+++ b/src/views/modules/code/equipmentAlarmLog.vue
@@ -169,8 +169,8 @@
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.list
+            this.totalPage = data.total
          } else {
            this.dataList = []
            this.totalPage = 0
--- a/src/views/modules/code/equipmentGroupAlarm.vue
+++ b/src/views/modules/code/equipmentGroupAlarm.vue
@@ -199,8 +199,8 @@
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.list
+            this.totalPage = data.total
          } else {
            this.dataList = []
            this.totalPage = 0
--- a/src/views/modules/code/equipmentPlc.vue
+++ b/src/views/modules/code/equipmentPlc.vue
@@ -217,8 +217,8 @@
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.list
+            this.totalPage = data.total
          } else {
            this.dataList = []
            this.totalPage = 0
--- a/src/views/modules/code/equipmentPlcConnect.vue
+++ b/src/views/modules/code/equipmentPlcConnect.vue
@@ -163,8 +163,8 @@
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.list
+            this.totalPage = data.total
          } else {
            this.dataList = []
            this.totalPage = 0
--- a/src/views/modules/code/equipmentPlcParam.vue
+++ b/src/views/modules/code/equipmentPlcParam.vue
@@ -247,8 +247,8 @@
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.list
+            this.totalPage = data.total
          } else {
            this.dataList = []
            this.totalPage = 0
--- a/src/views/modules/code/equipmentQuantity.vue
+++ b/src/views/modules/code/equipmentQuantity.vue
@@ -193,8 +193,8 @@
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.list
+            this.totalPage = data.total
          } else {
            this.dataList = []
            this.totalPage = 0
--- a/src/views/modules/code/equipmentStatusLog.vue
+++ b/src/views/modules/code/equipmentStatusLog.vue
@@ -187,8 +187,8 @@
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.list
+            this.totalPage = data.total
          } else {
            this.dataList = []
            this.totalPage = 0
--- a/src/views/modules/code/equipmentType.vue
+++ b/src/views/modules/code/equipmentType.vue
@@ -181,8 +181,8 @@
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.list
+            this.totalPage = data.total
          } else {
            this.dataList = []
            this.totalPage = 0
--- a/src/views/modules/code/equipmentTypeFile.vue
+++ b/src/views/modules/code/equipmentTypeFile.vue
@@ -187,8 +187,8 @@
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.list
+            this.totalPage = data.total
          } else {
            this.dataList = []
            this.totalPage = 0
--- a/src/views/modules/code/factory.vue
+++ b/src/views/modules/code/factory.vue
@@ -172,7 +172,7 @@
      getDataList () {
        this.dataListLoading = true
        this.$http({
-          url: this.$http.adornUrl('/monitoring/factory/list'),
+          url: this.$http.adornUrl('/monitoring/factory/page'),
          method: 'get',
          params: this.$http.adornParams({
            'page': this.pageIndex,
@@ -181,8 +181,8 @@
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.list
+            this.totalPage = data.totalCount
          } else {
            this.dataList = []
            this.totalPage = 0
--- a/src/views/modules/code/producArrt.vue
+++ b/src/views/modules/code/producArrt.vue
@@ -187,8 +187,8 @@
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.list
+            this.totalPage = data.total
          } else {
            this.dataList = []
            this.totalPage = 0
--- a/src/views/modules/code/product.vue
+++ b/src/views/modules/code/product.vue
@@ -205,8 +205,8 @@
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.list
+            this.totalPage = data.total
          } else {
            this.dataList = []
            this.totalPage = 0
--- a/src/views/modules/code/productionLine.vue
+++ b/src/views/modules/code/productionLine.vue
@@ -193,8 +193,8 @@
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.list
+            this.totalPage = data.total
          } else {
            this.dataList = []
            this.totalPage = 0
--- a/src/views/modules/code/productionLineRecSch.vue
+++ b/src/views/modules/code/productionLineRecSch.vue
@@ -133,8 +133,8 @@
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.list
+            this.totalPage = data.total
          } else {
            this.dataList = []
            this.totalPage = 0
--- a/src/views/modules/code/qualityInspectionDet.vue
+++ b/src/views/modules/code/qualityInspectionDet.vue
@@ -163,8 +163,8 @@
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.list
+            this.totalPage = data.total
          } else {
            this.dataList = []
            this.totalPage = 0
--- a/src/views/modules/code/qualityInspectionRecord.vue
+++ b/src/views/modules/code/qualityInspectionRecord.vue
@@ -193,8 +193,8 @@
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.list
+            this.totalPage = data.total
          } else {
            this.dataList = []
            this.totalPage = 0
--- a/src/views/modules/code/qualityInspectionType.vue
+++ b/src/views/modules/code/qualityInspectionType.vue
@@ -157,8 +157,8 @@
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.list
+            this.totalPage = data.total
          } else {
            this.dataList = []
            this.totalPage = 0
--- a/src/views/modules/code/reportSheet.vue
+++ b/src/views/modules/code/reportSheet.vue
@@ -193,8 +193,8 @@
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.list
+            this.totalPage = data.total
          } else {
            this.dataList = []
            this.totalPage = 0
--- a/src/views/modules/code/reportSheetCategory.vue
+++ b/src/views/modules/code/reportSheetCategory.vue
@@ -175,8 +175,8 @@
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.list
+            this.totalPage = data.total
          } else {
            this.dataList = []
            this.totalPage = 0
--- a/src/views/modules/code/sysfile.vue
+++ b/src/views/modules/code/sysfile.vue
@@ -169,8 +169,8 @@
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.list
+            this.totalPage = data.total
          } else {
            this.dataList = []
            this.totalPage = 0
--- a/src/views/modules/code/sysfileType.vue
+++ b/src/views/modules/code/sysfileType.vue
@@ -157,8 +157,8 @@
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.list
+            this.totalPage = data.total
          } else {
            this.dataList = []
            this.totalPage = 0
--- a/src/views/modules/code/workShopSection.vue
+++ b/src/views/modules/code/workShopSection.vue
@@ -187,8 +187,8 @@
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.list
+            this.totalPage = data.total
          } else {
            this.dataList = []
            this.totalPage = 0
--- a/src/views/modules/code/workShopSectionEquipment.vue
+++ b/src/views/modules/code/workShopSectionEquipment.vue
@@ -163,8 +163,8 @@
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.list
+            this.totalPage = data.total
          } else {
            this.dataList = []
            this.totalPage = 0
--- a/src/views/pages/login.vue
+++ b/src/views/pages/login.vue
@@ -98,7 +98,7 @@ export default {
        if (!valid) {
          return false
        }
-        this.$http.post('/login', this.dataForm).then(({ data: res }) => {
+        this.$http.post(this.$http.adornUrl('/login'), this.dataForm).then(({ data: res }) => {
          if (res.code !== 200) {
            // this.getCaptcha()
            return this.$message.error(res.msg)