diff --git a/.env.development b/.env.development index 83f4b20..101621c 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,6 @@ NODE_ENV=development VUE_APP_API_BASE_URL=http://182.92.183.230:9999 +# VUE_APP_API_BASE_URL=http://192.168.0.111:9999 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview diff --git a/src/api/manage.js b/src/api/manage.js index 5ce1de7..411538c 100644 --- a/src/api/manage.js +++ b/src/api/manage.js @@ -1,6 +1,7 @@ import Vue from 'vue' import { axios } from '@/utils/request' import signMd5Utils from '@/utils/encryption/signMd5Utils' +import qs from "qs"; const api = { user: '/mock/api/user', @@ -65,6 +66,9 @@ export function getAction(url,parameter) { url: url, method: 'get', params: parameter, + paramsSerializer: function (params) { + return qs.stringify(params, { arrayFormat: "repeat" }); + }, headers: signHeader }) } diff --git a/src/assets/images/web-statistics/download.png b/src/assets/images/web-statistics/download.png new file mode 100644 index 0000000..ccde799 Binary files /dev/null and b/src/assets/images/web-statistics/download.png differ diff --git a/src/assets/images/web-statistics/return-active.png b/src/assets/images/web-statistics/return-active.png new file mode 100644 index 0000000..eec7f1b Binary files /dev/null and b/src/assets/images/web-statistics/return-active.png differ diff --git a/src/assets/images/web-statistics/return.png b/src/assets/images/web-statistics/return.png new file mode 100644 index 0000000..de37da3 Binary files /dev/null and b/src/assets/images/web-statistics/return.png differ diff --git a/src/assets/images/web-statistics/view.png b/src/assets/images/web-statistics/view.png new file mode 100644 index 0000000..0a2ecab Binary files /dev/null and b/src/assets/images/web-statistics/view.png differ diff --git a/src/components/CustomTable/index.vue b/src/components/CustomTable/index.vue index 2959d9a..19798d4 100644 --- a/src/components/CustomTable/index.vue +++ b/src/components/CustomTable/index.vue @@ -60,19 +60,21 @@ export default { methods: { // 实现单击选中/反选功能 customRow(record) { + let _this = this return { - class: this.innerSelectedRowKeys.includes(record[this.rowKey]) ? 'ant-table-row-selected' : '', + class: _this.innerSelectedRowKeys.includes(record[_this.rowKey]) ? 'ant-table-row-selected' : '', on: { click: () => { - if(!this.canSelect) { + if(!_this.canSelect) { return } - if (this.innerSelectedRowKeys.includes(record[this.rowKey])) { - this.innerSelectedRowKeys = [] + if (_this.innerSelectedRowKeys.includes(record[_this.rowKey])) { + _this.innerSelectedRowKeys = [] } else { - this.innerSelectedRowKeys = [record[this.rowKey]] + _this.innerSelectedRowKeys = [record[_this.rowKey]] } - this.$emit('update:selectedRowKeys', this.innerSelectedRowKeys) + _this.$emit('update:selectedRowKeys', _this.innerSelectedRowKeys) + _this.$emit("detail",record) } } } diff --git a/src/mixins/JeecgListMixin.js b/src/mixins/JeecgListMixin.js index 69beb27..5581a80 100644 --- a/src/mixins/JeecgListMixin.js +++ b/src/mixins/JeecgListMixin.js @@ -73,35 +73,37 @@ export const JeecgListMixin = { }, methods:{ loadData(arg) { - if(!this.url.list){ - this.$message.error("请设置url.list属性!") - return - } - //加载数据 若传入参数1则加载第一页的内容 - if (arg === 1) { - this.ipagination.current = 1; - } - this.onClearSelected() - - var params = this.getQueryParams();//查询条件 - this.loading = true; - getAction(this.url.list, params).then((res) => { - if (res.success) { - //update-begin---author:zhangyafei Date:20201118 for:适配不分页的数据列表------------ - this.dataSource = res.result.records||res.result; - if(res.result.total) - { - this.ipagination.total = res.result.total; - }else{ - this.ipagination.total = 0; - } - //update-end---author:zhangyafei Date:20201118 for:适配不分页的数据列表------------ - }else{ - this.$message.warning(res.message) + // if(!this.url.list){ + // this.$message.error("请设置url.list属性!") + // return + // } + if (this.url.list) { + + //加载数据 若传入参数1则加载第一页的内容 + if (arg === 1) { + this.ipagination.current = 1; } - }).finally(() => { - this.loading = false - }) + this.onClearSelected() + var params = this.getQueryParams();//查询条件 + this.loading = true; + getAction(this.url.list, params).then((res) => { + if (res.success) { + //update-begin---author:zhangyafei Date:20201118 for:适配不分页的数据列表------------ + this.dataSource = res.result.records||res.result; + if(res.result.total) + { + this.ipagination.total = res.result.total; + }else{ + this.ipagination.total = 0; + } + //update-end---author:zhangyafei Date:20201118 for:适配不分页的数据列表------------ + }else{ + this.$message.warning(res.message) + } + }).finally(() => { + this.loading = false + }) + } }, initDictConfig(){ console.log("--这是一个假的方法!") @@ -120,6 +122,7 @@ export const JeecgListMixin = { }, getQueryParams() { //获取查询条件 + console.log("this.queryParamthis.queryParam",this.queryParam); let sqp = {} if(this.superQueryParams){ sqp['superQueryParams']=encodeURI(this.superQueryParams) diff --git a/src/views/statistics/RouteView.vue b/src/views/statistics/RouteView.vue index 1b04ad8..651cb49 100644 --- a/src/views/statistics/RouteView.vue +++ b/src/views/statistics/RouteView.vue @@ -1,8 +1,8 @@ \ No newline at end of file diff --git a/src/views/statistics/calibphd.vue b/src/views/statistics/calibphd.vue index 57d2a64..7c8950b 100644 --- a/src/views/statistics/calibphd.vue +++ b/src/views/statistics/calibphd.vue @@ -1,16 +1,102 @@ - + + \ No newline at end of file diff --git a/src/views/statistics/detail.vue b/src/views/statistics/detail.vue new file mode 100644 index 0000000..c0c6d5f --- /dev/null +++ b/src/views/statistics/detail.vue @@ -0,0 +1,562 @@ + + + + + \ No newline at end of file diff --git a/src/views/statistics/detbkphd.vue b/src/views/statistics/detbkphd.vue new file mode 100644 index 0000000..a363c6e --- /dev/null +++ b/src/views/statistics/detbkphd.vue @@ -0,0 +1,103 @@ + + + + + \ No newline at end of file diff --git a/src/views/statistics/list.vue b/src/views/statistics/list.vue new file mode 100644 index 0000000..5a97788 --- /dev/null +++ b/src/views/statistics/list.vue @@ -0,0 +1,202 @@ + + + + \ No newline at end of file diff --git a/src/views/statistics/qcphd.vue b/src/views/statistics/qcphd.vue new file mode 100644 index 0000000..f6ff873 --- /dev/null +++ b/src/views/statistics/qcphd.vue @@ -0,0 +1,103 @@ + + + + + \ No newline at end of file diff --git a/src/views/statistics/sphdf.vue b/src/views/statistics/sphdf.vue new file mode 100644 index 0000000..af4fed6 --- /dev/null +++ b/src/views/statistics/sphdf.vue @@ -0,0 +1,103 @@ + + + + + \ No newline at end of file diff --git a/src/views/statistics/sphdp.vue b/src/views/statistics/sphdp.vue new file mode 100644 index 0000000..9ea113f --- /dev/null +++ b/src/views/statistics/sphdp.vue @@ -0,0 +1,103 @@ + + + + + \ No newline at end of file