From baa8cc70475df41403bbebcb570aefce46c18073 Mon Sep 17 00:00:00 2001
From: xiaoning <1097449274@qq.com>
Date: Wed, 18 Oct 2023 14:42:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=94=B9=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 1815f9c..65806d8 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -8,7 +8,7 @@
 
       <div class="title-container">
 
-        <h1 class="title">{{ loginForm.zxtmc }}钢加生产计划排产</h1>
+        <h1 class="title">{{ loginForm.zxtmc }}钢加生产管控系统</h1>
         <h3 class="title">{{ loginForm.zxtmc }}登录</h3>
       </div>
 
@@ -25,7 +25,7 @@
         <el-input
           ref="username"
           v-model="loginForm.username"
-          placeholder="Username"
+          placeholder="用户名"
           name="username"
           type="text"
           tabindex="1"
@@ -44,7 +44,7 @@
             ref="password"
             v-model="loginForm.password"
             :type="passwordType"
-            placeholder="Password"
+            placeholder="密码"
             name="password"
             tabindex="2"
             autocomplete="on"
@@ -324,10 +324,11 @@
 </style>
 
 <style lang="scss" scoped>
+
+
   $bg:#2d3a4b;
   $dark_gray:#889aa4;
   $light_gray: #000000;
-
   .login-container {
     /*min-height: 100%;*/
     /*width: 100%;*/
@@ -340,8 +341,6 @@
     background-position: center;
     position: relative;
 
-
-
     .login-form {
       position: relative;
       width: 520px;
@@ -414,3 +413,4 @@
     }
   }
 </style>
+

From 172a957b3d439a0fd6b0ed184472d53bf0eb44c8 Mon Sep 17 00:00:00 2001
From: xiaoning <1097449274@qq.com>
Date: Thu, 19 Oct 2023 09:27:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sjzx/sbxxWH.vue | 1 -
 src/views/sjzx/tzjhGL.vue | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/views/sjzx/sbxxWH.vue b/src/views/sjzx/sbxxWH.vue
index 7f02ba4..2cb8d76 100644
--- a/src/views/sjzx/sbxxWH.vue
+++ b/src/views/sjzx/sbxxWH.vue
@@ -171,7 +171,6 @@ export default {
         {
           field: "szcs",
           title: "所属部门",
-          formatter: ['dictFormat','BMBM'],
           editRender: { name: "input" },
           minWidth: "90",
         },
diff --git a/src/views/sjzx/tzjhGL.vue b/src/views/sjzx/tzjhGL.vue
index 4a60e04..6b3f397 100644
--- a/src/views/sjzx/tzjhGL.vue
+++ b/src/views/sjzx/tzjhGL.vue
@@ -1,5 +1,5 @@
 <template>
-  <!-- 图纸计划管理 （样式）-->
+  <!-- 图纸计划管理-->
   <el-container>
     <el-header style="width: 100%">
       <el-row>
@@ -35,9 +35,9 @@
           </el-col>
         </el-col>
         <el-col :span="6" style="text-align: right">
-<!--          <el-button type="success" @click="toolbarButtonClickEvent('insert')"-->
-<!--            >审核</el-button-->
-<!--          >-->
+          <el-button type="success" @click="toolbarButtonClickEvent('insert')"
+            >审核</el-button
+          >
         </el-col>
       </el-row>
     </el-header>