Merge branch 'master' of http://git.mes123.com/zhouyx/mes-ui into qin

assets/css/base.less

@@ -1156,7 +1156,7 @@ html [type=button] {
         }
       }
       .tree {
-        height: calc(100% - 100px);
+        height: calc(100% - 150px);
         overflow: auto;
       }
     }

components/customTable/customTable.vue

@@ -9,13 +9,13 @@
       <template v-slot:button>
         <div style="float:right;" class="paddingbtn">
           <!-- 其他 业务按钮 -->
-          <Button type="success" @click="openCreate">创建</Button>
-          <Button type="success" @click="openOrderSendReview" v-if="false">订单送审</Button>
-          <Button type="success" @click="openOrderSend">订单派发</Button>
-          <Button type="success" @click="updateOrderOpenModal">修改</Button>
-          <Button type="success" @click="delOrder">删除</Button>
-          <Button type="success" @click="openOrderSplit">订单分解</Button>
-          <Button type="success" v-show="false">导出PDF</Button>
+          <Button type="primary" @click="openCreate">创建</Button>
+          <Button type="primary" @click="openOrderSendReview" v-if="false">订单送审</Button>
+          <Button type="primary" @click="openOrderSend">订单派发</Button>
+          <Button type="primary" @click="updateOrderOpenModal">修改</Button>
+          <Button type="primary" @click="delOrder">删除</Button>
+          <Button type="primary" @click="openOrderSplit">订单分解</Button>
+          <Button type="primary" v-show="false">导出PDF</Button>
           <!-- 列设置 -->
           <div @click="drawerShow = true" class="divIco">
             <Icon type="ios-list" class="icoListInfo" />
@@ -66,7 +66,7 @@
       <CreateOrder ref="createOrder"></CreateOrder>
       <div slot="footer">
         <Button @click="createShow = false">取消</Button>
-        <Button type="success" @click="orderCreateOrderOk">确定</Button>
+        <Button type="primary" @click="orderCreateOrderOk">确定</Button>
       </div>
     </Modal>
     <!-- 订单送审 -->
@@ -82,7 +82,7 @@
       <OrderSendReview ref="orderSendReview"></OrderSendReview>
       <div slot="footer">
         <Button @click="ModalOrderSendReview = false">取消</Button>
-        <Button type="success" @click="orderSendReviewOk">确定送审</Button>
+        <Button type="primary" @click="orderSendReviewOk">确定送审</Button>
       </div>
     </Modal>
     <!-- 订单派发 -->
@@ -99,7 +99,7 @@
       <OrderSend ref="orderSend"></OrderSend>
       <div slot="footer">
         <Button @click="ModalOrderSend = false">取消</Button>
-        <Button type="success" @click="orderSendOk">确定派发</Button>
+        <Button type="primary" @click="orderSendOk">确定派发</Button>
       </div>
     </Modal>
     <!-- 订单分解 -->
@@ -115,7 +115,7 @@
       <OrderSplit ref="orderSplit"></OrderSplit>
       <div slot="footer">
         <Button @click="ModalOrderSplit = false">取消</Button>
-        <Button type="success" @click="orderSplitOk">确定分解</Button>
+        <Button type="primary" @click="orderSplitOk">确定分解</Button>
       </div>
     </Modal>
     <!-- 信息提示 -->
@@ -131,7 +131,7 @@
       {{ metCodesStrTxt }}
       <div slot="footer">
         <Button @click="ModalInfo = false">取消</Button>
-        <Button type="success" @click="modalInfoOk">确定</Button>
+        <Button type="primary" @click="modalInfoOk">确定</Button>
       </div></Modal
     >
   </div>

components/modalTree/storeHouseLeft.vue

@@ -16,7 +16,7 @@
         </Button>
       </ButtonGroup>
     </h3>
-    <div class="tree">
+    <div class="tree" >
       <Tree
         ref="tree"
         :data="tree"

layouts/default.vue

@@ -33,6 +33,7 @@ export default {
   },
   mounted() {
     this.getMenu();
+    this.initUserInfo();
   },
   watch: {
     // 监听路由 控制侧边栏显示 标记当前顶栏菜单（如需要）
@@ -77,19 +78,11 @@ export default {
             res.result.avatarUrl != "" &&
             res.result.avatarUrl != null
           ) {
-            this.userInfo.avatarUrl = res.result.avatarUrl;
-            this.$store.commit(
-              "setUserAvatar",
-              fileUrlDown + res.result.avatarUrl
-            );
-          } else {
-            this.userInfo.avatarUrl = "";
-            this.$store.commit("setUserAvatar", avatar);
+            res.result.avatarUrl = fileUrlDown + res.result.avatarUrl;
           }
-          this.userName = res.result.userName;
-          localStorage.setItem("userName", this.userName);
+          this.$store.commit("admin/user/setUserAvatar", res.result);
         } else {
-          this.$Message.error("查询失败!");
+          this.$Message.error("用户信息查询失败!");
         }
       });
     },

pages/account/login/index.vue

 <template>
-  <div class="page-account">
+  <div class="account">
+    <Carousel v-model="value1" autoplay autoplay-speed="5000" loop class="zmd">
+      <CarouselItem>
+        <div class="bg bg0">1</div>
+      </CarouselItem>
+      <CarouselItem>
+        <div class="bg bg1">1</div>
+      </CarouselItem>
+      <CarouselItem>
+        <div class="bg bg2">1</div>
+      </CarouselItem>
+      <CarouselItem>
+        <div class="bg bg3">1</div>
+      </CarouselItem>
+    </Carousel>
     <div v-if="showI18n" class="page-account-header">
       <i-header-i18n />
     </div>
-    <div class="page-account-container">
+    <div class="main">
+      <div class="ad">
+        <img src="@/assets/images/login/ad.png" />
+      </div>
+      <div class="login">
         <div class="page-account-top">
-        <div class="page-account-top-logo">
+          <div class="page-account-top-logo tc">
             <img src="@/assets/images/logo.png" alt="logo" />
           </div>
-        <div class="page-account-top-desc">SaaS MES 制造执行系统</div>
+          <div class="page-account-top-desc tc">SaaS MES 制造执行系统</div>
         </div>
+        <h3 class="mb10">用户登陆</h3>
         <Login @on-submit="oidc">
           <UserName name="username" value="admin" />
           <Password name="password" value="admin" enter-to-submit />
@@ -19,15 +38,8 @@
           </div>
           <Submit>{{ $t('page.login.submit') }}</Submit>
         </Login>
-      <div class="page-account-other">
-        <!-- <span>{{ $t('page.login.other') }}</span>
-        <img src="@/assets/svg/icon-social-wechat.svg" alt="wechat" />
-        <img src="@/assets/svg/icon-social-qq.svg" alt="qq" />
-        <img src="@/assets/svg/icon-social-weibo.svg" alt="weibo" /> -->
-        <!-- <router-link class="page-account-register" to="./register">{{ $t('page.login.signup') }}</router-link> -->
       </div>
     </div>
-    <!-- <i-copyright /> -->
   </div>
 </template>
 <script>
@@ -55,6 +67,7 @@ export default {
       let that = this;
       mgr.getUser().then(function(user) {
         if (user) {
+          console.info("user",user)
           that.msg = "该用户已经登录";
           const userInfos = {
             token: user.access_token,
@@ -106,3 +119,56 @@ export default {
   }
 };
 </script>
+<style lang="less">
+@jianju:50px;
+.account {
+  position: fixed;
+  width: 100%;
+  top: 0;
+  bottom: 0;
+  .zmd {
+    z-index: 1;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    width: 100%;
+  }
+  .bg {
+    width: 100%;
+    height: 100vh;
+    background-size: 100% auto;
+  }
+  .bg0 {
+    background-image: url("../../../assets/images/login/bg0.png");
+  }
+  .bg1 {
+    background-image: url("../../../assets/images/login/bg1.png");
+  }
+  .bg2 {
+    background-image: url("../../../assets/images/login/bg2.jpg");
+  }
+  .bg3 {
+    background-image: url("../../../assets/images/login/bg3.png");
+  }
+  .main {
+    position: absolute;
+    z-index: 55;
+    top: @jianju;
+    left: @jianju;
+    right: @jianju;
+    bottom: @jianju;
+    background: rgba(0, 0, 0, 0.35);
+    display: flex;
+    .ad{
+      flex: 1;
+      text-align: center;
+      img{margin-top: 400px;}
+    }
+    .login {
+      background-color: white;
+      width: 600px;
+      padding: 100px 50px;     
+    }
+  }
+}
+</style>
\ No newline at end of file

pages/handle/process.vue

@@ -13,8 +13,14 @@
           <span class="auditedTime">{{item.auditedTime}}</span>
         </p>
         <div class="content">
-          <div class="records" v-if="index==0">
-           
+          <div class="records" v-if="index==cur">
+             <span>审批人：</span>
+            <User
+              v-for="(item3, index3) in item.records"
+              :key="index3"
+              :value="item3.operatorId"
+              class="mr5"
+            />
           </div>
           <div v-else-if="index>cur">
              <CheckboxGroup v-model="immutData">

pages/order/orderManager.vue

@@ -5,7 +5,7 @@
         <h3 class="zh-title">产品结构</h3>
         <div class="zh-box" >
           <Input search placeholder="请输入查询条件" v-model="treeInputSearch" />
-          <Tree :data="searchList" :style="{height:(treeHeight-95)+'px'}" style="overflow:auto;width:215px;"   @on-select-change="selectTreeNode"></Tree>
+          <Tree :data="searchList" :style="{height:(treeHeight-115)+'px'}" style="overflow:auto;width:215px;"   @on-select-change="selectTreeNode"></Tree>
         </div>
       </div>
     </Sider>
@@ -217,21 +217,21 @@ export default {
     }
   },
   created() {
-    this.treeHeight = window.innerHeight - 100
+    this.treeHeight = window.innerHeight - 150
   },
   async fetch({ store, params }) {
     await store.dispatch('loadDictionary') // 加载数据字典
   },
   mounted() {
     this.initTree()
-    this.tableHeight = window.innerHeight - 160
+    this.tableHeight = window.innerHeight - 220
     this.$refs.CustomTable.getTableHeight(this.tableHeight)
     window.onresize = () => {
       ///浏览器窗口大小变化
       return (() => {
         window.screenHeight = window.innerHeight
-        this.treeHeight = window.screenHeight - 100
-        this.tableHeight = window.screenHeight - 160
+        this.treeHeight = window.screenHeight - 150
+        this.tableHeight = window.screenHeight - 220
         this.$refs.CustomTable.getTableHeight(this.tableHeight)
       })()
     }

store/admin/user.js

@@ -7,6 +7,12 @@ export const mutations={
     },
     setUser(state,info){
         state.info=info;
+    },
+    setUserAvatar(state,user){
+        let info=state.info;
+        info.name=user.userName;
+        info.avatar=user.avatarUrl;
+        state.info=info;
     }
 }
 export const actions={