vue2-client 1.6.48 → 1.7.0

package/src/pages/CreateQueryPage.vue

@@ -1,84 +1,84 @@
-<template>
-  <div>
-    <create-query
-      :visible.sync="visible"
-      @saveQueryParams="saveQueryParams"
-    />
-    <create-simple-form-query
-      :visible.sync="createSimpleFormVisible"
-      @saveSimpleFormQueryParams="saveSimpleFormQueryParams"
-    />
-    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="showDrawer">打开完整查询配置生成工具
-    </a-button>
-    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="showSimpleFormQueryParamsDrawer">
-      打开基础表单配置生成工具
-    </a-button>
-    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="searchReport">请求数据</a-button>
-    <!--    <webmeter-analysis-view/>-->
-  </div>
-</template>
-
-<script>
-import { post } from '@vue2-client/services/api/restTools'
-import CreateQuery from '@vue2-client/base-client/components/common/CreateQuery'
-import CreateSimpleFormQuery from '@vue2-client/base-client/components/common/CreateSimpleFormQuery'
-
-export default {
-  name: 'CreateQueryPage',
-  components: {
-    CreateQuery,
-    CreateSimpleFormQuery
-  },
-  data () {
-    return {
-      visible: false,
-      createSimpleFormVisible: false
-    }
-  },
-  methods: {
-    showDrawer () {
-      this.visible = true
-    },
-    showSimpleFormQueryParamsDrawer () {
-      this.createSimpleFormVisible = true
-    },
-    // 查询report
-    searchReport (source) {
-      return post('/rs/report/saleMonthReport', {
-        'data': {
-          'condition': ' 1=1 ',
-          'startDate': '2022-11-21 00:00:00',
-          'endDate': '2022-11-21 23:59:59',
-          'f_orgid': 'f_orgid in (21142)'
-        }
-      }).then(res => {
-        this.$message.success(res)
-      }, err => {
-        console.error(err)
-      })
-    },
-    // 存储查询配置信息
-    saveQueryParams (source) {
-      return post('/api/af-system/logic/addOrEditQueryParams', {
-        source: source
-      }).then(res => {
-        this.$message.success('保存查询配置成功')
-      }, err => {
-        console.error(err)
-      })
-    },
-    // 存储基础表单配置信息
-    saveSimpleFormQueryParams (source) {
-      return post('/api/af-system/logic/addOrEditSimpleFormQueryParams', {
-        source: source
-      }).then(res => {
-        this.$message.success('保存基础表单配置成功')
-      }, err => {
-        console.error(err)
-      })
-    }
-  }
-}
-</script>
-<style lang="less" scoped>
-</style>
+<template>
+  <div>
+    <create-query
+      :visible.sync="visible"
+      @saveQueryParams="saveQueryParams"
+    />
+    <create-simple-form-query
+      :visible.sync="createSimpleFormVisible"
+      @saveSimpleFormQueryParams="saveSimpleFormQueryParams"
+    />
+    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="showDrawer">打开完整查询配置生成工具
+    </a-button>
+    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="showSimpleFormQueryParamsDrawer">
+      打开基础表单配置生成工具
+    </a-button>
+    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="searchReport">请求数据</a-button>
+    <!--    <webmeter-analysis-view/>-->
+  </div>
+</template>
+
+<script>
+import { post } from '@vue2-client/services/api/restTools'
+import CreateQuery from '@vue2-client/base-client/components/common/CreateQuery'
+import CreateSimpleFormQuery from '@vue2-client/base-client/components/common/CreateSimpleFormQuery'
+
+export default {
+  name: 'CreateQueryPage',
+  components: {
+    CreateQuery,
+    CreateSimpleFormQuery
+  },
+  data () {
+    return {
+      visible: false,
+      createSimpleFormVisible: false
+    }
+  },
+  methods: {
+    showDrawer () {
+      this.visible = true
+    },
+    showSimpleFormQueryParamsDrawer () {
+      this.createSimpleFormVisible = true
+    },
+    // 查询report
+    searchReport (source) {
+      return post('/rs/report/saleMonthReport', {
+        'data': {
+          'condition': ' 1=1 ',
+          'startDate': '2022-11-21 00:00:00',
+          'endDate': '2022-11-21 23:59:59',
+          'f_orgid': 'f_orgid in (21142)'
+        }
+      }).then(res => {
+        this.$message.success(res)
+      }, err => {
+        console.error(err)
+      })
+    },
+    // 存储查询配置信息
+    saveQueryParams (source) {
+      return post('/api/system/logic/addOrEditQueryParams', {
+        source: source
+      }).then(res => {
+        this.$message.success('保存查询配置成功')
+      }, err => {
+        console.error(err)
+      })
+    },
+    // 存储基础表单配置信息
+    saveSimpleFormQueryParams (source) {
+      return post('/api/system/logic/addOrEditSimpleFormQueryParams', {
+        source: source
+      }).then(res => {
+        this.$message.success('保存基础表单配置成功')
+      }, err => {
+        console.error(err)
+      })
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+</style>

package/src/pages/login/Login.vue

@@ -131,7 +131,10 @@ export default {
     },
     afterLoginV4 (res) {
       this.setV4AccessToken(res)
-      const data = res.resources
+      let data = res.resources
+      if (data.data) {
+        data = data.data
+      }
       this.$login.login(data).then(() => {
         this.afterGeneral(data)
         if (data.deps === '用户工单登记') {

package/src/pages/report/ReportTableHome.vue

@@ -20,7 +20,7 @@
     },
     methods: {
       async getData () {
-        this.tableData = await post('/api/af-system/logic/reportTest', {})
+        this.tableData = await post('/api/system/logic/reportTest', {})
         console.log('数据=>', JSON.stringify(this.tableData))
       }
     }

package/src/pages/system/dictionary/index.vue

@@ -1,43 +1,43 @@
-<template>
-  <a-card :bordered="false">
-    <dictionary-details-view
-      v-if="selectId"
-      :id="selectId"
-      :visible.sync="detailVisible"
-    />
-    <x-form-table
-      :queryParamsName="queryParamsName"
-      title="字典"
-      @action="toDetail">
-    </x-form-table>
-  </a-card>
-</template>
-
-<script>
-  import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-  import DictionaryDetailsView from '@vue2-client/base-client/components/system/DictionaryDetailsView'
-
-  export default {
-    name: 'Dictionary',
-    components: {
-      XFormTable,
-      DictionaryDetailsView
-    },
-    data () {
-      return {
-        // 选中的编号
-        selectId: undefined,
-        // 查询配置文件名
-        queryParamsName: 'dictionaryQueryParams',
-        // 是否显示详情抽屉
-        detailVisible: false
-      }
-    },
-    methods: {
-      toDetail (record, id) {
-        this.selectId = id + ''
-        this.detailVisible = true
-      }
-    }
-  }
-</script>
+<template>
+  <a-card :bordered="false">
+    <dictionary-details-view
+      v-if="selectId"
+      :id="selectId"
+      :visible.sync="detailVisible"
+    />
+    <x-form-table
+      :queryParamsName="queryParamsName"
+      title="字典"
+      @action="toDetail">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+  import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
+  import DictionaryDetailsView from '@vue2-client/base-client/components/system/DictionaryDetailsView'
+
+  export default {
+    name: 'Dictionary',
+    components: {
+      XFormTable,
+      DictionaryDetailsView
+    },
+    data () {
+      return {
+        // 选中的编号
+        selectId: undefined,
+        // 查询配置文件名
+        queryParamsName: 'crud_dictionary_manage',
+        // 是否显示详情抽屉
+        detailVisible: false
+      }
+    },
+    methods: {
+      toDetail (record, id) {
+        this.selectId = id + ''
+        this.detailVisible = true
+      }
+    }
+  }
+</script>

package/src/pages/system/file/index.vue

@@ -195,10 +195,10 @@ export default {
     getStockList () {
       this.loading = true
       // 请求仓库列表
-      post('/api/af-system/logic/getFilesStock', {}).then(res => {
+      post('/api/system/logic/getFilesStock', {}).then(res => {
         this.data = res.sort((a, b) => a.progress - b.progress)
         // 请求仓库列表
-        post('/api/af-system/logic/getFilesColl', {}).then(res => {
+        post('/api/system/logic/getFilesColl', {}).then(res => {
           this.coll = res
           this.loading = false
         })
@@ -269,7 +269,7 @@ export default {
     },
     submitStock () {
       // 保存仓库信息
-      post('/api/af-system/entity/t_files_manager', this.form).then(res => {
+      post('/api/system/entity/t_files_manager', this.form).then(res => {
         this.$message.success('提交成功')
         this.visible = false
         this.getStockList()

package/src/pages/system/monitor/loginInfor/index.vue

@@ -1,36 +1,36 @@
-<template>
-  <a-card :bordered="false">
-    <x-form-table
-      title="登录日志"
-      :queryParamsName="queryParamsName"
-      @action="toDetail">
-    </x-form-table>
-  </a-card>
-</template>
-
-<script>
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-
-export default {
-  name: 'loginInfor',
-  components: {
-    XFormTable
-  },
-  data () {
-    return {
-      // 选中的编号
-      selectNo: undefined,
-      // 查询配置文件名
-      queryParamsName: 'loginInforQueryParams',
-      // 是否显示详情抽屉
-      detailVisible: false
-    }
-  },
-  methods: {
-    toDetail (record, id) {
-      this.selectNo = id + ''
-      this.detailVisible = true
-    }
-  }
-}
-</script>
+<template>
+  <a-card :bordered="false">
+    <x-form-table
+      title="登录日志"
+      :queryParamsName="queryParamsName"
+      @action="toDetail">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
+
+export default {
+  name: 'loginInfor',
+  components: {
+    XFormTable
+  },
+  data () {
+    return {
+      // 选中的编号
+      selectNo: undefined,
+      // 查询配置文件名
+      queryParamsName: 'crud_login_infor_manage',
+      // 是否显示详情抽屉
+      detailVisible: false
+    }
+  },
+  methods: {
+    toDetail (record, id) {
+      this.selectNo = id + ''
+      this.detailVisible = true
+    }
+  }
+}
+</script>

package/src/pages/system/monitor/operLog/index.vue

@@ -1,36 +1,36 @@
-<template>
-  <a-card :bordered="false">
-    <x-form-table
-      title="操作日志"
-      :queryParamsName="queryParamsName"
-      @action="toDetail">
-    </x-form-table>
-  </a-card>
-</template>
-
-<script>
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-
-export default {
-  name: 'operLog',
-  components: {
-    XFormTable
-  },
-  data () {
-    return {
-      // 选中的编号
-      selectNo: undefined,
-      // 查询配置文件名
-      queryParamsName: 'operLogQueryParams',
-      // 是否显示详情抽屉
-      detailVisible: false
-    }
-  },
-  methods: {
-    toDetail (record, id) {
-      this.selectNo = id + ''
-      this.detailVisible = true
-    }
-  }
-}
-</script>
+<template>
+  <a-card :bordered="false">
+    <x-form-table
+      title="操作日志"
+      :queryParamsName="queryParamsName"
+      @action="toDetail">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
+
+export default {
+  name: 'operLog',
+  components: {
+    XFormTable
+  },
+  data () {
+    return {
+      // 选中的编号
+      selectNo: undefined,
+      // 查询配置文件名
+      queryParamsName: 'crud_oper_log_manage',
+      // 是否显示详情抽屉
+      detailVisible: false
+    }
+  },
+  methods: {
+    toDetail (record, id) {
+      this.selectNo = id + ''
+      this.detailVisible = true
+    }
+  }
+}
+</script>

package/src/router/async/router.map.js

@@ -21,8 +21,6 @@ routerResource.workplace = () => import('@vue2-client/pages/dashboard/workplace'
 routerResource.system = view.blank
 // 字典管理
 routerResource.dictionaryManage = () => import('@vue2-client/pages/system/dictionary')
-// 查询配置管理
-routerResource.queryParamsManage = () => import('@vue2-client/pages/system/queryParams')
 // 文件管理
 routerResource.fileManager = () => import('@vue2-client/pages/system/file')
 // 登录日志

package/src/services/api/DictionaryDetailsViewApi.js

@@ -1,6 +1,6 @@
 const DictionaryDetailsViewApi = {
   // 查询：获取字典详情
-  getDictionaryDetails: '/api/af-system/logic/getDictionaryDetails'
+  getDictionaryDetails: '/api/system/logic/getDictionaryDetails'
 }
 
 export { DictionaryDetailsViewApi }

package/src/services/api/LogDetailsViewApi.js

@@ -1,10 +1,10 @@
 const LogDetailsViewApi = {
   // 查询：获取日志详情
-  getLogDetails: '/api/af-system/logic/foreignaidGetLogDetails',
+  getLogDetails: '/api/system/logic/foreignaidGetLogDetails',
   // 查询：获取日志维护记录
-  getLogRecordList: '/api/af-system/logic/foreignaidGetRecordList',
+  getLogRecordList: '/api/system/logic/foreignaidGetRecordList',
   // 操作：更新日志状态
-  updateLogStatusData: '/api/af-system/logic/foreignaidUpdateLogStatus'
+  updateLogStatusData: '/api/system/logic/foreignaidUpdateLogStatus'
 }
 
 export { LogDetailsViewApi }

package/src/services/api/QueryParamsDetailsViewApi.js

@@ -1,6 +1,6 @@
 const QueryParamsDetailsViewApi = {
   // 查询：获取查询配置详情
-  getQueryParamsDetails: '/api/af-system/logic/getQueryParamsDetails'
+  getQueryParamsDetails: '/api/system/logic/getQueryParamsDetails'
 }
 
 export { QueryParamsDetailsViewApi }

package/src/services/api/TicketDetailsViewApi.js

@@ -1,34 +1,34 @@
 const TicketDetailsViewApi = {
   // 查询：获取工单流转详情
-  getTicketWorkFlowDetails: '/api/af-system/logic/getTicketWorkFlowDetails',
+  getTicketWorkFlowDetails: '/api/system/logic/getTicketWorkFlowDetails',
   // 查询：获取工单详情
-  getTicketDetails: '/api/af-system/logic/getTicketDetails',
+  getTicketDetails: '/api/system/logic/getTicketDetails',
   // 手动关闭工单
-  manualCloseTicket: '/api/af-system/logic/manualCloseTicket',
+  manualCloseTicket: '/api/system/logic/manualCloseTicket',
   // 转交工单给其他人
-  transferTicketToOthers: '/api/af-system/logic/transferTicketToOthers',
+  transferTicketToOthers: '/api/system/logic/transferTicketToOthers',
   // 确认工单，开始处理
-  confirmTicket: '/api/af-system/logic/confirmTicket',
+  confirmTicket: '/api/system/logic/confirmTicket',
   // 查询：获取订单详情用于订单追踪
-  getTicketDetailsForUploader: '/api/af-system/logic/getTicketDetailsForUploader',
+  getTicketDetailsForUploader: '/api/system/logic/getTicketDetailsForUploader',
   // 更新：将工单优先级增加
-  rushTicket: '/api/af-system/logic/rushTicket',
+  rushTicket: '/api/system/logic/rushTicket',
   // 客户手动关闭工单
-  manualCloseTicketByCustomer: '/api/af-system/logic/manualCloseTicketByCustomer',
+  manualCloseTicketByCustomer: '/api/system/logic/manualCloseTicketByCustomer',
   // 在工单提交页面删除照片
-  revocationImage: '/api/af-system/logic/revocationImage',
+  revocationImage: '/api/system/logic/revocationImage',
   // 在工单提交页面删除照片
-  getTicketImages: '/api/af-system/logic/getTicketImages',
+  getTicketImages: '/api/system/logic/getTicketImages',
   // 用户填写附加信息时取消了操作，将已上传的照片清空
-  removeAllImages: '/api/af-system/logic/removeAllImages',
+  removeAllImages: '/api/system/logic/removeAllImages',
   // 提交用户填写附加信息
-  AddonDescriptionToTicket: '/api/af-system/logic/AddonDescriptionToTicket',
+  AddonDescriptionToTicket: '/api/system/logic/AddonDescriptionToTicket',
   // 获取用户填写附加信息
-  getAddonDescription: '/api/af-system/logic/getAddonDescription',
+  getAddonDescription: '/api/system/logic/getAddonDescription',
   // 发起售后工单流程
-  createTicket: '/api/af-system/logic/createTicket',
+  createTicket: '/api/system/logic/createTicket',
   // 查询：获取所有员工名，供前端展示备选项
-  getAllEmployeeName: '/api/af-system/logic/getAllEmployeeName'
+  getAllEmployeeName: '/api/system/logic/getAllEmployeeName'
 }
 
 export { TicketDetailsViewApi }