提交新版本

src/views/vent/gas/gasAnalysis/index.vue

@@ -91,12 +91,7 @@ import { gasReportLogList } from './gasAnalysis.api'
 
 
 let searchTime = ref(dayjs().format('YYYY-MM-DD'))//dayjs().format('YYYY-MM-DD HH:mm:ss')
-let tableData = ref<any[]>([
-    { key: '1', bc: '3', insType: '2', xjzs: [1, 1, 1, 1, 1, 1], yxjs: [2, 2, 2, 2, 2, 2], wxjs: [3, 3, 3, 3, 3, 3], ljv: [4, 4, 4, 4, 4, 4], ljxq: [5, 5, 5, 5, 5, 5], bzljv: [1, 2, 3], totalLossDay: 10 },
-    { key: '2', bc: '3', insType: '2', xjzs: [1, 1, 1, 1, 1, 1], yxjs: [5, 5, 5, 5, 5, 5], wxjs: [3, 3, 3, 3, 3, 3], ljv: [4, 4, 4, 4, 4, 4], ljxq: [5, 5, 5, 5, 5, 5], bzljv: [1, 2, 3], totalLossDay: 10 },
-    { key: '3', bc: '3', insType: '2', xjzs: [1, 1, 1, 1, 1, 1], yxjs: [2, 2, 2, 2, 2, 2], wxjs: [3, 3, 3, 3, 3, 3], ljv: [4, 4, 4, 4, 4, 4], ljxq: [5, 5, 5, 5, 5, 5], bzljv: [1, 2, 3], totalLossDay: 10 },
-
-])
+let tableData = ref<any[]>([])
 let selectedRowKey = ref<any[]>(['1'])
 //柱状图相关数据
 let legendData = reactive({
@@ -144,7 +139,13 @@ async function gasReportLogLists() {
 
     if (res.code == 200 && res.records.length != 0) {
         pagination.current = 1
+        res.records=[
+      {totalNight1:1,totalNight2:2,totalEarly1:3,totalEarly2:4,totalNoon1:5,totalNoon2:6,finishNight1:'11',finishNight2:'22',finishEarly1:'33',finishEarly2:'44',finishNoon1:'55',finishNoon2:'66',missNight1:'111',missNight2:'222',missEarly1:'333',missEarly2:'444',missNoon1:'555',missNoon2:'666',lossNight1:'1111',lossNight2:'2222',lossEarly1:'3333',lossEarly2:'4444',lossNoon1:'5555',lossNoon2:'6666',detailsLossNight1:'11111',detailsLossNight2:'22222',detailsLossEarly1:'33333',detailsLossEarly2:'44444',detailsLossNoon1:'55555',detailsLossNoon2:'66666'},
+      {totalNight1:1,totalNight2:2,totalEarly1:3,totalEarly2:4,totalNoon1:5,totalNoon2:6,finishNight1:'11',finishNight2:'22',finishEarly1:'33',finishEarly2:'44',finishNoon1:'55',finishNoon2:'66',missNight1:'111',missNight2:'222',missEarly1:'333',missEarly2:'444',missNoon1:'555',missNoon2:'666',lossNight1:'1111',lossNight2:'2222',lossEarly1:'3333',lossEarly2:'4444',lossNoon1:'5555',lossNoon2:'6666',detailsLossNight1:'11111',detailsLossNight2:'22222',detailsLossEarly1:'33333',detailsLossEarly2:'44444',detailsLossNoon1:'55555',detailsLossNoon2:'66666'},
+      {totalNight1:1,totalNight2:2,totalEarly1:3,totalEarly2:4,totalNoon1:5,totalNoon2:6,finishNight1:'11',finishNight2:'22',finishEarly1:'33',finishEarly2:'44',finishNoon1:'55',finishNoon2:'66',missNight1:'111',missNight2:'222',missEarly1:'333',missEarly2:'444',missNoon1:'555',missNoon2:'666',lossNight1:'1111',lossNight2:'2222',lossEarly1:'3333',lossEarly2:'4444',lossNoon1:'5555',lossNoon2:'6666',detailsLossNight1:'11111',detailsLossNight2:'22222',detailsLossEarly1:'33333',detailsLossEarly2:'44444',detailsLossNoon1:'55555',detailsLossNoon2:'66666'}
+        ]
         tableData.value = res.records.map(el => {
+            el.key=new Date().getTime()
             el.bc = '3'
             el.insType = '2'
             el.xjzs = [el.totalNight1 || 0, el.totalNight2 || 0, el.totalEarly1 || 0, el.totalEarly2 || 0, el.totalNoon1 || 0, el.totalNoon2 || 0]

src/views/vent/gas/gasInspect/index.vue

@@ -197,7 +197,14 @@ async function queryByIdList() {
     let res = await list({ id: searchId.value, pageNo: pagination.current, pageSize: pagination.pageSize })
     console.log(res, '列表查询---')
     pagination.current = 1
-    tableData.value = res.records
+    tableData.value = res.records.map((el:any)=>{
+        return {
+            morning:el.insType,
+            afterNoon:el.insType,
+            evening:el.insType,
+            ...el
+        }
+    })
     pagination.total = res.total
 }
 //查询

src/views/vent/gas/gasInspectNonfc/components/inspectEdit.vue

@@ -31,7 +31,7 @@
 <script setup lang="ts">
 import { ref, reactive, onMounted, watch } from 'vue'
 import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
-import { queryAllDisTeam } from '../gasInspect.api'
+import { queryAllDisTeam } from '../gasInspectNonfc.api'
 
 let props = defineProps({
     inspectEditData: {

src/views/vent/gas/gasInspectNonfc/components/inspectTask.vue

@@ -40,8 +40,8 @@
 
 <script setup lang="ts">
 import { ref, reactive, onMounted } from 'vue'
-import { columnsTask } from '../gasInspect.data'
-import { queryAllDisTeam, getAllUserInfo } from '../gasInspect.api'
+import { columnsTask } from '../gasInspectNonfc.data'
+import { queryAllDisTeam, getAllUserInfo } from '../gasInspectNonfc.api'
 
 let tableDataTask = ref<any[]>([])
 let accountEarly = ref('')

src/views/vent/gas/gasInspectNonfc/index.vue

@@ -60,7 +60,7 @@
                     </template>
                     <template
                         v-if="column.dataIndex == 'afterNoon' || column.dataIndex == 'morning' || column.dataIndex == 'evening'">
-                        <div v-if="text == '1'">
+                        <div v-if="text == '2'">
                             <div class="table-text text-y ">是</div>
                             <div class="text-y">是</div>
                         </div>
@@ -107,8 +107,8 @@ import inspectEdit from './components/inspectEdit.vue'
 import inspectDel from './components/inspectDel.vue'
 import uploadOrdown from './components/uploadOrdown.vue'
 import { message } from 'ant-design-vue';
-import { columns, pagination } from './gasInspect.data'
-import { list, importByExcel, exportGasByExcel, moveOrderNum, edit, deleteCard, taskSubmit, clearCardInfo } from './gasInspect.api'
+import { columns, pagination } from './gasInspectNonfc.data'
+import { list, importByExcel, exportGasByExcel, moveOrderNum, edit, deleteCard, taskSubmit, clearCardInfo } from './gasInspectNonfc.api'
 
 
 let searchId = ref('')
@@ -197,7 +197,15 @@ async function queryByIdList() {
     let res = await list({ id: searchId.value, pageNo: pagination.current, pageSize: pagination.pageSize })
     console.log(res, '列表查询---')
     pagination.current = 1
-    tableData.value = res.records
+
+    tableData.value = res.records.map((el:any)=>{
+        return {
+            morning:el.insType,
+            afterNoon:el.insType,
+            evening:el.insType,
+            ...el
+        }
+    })
     pagination.total = res.total
 }
 //查询