UI-Project/src/views/ReportWork/reportWork.vue
@@ -4,18 +4,21 @@ <span style="margin-left: 10px;" class="demonstration">{{ $t('reportmanage.productiontime') }}</span> <el-date-picker style="margin-left: 10px;" v-model="timeRange" type="daterange" format="YYYY/MM/DD" value-format="YYYY-MM-DD" :start-placeholder="$t('reportmanage.starttime')" :end-placeholder="$t('reportmanage.endtime')" :default-time="defaultTime" /> 类型: <el-select v-model="report.type" placeholder="清选择类型" style="margin-left: 10px;" > <el-option label="全部" value="0"></el-option> <el-option label="完工" value="1"></el-option> <el-option label="破损" value="2"></el-option> <el-option label="拿走" value="3"></el-option> </el-select> 状态: <el-select v-model="report.status" placeholder="清选择状态" style="margin-left: 10px;" > <el-option label="全部" value="0"></el-option> <el-option label="未报工" value="1"></el-option> <el-option label="待报工" value="2"></el-option> <el-option label="已报工" value="3"></el-option> </el-select> 工序: <el-select v-model="report.workingProcedure" placeholder="清选择工序" style="margin-left: 10px;" > <el-option label="全部" value="0"></el-option> <el-option label="切割" value="1"></el-option> @@ -69,7 +72,7 @@ workingProcedure: '0', }); const reportData = ref([]) const timeRange = ref(["2022-01-01", "2022-01-01"]) const timeRange = ref(["2022-01-01", "2025-01-01"]) // 查询数据 UI-Project/src/views/Slicecage/slicecage.vue
@@ -513,6 +513,7 @@ // 定义消息处理函数,更新 receivedData 变量 const handleMessage = (data) => { // 更新 tableData 的数据 console.log(data.temperingSwitch[0]); if(data.bigStorageCageDetailsOutTask!=null){ tableDatac.value = data.bigStorageCageDetailsOutTask[0] adjusta.value = data.bigStorageCageDetailsOutTask[0].filter(rect => rect.slot !== null && rect.slot !== undefined); hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application-cz.yml
@@ -14,6 +14,11 @@ username: sa password: beibo.123/ driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver pp: url: jdbc:mysql://192.168.1.199:3306/pp?serverTimezone=GMT%2b8 username: root password: beibo.123/ driver-class-name: com.mysql.cj.jdbc.Driver cloud: nacos: discovery: hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application-dev.yml
@@ -14,6 +14,11 @@ username: sa password: beibo.123/ driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver pp: url: jdbc:mysql://127.0.0.1:3306/pp?serverTimezone=GMT%2b8 username: root password: beibo.123/ driver-class-name: com.mysql.cj.jdbc.Driver cloud: nacos: discovery: hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application-prod.yml
@@ -14,6 +14,11 @@ username: sa password: beibo.123/ driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver pp: url: jdbc:mysql://10.153.19.150:3306/pp?serverTimezone=GMT%2b8 username: root password: beibo.123/ driver-class-name: com.mysql.cj.jdbc.Driver cloud: nacos: discovery: hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
@@ -3,13 +3,13 @@ spring: profiles: active: cz active: prod application: name: cacheVerticalGlass mybatis-plus: mapper-locations: classpath*:mapper/*.xml configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # configuration: # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl mes: sequence: order: false