Merge remote-tracking branch 'origin/master'

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>
+

src/views/sjzx/sbxxWH.vue

@@ -171,7 +171,6 @@ export default {
         {
           field: "szcs",
           title: "所属部门",
-          formatter: ['dictFormat','BMBM'],
           editRender: { name: "input" },
           minWidth: "90",
         },

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 type="success" @click="toolbarButtonClickEvent('insert')"
-<!--            >审核</el-button-->
+            >审核</el-button
-<!--          >-->
+          >
         </el-col>
       </el-row>
     </el-header>