From 39456e021497f60964555406831fe2a9833997fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Thu, 9 Jan 2025 17:12:03 +0800
Subject: [PATCH] =?UTF-8?q?GP12=E8=A7=A6=E6=91=B8=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/mqtt/emqxUtil.js                    | 116 ++++----
 src/views/business/QcGp12BaseDefect.vue       |  22 +-
 src/views/business/QcGp12BaseGroup.vue        |  16 +-
 .../business/QcGp12BaseLabelAnalysis.vue      |  16 +-
 src/views/business/QcGp12BaseSite.vue         |  16 +-
 src/views/business/QcGp12LogWorkorder.vue     | 108 ++++----
 src/views/business/QcGp12RecordLabelScan.vue  |  21 +-
 .../business/QcGp12RecordWorkorderDefect.vue  |  26 +-
 .../business/QcGp12ServiceStatistics.vue      |  44 +--
 src/views/business/QcGp12ServiceWorkorder.vue | 158 ++++++-----
 .../gp12/touchScreen/main/index.css           |  15 +-
 .../gp12/touchScreen/main/index.vue           |  22 +-
 .../gp12/touchScreen/workorder/index.vue      | 254 +++++++++---------
 13 files changed, 396 insertions(+), 438 deletions(-)

diff --git a/src/utils/mqtt/emqxUtil.js b/src/utils/mqtt/emqxUtil.js
index fb03c19..721c4e7 100644
--- a/src/utils/mqtt/emqxUtil.js
+++ b/src/utils/mqtt/emqxUtil.js
@@ -1,86 +1,92 @@
-import mqtt from '@/plugins/mqtt.min.js';
-export const title = "shgg_mes"
+import mqtt from '@/plugins/mqtt.min.js'
+export const title = 'shgg_mes'
 // const mqtt = require('mqtt');
 // 云服务器环境
 // const url = 'wss://ff6bab7a.ala.cn-hangzhou.emqxsl.cn:8084/mqtt';
 // 本地环境
-// const url = 'ws://127.0.0.1:8083/mqtt';
+// const url = 'ws://192.168.0.58:8083/mqtt'
 // 线上环境
-const url = 'ws://192.168.60.251:8083/mqtt';
+const url = 'ws://192.168.60.251:8083/mqtt'
 // 创建客户端实例
 const options = {
-	clean: true,
-	connectTimeout: 4000,
-	clientId: 'emqx_test' + Math.random().toString(16).substring(2, 8),
-	username: 'user',
-	password: '123456'
+  clean: true,
+  connectTimeout: 4000,
+  clientId: 'emqx_test' + Math.random().toString(16).substring(2, 8),
+  username: 'user',
+  password: '123456',
 }
 // 首检topic
 export const firstFQCTopic = {
-	// 累加值变动
-	AccumulatorChange: title + '/firstFQC/AccumulatorChange',
-	// 班组切换
-	TeamChange: title + '/firstFQC/TeamChange',
-	// 工单切换
-	OrderChange: title + '/firstFQC/OrderChange',
-	// 首检当前操作工单保留消息
-	NowOrderRetain: title + '/firstFQC/NowOrderRetain'
+  // 累加值变动
+  AccumulatorChange: title + '/firstFQC/AccumulatorChange',
+  // 班组切换
+  TeamChange: title + '/firstFQC/TeamChange',
+  // 工单切换
+  OrderChange: title + '/firstFQC/OrderChange',
+  // 首检当前操作工单保留消息
+  NowOrderRetain: title + '/firstFQC/NowOrderRetain',
 }
 
 // 抛光topic
 export const againFQCTopic = {
-	// 累加值变动
-	AccumulatorChange: title + '/againFQC/AccumulatorChange',
-	// 班组切换
-	TeamChange: title + '/againFQC/TeamChange',
-	// 工单切换
-	OrderChange: title + '/againFQC/OrderChange'
+  // 累加值变动
+  AccumulatorChange: title + '/againFQC/AccumulatorChange',
+  // 班组切换
+  TeamChange: title + '/againFQC/TeamChange',
+  // 工单切换
+  OrderChange: title + '/againFQC/OrderChange',
 }
 
 // 包装topic
 export const thirtyFQCTopic = {
-	// 累加值变动
-	AccumulatorChange: title + '/thirtyFQC/AccumulatorChange',
-	// 班组切换
-	TeamChange: title + '/thirtyFQC/TeamChange',
-	// 工单切换
-	OrderChange: title + '/thirtyFQC/OrderChange'
+  // 累加值变动
+  AccumulatorChange: title + '/thirtyFQC/AccumulatorChange',
+  // 班组切换
+  TeamChange: title + '/thirtyFQC/TeamChange',
+  // 工单切换
+  OrderChange: title + '/thirtyFQC/OrderChange',
+}
+
+// GP12-topic
+export const GP12Topic = {
+  // GP12标签扫码
+  SiteComLabelCode: title + '/gp12/SiteComLabelCode',
 }
 
 export function createClient(clientId = null) {
-	let _options = options;
-	if (clientId !== null) {
-		_options.clientId = clientId;
-	}
-	return mqtt.connect(url, options);
+  let _options = options
+  if (clientId !== null) {
+    _options.clientId = clientId
+  }
+  return mqtt.connect(url, options)
 }
 export function endClient(client) {
-	if (client === null) {
-		return;
-	}
-	if (client.connected) {
-		client.end();
-	}
+  if (client === null) {
+    return
+  }
+  if (client.connected) {
+    client.end()
+  }
 }
 export function parseJSON(jsonStr = '') {
-	try {
-		return JSON.parse(jsonStr);
-	} catch (e) {
-		return null;
-	}
+  try {
+    return JSON.parse(jsonStr)
+  } catch (e) {
+    return null
+  }
 }
 
 export function stringJSON(object) {
-	try {
-		return JSON.stringify(object);
-	} catch (e) {
-		return null;
-	}
+  try {
+    return JSON.stringify(object)
+  } catch (e) {
+    return null
+  }
 }
 // 检查是否连接
 export function checkClient(client) {
-	if (client === null) {
-		return false;
-	}
-	return client.connected;
-}
\ No newline at end of file
+  if (client === null) {
+    return false
+  }
+  return client.connected
+}
diff --git a/src/views/business/QcGp12BaseDefect.vue b/src/views/business/QcGp12BaseDefect.vue
index 71f2c1b..2214861 100644
--- a/src/views/business/QcGp12BaseDefect.vue
+++ b/src/views/business/QcGp12BaseDefect.vue
@@ -39,19 +39,11 @@
       @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="50" align="center" />
       <el-table-column prop="id" label="序号" align="center" />
-      <el-table-column prop="name" label="名称" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="code" label="编号" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="group" label="组" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="type" label="系统类别" align="center">
-        <template slot-scope="scope">
-          <dict-tag :options="typeOptions" :value="scope.row.type" />
-        </template>
-      </el-table-column>
-      <el-table-column prop="status" label="系统状态" align="center">
-        <template slot-scope="scope">
-          <dict-tag :options="statusOptions" :value="scope.row.status" />
-        </template>
-      </el-table-column>
+      <el-table-column prop="name" label="名称" align="center" />
+      <el-table-column prop="code" label="编号" align="center" />
+      <el-table-column prop="group" label="组" align="center" />
+      <el-table-column prop="type" label="系统类别" align="center" />
+      <el-table-column prop="status" label="系统状态" align="center" />
       <el-table-column prop="remark" label="系统备注" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="createdTime" label="创建时间" align="center" :show-overflow-tooltip="true" />
@@ -109,8 +101,8 @@
           <el-col :lg="12">
             <el-form-item label="系统状态" prop="status">
               <el-radio-group v-model="form.status">
-                <el-radio v-for="item in statusOptions" :key="item.dictValue"
-                  :label="item.dictValue">{{ item.dictLabel }}</el-radio>
+                <el-radio v-for="item in statusOptions" :key="item.dictValue" :label="item.dictValue">{{ item.dictLabel
+                  }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
diff --git a/src/views/business/QcGp12BaseGroup.vue b/src/views/business/QcGp12BaseGroup.vue
index bc314a4..3bf6dc7 100644
--- a/src/views/business/QcGp12BaseGroup.vue
+++ b/src/views/business/QcGp12BaseGroup.vue
@@ -41,16 +41,8 @@
       <el-table-column prop="id" label="主键" align="center" />
       <el-table-column prop="name" label="名称" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="code" label="编号" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="type" label="系统类别" align="center">
-        <template slot-scope="scope">
-          <dict-tag :options="typeOptions" :value="scope.row.type" />
-        </template>
-      </el-table-column>
-      <el-table-column prop="status" label="系统状态" align="center">
-        <template slot-scope="scope">
-          <dict-tag :options="statusOptions" :value="scope.row.status" />
-        </template>
-      </el-table-column>
+      <el-table-column prop="type" label="系统类别" align="center" />
+      <el-table-column prop="status" label="系统状态" align="center" />
       <el-table-column prop="remark" label="系统备注" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="createdTime" label="创建时间" align="center" :show-overflow-tooltip="true" />
@@ -102,8 +94,8 @@
           <el-col :lg="12">
             <el-form-item label="系统状态" prop="status">
               <el-radio-group v-model="form.status">
-                <el-radio v-for="item in statusOptions" :key="item.dictValue"
-                  :label="item.dictValue">{{ item.dictLabel }}</el-radio>
+                <el-radio v-for="item in statusOptions" :key="item.dictValue" :label="item.dictValue">{{ item.dictLabel
+                  }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
diff --git a/src/views/business/QcGp12BaseLabelAnalysis.vue b/src/views/business/QcGp12BaseLabelAnalysis.vue
index 4309e9e..5bb61a3 100644
--- a/src/views/business/QcGp12BaseLabelAnalysis.vue
+++ b/src/views/business/QcGp12BaseLabelAnalysis.vue
@@ -43,16 +43,8 @@
       <el-table-column prop="code" label="编号" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="expression" label="表达式" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="sort" label="优先级" align="center" />
-      <el-table-column prop="type" label="系统类别" align="center">
-        <template slot-scope="scope">
-          <dict-tag :options="typeOptions" :value="scope.row.type" />
-        </template>
-      </el-table-column>
-      <el-table-column prop="status" label="系统状态" align="center">
-        <template slot-scope="scope">
-          <dict-tag :options="statusOptions" :value="scope.row.status" />
-        </template>
-      </el-table-column>
+      <el-table-column prop="type" label="系统类别" align="center" />
+      <el-table-column prop="status" label="系统状态" align="center" />
       <el-table-column prop="remark" label="系统备注" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="createdTime" label="创建时间" align="center" :show-overflow-tooltip="true" />
@@ -116,8 +108,8 @@
           <el-col :lg="12">
             <el-form-item label="系统状态" prop="status">
               <el-radio-group v-model="form.status">
-                <el-radio v-for="item in statusOptions" :key="item.dictValue"
-                  :label="item.dictValue">{{ item.dictLabel }}</el-radio>
+                <el-radio v-for="item in statusOptions" :key="item.dictValue" :label="item.dictValue">{{ item.dictLabel
+                  }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
diff --git a/src/views/business/QcGp12BaseSite.vue b/src/views/business/QcGp12BaseSite.vue
index b80776f..ee2db84 100644
--- a/src/views/business/QcGp12BaseSite.vue
+++ b/src/views/business/QcGp12BaseSite.vue
@@ -41,16 +41,8 @@
       <el-table-column prop="id" label="序号" align="center" />
       <el-table-column prop="name" label="名称" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="code" label="编号" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="type" label="系统类别" align="center">
-        <template slot-scope="scope">
-          <dict-tag :options="typeOptions" :value="scope.row.type" />
-        </template>
-      </el-table-column>
-      <el-table-column prop="status" label="系统状态" align="center">
-        <template slot-scope="scope">
-          <dict-tag :options="statusOptions" :value="scope.row.status" />
-        </template>
-      </el-table-column>
+      <el-table-column prop="type" label="系统类别" align="center" />
+      <el-table-column prop="status" label="系统状态" align="center" />
       <el-table-column prop="remark" label="系统备注" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="createdTime" label="创建时间" align="center" :show-overflow-tooltip="true" />
@@ -102,8 +94,8 @@
           <el-col :lg="12">
             <el-form-item label="系统状态" prop="status">
               <el-radio-group v-model="form.status">
-                <el-radio v-for="item in statusOptions" :key="item.dictValue"
-                  :label="item.dictValue">{{ item.dictLabel }}</el-radio>
+                <el-radio v-for="item in statusOptions" :key="item.dictValue" :label="item.dictValue">{{ item.dictLabel
+                  }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
diff --git a/src/views/business/QcGp12LogWorkorder.vue b/src/views/business/QcGp12LogWorkorder.vue
index eb2f337..1c4a141 100644
--- a/src/views/business/QcGp12LogWorkorder.vue
+++ b/src/views/business/QcGp12LogWorkorder.vue
@@ -9,9 +9,9 @@
 <template>
   <div class="app-container">
     <!-- :model属性用于表单验证使用 比如下面的el-form-item 的 prop属性用于对表单值进行验证操作 -->
-    <el-form :model="queryParams" size="small" label-position="right" inline ref="queryForm" :label-width="labelWidth" v-show="showSearch" 
-      @submit.native.prevent>
-      
+    <el-form :model="queryParams" size="small" label-position="right" inline ref="queryForm" :label-width="labelWidth"
+      v-show="showSearch" @submit.native.prevent>
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -20,33 +20,29 @@
     <!-- 工具区域 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" v-hasPermi="['business:qcgp12logworkorder:add']" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+        <el-button type="primary" v-hasPermi="['business:qcgp12logworkorder:add']" plain icon="el-icon-plus" size="mini"
+          @click="handleAdd">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="success" :disabled="single" v-hasPermi="['business:qcgp12logworkorder:edit']" plain icon="el-icon-edit" size="mini" @click="handleUpdate">修改</el-button>
+        <el-button type="success" :disabled="single" v-hasPermi="['business:qcgp12logworkorder:edit']" plain
+          icon="el-icon-edit" size="mini" @click="handleUpdate">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="danger" :disabled="multiple" v-hasPermi="['business:qcgp12logworkorder:delete']" plain icon="el-icon-delete" size="mini" @click="handleDelete">删除</el-button>
+        <el-button type="danger" :disabled="multiple" v-hasPermi="['business:qcgp12logworkorder:delete']" plain
+          icon="el-icon-delete" size="mini" @click="handleDelete">删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <!-- 数据区域 -->
-    <el-table :data="dataList" v-loading="loading" ref="table" border highlight-current-row @sort-change="sortChange" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="50" align="center"/>
+    <el-table :data="dataList" v-loading="loading" ref="table" border highlight-current-row @sort-change="sortChange"
+      @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="50" align="center" />
       <el-table-column prop="id" label="序号" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="name" label="日志名称" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="content" label="日志内容" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="type" label="系统类别" align="center">
-        <template slot-scope="scope">
-          <dict-tag :options="typeOptions" :value="scope.row.type" />
-        </template>
-      </el-table-column>
-      <el-table-column prop="status" label="系统状态" align="center">
-        <template slot-scope="scope">
-          <dict-tag :options="statusOptions" :value="scope.row.status" />
-        </template>
-      </el-table-column>
+      <el-table-column prop="type" label="系统类别" align="center" />
+      <el-table-column prop="status" label="系统状态" align="center" />
       <el-table-column prop="remark" label="系统备注" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="createdTime" label="创建时间" align="center" :show-overflow-tooltip="true" />
@@ -55,23 +51,25 @@
 
       <el-table-column label="操作" align="center" width="140">
         <template slot-scope="scope">
-          <el-button size="mini" v-hasPermi="['business:qcgp12logworkorder:edit']" type="success" icon="el-icon-edit" title="编辑" 
-            @click="handleUpdate(scope.row)"></el-button>      
-          <el-button size="mini" v-hasPermi="['business:qcgp12logworkorder:delete']" type="danger" icon="el-icon-delete" title="删除" 
-            @click="handleDelete(scope.row)"></el-button>
+          <el-button size="mini" v-hasPermi="['business:qcgp12logworkorder:edit']" type="success" icon="el-icon-edit"
+            title="编辑" @click="handleUpdate(scope.row)"></el-button>
+          <el-button size="mini" v-hasPermi="['business:qcgp12logworkorder:delete']" type="danger" icon="el-icon-delete"
+            title="删除" @click="handleDelete(scope.row)"></el-button>
         </template>
       </el-table-column>
     </el-table>
-    <pagination class="mt10" background :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+    <pagination class="mt10" background :total="total" :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize" @pagination="getList" />
 
     <!-- 添加或修改质量GP12工单操作日志对话框 -->
-    <el-dialog :title="title" :lock-scroll="false" :visible.sync="open" >
+    <el-dialog :title="title" :lock-scroll="false" :visible.sync="open">
       <el-form ref="form" :model="form" :rules="rules" :label-width="formLabelWidth">
         <el-row :gutter="20">
-        
+
           <el-col :lg="12">
             <el-form-item label="序号" prop="id">
-              <el-input-number v-model.number="form.id" controls-position="right" placeholder="请输入序号" :disabled="title=='修改数据'"/>
+              <el-input-number v-model.number="form.id" controls-position="right" placeholder="请输入序号"
+                :disabled="title == '修改数据'" />
             </el-form-item>
           </el-col>
 
@@ -90,7 +88,8 @@
           <el-col :lg="12">
             <el-form-item label="系统类别" prop="type">
               <el-select v-model="form.type" placeholder="请选择系统类别">
-                <el-option v-for="item in typeOptions" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
+                <el-option v-for="item in typeOptions" :key="item.dictValue" :label="item.dictLabel"
+                  :value="item.dictValue"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -98,7 +97,8 @@
           <el-col :lg="12">
             <el-form-item label="系统状态" prop="status">
               <el-radio-group v-model="form.status">
-                <el-radio v-for="item in statusOptions" :key="item.dictValue" :label="item.dictValue">{{item.dictLabel}}</el-radio>
+                <el-radio v-for="item in statusOptions" :key="item.dictValue"
+                  :label="item.dictValue">{{ item.dictLabel }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -144,7 +144,7 @@
   </div>
 </template>
 <script>
-import { 
+import {
   listQcGp12LogWorkorder,
   addQcGp12LogWorkorder,
   delQcGp12LogWorkorder,
@@ -157,7 +157,7 @@ export default {
   data() {
     return {
       labelWidth: "100px",
-      formLabelWidth:"100px",
+      formLabelWidth: "100px",
       // 选中id数组
       ids: [],
       // 非单个禁用
@@ -184,16 +184,16 @@ export default {
       // 表单参数
       form: {},
       columns: [
-        { index: 0, key: 'id', label: `序号`, checked:  true  },
-        { index: 1, key: 'name', label: `日志名称`, checked:  true  },
-        { index: 2, key: 'content', label: `日志内容`, checked:  true  },
-        { index: 3, key: 'type', label: `系统类别`, checked:  true  },
-        { index: 4, key: 'status', label: `系统状态`, checked:  true  },
-        { index: 5, key: 'remark', label: `系统备注`, checked:  true  },
-        { index: 6, key: 'createdBy', label: `创建人`, checked:  true  },
-        { index: 7, key: 'createdTime', label: `创建时间`, checked:  true  },
-        { index: 8, key: 'updatedBy', label: `更新人`, checked:  true  },
-        { index: 9, key: 'updatedTime', label: `更新时间`, checked:  false  },
+        { index: 0, key: 'id', label: `序号`, checked: true },
+        { index: 1, key: 'name', label: `日志名称`, checked: true },
+        { index: 2, key: 'content', label: `日志内容`, checked: true },
+        { index: 3, key: 'type', label: `系统类别`, checked: true },
+        { index: 4, key: 'status', label: `系统状态`, checked: true },
+        { index: 5, key: 'remark', label: `系统备注`, checked: true },
+        { index: 6, key: 'createdBy', label: `创建人`, checked: true },
+        { index: 7, key: 'createdTime', label: `创建时间`, checked: true },
+        { index: 8, key: 'updatedBy', label: `更新人`, checked: true },
+        { index: 9, key: 'updatedTime', label: `更新时间`, checked: false },
       ],
       // 系统类别选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
       typeOptions: [],
@@ -213,7 +213,7 @@ export default {
       },
     };
   },
-  created() {    
+  created() {
     // 列表数据查询
     this.getList();
 
@@ -225,12 +225,12 @@ export default {
     getList() {
       this.loading = true;
       listQcGp12LogWorkorder(this.queryParams).then(res => {
-         if (res.code == 200) {
-           this.dataList = res.data.result;
-           this.total = res.data.totalNum;
-           this.loading = false;
-         }
-       })
+        if (res.code == 200) {
+          this.dataList = res.data.result;
+          this.total = res.data.totalNum;
+          this.loading = false;
+        }
+      })
     },
     // 取消按钮
     cancel() {
@@ -265,7 +265,7 @@ export default {
       this.single = selection.length != 1
       this.multiple = !selection.length;
     },
-     // 自定义排序
+    // 自定义排序
     sortChange(column) {
       if (column.prop == null || column.order == null) {
         this.queryParams.sort = undefined;
@@ -301,7 +301,7 @@ export default {
           this.handleQuery();
           this.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -333,15 +333,15 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           console.log(JSON.stringify(this.form));
-          
+
           if (this.form.id != undefined && this.opertype === 2) {
             updateQcGp12LogWorkorder(this.form)
               .then((res) => {
                 this.msgSuccess("修改成功");
                 this.open = false;
                 this.getList();
-            })
-            .catch((err) => {
+              })
+              .catch((err) => {
                 //TODO 错误逻辑
               });
           } else {
@@ -350,8 +350,8 @@ export default {
                 this.msgSuccess("新增成功");
                 this.open = false;
                 this.getList();
-            })
-            .catch((err) => {
+              })
+              .catch((err) => {
                 //TODO 错误逻辑
               });
           }
diff --git a/src/views/business/QcGp12RecordLabelScan.vue b/src/views/business/QcGp12RecordLabelScan.vue
index 6e9a7f4..5112204 100644
--- a/src/views/business/QcGp12RecordLabelScan.vue
+++ b/src/views/business/QcGp12RecordLabelScan.vue
@@ -47,21 +47,14 @@
       <el-table-column prop="label" label="标签内容" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="labelType" label="标签类别(1-外箱标签 2-内标签)" align="center">
         <template slot-scope="scope">
-          <dict-tag :options="labelTypeOptions" :value="scope.row.labelType" />
+          <el-tag type="primary" v-if="scope.row.labelType === 1">外箱标签</el-tag>
+          <el-tag type="success" v-if="scope.row.labelType === 2">内标签</el-tag>
         </template>
       </el-table-column>
       <el-table-column prop="labelSort" label="标签流水号" align="center" />
-      <el-table-column prop="scanTime" label="扫码时间" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="type" label="系统类别" align="center">
-        <template slot-scope="scope">
-          <dict-tag :options="typeOptions" :value="scope.row.type" />
-        </template>
-      </el-table-column>
-      <el-table-column prop="status" label="系统状态" align="center">
-        <template slot-scope="scope">
-          <dict-tag :options="statusOptions" :value="scope.row.status" />
-        </template>
-      </el-table-column>
+      <el-table-column prop="scanTime" label="扫码时间" align="center" />
+      <el-table-column prop="type" label="系统类别" align="center" />
+      <el-table-column prop="status" label="系统状态" align="center" />
       <el-table-column prop="remark" label="系统备注" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="createdTime" label="创建时间" align="center" :show-overflow-tooltip="true" />
@@ -161,8 +154,8 @@
           <el-col :lg="12">
             <el-form-item label="系统状态" prop="status">
               <el-radio-group v-model="form.status">
-                <el-radio v-for="item in statusOptions" :key="item.dictValue"
-                  :label="item.dictValue">{{ item.dictLabel }}</el-radio>
+                <el-radio v-for="item in statusOptions" :key="item.dictValue" :label="item.dictValue">{{ item.dictLabel
+                  }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
diff --git a/src/views/business/QcGp12RecordWorkorderDefect.vue b/src/views/business/QcGp12RecordWorkorderDefect.vue
index e46b706..c983bfa 100644
--- a/src/views/business/QcGp12RecordWorkorderDefect.vue
+++ b/src/views/business/QcGp12RecordWorkorderDefect.vue
@@ -44,25 +44,13 @@
       <el-table-column prop="team" label="班组" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="siteNo" label="站点号" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="comNo" label="串口号" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="defectCode" label="缺陷编号" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="defectName" label="缺陷名称" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="defectType" label="缺陷类别" align="center">
-        <template slot-scope="scope">
-          <dict-tag :options="defectTypeOptions" :value="scope.row.defectType" />
-        </template>
-      </el-table-column>
+      <el-table-column prop="defectCode" label="缺陷编号" align="center" />
+      <el-table-column prop="defectName" label="缺陷名称" align="center" />
+      <el-table-column prop="defectType" label="缺陷类别" align="center" />
       <el-table-column prop="defectNum" label="缺陷数量" align="center" />
       <el-table-column prop="clickTime" label="最后点击时间" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="type" label="系统类别" align="center">
-        <template slot-scope="scope">
-          <dict-tag :options="typeOptions" :value="scope.row.type" />
-        </template>
-      </el-table-column>
-      <el-table-column prop="status" label="系统状态" align="center">
-        <template slot-scope="scope">
-          <dict-tag :options="statusOptions" :value="scope.row.status" />
-        </template>
-      </el-table-column>
+      <el-table-column prop="type" label="系统类别" align="center" />
+      <el-table-column prop="status" label="系统状态" align="center" />
       <el-table-column prop="remark" label="系统备注" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="createdTime" label="创建时间" align="center" :show-overflow-tooltip="true" />
@@ -168,8 +156,8 @@
           <el-col :lg="12">
             <el-form-item label="系统状态" prop="status">
               <el-radio-group v-model="form.status">
-                <el-radio v-for="item in statusOptions" :key="item.dictValue"
-                  :label="item.dictValue">{{ item.dictLabel }}</el-radio>
+                <el-radio v-for="item in statusOptions" :key="item.dictValue" :label="item.dictValue">{{ item.dictLabel
+                  }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
diff --git a/src/views/business/QcGp12ServiceStatistics.vue b/src/views/business/QcGp12ServiceStatistics.vue
index 39063ab..e9ea03d 100644
--- a/src/views/business/QcGp12ServiceStatistics.vue
+++ b/src/views/business/QcGp12ServiceStatistics.vue
@@ -47,26 +47,10 @@
       <el-table-column prop="team" label="班组" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="siteNo" label="站点号" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="comNo" label="串口号" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="isOnetime" label="是否一次合格" align="center">
-        <template slot-scope="scope">
-          <dict-tag :options="isOnetimeOptions" :value="scope.row.isOnetime" />
-        </template>
-      </el-table-column>
-      <el-table-column prop="isBack" label="是否返工件" align="center">
-        <template slot-scope="scope">
-          <dict-tag :options="isBackOptions" :value="scope.row.isBack" />
-        </template>
-      </el-table-column>
-      <el-table-column prop="isPolish" label="是否抛光件" align="center">
-        <template slot-scope="scope">
-          <dict-tag :options="isPolishOptions" :value="scope.row.isPolish" />
-        </template>
-      </el-table-column>
-      <el-table-column prop="isOut" label="是否外部件" align="center">
-        <template slot-scope="scope">
-          <dict-tag :options="isOutOptions" :value="scope.row.isOut" />
-        </template>
-      </el-table-column>
+      <el-table-column prop="isOnetime" label="是否一次合格" align="center" />
+      <el-table-column prop="isBack" label="是否返工件" align="center" />
+      <el-table-column prop="isPolish" label="是否抛光件" align="center" />
+      <el-table-column prop="isOut" label="是否外部件" align="center" />
       <el-table-column prop="startTime" label="开始时间" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="endTime" label="结束时间" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="label" label="箱标签记录" align="center" :show-overflow-tooltip="true" />
@@ -169,8 +153,8 @@
           <el-col :lg="12">
             <el-form-item label="是否一次合格" prop="isOnetime">
               <el-radio-group v-model="form.isOnetime">
-                <el-radio v-for="item in isOnetimeOptions" :key="item.dictValue"
-                  :label="parseInt(item.dictValue)">{{ item.dictLabel }}</el-radio>
+                <el-radio v-for="item in isOnetimeOptions" :key="item.dictValue" :label="parseInt(item.dictValue)">{{
+                  item.dictLabel }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -178,8 +162,8 @@
           <el-col :lg="12">
             <el-form-item label="是否返工件" prop="isBack">
               <el-radio-group v-model="form.isBack">
-                <el-radio v-for="item in isBackOptions" :key="item.dictValue"
-                  :label="parseInt(item.dictValue)">{{ item.dictLabel }}</el-radio>
+                <el-radio v-for="item in isBackOptions" :key="item.dictValue" :label="parseInt(item.dictValue)">{{
+                  item.dictLabel }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -187,8 +171,8 @@
           <el-col :lg="12">
             <el-form-item label="是否抛光件" prop="isPolish">
               <el-radio-group v-model="form.isPolish">
-                <el-radio v-for="item in isPolishOptions" :key="item.dictValue"
-                  :label="parseInt(item.dictValue)">{{ item.dictLabel }}</el-radio>
+                <el-radio v-for="item in isPolishOptions" :key="item.dictValue" :label="parseInt(item.dictValue)">{{
+                  item.dictLabel }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -196,8 +180,8 @@
           <el-col :lg="12">
             <el-form-item label="是否外部件" prop="isOut">
               <el-radio-group v-model="form.isOut">
-                <el-radio v-for="item in isOutOptions" :key="item.dictValue"
-                  :label="parseInt(item.dictValue)">{{ item.dictLabel }}</el-radio>
+                <el-radio v-for="item in isOutOptions" :key="item.dictValue" :label="parseInt(item.dictValue)">{{
+                  item.dictLabel }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -280,8 +264,8 @@
           <el-col :lg="12">
             <el-form-item label="系统状态" prop="status">
               <el-radio-group v-model="form.status">
-                <el-radio v-for="item in statusOptions" :key="item.dictValue"
-                  :label="item.dictValue">{{ item.dictLabel }}</el-radio>
+                <el-radio v-for="item in statusOptions" :key="item.dictValue" :label="item.dictValue">{{ item.dictLabel
+                  }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
diff --git a/src/views/business/QcGp12ServiceWorkorder.vue b/src/views/business/QcGp12ServiceWorkorder.vue
index 758653a..a3dccc0 100644
--- a/src/views/business/QcGp12ServiceWorkorder.vue
+++ b/src/views/business/QcGp12ServiceWorkorder.vue
@@ -9,9 +9,9 @@
 <template>
   <div class="app-container">
     <!-- :model属性用于表单验证使用 比如下面的el-form-item 的 prop属性用于对表单值进行验证操作 -->
-    <el-form :model="queryParams" size="small" label-position="right" inline ref="queryForm" :label-width="labelWidth" v-show="showSearch" 
-      @submit.native.prevent>
-      
+    <el-form :model="queryParams" size="small" label-position="right" inline ref="queryForm" :label-width="labelWidth"
+      v-show="showSearch" @submit.native.prevent>
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -20,20 +20,24 @@
     <!-- 工具区域 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" v-hasPermi="['business:qcgp12serviceworkorder:add']" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+        <el-button type="primary" v-hasPermi="['business:qcgp12serviceworkorder:add']" plain icon="el-icon-plus"
+          size="mini" @click="handleAdd">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="success" :disabled="single" v-hasPermi="['business:qcgp12serviceworkorder:edit']" plain icon="el-icon-edit" size="mini" @click="handleUpdate">修改</el-button>
+        <el-button type="success" :disabled="single" v-hasPermi="['business:qcgp12serviceworkorder:edit']" plain
+          icon="el-icon-edit" size="mini" @click="handleUpdate">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="danger" :disabled="multiple" v-hasPermi="['business:qcgp12serviceworkorder:delete']" plain icon="el-icon-delete" size="mini" @click="handleDelete">删除</el-button>
+        <el-button type="danger" :disabled="multiple" v-hasPermi="['business:qcgp12serviceworkorder:delete']" plain
+          icon="el-icon-delete" size="mini" @click="handleDelete">删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <!-- 数据区域 -->
-    <el-table :data="dataList" v-loading="loading" ref="table" border highlight-current-row @sort-change="sortChange" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="50" align="center"/>
+    <el-table :data="dataList" v-loading="loading" ref="table" border highlight-current-row @sort-change="sortChange"
+      @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="50" align="center" />
       <el-table-column prop="id" label="序号" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="workOrder" label="工单号" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="partNumber" label="零件号" align="center" :show-overflow-tooltip="true" />
@@ -88,23 +92,25 @@
 
       <el-table-column label="操作" align="center" width="140">
         <template slot-scope="scope">
-          <el-button size="mini" v-hasPermi="['business:qcgp12serviceworkorder:edit']" type="success" icon="el-icon-edit" title="编辑" 
-            @click="handleUpdate(scope.row)"></el-button>      
-          <el-button size="mini" v-hasPermi="['business:qcgp12serviceworkorder:delete']" type="danger" icon="el-icon-delete" title="删除" 
-            @click="handleDelete(scope.row)"></el-button>
+          <el-button size="mini" v-hasPermi="['business:qcgp12serviceworkorder:edit']" type="success"
+            icon="el-icon-edit" title="编辑" @click="handleUpdate(scope.row)"></el-button>
+          <el-button size="mini" v-hasPermi="['business:qcgp12serviceworkorder:delete']" type="danger"
+            icon="el-icon-delete" title="删除" @click="handleDelete(scope.row)"></el-button>
         </template>
       </el-table-column>
     </el-table>
-    <pagination class="mt10" background :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+    <pagination class="mt10" background :total="total" :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize" @pagination="getList" />
 
     <!-- 添加或修改质量GP12工单业务模块对话框 -->
-    <el-dialog :title="title" :lock-scroll="false" :visible.sync="open" >
+    <el-dialog :title="title" :lock-scroll="false" :visible.sync="open">
       <el-form ref="form" :model="form" :rules="rules" :label-width="formLabelWidth">
         <el-row :gutter="20">
-        
+
           <el-col :lg="12">
             <el-form-item label="序号" prop="id">
-              <el-input-number v-model.number="form.id" controls-position="right" placeholder="请输入序号" :disabled="title=='修改数据'"/>
+              <el-input-number v-model.number="form.id" controls-position="right" placeholder="请输入序号"
+                :disabled="title == '修改数据'" />
             </el-form-item>
           </el-col>
 
@@ -155,35 +161,39 @@
               <el-input v-model="form.comNo" placeholder="请输入串口号" />
             </el-form-item>
           </el-col>
-    
+
           <el-col :lg="12">
             <el-form-item label="是否一次合格" prop="isOnetime">
               <el-radio-group v-model="form.isOnetime">
-                <el-radio v-for="item in isOnetimeOptions" :key="item.dictValue" :label="parseInt(item.dictValue)">{{item.dictLabel}}</el-radio>
+                <el-radio v-for="item in isOnetimeOptions" :key="item.dictValue" :label="parseInt(item.dictValue)">{{
+                  item.dictLabel }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
-    
+
           <el-col :lg="12">
             <el-form-item label="是否返工件" prop="isBack">
               <el-radio-group v-model="form.isBack">
-                <el-radio v-for="item in isBackOptions" :key="item.dictValue" :label="parseInt(item.dictValue)">{{item.dictLabel}}</el-radio>
+                <el-radio v-for="item in isBackOptions" :key="item.dictValue" :label="parseInt(item.dictValue)">{{
+                  item.dictLabel }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
-    
+
           <el-col :lg="12">
             <el-form-item label="是否抛光件" prop="isPolish">
               <el-radio-group v-model="form.isPolish">
-                <el-radio v-for="item in isPolishOptions" :key="item.dictValue" :label="parseInt(item.dictValue)">{{item.dictLabel}}</el-radio>
+                <el-radio v-for="item in isPolishOptions" :key="item.dictValue" :label="parseInt(item.dictValue)">{{
+                  item.dictLabel }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
-    
+
           <el-col :lg="12">
             <el-form-item label="是否外部件" prop="isOut">
               <el-radio-group v-model="form.isOut">
-                <el-radio v-for="item in isOutOptions" :key="item.dictValue" :label="parseInt(item.dictValue)">{{item.dictLabel}}</el-radio>
+                <el-radio v-for="item in isOutOptions" :key="item.dictValue" :label="parseInt(item.dictValue)">{{
+                  item.dictLabel }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -205,25 +215,25 @@
               <el-input v-model="form.label" placeholder="请输入箱标签记录" />
             </el-form-item>
           </el-col>
-    
+
           <el-col :lg="12">
             <el-form-item label="投入数" prop="requireNumber">
               <el-input v-model="form.requireNumber" placeholder="请输入投入数" />
             </el-form-item>
           </el-col>
-    
+
           <el-col :lg="12">
             <el-form-item label="合格数" prop="qualifiedNumber">
               <el-input v-model="form.qualifiedNumber" placeholder="请输入合格数" />
             </el-form-item>
           </el-col>
-    
+
           <el-col :lg="12">
             <el-form-item label="打磨数" prop="damoNumber">
               <el-input v-model="form.damoNumber" placeholder="请输入打磨数" />
             </el-form-item>
           </el-col>
-    
+
           <el-col :lg="12">
             <el-form-item label="报废数" prop="baofeiNumber">
               <el-input v-model="form.baofeiNumber" placeholder="请输入报废数" />
@@ -233,7 +243,8 @@
           <el-col :lg="12">
             <el-form-item label="系统类别" prop="type">
               <el-select v-model="form.type" placeholder="请选择系统类别">
-                <el-option v-for="item in typeOptions" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
+                <el-option v-for="item in typeOptions" :key="item.dictValue" :label="item.dictLabel"
+                  :value="item.dictValue"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -241,7 +252,8 @@
           <el-col :lg="12">
             <el-form-item label="系统状态" prop="status">
               <el-radio-group v-model="form.status">
-                <el-radio v-for="item in statusOptions" :key="item.dictValue" :label="item.dictValue">{{item.dictLabel}}</el-radio>
+                <el-radio v-for="item in statusOptions" :key="item.dictValue" :label="item.dictValue">{{ item.dictLabel
+                  }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -287,7 +299,7 @@
   </div>
 </template>
 <script>
-import { 
+import {
   listQcGp12ServiceWorkorder,
   addQcGp12ServiceWorkorder,
   delQcGp12ServiceWorkorder,
@@ -300,7 +312,7 @@ export default {
   data() {
     return {
       labelWidth: "100px",
-      formLabelWidth:"100px",
+      formLabelWidth: "100px",
       // 选中id数组
       ids: [],
       // 非单个禁用
@@ -327,33 +339,33 @@ export default {
       // 表单参数
       form: {},
       columns: [
-        { index: 0, key: 'id', label: `序号`, checked:  true  },
-        { index: 1, key: 'workOrder', label: `工单号`, checked:  true  },
-        { index: 2, key: 'partNumber', label: `零件号`, checked:  true  },
-        { index: 3, key: 'description', label: `零件描述`, checked:  true  },
-        { index: 4, key: 'specification', label: `规格`, checked:  true  },
-        { index: 5, key: 'color', label: `颜色`, checked:  true  },
-        { index: 6, key: 'team', label: `班组`, checked:  true  },
-        { index: 7, key: 'siteNo', label: `站点号`, checked:  true  },
-        { index: 8, key: 'comNo', label: `串口号`, checked:  true  },
-        { index: 9, key: 'isOnetime', label: `是否一次合格`, checked:  false  },
-        { index: 10, key: 'isBack', label: `是否返工件`, checked:  false  },
-        { index: 11, key: 'isPolish', label: `是否抛光件`, checked:  false  },
-        { index: 12, key: 'isOut', label: `是否外部件`, checked:  false  },
-        { index: 13, key: 'startTime', label: `开始时间`, checked:  false  },
-        { index: 14, key: 'endTime', label: `结束时间`, checked:  false  },
-        { index: 15, key: 'label', label: `箱标签记录`, checked:  false  },
-        { index: 16, key: 'requireNumber', label: `投入数`, checked:  false  },
-        { index: 17, key: 'qualifiedNumber', label: `合格数`, checked:  false  },
-        { index: 18, key: 'damoNumber', label: `打磨数`, checked:  false  },
-        { index: 19, key: 'baofeiNumber', label: `报废数`, checked:  false  },
-        { index: 20, key: 'type', label: `系统类别`, checked:  false  },
-        { index: 21, key: 'status', label: `系统状态`, checked:  false  },
-        { index: 22, key: 'remark', label: `系统备注`, checked:  false  },
-        { index: 23, key: 'createdBy', label: `创建人`, checked:  false  },
-        { index: 24, key: 'createdTime', label: `创建时间`, checked:  false  },
-        { index: 25, key: 'updatedBy', label: `更新人`, checked:  false  },
-        { index: 26, key: 'updatedTime', label: `更新时间`, checked:  false  },
+        { index: 0, key: 'id', label: `序号`, checked: true },
+        { index: 1, key: 'workOrder', label: `工单号`, checked: true },
+        { index: 2, key: 'partNumber', label: `零件号`, checked: true },
+        { index: 3, key: 'description', label: `零件描述`, checked: true },
+        { index: 4, key: 'specification', label: `规格`, checked: true },
+        { index: 5, key: 'color', label: `颜色`, checked: true },
+        { index: 6, key: 'team', label: `班组`, checked: true },
+        { index: 7, key: 'siteNo', label: `站点号`, checked: true },
+        { index: 8, key: 'comNo', label: `串口号`, checked: true },
+        { index: 9, key: 'isOnetime', label: `是否一次合格`, checked: false },
+        { index: 10, key: 'isBack', label: `是否返工件`, checked: false },
+        { index: 11, key: 'isPolish', label: `是否抛光件`, checked: false },
+        { index: 12, key: 'isOut', label: `是否外部件`, checked: false },
+        { index: 13, key: 'startTime', label: `开始时间`, checked: false },
+        { index: 14, key: 'endTime', label: `结束时间`, checked: false },
+        { index: 15, key: 'label', label: `箱标签记录`, checked: false },
+        { index: 16, key: 'requireNumber', label: `投入数`, checked: false },
+        { index: 17, key: 'qualifiedNumber', label: `合格数`, checked: false },
+        { index: 18, key: 'damoNumber', label: `打磨数`, checked: false },
+        { index: 19, key: 'baofeiNumber', label: `报废数`, checked: false },
+        { index: 20, key: 'type', label: `系统类别`, checked: false },
+        { index: 21, key: 'status', label: `系统状态`, checked: false },
+        { index: 22, key: 'remark', label: `系统备注`, checked: false },
+        { index: 23, key: 'createdBy', label: `创建人`, checked: false },
+        { index: 24, key: 'createdTime', label: `创建时间`, checked: false },
+        { index: 25, key: 'updatedBy', label: `更新人`, checked: false },
+        { index: 26, key: 'updatedTime', label: `更新时间`, checked: false },
       ],
       // 是否一次合格选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
       isOnetimeOptions: [],
@@ -381,7 +393,7 @@ export default {
       },
     };
   },
-  created() {    
+  created() {
     // 列表数据查询
     this.getList();
 
@@ -393,12 +405,12 @@ export default {
     getList() {
       this.loading = true;
       listQcGp12ServiceWorkorder(this.queryParams).then(res => {
-         if (res.code == 200) {
-           this.dataList = res.data.result;
-           this.total = res.data.totalNum;
-           this.loading = false;
-         }
-       })
+        if (res.code == 200) {
+          this.dataList = res.data.result;
+          this.total = res.data.totalNum;
+          this.loading = false;
+        }
+      })
     },
     // 取消按钮
     cancel() {
@@ -450,7 +462,7 @@ export default {
       this.single = selection.length != 1
       this.multiple = !selection.length;
     },
-     // 自定义排序
+    // 自定义排序
     sortChange(column) {
       if (column.prop == null || column.order == null) {
         this.queryParams.sort = undefined;
@@ -486,7 +498,7 @@ export default {
           this.handleQuery();
           this.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -534,15 +546,15 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           console.log(JSON.stringify(this.form));
-          
+
           if (this.form.id != undefined && this.opertype === 2) {
             updateQcGp12ServiceWorkorder(this.form)
               .then((res) => {
                 this.msgSuccess("修改成功");
                 this.open = false;
                 this.getList();
-            })
-            .catch((err) => {
+              })
+              .catch((err) => {
                 //TODO 错误逻辑
               });
           } else {
@@ -551,8 +563,8 @@ export default {
                 this.msgSuccess("新增成功");
                 this.open = false;
                 this.getList();
-            })
-            .catch((err) => {
+              })
+              .catch((err) => {
                 //TODO 错误逻辑
               });
           }
diff --git a/src/views/qualityManagement/gp12/touchScreen/main/index.css b/src/views/qualityManagement/gp12/touchScreen/main/index.css
index 5939db1..3b9a62f 100644
--- a/src/views/qualityManagement/gp12/touchScreen/main/index.css
+++ b/src/views/qualityManagement/gp12/touchScreen/main/index.css
@@ -1,20 +1,23 @@
-.container{
+.container {
     margin: 0;
-    padding: 10px;
+    padding: 2px;
     width: 100%;
-    min-height: 93vh;
+    height: 100%;
     background-color: #000d2c;
     display: flex;
     flex-direction: column;
 }
-.nav-right{
+
+.nav-right {
     display: flex;
     flex-direction: row;
     width: 300px;
 }
-.text-green{
+
+.text-green {
     color: #67C23A;
 }
-.text-red{
+
+.text-red {
     color: red;
 }
\ No newline at end of file
diff --git a/src/views/qualityManagement/gp12/touchScreen/main/index.vue b/src/views/qualityManagement/gp12/touchScreen/main/index.vue
index 010afac..37b1ca5 100644
--- a/src/views/qualityManagement/gp12/touchScreen/main/index.vue
+++ b/src/views/qualityManagement/gp12/touchScreen/main/index.vue
@@ -11,16 +11,7 @@
                 <keep-alive>
                     <component :is="currentComponent" v-if="currentMenu !== -1"></component>
                 </keep-alive>
-                <!-- <div v-if="currentMenu === 0">
-                    <WorkOrder></WorkOrder>
-                </div>
-                <div v-if="currentMenu === 1">记录面内容</div>
-                <div v-if="currentMenu === 2">工具面内容</div>
-                <div v-if="currentMenu === 3">
-                    <comText></comText>
-                </div> -->
             </div>
-
             <!-- 右侧目录菜单 -->
             <div class="menu">
                 <ul>
@@ -154,6 +145,8 @@ export default {
 <style scoped>
 @import './index.css';
 
+
+
 .border {
     border: 1px solid red;
 }
@@ -176,12 +169,13 @@ export default {
 .main-page {
     flex: 1;
     background-color: #2c3e50;
+    min-height: 93vh;
     /* 移除内边距并保持一致背景色 */
 }
 
 .menu {
-    width: 120px;
-    padding: 10px;
+    width: 80px;
+    padding: 5px;
     background-color: #34495e;
     /* 更柔和的颜色 */
     border-left: 1px solid #2980b9;
@@ -197,7 +191,7 @@ export default {
 .menu li {
     display: flex;
     align-items: center;
-    padding: 10px;
+    padding: 5px;
     border-bottom: 1px solid #2980b9;
     /* 设置底部边框颜色 */
     cursor: pointer;
@@ -227,12 +221,12 @@ export default {
 }
 
 .menu li .mdi {
-    font-size: 32px;
+    font-size: 24px;
     margin-right: 15px;
 }
 
 .menu li div {
-    font-size: 24px;
+    font-size: 16px;
 }
 
 /* 顶部标题与功能菜单栏样式 */
diff --git a/src/views/qualityManagement/gp12/touchScreen/workorder/index.vue b/src/views/qualityManagement/gp12/touchScreen/workorder/index.vue
index 8c0497c..50e55f7 100644
--- a/src/views/qualityManagement/gp12/touchScreen/workorder/index.vue
+++ b/src/views/qualityManagement/gp12/touchScreen/workorder/index.vue
@@ -38,21 +38,18 @@
                     <div class="workorder-card-button-box">
                         <div>
                             <el-button type="primary" @click="doRefresh">刷新</el-button>
-                            <!-- <el-button type="primary" @click="sendData">发送</el-button> -->
                         </div>
                         <div>
                             <el-button v-if="formStatus === 1" type="success"
                                 @click="doBtnStartWorkOrder">开始工单</el-button>
-                            <el-button v-if="formStatus === 2" type="primary"
-                                @click="connectSerialPort">请求扫描内标签</el-button>
                             <el-button v-if="formStatus === 2" type="warning"
                                 @click="doBtnEndWorkOrder">结束工单</el-button>
                         </div>
                     </div>
                     <div class="workorder-card-action-box">
                         <div>
-                            <span>站点:</span>
-                            <el-select v-model="site" placeholder="请选择站点" @change="selectChange">
+                            <span>站点: </span>
+                            <el-select style="width: 140px;" v-model="site" placeholder="请选择站点" @change="selectChange">
                                 <el-option v-for="item in siteOptions" :key="item.code" :label="item.name"
                                     :value="item.code">
                                 </el-option>
@@ -60,8 +57,8 @@
                         </div>
 
                         <div>
-                            <span>班组:</span>
-                            <el-select v-model="team" placeholder="请选择班组" @change="selectChange">
+                            <span>班组: </span>
+                            <el-select style="width: 140px;" v-model="team" placeholder="请选择班组" @change="selectChange">
                                 <el-option v-for="item in teamOptions" :key="item.code" :label="item.name"
                                     :value="item.code">
                                 </el-option>
@@ -160,22 +157,27 @@
                     <div class="number-text">{{ startWorkOrderDialog.labelCode }}</div>
                 </el-form-item>
                 <div v-if="startWorkOrderDialog.partnumber">
-                    <!-- <el-form-item label="是否一次合格品">
-                        <el-switch v-model="startWorkOrderDialog.isOnetime" active-value="1" inactive-value="0">
-                        </el-switch>
-                    </el-form-item> -->
-                    <el-form-item label="是否抛光件">
-                        <el-switch v-model="startWorkOrderDialog.isPolish" :active-value="1" :inactive-value="0">
-                        </el-switch>
-                    </el-form-item>
-                    <el-form-item label="是否返工件">
-                        <el-switch v-model="startWorkOrderDialog.isBack" :active-value="1" :inactive-value="0">
-                        </el-switch>
-                    </el-form-item>
-                    <el-form-item label="标记">
-                        <el-switch v-model="startWorkOrderDialog.isOut" :active-value="1" :inactive-value="0">
-                        </el-switch>
-                    </el-form-item>
+                    <el-row>
+                        <el-col :span="8">
+                            <el-form-item label="是否抛光件">
+                                <el-switch v-model="startWorkOrderDialog.isPolish" :active-value="1"
+                                    :inactive-value="0">
+                                </el-switch>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="是否返工件">
+                                <el-switch v-model="startWorkOrderDialog.isBack" :active-value="1" :inactive-value="0">
+                                </el-switch>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="标记">
+                                <el-switch v-model="startWorkOrderDialog.isOut" :active-value="1" :inactive-value="0">
+                                </el-switch>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
                 </div>
             </el-form>
             <scanInput @scanInput="handleScanBoxOutLabel"></scanInput>
@@ -189,7 +191,7 @@
         </el-dialog>
         <!-- 结束工单 -->
         <el-dialog v-loading="endWorkOrderDialog.loading" :visible.sync="endWorkOrderDialog.show"
-            :title="endWorkOrderDialog.title" width="75%" append-to-body :close-on-click-modal="false">
+            :title="endWorkOrderDialog.title" width="90%" append-to-body :close-on-click-modal="false">
             <el-form label-width="auto">
                 <el-row :gutter="20">
                     <el-col :span="6">
@@ -280,6 +282,7 @@
 </template>
 
 <script>
+import * as emqxUtil from '@/utils/mqtt/emqxUtil';
 import * as QcGp12Api from '@/api/qualityManagement/gp12/qcGp12Service';
 import scanInput from '../components/scanInput.vue';
 export default {
@@ -287,6 +290,8 @@ export default {
     components: { scanInput },
     data() {
         return {
+            mqttClient: null,
+            mqttClientId: emqxUtil.title + 'GP12' + Math.random().toString(16).substring(1, 10),
             sessionKey: '_touchScreenA01',
             groups: [
                 { groupName: '油漆', children: [] },
@@ -297,18 +302,7 @@ export default {
             ],
             rowList: ['抛光', '打磨', '报废'],
             // 缺陷数据
-            defectList: [
-                {
-                    id: '11',
-                    defectCode: '111',
-                    defectNum: 5
-                },
-                {
-                    id: '22',
-                    defectCode: '111',
-                    defectNum: 5
-                }
-            ],
+            defectList: [],
             teamOptions: [],
             siteOptions: [],
             // 站点工单执行状态 1-初始状态（扫外箱标签） 2-工单执行中（扫内标签）
@@ -376,13 +370,13 @@ export default {
     computed: {
         // 20250103 TODO 投入数，合格数，合格率，抛光数，打磨数，报废数 计算
         qualifiedRate() {
-            try {
-                if (this.formData.requireNumber * 1 > 0) {
-                    return Math.floor(this.formData.qualifiedNumber * 1 / this.formData.requireNumber * 1) * 100 + '%';
-                } else {
-                    return "0%";
-                }
-            } catch (error) {
+            console.log('requireNumber:', this.formData.requireNumber);
+            console.log('qualifiedNumber:', this.formData.qualifiedNumber);
+
+            if (this.formData.requireNumber > 0) {
+                const rate = Math.floor((this.formData.qualifiedNumber / this.formData.requireNumber) * 100);
+                return `${rate}%`;
+            } else {
                 return "0%";
             }
         }
@@ -407,6 +401,7 @@ export default {
             this.groups = groups.data
             // 缓存数据读取
             this.getLocalStorage()
+            this.initMqtt()
         },
         selectChange() {
             this.setLocalStorage()
@@ -434,6 +429,7 @@ export default {
             if (this.serialPort && this.serialPort.readable) {
                 this.serialPort.close();
             }
+            emqxUtil.endClient(this.mqttClient);
         },
         handleTouchMove(event) {
             // 处理 touchmove 事件（如果需要）
@@ -478,7 +474,7 @@ export default {
             this.startWorkOrderDialog.show = true
         },
         // 扫外箱标签的情况
-        handleScanBoxOutLabel(label = '') {
+        handleScanBoxOutLabel(label = '', comNo = '未知串口') {
             const params = {
                 label,
                 // type === 1 获取详细物料信息 2只判断零件号是否正确
@@ -486,6 +482,20 @@ export default {
             }
             QcGp12Api.AnalyzeLabel(params).then(res => {
                 if (res.code === 200 && res.data.isOk) {
+                    // 可能为内标签
+                    if (res.data.number < 6) {
+                        this.$confirm('标签异常:标签判定为内标签', '提示', {
+                            confirmButtonText: '确定',
+                            cancelButtonText: '取消',
+                            type: 'warning',
+                            center: true
+                        }).then(() => {
+                        }).catch(() => {
+                        });
+                        this.message = '标签判定为内标签';
+                        this.messageClass = 'text-red';
+                        return;
+                    }
                     this.message = '正常';
                     this.messageClass = 'text-green';
                     this.startWorkOrderDialog.partnumber = res.data.partnumber;
@@ -494,6 +504,7 @@ export default {
                     this.startWorkOrderDialog.number = res.data.number;
                     this.startWorkOrderDialog.description = res.data.description;
                     this.startWorkOrderDialog.labelCode = res.data.labelCode;
+                    this.startWorkOrderDialog.comNo = comNo;
                 } else {
                     this.$confirm('标签异常:' + res.data.msg, '提示', {
                         confirmButtonText: '确定',
@@ -517,7 +528,7 @@ export default {
                 color: this.startWorkOrderDialog.color,
                 team: this.team,
                 siteNo: this.site,
-                comNo: "COM1",
+                comNo: this.startWorkOrderDialog.comNo,
                 isOnetime: this.startWorkOrderDialog.isPolish === 0 ? 1 : 0,
                 isBack: this.startWorkOrderDialog.isBack,
                 isPolish: this.startWorkOrderDialog.isPolish,
@@ -575,7 +586,8 @@ export default {
             this.endWorkOrderDialog.loading = false;
         },
         // 扫内标签的情况
-        handleScanInnerLabel(label = '', comNo = "COM1") {
+        handleScanInnerLabel(label = '', comNo = "未知串口") {
+            console.log(label, comNo);
             const params = {
                 workOrder: this.formData.workOrder,
                 partNumber: this.formData.partNumber,
@@ -587,9 +599,13 @@ export default {
             }
             QcGp12Api.ScanInnerLabel(params).then(res => {
                 if (res.code === 200 && res.data === "ok") {
+                    this.message = '正常';
+                    this.messageClass = 'text-green';
                     this.updateFormData()
                 } else {
                     this.$message.error("扫描内标签异常！" + res.data);
+                    this.message = res.data;
+                    this.messageClass = 'text-red';
                 }
             });
         },
@@ -791,56 +807,6 @@ export default {
                 }
             })
         },
-        async connectSerialPort() {
-            try {
-                // 请求用户选择串口
-                this.serialPort = await navigator.serial.requestPort();
-                // 打开串口
-                await this.serialPort.open({ baudRate: 9600 });
-                // 创建读取器
-                const decoder = new TextDecoderStream();
-                this.reader = this.serialPort.readable.pipeThrough(decoder).getReader();
-                // 读取数据
-                while (true) {
-                    const { value, done } = await this.reader.read();
-                    this.$message.success('数据:' + value)
-                    if (done) {
-                        break;
-                    }
-                    console.log("value", value);
-                    this.handleScanInnerLabel(value)
-                }
-            } catch (error) {
-                this.$message.error('无法连接到串口:' + error)
-                console.error("无法连接到串口:", error);
-            }
-        },
-        // 测试发数据
-        async sendData() {
-            if (!this.serialPort || !this.serialPort.writable) {
-                this.$message.error('请先连接串口!');
-                return;
-            }
-            if (!this.writer) {
-                try {
-                    this.writer = this.serialPort.writable.getWriter();
-                } catch (error) {
-                    console.error('无法创建写入器:', error);
-                    this.$message.error('无法创建写入器: ' + error.message);
-                    return;
-                }
-            }
-            const message = '发送了串口数据!\n';
-            const encoder = new TextEncoder();
-            const data = encoder.encode(message);
-            try {
-                await this.writer.write(data);
-                console.log('消息发送:', message);
-            } catch (error) {
-                console.error('错误:', error);
-                this.$message.error('错误: ' + error.message);
-            }
-        },
         closeWriter() {
             if (this.writer) {
                 try {
@@ -860,7 +826,53 @@ export default {
                     console.error('Error canceling reader:', error);
                 }
             }
-        }
+        },
+        // mqtt 操作
+        initMqtt() {
+            const that = this;
+            if (that.mqttClient !== null && that.mqttClient.connected) {
+                // 已建立连接
+                return;
+            }
+            // 需要传输或订阅的内容
+            const _topic = emqxUtil.GP12Topic;
+            that.mqttClient = emqxUtil.createClient(that.mqttClientId);
+            // 订阅所有值变动
+            that.mqttClient.subscribe(_topic.SiteComLabelCode + '/#');
+            that.mqttClient.on('message', function (topic, message) {
+                if (topic === _topic.SiteComLabelCode) {
+                    const objData = emqxUtil.parseJSON(message);
+                    if (objData && objData.SiteNo === that.site) {
+                        that.doMqttAction(objData)
+                    }
+                }
+            })
+        },
+        // 执行mqtt消息动作
+        doMqttAction(objData) {
+            const { SiteNo, ComNo, LabelCode, Time } = objData;
+            if (!LabelCode) {
+                this.$message.error("标签为空!");
+                return;
+            }
+            const params = {
+                label: LabelCode,
+                // 1 获取详细物料信息 2只判断零件号是否正确
+                type: 1
+            }
+            // 解析结果
+            if (this.formStatus === 1 && this.startWorkOrderDialog.show) {
+                // 扫外箱标签模式
+                this.handleScanBoxOutLabel(LabelCode, ComNo)
+                return;
+            }
+            // 扫内标签模式
+            if (this.formStatus === 2) {
+                // 扫外箱标签模式
+                this.handleScanInnerLabel(LabelCode, ComNo)
+                return;
+            }
+        },
     }
 };
 </script>
@@ -875,30 +887,29 @@ export default {
     border-radius: 10px;
     box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
     /* 设置阴影 */
-    margin-top: 10px;
-    margin-bottom: 10px;
+    margin-top: 2px;
+    margin-bottom: 2px;
     /* 增加卡片底部间距 */
 }
 
-.workorder-card {
-    min-height: 600px;
-}
-
 .card-header {
     color: #ecf0f1;
-
     display: flex;
     align-items: center;
     justify-content: center;
-    font-size: 28px;
+    font-size: 20px;
     font-weight: 600;
-
 }
 
+.workorder-card {
+    min-height: 400px;
+}
+
+
 .workorder-card-header {
     width: 100%;
-    font-size: 24px;
-    font-weight: 700;
+    font-size: 18px;
+    font-weight: 600;
     margin-bottom: 10px;
     display: flex;
     align-items: center;
@@ -907,15 +918,15 @@ export default {
 
 .workorder-card-table {
     width: 100%;
-    font-size: 20px;
-    font-weight: 600;
+    font-size: 16px;
+    font-weight: 500;
     border: 2px solid #000;
     border-collapse: collapse;
 }
 
 .workorder-card-table td {
-    padding: 10px;
     border: 2px solid #000;
+    padding: 5px;
 }
 
 .workorder-card-button-box {
@@ -932,14 +943,13 @@ export default {
     align-items: center;
     justify-content: space-between;
     margin-bottom: 10px;
-    font-size: 20px;
+    font-size: 16px;
     font-weight: 600;
 }
 
 .defect-item-left {
-
-    height: 120px;
-    font-size: 24px;
+    height: 100px;
+    font-size: 16px;
     font-weight: 600;
     display: flex;
     align-items: center;
@@ -952,7 +962,7 @@ export default {
     border-radius: 5%;
     margin-top: 5px;
     margin-bottom: 5px;
-    background-color: #016129;
+    background-color: #11a983;
     display: flex;
     flex-direction: column;
     align-items: center;
@@ -962,7 +972,7 @@ export default {
 }
 
 .defect-item-box:hover {
-    background-color: #00a876;
+    background-color: #008c62;
     /* 悬停时的背景颜色 */
     transform: scale(1.05);
     /* 悬停时稍微放大 */
@@ -972,14 +982,14 @@ export default {
 
 .defect-item-name {
     width: 100%;
-    height: 100px;
-    font-size: 20px;
+    height: 60px;
+    font-size: 16px;
     font-weight: 600;
     text-align: center;
     display: flex;
     align-items: center;
     justify-content: center;
-    /* writing-mode: vertical-lr; */
+    writing-mode: vertical-lr;
     letter-spacing: 5px;
 }
 
@@ -987,7 +997,7 @@ export default {
     color: red;
     width: 100%;
     height: 40px;
-    font-size: 28px;
+    font-size: 20px;
     font-weight: 600;
     display: flex;
     align-items: center;
@@ -995,7 +1005,7 @@ export default {
 }
 
 .number-text {
-    font-size: 28px;
+    font-size: 20px;
     font-weight: 600;
 }
 </style>