Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-mes into dev

src/api/produceOrder/index.js

@@ -92,7 +92,7 @@ export async function reportCount (params) {
 
 // 详情页-tab列表
 export async function reportPage (data) {
-  const res = await request.get('/mes/workreport/page', { params: data });
+  const res = await request.post('/mes/workreport/page', data );
   if (res.data.code == 0) {
     return res.data.data;
   }
@@ -107,3 +107,12 @@ export async function getInfoById (id) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+// 冲销接口 
+export async function writeOffWork (data) {
+  const res = await request.post(`/mes/workreport/writeOff`, data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/views/produceOrder/components/progressBox.vue

@@ -7,7 +7,9 @@
           :key="index"
           :class="{ active: active >= index }"
         >
-          <p class="text">{{ item.taskTypeName }}</p>
+		   <el-tooltip class="item" effect="dark" :content="item.taskTypeName" placement="top">
+			  <p>{{ item.taskTypeName }}</p>
+		   </el-tooltip>
           <div
             class="progress-box"
             :style="`backgroundImage:linear-gradient(to top, var(--color-primary), var(--color-primary) ${item.percent},#fff ${item.percent}, #fff);`"
@@ -66,10 +68,12 @@
 
 <style lang="scss" scoped>
   .progress-container {
+	  width: 100%;
+	  overflow-x: auto;
     ul {
       list-style: none;
       display: flex;
-      justify-content: space-around;
+      justify-content: flex-start;
       align-items: center;
       li {
         display: flex;
@@ -77,6 +81,7 @@
         justify-content: center;
         flex: 1;
         position: relative;
+		min-width: 110px;
         &::after {
           content: '';
           position: absolute;
@@ -101,6 +106,13 @@
             border-color: var(--color-primary);
           }
         }
+		.el-tooltip{
+		  width: 100%;
+		  text-align: center;
+		  white-space: nowrap; /* 不换行 */
+		  overflow: hidden; /* 超出部分隐藏 */
+		  text-overflow: ellipsis; /* 显示省略号 */
+		}
         .num,
         .text {
           width: 100%;

src/views/produceOrder/index.vue

@@ -334,7 +334,7 @@
       // 完结与批量完结
       toEnd (row) {
         if (row) {
-          this.$confirm(`是否要完结工单【${row.code}】？`, '提醒', {
+          this.$confirm(`是否要完结工单 <span style="color: red;">【${row.code}】</span>？`, '提醒', {
             confirmButtonText: '确认',
             cancelButtonText: '取消',
             type: 'warning'