Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

ys_vue/src/routes.js

@@ -76,7 +76,7 @@ let routes = [
         iconCls: 'iconfont icon-moxing',
         children: [
             { path: '/moldList', component: moldList, name: '模具列表' },
-            { path: '/moldList/:id', component: moldDetail, name: '模具详情', hidden: true },
+            { path: '/moldList/:id/:type', component: moldDetail, name: '模具详情', hidden: true },
             // { path: '/moldFile', component: moldFile, name: '文档审批' },
             { path: '/moldDownload', component: moldDownload, name: '文档下载' }
         ]

ys_vue/src/views/Home.vue

@@ -1,116 +1,116 @@
 <template>
     <el-row class="container">
         <el-col :span="24" class="header">
-        <el-col
-            :span="10"
-            class="logo"
-            :class="collapsed?'logo-collapse-width':'logo-width'"
-            :style="collapsed?'padding:0':''"
-        >
-            <img v-if="collapsed" class="headImg" src="../assets/image/head_logo.png" />
-            <span v-else>{{sysName}}</span>
-        </el-col>
-        <el-col :span="10">
-            <div class="tools" @click.prevent="collapse">
-            <i class="fa fa-align-justify"></i>
-            </div>
-        </el-col>
-        <el-col :span="6" class="userinfo">
-            <el-badge class="itemNew" :value="unreadCount[3]" :hidden="unreadCount[3] == 0">
-            <i class="el-icon-message-solid" style="font-size:24px" v-popover:popover1></i>
-            <!-- 消息中心 -->
-            <el-popover
-                ref="popover1"
-                placement="bottom"
-                width="400"
-                trigger="hover"
-                popper-class="popover-self"
+            <el-col
+                :span="10"
+                class="logo"
+                :class="collapsed?'logo-collapse-width':'logo-width'"
+                :style="collapsed?'padding:0':''"
             >
-                <!-- 消息盒子中间部分 -->
-                <el-tabs v-model="activePage" @tab-click="handleClick" stretch>
-                <!-- 审批的页面 -->
-                <el-tab-pane name="0">
-                    <span slot="label">
-                    <span v-if="unreadCount[0] == 0">审批</span>
-                    <span v-else>审批（{{unreadCount[0]}}）</span>
-                    </span>
-                    <div class="popover-item" v-if="popoverData[0].length == 0">暂无审批消息</div>
-                    <div class="popover-item" v-for="item in popoverData[0]">
-                    <div
-                        style="cursor: pointer;"
-                        @click="locationHerf(item.id, item.refId, item.noticeType)"
-                    >
-                        <p class="popover-title">
-                        <span v-if="item.isRead == 1" class="isRead">{{item.projectName}}</span>
-                        <span v-else>{{item.projectName}}</span>
-                        </p>
-                        <p v-if="item.isRead == 1" class="isRead">{{item.content}}</p>
-                        <p v-else>{{item.content}}</p>
-                    </div>
-                    </div>
-                </el-tab-pane>
-
-                <!-- 警告的页面 -->
-                <el-tab-pane name="1">
-                    <span slot="label">
-                    <span v-if="unreadCount[1] == 0">警告</span>
-                    <span v-else>警告（{{unreadCount[1]}}）</span>
-                    </span>
-                    <div class="popover-item" v-if="popoverData[1].length == 0">暂无警告消息</div>
-                    <div class="popover-item" v-for="item in popoverData[1]">
-                    <div
-                        style="cursor: pointer;"
-                        @click="locationHerf(item.id, item.refId, item.noticeType)"
-                    >
-                        <p class="popover-title">
-                        <span v-if="item.isRead == 1" class="isRead">{{item.projectName}}</span>
-                        <span v-else>{{item.projectName}}</span>
-                        </p>
-                        <p v-if="item.isRead == 1" class="isRead">{{item.content}}</p>
-                        <p v-else>{{item.content}}</p>
-                    </div>
-                    </div>
-                </el-tab-pane>
-
-                <!-- 保养的页面 -->
-                <el-tab-pane name="2">
-                    <span slot="label">
-                    <span v-if="unreadCount[2] == 0">保养</span>
-                    <span v-else>保养（{{unreadCount[2]}}）</span>
-                    </span>
-                    <div class="popover-item" v-if="popoverData[2].length == 0">暂无保养消息</div>
-                    <div class="popover-item" v-for="item in popoverData[2]">
-                    <div
-                        style="cursor: pointer;"
-                        @click="locationHerf(item.id, item.refId, item.noticeType)"
-                    >
-                        <p class="popover-title">
-                        <span v-if="item.isRead == 1" class="isRead">{{item.projectName}}</span>
-                        <span v-else>{{item.projectName}}</span>
-                        </p>
-                        <p v-if="item.isRead == 1" class="isRead">{{item.content}}</p>
-                        <p v-else>{{item.content}}</p>
-                    </div>
-                    </div>
-                </el-tab-pane>
-                </el-tabs>
-
-                <!-- 查看全部的按钮 -->
-                <router-link :to="'/message'" tag="div" class="popover-button">查看全部</router-link>
-            </el-popover>
-            </el-badge>
-            <el-dropdown trigger="hover">
-            <span class="el-dropdown-link userinfo-inner">
-                <img src="../assets/image/userHead.png" />
-                {{sysUserName}}
-            </span>
-            <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item @click.native="reset">修改密码</el-dropdown-item>
-                <el-dropdown-item @click.native="editInfoOpen">修改信息</el-dropdown-item>
-                <el-dropdown-item divided @click.native="logout">退出登录</el-dropdown-item>
-            </el-dropdown-menu>
-            </el-dropdown>
-        </el-col>
+                <img v-if="collapsed" class="headImg" src="../assets/image/head_logo.png" />
+                <span v-else>{{sysName}}</span>
+            </el-col>
+            <el-col :span="10">
+                <div class="tools" @click.prevent="collapse">
+                <i class="fa fa-align-justify"></i>
+                </div>
+            </el-col>
+            <el-col :span="6" class="userinfo">
+                <el-badge class="itemNew" :value="unreadCount[3]" :hidden="unreadCount[3] == 0">
+                <i class="el-icon-message-solid" style="font-size:24px" v-popover:popover1></i>
+                <!-- 消息中心 -->
+                <el-popover
+                    ref="popover1"
+                    placement="bottom"
+                    width="400"
+                    trigger="hover"
+                    popper-class="popover-self"
+                >
+                    <!-- 消息盒子中间部分 -->
+                    <el-tabs v-model="activePage" @tab-click="handleClick" stretch>
+                    <!-- 审批的页面 -->
+                    <el-tab-pane name="0">
+                        <span slot="label">
+                        <span v-if="unreadCount[0] == 0">审批</span>
+                        <span v-else>审批（{{unreadCount[0]}}）</span>
+                        </span>
+                        <div class="popover-item" v-if="popoverData[0].length == 0">暂无审批消息</div>
+                        <div class="popover-item" v-for="item in popoverData[0]">
+                        <div
+                            style="cursor: pointer;"
+                            @click="locationHerf(item.id, item.refId, item.noticeType, item.belongType)"
+                        >
+                            <p class="popover-title">
+                            <span v-if="item.isRead == 1" class="isRead">{{item.projectName}}</span>
+                            <span v-else>{{item.projectName}}</span>
+                            </p>
+                            <p v-if="item.isRead == 1" class="isRead">{{item.content}}</p>
+                            <p v-else>{{item.content}}</p>
+                        </div>
+                        </div>
+                    </el-tab-pane>
+
+                    <!-- 警告的页面 -->
+                    <el-tab-pane name="1">
+                        <span slot="label">
+                        <span v-if="unreadCount[1] == 0">警告</span>
+                        <span v-else>警告（{{unreadCount[1]}}）</span>
+                        </span>
+                        <div class="popover-item" v-if="popoverData[1].length == 0">暂无警告消息</div>
+                        <div class="popover-item" v-for="item in popoverData[1]">
+                        <div
+                            style="cursor: pointer;"
+                            @click="locationHerf(item.id, item.refId, item.noticeType, null)"
+                        >
+                            <p class="popover-title">
+                            <span v-if="item.isRead == 1" class="isRead">{{item.projectName}}</span>
+                            <span v-else>{{item.projectName}}</span>
+                            </p>
+                            <p v-if="item.isRead == 1" class="isRead">{{item.content}}</p>
+                            <p v-else>{{item.content}}</p>
+                        </div>
+                        </div>
+                    </el-tab-pane>
+
+                    <!-- 保养的页面 -->
+                    <el-tab-pane name="2">
+                        <span slot="label">
+                        <span v-if="unreadCount[2] == 0">保养</span>
+                        <span v-else>保养（{{unreadCount[2]}}）</span>
+                        </span>
+                        <div class="popover-item" v-if="popoverData[2].length == 0">暂无保养消息</div>
+                        <div class="popover-item" v-for="item in popoverData[2]">
+                        <div
+                            style="cursor: pointer;"
+                            @click="locationHerf(item.id, item.refId, item.noticeType, null)"
+                        >
+                            <p class="popover-title">
+                            <span v-if="item.isRead == 1" class="isRead">{{item.projectName}}</span>
+                            <span v-else>{{item.projectName}}</span>
+                            </p>
+                            <p v-if="item.isRead == 1" class="isRead">{{item.content}}</p>
+                            <p v-else>{{item.content}}</p>
+                        </div>
+                        </div>
+                    </el-tab-pane>
+                    </el-tabs>
+
+                    <!-- 查看全部的按钮 -->
+                    <router-link :to="'/message'" tag="div" class="popover-button">查看全部</router-link>
+                </el-popover>
+                </el-badge>
+                <el-dropdown trigger="hover">
+                <span class="el-dropdown-link userinfo-inner">
+                    <img src="../assets/image/userHead.png" />
+                    {{sysUserName}}
+                </span>
+                <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item @click.native="reset">修改密码</el-dropdown-item>
+                    <el-dropdown-item @click.native="editInfoOpen">修改信息</el-dropdown-item>
+                    <el-dropdown-item divided @click.native="logout">退出登录</el-dropdown-item>
+                </el-dropdown-menu>
+                </el-dropdown>
+            </el-col>
         </el-col>
 
         <el-col :span="24" class="main">
@@ -476,49 +476,49 @@
             );
             },
             //点击消息的跳转
-            locationHerf(id, refid, type) {
-            this.http.post(
-                this.port.notice.read,
-                {
-                id: id
-                },
-                res => {
-                if (res.code == "ok") {
-                    //重新读取一次消息
-                    this.loadNotice();
-                } else {
+            locationHerf(id, refid, type, approval) {
+                this.http.post(
+                    this.port.notice.read,
+                    {
+                    id: id
+                    },
+                    res => {
+                    if (res.code == "ok") {
+                        //重新读取一次消息
+                        this.loadNotice();
+                    } else {
+                        this.$message({
+                        message: res.msg,
+                        type: "error"
+                        });
+                    }
+                    },
+                    error => {
                     this.$message({
-                    message: res.msg,
-                    type: "error"
+                        message: error,
+                        type: "error"
                     });
+                    }
+                );
+                //本页面再点的话强制转移一下
+                var currentRoute = this.$route.path.split("/");
+                if (currentRoute.length == 3 && currentRoute[1] == "moldList") {
+                    this.$router.go(0);
                 }
-                },
-                error => {
-                this.$message({
-                    message: error,
-                    type: "error"
-                });
+                if (type == 0) {
+                    //审批 跳转到模具详情
+                    this.$router.push("/moldList/" + refid + "/" + approval);
+                } else if (type == 1) {
+                    //警告 跳转到运行监测
+                    this.$router.push("/detection");
+                } else if (type == 2) {
+                    //保养 跳转到运行监测详情
+                    this.$router.push("/detection/" + refid);
                 }
-            );
-            //本页面再点的话强制转移一下
-            var currentRoute = this.$route.path.split("/");
-            if (currentRoute.length == 3 && currentRoute[1] == "moldList") {
-                this.$router.go(0);
-            }
-            if (type == 0) {
-                //审批 跳转到模具详情
-                this.$router.push("/moldList/" + refid);
-            } else if (type == 1) {
-                //警告 跳转到运行监测
-                this.$router.push("/detection");
-            } else if (type == 2) {
-                //保养 跳转到运行监测详情
-                this.$router.push("/detection/" + refid);
-            }
             },
             //标签页面切换时
             handleClick(tab, event) {
-            this.activeTab = tab.name;
+                this.activeTab = tab.name;
             }
         },
         mounted() {

ys_vue/src/views/detection/detection.vue

@@ -116,7 +116,7 @@ export default {
     },
     //跳转到模具详情
     toMould(id) {
-      this.$router.push("/moldList/" + id);
+      this.$router.push("/moldList/" + id + "/0");
     },
     //获取模具信息
     getMoulds(keyWord) {

ys_vue/src/views/message.vue

@@ -18,7 +18,7 @@
             <div
               class="message-div"
               v-for="item in messages[0]"
-              @click="locationHerf(item.id, item.refId, item.noticeType)"
+              @click="locationHerf(item.id, item.refId, item.noticeType, item.belongType)"
             >
               <p>
                 <span class="message-title isRead" v-if="item.isRead == 1">{{item.projectName}}</span>
@@ -47,7 +47,7 @@
             <div
               class="message-div"
               v-for="item in messages[1]"
-              @click="locationHerf(item.id, item.refId, item.noticeType)"
+              @click="locationHerf(item.id, item.refId, item.noticeType, null)"
             >
               <p>
                 <span class="message-title isRead" v-if="item.isRead == 1">{{item.projectName}}</span>
@@ -76,7 +76,7 @@
             <div
               class="message-div"
               v-for="item in messages[2]"
-              @click="locationHerf(item.id, item.refId, item.noticeType)"
+              @click="locationHerf(item.id, item.refId, item.noticeType, null)"
             >
               <p>
                 <span class="message-title isRead" v-if="item.isRead == 1">{{item.projectName}}</span>
@@ -185,7 +185,7 @@ export default {
       );
     },
     //点击消息的跳转
-    locationHerf(id, refid, type) {
+    locationHerf(id, refid, type, approval) {
       this.http.post(
         this.port.notice.read,
         {
@@ -209,7 +209,7 @@ export default {
       );
       if (type == 0) {
         //审批 跳转到模具详情
-        this.$router.push("/moldList/" + refid);
+        this.$router.push("/moldList/" + refid + "/" + approval);
       } else if (type == 1) {
         //警告 跳转到运行监测
         this.$router.push("/detection");

ys_vue/src/views/mold/moldDetail.vue

@@ -702,8 +702,8 @@
 
                 editLoading: false,
                 listLoading: false,
-                activeTab: 0,
-                activePage: 0,
+                activeTab: this.$route.params.type,
+                activePage: this.$route.params.type,
                 activeArticleId: null,
                 activeFileName: null,
                 fileUrl: null,
@@ -750,14 +750,6 @@
             },
 
             toAnotherMould(id){
-                //简单粗暴的方法到另一个模具详情
-                // var currentRoute = this.$route.path.split("/");
-                // if (currentRoute.length == 3 && currentRoute[1] == "moldList") {
-                //     this.$router.go(0);
-                // }
-                // this.$router.replace('/moldList/' + id);
-
-                //更加简单粗暴地方法
                 this.detailId = id;
                 this.getDetail();
             },
@@ -779,8 +771,8 @@
                         this.boxes = res.data;
                     } else {
                         this.$message({
-                        message: res.msg,
-                        type: "error"
+                            message: res.msg,
+                            type: "error"
                         });
                     }
                 },

ys_vue/src/views/mold/moldList.vue

@@ -343,7 +343,7 @@
 
             //详情
             toDetail(row) {
-                this.$router.push("/moldList/" + row.id);
+                this.$router.push("/moldList/" + row.id + "/0");
             },
 
             //删除