Compare commits

...

2 Commits

Author SHA1 Message Date
caoqianming e671393bff fix:table下的tr补上tbody包裹,消除vue3.5模板编译的HTML嵌套规范警告
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-21 10:29:26 +08:00
caoqianming 87ef0772a4 chore:升级依赖 vue3.2->3.5, element-plus2.8->2.14, sass等; maopi/zhongjian1Total的script声明lang=jsx以兼容新版编译器
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-21 10:14:54 +08:00
7 changed files with 45 additions and 25 deletions

View File

@ -7,11 +7,11 @@
"build": "vue-cli-service build --report" "build": "vue-cli-service build --report"
}, },
"dependencies": { "dependencies": {
"@element-plus/icons-vue": "2.0.10", "@element-plus/icons-vue": "^2.3.2",
"@kjgl77/datav-vue3": "^1.7.1", "@kjgl77/datav-vue3": "^1.7.1",
"@tinymce/tinymce-vue": "5.0.0", "@tinymce/tinymce-vue": "5.0.0",
"animate.css": "^4.1.1", "animate.css": "^4.1.1",
"axios": "1.3.4", "axios": "^1.18.1",
"babylonjs": "^6.46.0", "babylonjs": "^6.46.0",
"babylonjs-gui": "^6.46.0", "babylonjs-gui": "^6.46.0",
"babylonjs-loaders": "^6.46.0", "babylonjs-loaders": "^6.46.0",
@ -19,26 +19,26 @@
"codemirror": "^5.65.17", "codemirror": "^5.65.17",
"codemirror-editor-vue3": "^2.7.0", "codemirror-editor-vue3": "^2.7.0",
"copy-webpack-plugin": "^12.0.2", "copy-webpack-plugin": "^12.0.2",
"core-js": "3.29.0", "core-js": "^3.49.0",
"cropperjs": "1.5.13", "cropperjs": "1.5.13",
"crypto-browserify": "^3.12.0", "crypto-browserify": "^3.12.0",
"crypto-js": "4.1.1", "crypto-js": "^4.2.0",
"d3": "^7.6.1", "d3": "^7.6.1",
"dagre-d3": "^0.6.4", "dagre-d3": "^0.6.4",
"dhtmlx-gantt": "^8.0.6", "dhtmlx-gantt": "^8.0.6",
"echarts": "^5.5.1", "echarts": "^5.5.1",
"element-plus": "^2.8.4", "element-plus": "^2.14.3",
"html2canvas": "^1.4.1", "html2canvas": "^1.4.1",
"json-editor-vue3": "^1.0.6", "json-editor-vue3": "^1.0.6",
"jspdf": "^2.5.1", "jspdf": "^2.5.1",
"node-polyfill-webpack-plugin": "^4.0.0", "node-polyfill-webpack-plugin": "^4.0.0",
"nprogress": "0.2.0", "nprogress": "0.2.0",
"qrcodejs2": "0.0.2", "qrcodejs2": "0.0.2",
"sortablejs": "1.15.0", "sortablejs": "^1.15.7",
"tinymce": "6.3.2", "tinymce": "6.3.2",
"vue": "3.2.47", "vue": "^3.5.40",
"vue-i18n": "9.2.2", "vue-i18n": "^11.4.7",
"vue-router": "4.1.6", "vue-router": "^4.6.4",
"vuedraggable": "4.0.3", "vuedraggable": "4.0.3",
"vuex": "4.1.0", "vuex": "4.1.0",
"xgplayer": "2.32.2", "xgplayer": "2.32.2",
@ -48,9 +48,9 @@
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "7.21.00", "@babel/core": "7.21.00",
"@vue/cli-plugin-babel": "5.0.8", "@vue/cli-plugin-babel": "^5.0.9",
"@vue/cli-service": "5.0.8", "@vue/cli-service": "^5.0.9",
"sass": "1.58.3", "sass": "^1.101.0",
"sass-loader": "10.1.1" "sass-loader": "10.1.1"
}, },
"browserslist": [ "browserslist": [

View File

@ -155,6 +155,7 @@
</el-card> </el-card>
<p class="tables-title">作业人员</p> <p class="tables-title">作业人员</p>
<table class="tables" cellspacing="0"> <table class="tables" cellspacing="0">
<tbody>
<tr class="tableTh tableThS"> <tr class="tableTh tableThS">
<td class="tableTd">序号</td> <td class="tableTd">序号</td>
<td class="tableTd" style="width:100px">姓名</td> <td class="tableTd" style="width:100px">姓名</td>
@ -172,9 +173,11 @@
</td> </td>
<td class="tableTd" style="width:180px">{{ item.create_time }}</td> <td class="tableTd" style="width:180px">{{ item.create_time }}</td>
</tr> </tr>
</tbody>
</table> </table>
<p class="tables-title">气体检测记录</p> <p class="tables-title">气体检测记录</p>
<table class="tables" cellspacing="0"> <table class="tables" cellspacing="0">
<tbody>
<tr class="tableTh tableThS"> <tr class="tableTh tableThS">
<td class="tableTd">序号</td> <td class="tableTd">序号</td>
<td class="tableTd">检测部位</td> <td class="tableTd">检测部位</td>
@ -198,9 +201,11 @@
<td class="tableTd">{{ item.check_time }}</td> <td class="tableTd">{{ item.check_time }}</td>
<td class="tableTd">{{ item.create_time }}</td> <td class="tableTd">{{ item.create_time }}</td>
</tr> </tr>
</tbody>
</table> </table>
<p class="tables-title">处理日志</p> <p class="tables-title">处理日志</p>
<table class="tables" cellspacing="0"> <table class="tables" cellspacing="0">
<tbody>
<tr class="tableTh"> <tr class="tableTh">
<td class="tableTd">进行状态</td> <td class="tableTd">进行状态</td>
<td class="tableTd attributeTd">操作类型</td> <td class="tableTd attributeTd">操作类型</td>
@ -228,6 +233,7 @@
</td> </td>
<td class="tableTd" v-if="item.participant_str==null">{{ item.update_time }}</td> <td class="tableTd" v-if="item.participant_str==null">{{ item.update_time }}</td>
</tr> </tr>
</tbody>
</table> </table>
</div> </div>

View File

@ -9,11 +9,13 @@
@mouseout="mouseOut" @mouseout="mouseOut"
> >
<table class="totall"> <table class="totall">
<tbody>
<tr class="title"> <tr class="title">
<th v-for="itemx in titleData" :key="itemx"> <th v-for="itemx in titleData" :key="itemx">
{{ itemx }} {{ itemx }}
</th> </th>
</tr> </tr>
</tbody>
</table> </table>
<div <div
:id="refValue" :id="refValue"
@ -22,6 +24,7 @@
> >
<div :id="'scrollBody' + refValue"> <div :id="'scrollBody' + refValue">
<table :class="{ marquee_top: animate }"> <table :class="{ marquee_top: animate }">
<tbody>
<tr <tr
v-for="(itemy, index) in rowData" v-for="(itemy, index) in rowData"
class="rollData" class="rollData"
@ -47,11 +50,13 @@
<span v-else>{{ itemz.value }}</span> <span v-else>{{ itemz.value }}</span>
</td> </td>
</tr> </tr>
</tbody>
</table> </table>
<table <table
:class="{ marquee_top: animate }" :class="{ marquee_top: animate }"
v-show="scrollVivible" v-show="scrollVivible"
> >
<tbody>
<tr <tr
v-for="(itemy, index) in rowData" v-for="(itemy, index) in rowData"
class="rollData" class="rollData"
@ -81,6 +86,7 @@
<span v-else>{{ itemz.value }}</span> <span v-else>{{ itemz.value }}</span>
</td> </td>
</tr> </tr>
</tbody>
</table> </table>
</div> </div>
</div> </div>

View File

@ -1,18 +1,22 @@
<template> <template>
<div class="wrapper" @mouseover="mouseOver" @mouseout="mouseOut"> <div class="wrapper" @mouseover="mouseOver" @mouseout="mouseOut">
<table class="totall"> <table class="totall">
<tbody>
<tr class="title"> <tr class="title">
<th v-for="itemx in liData" :key="itemx">{{ itemx }}</th> <th v-for="itemx in liData" :key="itemx">{{ itemx }}</th>
</tr> </tr>
</tbody>
</table> </table>
<div ref="moocBox" class="wrapper2"> <div ref="moocBox" class="wrapper2">
<table :class="{ marquee_top: animate }"> <table :class="{ marquee_top: animate }">
<tbody>
<tr v-for="itemy in listData" class="rollData" ref="con1" :key="itemy"> <tr v-for="itemy in listData" class="rollData" ref="con1" :key="itemy">
<td v-for="itemz in itemy" :key="itemz">{{ itemz }}</td> <td v-for="itemz in itemy" :key="itemz">{{ itemz }}</td>
</tr> </tr>
<tr v-for="itemy in listData" class="rollData" ref="con2" :key="itemy"> <tr v-for="itemy in listData" class="rollData" ref="con2" :key="itemy">
<td v-for="itemz in itemy" :key="itemz">{{ itemz }}</td> <td v-for="itemz in itemy" :key="itemz">{{ itemz }}</td>
</tr> </tr>
</tbody>
</table> </table>
</div> </div>
</div> </div>

View File

@ -195,7 +195,7 @@
</el-container> </el-container>
</template> </template>
<script> <script lang="jsx">
export default { export default {
name: "statistics_guan", name: "statistics_guan",
data() { data() {

View File

@ -327,7 +327,7 @@
</el-container> </el-container>
</template> </template>
<script> <script lang="jsx">
export default { export default {
name: "statistics_guan", name: "statistics_guan",
data() { data() {

View File

@ -37,6 +37,7 @@
<el-main id="elMain"> <el-main id="elMain">
<el-row :gutter="15"> <el-row :gutter="15">
<table class="tables" border="1" cellspacing="0"> <table class="tables" border="1" cellspacing="0">
<tbody>
<tr> <tr>
<th class="tableTh tableHead" colspan="15">库存统计</th> <th class="tableTh tableHead" colspan="15">库存统计</th>
</tr> </tr>
@ -204,10 +205,12 @@
<td class="tableTd">外扫未抛光</td> <td class="tableTd">外扫未抛光</td>
<td class="tableTd"></td> <td class="tableTd"></td>
</tr> </tr>
</tbody>
</table> </table>
</el-row> </el-row>
<el-row :gutter="15"> <el-row :gutter="15">
<table class="tables" border="1" cellspacing="0"> <table class="tables" border="1" cellspacing="0">
<tbody>
<tr> <tr>
<th class="tableTh tableHead" colspan="15">扫边车间数据汇总</th> <th class="tableTh tableHead" colspan="15">扫边车间数据汇总</th>
</tr> </tr>
@ -358,6 +361,7 @@
<td class="tableTd">外扫未抛光</td> <td class="tableTd">外扫未抛光</td>
<td class="tableTd"></td> <td class="tableTd"></td>
</tr> </tr>
</tbody>
</table> </table>
</el-row> </el-row>
</el-main> </el-main>