Merge remote-tracking branch 'origin/master'

frontend_web/src/router/index.js

@@ -305,7 +305,7 @@ router.beforeEach(async (to, from, next) => {
       // 没有登录的时候跳转到登录界面
       // 携带上登陆成功之后需要跳转的页面完整路径
       next({
-        name: 'login',
+        name: 'page1',
         query: {
           redirect: to.fullPath
         }

frontend_web/src/store/modules/d2admin/modules/account.js

@@ -73,7 +73,7 @@ export default {
             // await dispatch('d2admin/user/setAuthUser', {}, { root: true })
             // 跳转路由
             router.push({
-              name: 'login'
+              name: 'page1'
             })
           })
           .catch(err => {

frontend_web/src/views/demo/page1/index.vue

@@ -13,7 +13,7 @@
         </el-col>
         <el-col :span="4">
           <div class="login_bg5x">
-            <a href="/login"
+            <a href="/#/login"
                alt="logo">
               <img src="./image/button.png"
                    class="intelligent1-img" /> </a>

frontend_web/src/views/instrument/instrumenrunrecord/index.vue

@@ -78,11 +78,6 @@
                        label="运行说明"
                        show-overflow-tooltip
                        width="270"></el-table-column>
-      <el-table-column prop="ContractNo"
-                       align="center"
-                       min-width="120px"
-                       label="项目编号"
-                       show-overflow-tooltip></el-table-column>
     </el-table>
     <!-- </el-card> -->
     <template slot="footer">

frontend_web/src/views/setuser/passwordset.vue

@@ -1,26 +1,45 @@
 <template>
-      <el-dialog title="修改密码" :visible.sync="adddialog" width="700px">
-  <!-- <div class="page"> -->
+  <el-dialog title="修改密码"
+             :visible.sync="adddialog"
+             width="700px">
+    <!-- <div class="page"> -->
     <el-row>
-      <el-col :span="20" style="text-align:center">
-        <el-form :model="pwdform" :rules="pwdrules" ref="pwdform" label-width="200px">
-          <el-form-item label="当前登录密码 ：" prop="pass" required>
-            <el-input type="password" v-model="pwdform.pass" auto-complete="off"></el-input>
+      <el-col :span="20"
+              style="text-align:center">
+        <el-form :model="pwdform"
+                 :rules="pwdrules"
+                 ref="pwdform"
+                 label-width="200px">
+          <el-form-item label="当前登录密码 ："
+                        prop="pass"
+                        required>
+            <el-input type="password"
+                      v-model="pwdform.pass"
+                      auto-complete="off"></el-input>
           </el-form-item>
-          <el-form-item label="新的登录密码 ：" prop="newpass" required>
-            <el-input type="password" v-model="pwdform.newpass" auto-complete="off"></el-input>
+          <el-form-item label="新的登录密码 ："
+                        prop="newpass"
+                        required>
+            <el-input type="password"
+                      v-model="pwdform.newpass"
+                      auto-complete="off"></el-input>
           </el-form-item>
-          <el-form-item label="确认新的登录密码 ：" prop="checknewPass" required>
-            <el-input type="password" v-model="pwdform.checknewPass" auto-complete="off"></el-input>
+          <el-form-item label="确认新的登录密码 ："
+                        prop="checknewPass"
+                        required>
+            <el-input type="password"
+                      v-model="pwdform.checknewPass"
+                      auto-complete="off"></el-input>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="submitForm('pwdform')">提交</el-button>
+            <el-button type="primary"
+                       @click="submitForm('pwdform')">提交</el-button>
             <el-button @click="resetForm('pwdform')">重置</el-button>
           </el-form-item>
         </el-form>
       </el-col>
     </el-row>
-   </el-dialog>
+  </el-dialog>
 </template>
 
 <script>
@@ -94,7 +113,7 @@ export default {
                 })
               }
             })
-            .catch(() => {})
+            .catch(() => { })
         }
       })
     },