diff --git a/.env b/.env index 2308eb6..b175ee6 100644 --- a/.env +++ b/.env @@ -1,5 +1,5 @@ # 标题 -VITE_APP_TITLE=闻荫管理系统 +VITE_APP_TITLE=铸诚钢管 # 项目本地运行端口号 VITE_PORT=80 @@ -8,7 +8,7 @@ VITE_PORT=80 VITE_OPEN=true # 租户开关 -VITE_APP_TENANT_ENABLE=true +VITE_APP_TENANT_ENABLE=false # 验证码的开关 VITE_APP_CAPTCHA_ENABLE=true diff --git a/.env.production b/.env.production index 8e25d23..6b18463 100644 --- a/.env.production +++ b/.env.production @@ -4,16 +4,19 @@ NODE_ENV=production VITE_DEV=false # 请求路径 -VITE_BASE_URL='http://localhost:12080' +# VITE_BASE_URL='http://dev.ccwin-in.com:26110' +VITE_BASE_URL='http://10.140.10.4:26110' # 上传路径 -VITE_UPLOAD_URL='http://localhost:12080/admin-api/infra/file/upload' +# VITE_UPLOAD_URL='http://dev.ccwin-in.com:26110/api/admin-api/infra/file/upload' +VITE_UPLOAD_URL='http://10.140.10.4:26110/api/admin-api/infra/file/upload' # 接口前缀 VITE_API_BASEPATH= # 接口地址 -VITE_API_URL=/admin-api +# VITE_API_URL=/api/admin-api +VITE_API_URL=/api # 是否删除debugger VITE_DROP_DEBUGGER=true @@ -31,4 +34,6 @@ VITE_BASE_PATH=/ VITE_OUT_DIR=dist-pro # 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25110' +# VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:26110' +VITE_JMREPORT_BASE_URL='http://10.140.10.4:26110' + diff --git a/.env.test b/.env.test index 84edcdf..6f4058b 100644 --- a/.env.test +++ b/.env.test @@ -31,7 +31,7 @@ VITE_BASE_PATH=/ VITE_OUT_DIR=dist-test # 自定义接口路径 -VITE_INTERFACE_URL='http://dev.ccwin-in.com:25110/magic/web/index.html' +# VITE_INTERFACE_URL='http://dev.ccwin-in.com:25110/magic/web/index.html' # 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25110' +# VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25110' diff --git a/src/api/pszc/pselectricdata/index.ts b/src/api/pszc/pselectricdata/index.ts index 0130d28..d950af7 100644 --- a/src/api/pszc/pselectricdata/index.ts +++ b/src/api/pszc/pselectricdata/index.ts @@ -48,4 +48,8 @@ export const exportPsElectricdata = async (params) => { // 下载导入模板 export const importTemplate = () => { return request.download({ url: '/pszc/pselectricdata/get-import-template' }) +} + +export const getAllDbTypes = async () => { + return await request.get({ url: `/pszc/pselectricdata/getAllDbTypes`}) } \ No newline at end of file diff --git a/src/api/tjanalysis/index.ts b/src/api/tjanalysis/index.ts index 9a42851..f37559b 100644 --- a/src/api/tjanalysis/index.ts +++ b/src/api/tjanalysis/index.ts @@ -19,3 +19,9 @@ export const queryTjPlatScales = async (params) => { export const exportPsales = async (params) => { return await request.download({ url: `/tjanalysis/exportPsales`, params}) } + +// 天然气总流量日统计 +export const queryNatgasdatatotal = async (params) => { + return await request.get({ url: `/tjanalysis/queryNatgasdatatotal`, params }) +} + diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue index 2743af1..114e8d5 100644 --- a/src/views/Home/Index.vue +++ b/src/views/Home/Index.vue @@ -1,16 +1,13 @@ - - + + + - diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue index bf21bc9..0d1745a 100644 --- a/src/views/Login/components/LoginForm.vue +++ b/src/views/Login/components/LoginForm.vue @@ -125,8 +125,10 @@ const loginData = reactive({ tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE, loginForm: { tenantName: '铸诚钢管', - username: 'admin', - password: '123456', + // username: 'admin', + // password: '123456', + username: '', + password: '', captchaVerification: '', rememberMe: false, code: '', diff --git a/src/views/lab/platscale/index.vue b/src/views/lab/platscale/index.vue index 7c47af3..e5ab422 100644 --- a/src/views/lab/platscale/index.vue +++ b/src/views/lab/platscale/index.vue @@ -33,7 +33,7 @@ - 确认 + diff --git a/src/views/lab/platscale/platscale.data.ts b/src/views/lab/platscale/platscale.data.ts index bbec966..da3ff0c 100644 --- a/src/views/lab/platscale/platscale.data.ts +++ b/src/views/lab/platscale/platscale.data.ts @@ -12,62 +12,62 @@ export const Platscale = useCrudSchemas(reactive([ // sort: 'custom', // isForm: false, // }, - { - label: '批号', - field: 'batchNo', - sort: 'custom', - isSearch: true, - table: { - width: 150 - } - }, - { - label: '送样单位', - field: 'sydw', - sort: 'custom', - isSearch: false, - table: { - width: 150 - } - }, - { - label: '标准', - field: 'standard', - sort: 'custom', - isSearch: false, - table: { - width: 150 - } - }, - { - label: '材质', - field: 'cz', - sort: 'custom', - isSearch: false, - table: { - width: 150 - } - }, - { - label: '规格', - field: 'guig', - sort: 'custom', - isSearch: false, - table: { - width: 150 - } - }, - { - label: '实验人', - field: 'testUser', - sort: 'custom', - isSearch: true, - table: { - width: 150 - }, - dictType: DICT_TYPE.LAB_USER_TEST_TYPE, - dictClass: 'number' - }, + // { + // label: '批号', + // field: 'batchNo', + // sort: 'custom', + // isSearch: true, + // table: { + // width: 150 + // } + // }, + // { + // label: '送样单位', + // field: 'sydw', + // sort: 'custom', + // isSearch: false, + // table: { + // width: 150 + // } + // }, + // { + // label: '标准', + // field: 'standard', + // sort: 'custom', + // isSearch: false, + // table: { + // width: 150 + // } + // }, + // { + // label: '材质', + // field: 'cz', + // sort: 'custom', + // isSearch: false, + // table: { + // width: 150 + // } + // }, + // { + // label: '规格', + // field: 'guig', + // sort: 'custom', + // isSearch: false, + // table: { + // width: 150 + // } + // }, + // { + // label: '实验人', + // field: 'testUser', + // sort: 'custom', + // isSearch: true, + // table: { + // width: 150 + // }, + // dictType: DICT_TYPE.LAB_USER_TEST_TYPE, + // dictClass: 'number' + // }, { label: '车号', field: 'ch', @@ -288,18 +288,18 @@ export const Platscale = useCrudSchemas(reactive([ width: 150 } }, - { - label: '审核状态', - field: 'auditStatus', - sort: 'custom', - isSearch: true, - table: { - width: 120, - fixed: 'right' - }, - dictType: DICT_TYPE.LAB_AUDIT_STATUS, - dictClass: 'number' - }, + // { + // label: '审核状态', + // field: 'auditStatus', + // sort: 'custom', + // isSearch: true, + // table: { + // width: 120, + // fixed: 'right' + // }, + // dictType: DICT_TYPE.LAB_AUDIT_STATUS, + // dictClass: 'number' + // }, { label: '采集时间', field: 'createTime', diff --git a/src/views/report/goview/index.vue b/src/views/report/goview/index.vue index 1bac286..d5be8d7 100644 --- a/src/views/report/goview/index.vue +++ b/src/views/report/goview/index.vue @@ -7,4 +7,5 @@ defineOptions({ name: 'GoView' }) const src = 'http://127.0.0.1:3000' +// const src = 'http://10.140.10.4:26111' diff --git a/src/views/tjanalysis/electricdata/index.vue b/src/views/tjanalysis/electricdata/index.vue index 3dbe2f1..db3beb9 100644 --- a/src/views/tjanalysis/electricdata/index.vue +++ b/src/views/tjanalysis/electricdata/index.vue @@ -10,6 +10,15 @@ type="date" /> + + + + + 搜索 重置 @@ -22,9 +31,8 @@ 二次计量:一九八六年五月三日安全运行({{ dataList.days }})天 - + header-row-style="height: 50px; text-align: center"> + @@ -49,9 +57,11 @@ diff --git a/src/views/tjanalysis/irealdata/index.vue b/src/views/tjanalysis/irealdata/index.vue index af20ae4..98d1179 100644 --- a/src/views/tjanalysis/irealdata/index.vue +++ b/src/views/tjanalysis/irealdata/index.vue @@ -74,13 +74,14 @@ const getList = async () => { const res = await TjanalysisApi.queryIrealdataTj(queryParams) if (res != null && res.trList != null) { dataList.days = res.days + dataList.dList = [] dataList.dList = res.trList } loading.value = false } function arraySpanMethod ({ row, column, rowIndex, columnIndex }) { - if (rowIndex == 7) { + if (rowIndex == 6) { if (columnIndex == 0) { return { rowspan: 1, diff --git a/src/views/tjanalysis/natgasdatatotal/index.vue b/src/views/tjanalysis/natgasdatatotal/index.vue new file mode 100644 index 0000000..bbe1965 --- /dev/null +++ b/src/views/tjanalysis/natgasdatatotal/index.vue @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + 天然气: + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/tjanalysis/platscale/index.vue b/src/views/tjanalysis/platscale/index.vue index cfc3a58..aded00e 100644 --- a/src/views/tjanalysis/platscale/index.vue +++ b/src/views/tjanalysis/platscale/index.vue @@ -50,7 +50,7 @@ import * as TjanalysisApi from '@/api/tjanalysis' import { formatDate } from '@/utils/formatTime' -defineOptions({ name: 'Irealanalysis' }) +defineOptions({ name: 'PlatscaleAnalysis' }) const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化