From 38e2fda87c28fa7128d971e7afac1b05a06872d6 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期日, 31 三月 2024 13:54:42 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/Slicecage/slicecage.vue | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/UI-Project/src/views/mm/slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
similarity index 92%
rename from UI-Project/src/views/mm/slicecage/slicecage.vue
rename to UI-Project/src/views/Slicecage/slicecage.vue
index fbbc70f..ea231b5 100644
--- a/UI-Project/src/views/mm/slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -287,7 +287,7 @@
<template>
<div style="height: 700px;">
- <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="primary" @click="dialogFormVisible = true">鎵嬪姩杩涚墖</el-button>
+ <!-- <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="primary" @click="dialogFormVisible = true">鎵嬪姩杩涚墖</el-button> -->
<el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="primary" @click="dialogFormVisiblea = true">璁㈠崟淇℃伅</el-button>
<el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="success" @click="dialogFormVisibleb = true">鍑虹墖闃熷垪</el-button>
<el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="danger">缁堟杩涚墖</el-button>
@@ -302,9 +302,9 @@
<el-table-column prop="id" align="center" label="鍑虹墖鐜荤拑ID" min-width="80" />
<el-table-column prop="long" align="center" label="绗煎瓙" min-width="120" />
<el-table-column prop="wide" align="center" label="鏍煎瓙" min-width="120" />
- <el-table-column prop="type" align="center" label="璁㈠崟缂栧彿" min-width="120" />
- <el-table-column prop="type" align="center" label="鍒楄〃缂栧彿" min-width="120" />
- <el-table-column prop="type" align="center" label="绠卞瓙缂栧彿" min-width="120" />
+ <el-table-column prop="type" align="center" label="宸ョ▼鍙�" min-width="120" />
+ <el-table-column prop="type" align="center" label="娴佺▼鍗″彿" min-width="120" />
+ <el-table-column prop="type" align="center" label="閽㈠寲鐗堝浘鍙�" min-width="120" />
<el-table-column prop="type" align="center" label="灏哄" min-width="120" />
<el-table-column prop="type" align="center" label="缁撴潫浠诲姟" min-width="120" />
</el-table>
@@ -318,9 +318,9 @@
<el-table-column prop="idb" align="center" label="杩涚墖鐜荤拑ID" min-width="80" />
<el-table-column prop="longb" align="center" label="绗煎瓙" min-width="120" />
<el-table-column prop="wideb" align="center" label="鏍煎瓙" min-width="120" />
- <el-table-column prop="typeb" align="center" label="璁㈠崟缂栧彿" min-width="120" />
- <el-table-column prop="typeb" align="center" label="鍒楄〃缂栧彿" min-width="120" />
- <el-table-column prop="typeb" align="center" label="绠卞瓙缂栧彿" min-width="120" />
+ <el-table-column prop="typeb" align="center" label="宸ョ▼鍙�" min-width="120" />
+ <el-table-column prop="typeb" align="center" label="娴佺▼鍗″彿" min-width="120" />
+ <el-table-column prop="typeb" align="center" label="閽㈠寲鐗堝浘鍙�" min-width="120" />
<el-table-column prop="typeb" align="center" label="灏哄" min-width="120" />
<el-table-column prop="typeb" align="center" label="缁撴潫浠诲姟" min-width="120" />
</el-table>
@@ -339,7 +339,7 @@
</div>
</div>
<div id="awatch">
- <img src="../../../assets/xmjc.png" alt="" style="width: 70%;height: 100%;margin-left: 160px;">
+ <img src="../../assets/xmjc.png" alt="" style="width: 70%;height: 100%;margin-left: 160px;">
</div>
</div>
<el-dialog v-model="dialogFormVisible" top="12vh" width="85%" title="璇风‘璁ょ幓鐠冧俊鎭�" >
@@ -465,18 +465,16 @@
</template>
</el-dialog>
<el-dialog v-model="dialogFormVisiblea" top="10vh" width="85%" title="璁㈠崟淇℃伅" >
- <el-input placeholder="璇疯緭鍏ヨ鍗昳d" style="width: 180px;size: mini;"></el-input>
+ <el-input placeholder="璇疯緭鍏ュ伐绋嬪彿" style="width: 180px;size: mini;"></el-input>
<el-button style="margin-left: 10px;size: mini;" type="primary">鏌ヨ</el-button>
<el-table ref="table" style="margin-top: 20px;height: 500px;"
@selection-change="handleSelectionChange"
:data="tableDataa" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="ida" align="center" label="鐜荤拑id" min-width="80" />
- <el-table-column prop="typea" align="center" label="璁㈠崟缂栧彿" min-width="120" />
- <el-table-column prop="typea" align="center" label="鍒楄〃缂栧彿" min-width="120" />
- <el-table-column prop="typea" align="center" label="绠卞瓙缂栧彿" min-width="120" />
- <el-table-column prop="ida" align="center" label="閾濇id" min-width="120" />
+ <el-table-column prop="typea" align="center" label="宸ョ▼鍙�" min-width="120" />
<el-table-column prop="typea" align="center" label="闀�" min-width="120" />
<el-table-column prop="typea" align="center" label="瀹�" min-width="120" />
+ <el-table-column prop="typea" align="center" label="鍘�" min-width="120" />
</el-table>
<div id="demo-pagination-block">
<el-pagination
@@ -494,7 +492,7 @@
/>
</div>
</el-dialog>
-<el-dialog v-model="dialogFormVisibleb" top="10vh" width="85%" title="璁㈠崟淇℃伅" >
+<el-dialog v-model="dialogFormVisibleb" top="10vh" width="85%" title="鍑虹墖闃熷垪" >
<div style="display: flex;">
<p style="margin-top: 4px;">闃熷垪鐘舵�侊細</p>
<p style="margin-top: 4px;">寮�濮�</p>
--
Gitblit v1.8.0