From 79d70be37ce3515cb28f4c8eea37aaf1a74df315 Mon Sep 17 00:00:00 2001
From: "daikun1@bosssoft.com.cn" <daikun1@bosssoft.com.cn>
Date: Wed, 13 Dec 2023 16:32:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                          |   4 +-
 .env.production                               |  13 +-
 .env.test                                     |   4 +-
 src/api/pszc/pselectricdata/index.ts          |   4 +
 src/api/tjanalysis/index.ts                   |   6 +
 src/views/Home/Index.vue                      |  17 +--
 src/views/Login/components/LoginForm.vue      |   6 +-
 src/views/lab/platscale/index.vue             |   2 +-
 src/views/lab/platscale/platscale.data.ts     | 136 +++++++++---------
 src/views/report/goview/index.vue             |   1 +
 src/views/tjanalysis/electricdata/index.vue   |  64 ++++-----
 src/views/tjanalysis/irealdata/index.vue      |   3 +-
 .../tjanalysis/natgasdatatotal/index.vue      | 120 ++++++++++++++++
 src/views/tjanalysis/platscale/index.vue      |   2 +-
 14 files changed, 253 insertions(+), 129 deletions(-)
 create mode 100644 src/views/tjanalysis/natgasdatatotal/index.vue

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 @@
 <template>
-  <!-- <img class="homebg" src="@/assets/imgs/bgnew.jpg" /> -->
-  <div></div>
+  <ContentWrap>
+    <IFrame :src="src" />
+  </ContentWrap>
 </template>
-<style lang="scss">
 
-  .homebg {
-    padding: 0px;
-    width: 100%;
-    height: 100%;
-    // background-size: cover;
-  }
+<script lang="ts" setup>
+defineOptions({ name: 'GoView' })
 
+const src = '' //'http://localhost:3000/#/chart/preview/15'
 
+</script>
 
-</style>
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 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <el-button type="text" @click="auditStatus(row)">确认</el-button>
+        <!-- <el-button type="text" @click="auditStatus(row)">确认</el-button> -->
         <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
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<CrudSchema[]>([
   //   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<CrudSchema[]>([
       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'
 </script>
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"
         />
       </el-form-item>
+      <el-form-item label="电表" prop="mcode">
+        <el-select v-model="queryParams.mcode" placeholder="请选择">
+          <el-option
+            v-for="item in dbTypes.typeList"
+            :key="item.mcode"
+            :label="item.mname"
+            :value="item.mcode" />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" size="mini" @click="handleQuery">搜索</el-button>
         <el-button size="mini" @click="resetQuery">重置</el-button>
@@ -22,9 +31,8 @@
     <el-divider content-position="left"><div style="font-size:16px; float: left"><b>二次计量：</b></div><div style="float: left">一九八六年五月三日安全运行（{{ dataList.days }}）天</div></el-divider>
     <el-table
       v-loading="loading" :data="dataList.dList" border="true" highlight-current-row="true" 
-      header-row-style="height: 50px; text-align: center" :span-method="arraySpanMethod" 
-      :row-class-name="tableRowClassName" :cell-class-name="tableCellClassName">
-      <el-table-column label="" prop="mname" align="right" :show-overflow-tooltip="true" width="150" />
+      header-row-style="height: 50px; text-align: center">
+      <!-- <el-table-column label="" prop="mname" align="right" :show-overflow-tooltip="true" width="250" /> -->
       <el-table-column label="" prop="name" align="right" :show-overflow-tooltip="true" width="150" />
       <el-table-column label="00:00" prop="num0" align="center" :show-overflow-tooltip="true" width="100" />
       <el-table-column label="06:00" prop="num6" align="center" :show-overflow-tooltip="true" width="100" />
@@ -49,9 +57,11 @@
 
 <script setup lang="ts">
 import * as TjanalysisApi from '@/api/tjanalysis'
+import * as PselectricdataApi from '@/api/pszc/pselectricdata'
 import { formatDate } from '@/utils/formatTime'
+import { get } from 'http'
 
-defineOptions({ name: 'Irealanalysis' })
+defineOptions({ name: 'ElectricdataAnalysis' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -60,6 +70,7 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const loading = ref(true)
+const dbTypes = reactive({typeList: []})
 const dataList = reactive({dList: [] , days: 0})
 
 const queryParams = reactive({
@@ -76,6 +87,15 @@ const resetQuery = async () => {
   getList()
 }
 
+const getDbTypes = async () => {
+  const res = await PselectricdataApi.getAllDbTypes()
+  if (res != null && res.length > 0) {
+    dbTypes.typeList = res
+    queryParams.mcode = res[0].mcode
+    getList()
+  }
+}
+
 const getList = async () => {
   const res = await TjanalysisApi.queryElectricdataTj(queryParams)
   if (res != null && res.trList != null) {
@@ -85,43 +105,11 @@ const getList = async () => {
   loading.value = false
 }
 
-function arraySpanMethod ({ row, column, rowIndex, columnIndex }) {
-  if (rowIndex == 7) {
-    if (columnIndex == 0) {
-      return {
-        rowspan: 1,
-        colspan: 10
-      }
-    } else if (columnIndex == 10) {
-      return {
-        rowspan: 1,
-        colspan: 2
-      }
-    } else {
-      return {
-        rowspan: 0,
-        colspan: 0
-      }
-    }
-  }
-}
-
-function tableRowClassName({row, rowIndex}) {
-  if (rowIndex === 7) {
-    return 'success-row'
-  }
-  return ''
-}
-
-function tableCellClassName({row, column, rowIndex, columnIndex}) {
-  if (columnIndex == 0) {
-    return 'success-cols'
-  }
-}
 
 /** 初始化 **/
 onMounted(async () => {
-  getList()
+  getDbTypes()
+  // getList()
 })
 
 </script>
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 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" :inline="true">
+      <el-form-item label="日期" prop="date">
+        <el-date-picker
+          v-model="queryParams.date"
+          style="width: 240px; height: 30px"
+          value-format="YYYY-MM-DD"
+          type="date"
+        />
+      </el-form-item>
+      <el-form-item label="位置" prop="mcode">
+        <el-select v-model="queryParams.flag" placeholder="请选择">
+          <el-option
+            v-for="item in types.flagList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-divider content-position="left"><div style="font-size:16px; float: left"><b>天然气：</b></div></el-divider>
+    <el-table
+      v-loading="loading" :data="dataList.dList" border="true" highlight-current-row="true" 
+      header-row-style="height: 50px; text-align: center">
+      <!-- <el-table-column label="" prop="mname" align="right" :show-overflow-tooltip="true" width="250" /> -->
+      <el-table-column label="" prop="name" align="right" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="00:00" prop="num0" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="06:00" prop="num6" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="08:00" prop="num8" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="12:00" prop="num12" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="16:00" prop="num16" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="18:00" prop="num18" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="20:00" prop="num20" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="22:00" prop="num22" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="24:00" prop="num24" align="center" :show-overflow-tooltip="true" width="120" />
+      <el-table-column label="08:00-00:00" prop="num0008" align="center" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="16:00-08:00" prop="num0816" align="center" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="24:00-16:00" prop="num1624" align="center" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="12:00-00:00" prop="num0012" align="center" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="24:00-12:00" prop="num1224" align="center" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="总(24:00-00:00)" prop="num0024" align="center" :show-overflow-tooltip="true" width="150" />
+      <!-- <el-table-column label="电量" prop="numTj" align="center" :show-overflow-tooltip="true" width="100" /> -->
+    </el-table>
+  </ContentWrap>
+
+</template>
+
+<script setup lang="ts">
+import * as TjanalysisApi from '@/api/tjanalysis'
+import * as PselectricdataApi from '@/api/pszc/pselectricdata'
+import { formatDate } from '@/utils/formatTime'
+import { get } from 'http'
+
+defineOptions({ name: 'Natgasdatatotal' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const loading = ref(true)
+const types = reactive({flagList: [
+  {name: '热轧' , value: '1'},
+  {name: '冷拔' , value: '2'}
+]})
+const dataList = reactive({dList: [] , days: 0})
+
+const queryParams = reactive({
+  date: formatDate(new Date() , 'YYYY-MM-DD'),
+  flag: '1'
+})
+
+const handleQuery = async () => {
+  dataList.dList = []
+  getList()
+}
+
+const resetQuery = async () => {
+  dataList.dList = []
+  queryParams.date = formatDate(new Date() , 'YYYY-MM-DD')
+  getList()
+}
+
+const getList = async () => {
+  const res = await TjanalysisApi.queryNatgasdatatotal(queryParams)
+  if (res != null && res.trList != null) {
+    dataList.dList = res.trList
+  }
+  loading.value = false
+}
+
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+
+</script>
+
+<style>
+  .el-table .success-row {
+    background: #f0f9eb;
+  }
+
+  .el-table .success-cols {
+    font-weight: bold;
+  }
+</style>
+
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() // 国际化