From e389c5505cbdd095880eea7860dd9b9fd5dee02f Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Fri, 5 Jan 2024 09:55:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.ts                             |  8 +++--
 .../tjanalysis/hrelongatordata/index.vue      | 26 +++++++++-------
 src/views/tjanalysis/hrpuncherdata/index.vue  | 31 ++++++++++---------
 .../tjanalysis/hrsizingmilldata/index.vue     | 30 +++++++++---------
 4 files changed, 52 insertions(+), 43 deletions(-)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 884cf58..f62e7a7 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -110,8 +110,12 @@ export enum DICT_TYPE {
   natgasdatacd = 'natgasdatacd',
 //==========================天然气总量字典项===========================
   natgasdatatotal = 'natgasdatatotal',
-  
-  
+  //==========================热轧延伸机日统计字典项===========================
+  hrelongatordata = 'hrelongatordata',
+  //==========================热轧定经机日统计字典项===========================
+  hrsizingmilldata='hrsizingmilldata',
+  //==========================热轧穿孔机日统计字典项===========================
+  hrpuncherdata = 'hrpuncherdata',
   // ========== SYSTEM 模块 ==========
   SYSTEM_USER_SEX = 'system_user_sex',
   SYSTEM_MENU_TYPE = 'system_menu_type',
diff --git a/src/views/tjanalysis/hrelongatordata/index.vue b/src/views/tjanalysis/hrelongatordata/index.vue
index f885975..c0c5d1f 100644
--- a/src/views/tjanalysis/hrelongatordata/index.vue
+++ b/src/views/tjanalysis/hrelongatordata/index.vue
@@ -14,9 +14,9 @@
       <el-form-item label="位置" prop="flag">
         <el-select v-model="queryParams.flag" placeholder="请选择">
           <el-option
-            v-for="item in types.flagList"
+            v-for="item in flagList"
             :key="item.value"
-            :label="item.name"
+            :label="item.label"
             :value="item.value" />
         </el-select>
       </el-form-item>
@@ -49,6 +49,7 @@
 <script setup lang="ts">
 import * as TjanalysisApi from '@/api/tjanalysis'
 import { formatDate } from '@/utils/formatTime'
+import * as DictApi from '@/utils/dict'
 
 defineOptions({ name: 'HrElongatorData' })
 
@@ -66,12 +67,12 @@ const queryParams = reactive({
   flag: '1'
 })
 
-const types = reactive({flagList: [
-  {name: '热轧108延伸' , value: '1'},
-  {name: '热轧90延伸' , value: '2'}
-]})
+const flagList = ref([])
 
 const handleQuery = async () => {
+  const ll = flagList.value.find(map=>map.value == queryParams.flag);
+  names.value = ll?.label
+  dataList.value = [];
   getList()
 }
 
@@ -84,12 +85,6 @@ const getList = async () => {
   const res = await TjanalysisApi.queryRzcjinfoDay(queryParams)
     dataList.value  = res.dataList
   loading.value = false
-  if(queryParams.flag=='1'){
-    names.value = "热轧108延伸"
-  }else{
-    names.value = "热轧90延伸"
-  }
-  
 }
 
 function arraySpanMethod ({ row, column, rowIndex, columnIndex }) {
@@ -128,6 +123,13 @@ function tableCellClassName({row, column, rowIndex, columnIndex}) {
 
 /** 初始化 **/
 onMounted(async () => {
+  const res =await DictApi.getStrDictOptions(DICT_TYPE.hrelongatordata);
+  if (res != null && res.length>0) {
+    flagList.value  = res
+    queryParams.flag= flagList.value[0].value;
+    const ll = flagList.value.find(map=>map.value == queryParams.flag);
+    names.value = ll?.label
+  } 
   getList()
 })
 
diff --git a/src/views/tjanalysis/hrpuncherdata/index.vue b/src/views/tjanalysis/hrpuncherdata/index.vue
index e2dcae4..fe988ba 100644
--- a/src/views/tjanalysis/hrpuncherdata/index.vue
+++ b/src/views/tjanalysis/hrpuncherdata/index.vue
@@ -1,6 +1,6 @@
 <template>
   <ContentWrap>
-    <!-- 搜索工作栏 -->
+    <!-- 热轧穿孔机搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" :inline="true">
       <el-form-item label="日期" prop="date">
         <el-date-picker
@@ -14,9 +14,9 @@
       <el-form-item label="位置" prop="flag">
         <el-select v-model="queryParams.flag" placeholder="请选择">
           <el-option
-            v-for="item in types.flagList"
+            v-for="item in flagList"
             :key="item.value"
-            :label="item.name"
+            :label="item.label"
             :value="item.value" />
         </el-select>
       </el-form-item>
@@ -49,6 +49,7 @@
 <script setup lang="ts">
 import * as TjanalysisApi from '@/api/tjanalysis'
 import { formatDate } from '@/utils/formatTime'
+import * as DictApi from '@/utils/dict'
 
 defineOptions({ name: 'HrPuncherData' })
 
@@ -60,18 +61,17 @@ const routeName = ref()
 routeName.value = route.name
 const loading = ref(true)
 const dataList = ref([])
-const names = ref("热轧108穿孔");
+const names = ref('');
 const queryParams = reactive({
   date: formatDate(new Date() , 'YYYY-MM-DD'),
   flag: '1'
 })
 
-const types = reactive({flagList: [
-  {name: '热轧108穿孔' , value: '1'},
-  {name: '热轧90穿孔' , value: '2'}
-]})
-
+const flagList =ref([])
 const handleQuery = async () => {
+  const ll = flagList.value.find(map=>map.value == queryParams.flag);
+  names.value = ll?.label
+  dataList.value = [];
   getList()
 }
 
@@ -84,12 +84,6 @@ const getList = async () => {
   const res = await TjanalysisApi.queryHrpuncherDay(queryParams)
     dataList.value  = res.dataList
   loading.value = false
-  if(queryParams.flag=='1'){
-    names.value = "热轧108穿孔"
-  }else{
-    names.value = "热轧90穿孔"
-  }
-  
 }
 
 function arraySpanMethod ({ row, column, rowIndex, columnIndex }) {
@@ -128,6 +122,13 @@ function tableCellClassName({row, column, rowIndex, columnIndex}) {
 
 /** 初始化 **/
 onMounted(async () => {
+  const res =await DictApi.getStrDictOptions(DICT_TYPE.hrpuncherdata);
+  if (res != null && res.length>0) {
+    flagList.value  = res
+    queryParams.flag= flagList.value[0].value;
+    const ll = flagList.value.find(map=>map.value == queryParams.flag);
+    names.value = ll?.label
+  } 
   getList()
 })
 
diff --git a/src/views/tjanalysis/hrsizingmilldata/index.vue b/src/views/tjanalysis/hrsizingmilldata/index.vue
index af98234..edfa2c6 100644
--- a/src/views/tjanalysis/hrsizingmilldata/index.vue
+++ b/src/views/tjanalysis/hrsizingmilldata/index.vue
@@ -1,6 +1,6 @@
 <template>
   <ContentWrap>
-    <!-- 搜索工作栏 -->
+    <!-- 定经机搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" :inline="true">
       <el-form-item label="日期" prop="date">
         <el-date-picker
@@ -15,9 +15,9 @@
       <el-form-item label="位置" prop="flag">
         <el-select v-model="queryParams.flag" placeholder="请选择">
           <el-option
-            v-for="item in types.flagList"
+            v-for="item in flagList"
             :key="item.value"
-            :label="item.name"
+            :label="item.label"
             :value="item.value" />
         </el-select>
       </el-form-item>
@@ -50,6 +50,7 @@
 <script setup lang="ts">
 import * as TjanalysisApi from '@/api/tjanalysis'
 import { formatDate } from '@/utils/formatTime'
+import * as DictApi from '@/utils/dict'
 
 defineOptions({ name: 'HrSizingMillData' })
 
@@ -61,18 +62,18 @@ const routeName = ref()
 routeName.value = route.name
 const loading = ref(true)
 const dataList = ref([])
-const names = ref("热轧108定经");
+const names = ref('');
 const queryParams = reactive({
   date: formatDate(new Date() , 'YYYY-MM-DD'),
   flag: '1'
 })
 
-const types = reactive({flagList: [
-  {name: '热轧108定经' , value: '1'},
-  {name: '热轧90定经' , value: '2'}
-]})
+const flagList = ref([])
 
 const handleQuery = async () => {
+  const ll = flagList.value.find(map=>map.value == queryParams.flag);
+  names.value = ll?.label
+  dataList.value = [];
   getList()
 }
 
@@ -85,12 +86,6 @@ const getList = async () => {
   const res = await TjanalysisApi.querySizingmillDay(queryParams)
     dataList.value  = res.dataList
   loading.value = false
-  if(queryParams.flag=='1'){
-    names.value = "热轧108定经"
-  }else{
-    names.value = "热轧90定经"
-  }
-  
 }
 
 function arraySpanMethod ({ row, column, rowIndex, columnIndex }) {
@@ -129,6 +124,13 @@ function tableCellClassName({row, column, rowIndex, columnIndex}) {
 
 /** 初始化 **/
 onMounted(async () => {
+  const res =await DictApi.getStrDictOptions(DICT_TYPE.hrsizingmilldata);
+  if (res != null && res.length>0) {
+    flagList.value  = res
+    queryParams.flag= flagList.value[0].value;
+    const ll = flagList.value.find(map=>map.value == queryParams.flag);
+    names.value = ll?.label
+  } 
   getList()
 })