Inicio Explorar Axuda
Rexistro Iniciar sesión
ZHOU
/
yunsu
1
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

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

# Conflicts:
#	ys_vue/index.html
sunyadv %!s(int64=5) %!d(string=hai) anos
pai
061d4c472a 379879e6a3
achega
dad0c93f68
Modificáronse 6 ficheiros con 61 adicións e 25 borrados
Unificar vista Mostrar estatísticas de Diff
  1. 19 1
      cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/ProjectApproveServiceImpl.java
  2. 3 3
      cloud-model/src/main/resources/mapper/MouldMapper.xml
  3. 8 5
      ys_vue/index.html
  4. 24 11
      ys_vue/src/views/Home.vue
  5. 1 1
      ys_vue/src/views/detection/detection.vue
  6. 6 4
      ys_vue/src/views/message.vue

+ 19 - 1
cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/ProjectApproveServiceImpl.java
Ver ficheiro 

@@ -1,8 +1,10 @@
 
 package com.hssx.cloudmodel.service.impl;
 
 package com.hssx.cloudmodel.service.impl;
 
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
+import com.hssx.cloudmodel.constant.Constant;
 
 import com.hssx.cloudmodel.entity.ProjectApprove;
 
 import com.hssx.cloudmodel.entity.ProjectApprove;
 
 import com.hssx.cloudmodel.entity.User;
 
 import com.hssx.cloudmodel.entity.User;
 
+import com.hssx.cloudmodel.mapper.CompanyMapper;
 
 import com.hssx.cloudmodel.mapper.ProjectApproveMapper;
 
 import com.hssx.cloudmodel.mapper.ProjectApproveMapper;
 
 import com.hssx.cloudmodel.mapper.UserMapper;
 
 import com.hssx.cloudmodel.mapper.UserMapper;
 
 import com.hssx.cloudmodel.service.ProjectApproveService;
 
 import com.hssx.cloudmodel.service.ProjectApproveService;
 
@@ -23,10 +25,26 @@ public class ProjectApproveServiceImpl extends ServiceImpl<ProjectApproveMapper,
 
     ProjectApproveMapper projectApproveMapper;
 
     ProjectApproveMapper projectApproveMapper;
 
     @Resource
 
     @Resource
 
     UserMapper userMapper;
 
     UserMapper userMapper;
 
+    @Resource
 
+    CompanyMapper companyMapper;
 
 
 
     @Override
 
     @Override
 
     public HttpRespMsg setUpExamine(ProjectApprove projectApprove, String token) {
 
     public HttpRespMsg setUpExamine(ProjectApprove projectApprove, String token) {
 
-        userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl",token));
 
+        HttpRespMsg msg = new HttpRespMsg();
 
+        User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
 
+        if(user != null){
 
+            if(Constant.SYS_ID == user.getParentId()){
 
+                //资产方管理员
 
+                User examiner = userMapper.selectById(projectApprove.getApproverId());
 
+
 
+                projectApprove.setApproverName(examiner.getUsername());
 
+                projectApprove.setCompanyId(examiner.getCompanyId());
 
+            }else{
 
+                msg.setError("对不起，您没有操作该功能的权限");
 
+            }
 
+        }else{
 
+            msg.setError("用户未登录或不存在");
 
+        }
 
         return null;
 
         return null;
 
     }
 
     }
 
 }
 
 }

+ 3 - 3
cloud-model/src/main/resources/mapper/MouldMapper.xml
Ver ficheiro 

@@ -74,7 +74,7 @@
 
         select
 
         select
 
         tbm.id id,tbm.model_no model_no, tbm.model_name,tbm.initial_modulus initial_modulus,
 
         tbm.id id,tbm.model_no model_no, tbm.model_name,tbm.initial_modulus initial_modulus,
 
         tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbc.company_name companyName,
 
         tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbc.company_name companyName,
 
-        tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,
 
+        tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,tbmp.hill_number hillNumber,
 
         tbmp.equipment_no equipmentNo,tbm.setting_life setting_life,tbp.owner_company_name ownerCompanyName
 
         tbmp.equipment_no equipmentNo,tbm.setting_life setting_life,tbp.owner_company_name ownerCompanyName
 
         from
 
         from
 
         tb_mould tbm
 
         tb_mould tbm
 
@@ -107,9 +107,9 @@
 
     <select id="selectListByConditionByProject" resultMap="BaseResultMapVO">
 
     <select id="selectListByConditionByProject" resultMap="BaseResultMapVO">
 
         select
 
         select
 
         tbm.id id,tbm.model_no model_no, tbm.model_name, tbmp.end_time endTime,tbm.state state,tbp.project_name
 
         tbm.id id,tbm.model_no model_no, tbm.model_name, tbmp.end_time endTime,tbm.state state,tbp.project_name
 
-        projectName,tbm.initial_modulus initial_modulus,tbc.company_name companyName,
 
+        projectName,tbm.initial_modulus initial_modulus,tbc.company_name companyName,tbmp.hill_number hillNumber,
 
         tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,tbmp.equipment_no
 
         tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,tbmp.equipment_no
 
-        equipmentNo,tbm.setting_life setting_life
 
+        equipmentNo,tbm.setting_life setting_life,tbp.owner_company_name ownerCompanyName
 
         from
 
         from
 
         tb_mould tbm
 
         tb_mould tbm
 
         left join
 
         left join

+ 8 - 5
ys_vue/index.html
Ver ficheiro 

@@ -65,21 +65,24 @@
 
             /*滚动条的宽度*/
 
             /*滚动条的宽度*/
 
             ::-webkit-scrollbar {
 
             ::-webkit-scrollbar {
 
                 width:9px;
 
                 width:9px;
 
-                height: 9px;
 
-            }
 
+            height: 9px;}
 
             /*滚动条的设置*/
 
             /*滚动条的设置*/
 
             ::-webkit-scrollbar-thumb {
 
             ::-webkit-scrollbar-thumb {
 
                 background-color:#dddddd;
 
                 background-color:#dddddd;
 
                 background-clip:padding-box;
 
                 background-clip:padding-box;
 
                 -webkit-border-radius: 2em;
 
                 -webkit-border-radius: 2em;
 
                 -moz-border-radius: 2em;
 
                 -moz-border-radius: 2em;
 
-                border-radius: 2em;
 
-            }
 
+                border-radius: 2em;}
 
+
 
             /*滚动条鼠标移上去*/
 
             /*滚动条鼠标移上去*/
 
             ::-webkit-scrollbar-thumb:hover {
 
             ::-webkit-scrollbar-thumb:hover {
 
                 background-color:#bbb;
 
                 background-color:#bbb;
 
             }
 
             }
 
-        </style>
 
+
 
+            /*取消消息列表弹出框的内边距*/
 
+            .popover-self {
 
+                padding: 0 !important;
 
+            }    </style>
 
     </head>
 
     </head>
 
     <body>
 
     <body>
 
         <div id="app"></div>
 
         <div id="app"></div>

+ 24 - 11
ys_vue/src/views/Home.vue
Ver ficheiro 

@@ -15,7 +15,13 @@
 
         <el-badge is-dot class="itemNew">
 
         <el-badge is-dot class="itemNew">
 
           <i class="el-icon-message-solid" style="font-size:24px" v-popover:popover1></i>
 
           <i class="el-icon-message-solid" style="font-size:24px" v-popover:popover1></i>
 
           <!-- 消息中心 -->
 
           <!-- 消息中心 -->
 
-          <el-popover ref="popover1" placement="bottom" width="400" trigger="hover">
 
+          <el-popover
 
+            ref="popover1"
 
+            placement="bottom"
 
+            width="400"
 
+            trigger="hover"
 
+            popper-class="popover-self"
 
+          >
 
             <div class="popover-main">消息盒子</div>
 
             <div class="popover-main">消息盒子</div>
 
             <div class="popover-item" v-for="item in popoverData">
 
             <div class="popover-item" v-for="item in popoverData">
 
               <p class="popover-title">
 
               <p class="popover-title">
 
@@ -24,7 +30,7 @@
 
               </p>
 
               </p>
 
               <p>{{item.article}}</p>
 
               <p>{{item.article}}</p>
 
             </div>
 
             </div>
 
-              <router-link :to="'/message'" tag="div" class="popover-button">查看全部</router-link>
 
+            <router-link :to="'/message'" tag="div" class="popover-button">查看全部</router-link>
 
           </el-popover>
 
           </el-popover>
 
         </el-badge>
 
         </el-badge>
 
         <el-dropdown trigger="hover">
 
         <el-dropdown trigger="hover">
 
@@ -424,22 +430,29 @@ export default {
 
 
 
 .popover-main {
 
 .popover-main {
 
   font-weight: 700;
 
   font-weight: 700;
 
-  padding-bottom: 12px;
 
-  border-bottom: 1px grey solid;
 
+  padding: 10px;
 
+  border-bottom: 1px #CCC solid;
 
+}
 
+.popover-item {
 
+  padding: 10px;
 
+  border-bottom: 1px #CCC solid;
 
+}
 
+.popover-item>p {
 
+  margin: 0;
 
+  line-height: 18px;
 
 }
 
 }
 
 .popover-title {
 
 .popover-title {
 
-  color: blue;
 
+  color: #409EFF;
 
+  padding-bottom: 8px;
 
 }
 
 }
 
 .popover-type {
 
 .popover-type {
 
-  color: black;
 
+  color: #AAA;
 
+  font-size: 8px;
 
   float: right;
 
   float: right;
 
 }
 
 }
 
-.popover-item {
 
-  border-bottom: 1px grey solid;
 
-}
 
 .popover-button {
 
 .popover-button {
 
-  font-weight: 700;
 
-  padding-top: 12px;
 
+  font-weight: 900;
 
+  padding: 10px;
 
   text-align: center;
 
   text-align: center;
 
 }
 
 }
 
 </style>
 
 </style>

+ 1 - 1
ys_vue/src/views/detection/detection.vue
Ver ficheiro 

@@ -37,7 +37,7 @@
 
       <el-table-column prop="area" label="位置" width="200" sortable></el-table-column>
 
       <el-table-column prop="area" label="位置" width="200" sortable></el-table-column>
 
       <el-table-column prop="runTimes" label="运行次数" width="100" sortable></el-table-column>
 
       <el-table-column prop="runTimes" label="运行次数" width="100" sortable></el-table-column>
 
       <el-table-column prop="ocCycle" label="每模平均周期" width="140" sortable></el-table-column>
 
       <el-table-column prop="ocCycle" label="每模平均周期" width="140" sortable></el-table-column>
 
-      <el-table-column label="电量" width="80" sortable></el-table-column>
 
+      <el-table-column prop="hillNumber" label="电量" width="80" sortable></el-table-column>
 
       <el-table-column prop="state" label="当前状态" width="100" sortable></el-table-column>
 
       <el-table-column prop="state" label="当前状态" width="100" sortable></el-table-column>
 
       <el-table-column label="模具保养" width="100">
 
       <el-table-column label="模具保养" width="100">
 
         <template slot-scope="scope">
 
         <template slot-scope="scope">

+ 6 - 4
ys_vue/src/views/message.vue
Ver ficheiro 

@@ -15,7 +15,7 @@
 
         <span class="message-title">{{item.title}}</span>
 
         <span class="message-title">{{item.title}}</span>
 
         <span class="message-time">{{item.time}}</span>
 
         <span class="message-time">{{item.time}}</span>
 
       </p>
 
       </p>
 
-      <p>{{item.article}}</p>
 
+      <p class="message-article">{{item.article}}</p>
 
     </div>
 
     </div>
 
   </section>
 
   </section>
 
 </template>
 
 </template>
 
@@ -62,13 +62,15 @@ export default {
 
   margin: 0;
 
   margin: 0;
 
 }
 
 }
 
 .message-type {
 
 .message-type {
 
-  font-weight: 800;
 
+  font-weight: 700;
 
 }
 
 }
 
 .message-title {
 
 .message-title {
 
-  font-weight: 800;
 
 }
 
 }
 
 .message-time {
 
 .message-time {
 
   padding-left: 30px;
 
   padding-left: 30px;
 
-  color: grey;
 
+  color: #777;
 
+}
 
+.message-article {
 
+  color: #555;
 
 }
 
 }
 
 </style>
 
 </style>