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

ys_vue/src/port.js

@@ -3,6 +3,11 @@ export default {
         login: '/user/login', //登录
         //logout: '/manage/company/loginOut' //退出
     },
+    //消息提示相关
+    notice: {
+        list: '/vnoticeuser/list',  //消息列表
+        read: '/vnoticeuser/read'  //消息读取
+    },
     pwd: {
         resetPwd: '/user/updatePassword'
     },
@@ -27,6 +32,7 @@ export default {
         powerList: '/power/list', // 权限列表
         powerUpdate: '/power/update', //修改权限
     },
+    //模具
     mold: {
         addMold: '/mould/addOrUpdate', //添加/修改模具设备
         molds: '/mould/list', //模具列表
@@ -39,7 +45,7 @@ export default {
         moldFileDelete: '/mouldfile/delFile', //项目文档的删除
         moldOperationList: '/mouldoperationdynamics/list', //项目文档的删除
     },
-    // 基础管理
+    //基础管理
     base: {
         addRole: '/role/add',  //新建或修改 （角色）
         roleList: '/role/list', //列表

ys_vue/src/views/Home.vue

@@ -270,6 +270,10 @@ export default {
           );
         }
       });
+    },
+    //消息提示
+    loadNotice(){
+
     }
   },
   mounted() {

ys_vue/src/views/mold/moldDetail.vue

@@ -316,16 +316,10 @@
         style="width: 100%;"
       >
         <el-table-column type="index" width="40"></el-table-column>
-        <el-table-column prop="name" label="姓名" width="400" sortable></el-table-column>
-        <el-table-column prop="document" label="文档名称" sortable></el-table-column>
-        <el-table-column label="操作" width="400" sortable>
-          <template slot-scope="scope">
-            <span v-if="scope.row.operation == 0">浏览</span>
-            <span v-else-if="scope.row.operation == 1">下载</span>
-            <span v-else>删除</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="time" label="时间" width="400" sortable></el-table-column>
+        <el-table-column prop="operatorName" label="姓名" width="200" sortable></el-table-column>
+        <el-table-column prop="fileName" label="文档名称" sortable></el-table-column>
+        <el-table-column prop="content" label="操作" width="200" sortable></el-table-column>
+        <el-table-column prop="indate" label="时间" width="300" sortable></el-table-column>
       </el-table>
     </el-col>
 
@@ -382,15 +376,7 @@ export default {
         update: [],
         abandon: []
       },
-      //临时数据
-      operations: [
-        {
-          name: "王多银",
-          document: "墨盒产品验证文档.word",
-          operation: 0,
-          time: "时间"
-        }
-      ],
+      operations: [],
       allDetail: {
         overflow: "auto",
         padding: "0px 5px",
@@ -400,6 +386,7 @@ export default {
       centerDialog2Visible: false,
       listLoading: false,
       activeTab: 0,
+      activeTab2: 0,
       activePage: 0,
       activeArticleId: null,
       activeFileName: null
@@ -415,6 +402,7 @@ export default {
     //标签页面切换时
     handleClick(tab, event) {
       this.activeTab = tab.name;
+      this.getOperationRecord(this.activeTab);
     },
     //模具详情
     getDetail() {
@@ -456,6 +444,8 @@ export default {
             this.documents.maintain = res.data[3].list;
             this.documents.update = res.data[4].list;
             this.documents.abandon = res.data[5].list;
+            //顺便再把下面操作记录读取一下
+            this.getOperationRecord(this.activeTab);
           } else {
             this.$message({
               message: res.msg,
@@ -587,19 +577,17 @@ export default {
       );
     },
     //获取操作记录
-    getOperationRecord() {
+    getOperationRecord(type) {
       this.http.post(
         this.port.mold.moldOperationList,
         {
-          mould_id: this.detailId,
-          belong_type: 0
+          mouldId: this.detailId,
+          belongType: type
         },
         res => {
           if (res.code == "ok") {
-            this.$message({
-              message: "获取操作记录成功",
-              type: "success"
-            });
+            this.operations = res.data;
+            console.log(this.operations);
           } else {
             this.$message({
               message: res.msg,
@@ -627,7 +615,6 @@ export default {
   mounted() {
     this.getDetail();
     this.getDocument();
-    this.getOperationRecord()
   }
 };
 </script>