修改通知点击出现bug

cloud-model/src/main/java/com/hssx/cloudmodel/constant/Constant.java

@@ -40,7 +40,7 @@ public class Constant {
     public static final String EMERGENCY_ELECTRICITY_NOTICE = "该云模盒电量已达告警阈值,请前往处理";//告警通知
     public static final String EMERGENCY_TEMPERATURE_NOTICE = "该云模盒温度已达告警阈值,请前往处理";//告警通知
     public static final String SCRAP_NOTICE = "该模具运行次数已超过寿命次数,请申请报废处理";//待报废
-    public static final String EMERGENCY_NOTICE = "模具云墨盒已被更换，请前往查看并处理";//模具云墨盒解绑告警
+    public static final String EMERGENCY_NOTICE = "模具云模盒已被更换，请前往查看并处理";//模具云墨盒解绑告警
     public static final String MAINTAIN_NAME_FIRST = "动作";//保养类型名称0
     public static final String MAINTAIN_NAME_SECOND = "易损件";//保养类型名称1
     public static final String MAINTAIN_WAY_FIRST = "喷漆";//对应保养类型动作

cloud-model/src/main/java/com/hssx/cloudmodel/mapper/ProjectMapper.java

@@ -21,7 +21,7 @@ public interface ProjectMapper extends BaseMapper<Project> {
 
     List<ProjectVO> getProjectListByUid(@Param("keyName") String keyName, @Param("currentUser") User currentUser);
 
-    ProjectVO getProjectById(@Param("id")Integer id);
+    ProjectVO getProjectById(@Param("id")Integer id, @Param("user")User user);
 
     List<User> getProjectUserById(@Param("id")Integer id);
 

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldEquipmentServiceImpl.java

@@ -324,7 +324,7 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
                     newsNotice.setNoticeType(Constant.EMERGENCY_TYPE);
                     newsNotice.setProjectId(project.getId());
                     newsNotice.setProjectName(project.getProjectName() + "-" + mould.getModelName());
-//                    newsNotice.setRefId(mould.getId());
+                    newsNotice.setRefId(mould.getId());
                     newsNotice.setContent(mouldEquipment.getEquipmentNo() + "-" + Constant.EMERGENCY_TEMPERATURE_NOTICE);
                     newsNoticeMapper.insert(newsNotice);
                     for (User u : users) {

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldServiceImpl.java

@@ -227,7 +227,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                 mould.setInjectionMolding(molding);
             }
             map.put("vo", mould);
-            ProjectVO vo = projectMapper.getProjectById(mould.getProjectId());
+            ProjectVO vo = projectMapper.getProjectById(mould.getProjectId(), user);
             if (null == mould.getProjectId()) {
                 map.put("update", 0);
                 map.put("download", 0);
@@ -569,7 +569,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
             NewsNotice newsNotice = new NewsNotice();
             newsNotice.setNoticeType(Constant.EMERGENCY_TYPE);
             newsNotice.setProjectName(project.getProjectName());
-//            newsNotice.setRefId(mould.getId());
+            newsNotice.setRefId(mould.getId());
             newsNotice.setContent(mou.getModelNo() + "-" + Constant.EMERGENCY_NOTICE);
             newsNoticeMapper.insert(newsNotice);
             //通知该模具所属资产方的管理员

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/ProjectServiceImpl.java

@@ -408,7 +408,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             msg.setError("您没有该权限!");
             return msg;
         }
-        ProjectVO vo = projectMapper.getProjectById(project.getId());
+        ProjectVO vo = projectMapper.getProjectById(project.getId(), user);
         if (Constant.SYS_PARENT_ID.equals(user.getParentId())) {
             //当前人超级管理员 ,对项目只可以浏览
             map.put("update", 0);
@@ -439,32 +439,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             map.put("download", 1);
             map.put("view", 1);
             map.put("approve", approve);
-        } /*else if (projectApproveMapper.selectCount(new QueryWrapper<ProjectApprove>().eq("approver_id", user.getId())) > 0) {
-            //是否为审批人
-            //该项目的参与人
-            Integer update = 0;
-            Integer download = 0;
-            Integer view = 0;
-            Integer approve = 1;
-            List<Power> powers = powerMapper.selectList(new QueryWrapper<Power>().eq("project_id", project.getId()).eq("user_id", user.getId()));
-            if (powers.size() > 0) {
-                for (Power power : powers) {
-                    if (power.getPowerType() == 0) {
-                        update = 1;
-                    } else if (power.getPowerType() == 1) {
-                        download = 1;
-                    } else if (power.getPowerType() == 2) {
-                        view = 1;
-                    } else {
-                        approve = 1;
-                    }
-                }
-            }
-            map.put("update", update);
-            map.put("download", download);
-            map.put("view", view);
-            map.put("approve", approve);
-        }*/ else {
+        } else {
             //该项目的参与人
             Integer update = 0;
             Integer download = 0;

cloud-model/src/main/java/com/hssx/cloudmodel/util/ExcelUtil.java

@@ -1,5 +1,6 @@
 package com.hssx.cloudmodel.util;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.ss.usermodel.BorderStyle;
 import org.apache.poi.ss.usermodel.CellStyle;
@@ -124,7 +125,15 @@ public class ExcelUtil {
                         }else {
                             cell.setCellStyle(cellStyle);
                         }
-                        cell.setCellValue(rowList.get(i));
+                        //解决数字在导出的excel中无法自动累加的问题
+
+                        if(NumberUtil.isInteger(rowList.get(i))) {
+                            cell.setCellValue(Integer.parseInt(rowList.get(i)));
+                        } else if(NumberUtil.isDouble(rowList.get(i))) {
+                            cell.setCellValue(Double.parseDouble(rowList.get(i)));
+                        } else {
+                            cell.setCellValue(rowList.get(i));
+                        }
                     }
                     start++;
                 }

cloud-model/src/main/java/com/hssx/cloudmodel/util/NumberUtil.java

@@ -0,0 +1,35 @@
+package com.hssx.cloudmodel.util;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.regex.Pattern;
+
+public class NumberUtil {
+
+    public static boolean isInteger(String str) {
+        Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
+        if (pattern.matcher(str).matches()) {
+            String maxInteger = Integer.MAX_VALUE+"";
+            if (str.length() > maxInteger.length()) {
+                return false;
+            }
+            if (str.length() == maxInteger.length() && str.compareTo(maxInteger) > 0) {
+                return false;
+            }
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public static boolean isDouble(String str) {
+        Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*\\.[\\d]*$");
+        return pattern.matcher(str).matches();
+    }
+
+    public static void main(String[] args) {
+        String str = "89860416121880584940";
+        System.out.println(StringUtils.isNumeric(str));
+        System.out.println(Integer.MAX_VALUE);
+    }
+}

cloud-model/src/main/resources/application-prod.properties

@@ -25,8 +25,8 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.url=jdbc:mysql://127.0.0.1:3306/cloud_mould?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 spring.datasource.username=root
 spring.datasource.password=Hssx2019.!
-#spring.datasource.druid.test-on-borrow=true
-#spring.datasource.druid.test-while-idle=true
+spring.datasource.druid.test-on-borrow=true
+spring.datasource.druid.test-while-idle=true
 # ####################################################################################################
 # MyBatis ÅäÖÃ
 mybatis.mapper-locations=mappers/*Mapper.xml

cloud-model/src/main/resources/application.properties

@@ -18,8 +18,8 @@ spring.datasource.url=jdbc:mysql://47.100.37.243:7644/cloud_mould?useUnicode=tru
 spring.datasource.username=root
 #spring.datasource.password=p011430seya1026
 spring.datasource.password=Ziyu1026!@
-#spring.datasource.druid.test-on-borrow=true
-#spring.datasource.druid.test-while-idle=true
+spring.datasource.druid.test-on-borrow=true
+spring.datasource.druid.test-while-idle=true
 # ####################################################################################################
 # MyBatis ÅäÖÃ
 mybatis.mapper-locations=mappers/*Mapper.xml

cloud-model/src/main/resources/mapper/MouldMapper.xml

@@ -183,6 +183,7 @@
                      open="(" separator="," close=")">
                 #{item}
             </foreach>
+            AND tbm.produce_company_id =#{userVO.companyId}
         </where>
     </select>
 

cloud-model/src/main/resources/mapper/ProjectMapper.xml

@@ -168,6 +168,9 @@
     on tbp.id = p.owner_company
     where
       p.id = #{id}
+      <if test="user.subordinateType == 1">
+            and m.produce_company_id = #{user.companyId}
+      </if>
     </select>
 
     <resultMap id="UserResultMap" type="com.hssx.cloudmodel.entity.User">

website/src/main/resources/templates/about.html

@@ -67,7 +67,7 @@
                             </div>
                         </li>
                         <span style="border-left: 1px solid #fff;line-height: 1.5;"></span>
-                        <li id="login" class="nav-item dropdown menu-large"><a href="login.html">登录 <b
+                        <li id="login" class="nav-item dropdown menu-large"><a href="/vip">登录 <b
                                 class="caret"></b></a></li>
                         <li id="vip" class="nav-item dropdown menu-large"><a href="/vip">会员入口 <b class="caret"></b></a>
                         </li>
@@ -156,49 +156,43 @@
                 </div>
             </section>
         </div>
-        <section class="bar background-pentagon no-mb">
-            <div class="container">
-                <h2 style="text-align: center;margin-bottom: 50px;">我们的福利</h2>
-                <div class="row showcase text-center">
-                    <div class="col-md-2 col-sm-6">
-                        <div class="item">
-                            <div class="icon-outlined icon-sm icon-thin"><i class="fa fa-thumbs-o-up"></i></div>
-                            <h4>技术大牛带飞<br>定期学习分享</h4>
-                        </div>
-                    </div>
-                    <div class="col-md-2 col-sm-6">
-                        <div class="item">
-                            <div class="icon-outlined icon-sm icon-thin"><i class="fa fa-leaf"></i></div>
-                            <h4>供应早午晚餐<br>果零饮不间断</h4>
-                        </div>
-                    </div>
-                    <div class="col-md-2 col-sm-6">
-                        <div class="item">
-                            <div class="icon-outlined icon-sm icon-thin"><i class="fa fa-clock-o"></i></div>
-                            <h4>灵活工作时间<br>舒适工作环境</h4>
-                        </div>
-                    </div>
-                    <div class="col-md-2 col-sm-6">
-                        <div class="item">
-                            <div class="icon-outlined icon-sm icon-thin"><i class="fa fa-users"></i></div>
-                            <h4>年轻精英团队<br>超扁平化管理</h4>
-                        </div>
-                    </div>
-                    <div class="col-md-2 col-sm-6">
-                        <div class="item">
-                            <div class="icon-outlined icon-sm icon-thin"><i class="fa fa-gift"></i></div>
-                            <h4>关心成员成长<br>团建礼物惊喜</h4>
-                        </div>
-                    </div>
-                    <div class="col-md-2 col-sm-6">
-                        <div class="item">
-                            <div class="icon-outlined icon-sm icon-thin"><i class="fa fa-paper-plane-o"></i></div>
-                            <h4>高于行业薪酬<br>五险金加商保</h4>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </section>
+<!--        <section class="bar background-pentagon no-mb">-->
+<!--            <div class="container">-->
+<!--                <h2 style="text-align: center;margin-bottom: 50px;">我们的福利</h2>-->
+<!--                <div class="row showcase text-center" style="margin:0 auto; justify-content:center;">-->
+<!--                    <div class="col-md-2 col-sm-6">-->
+<!--                        <div class="item">-->
+<!--                            <div class="icon-outlined icon-sm icon-thin"><i class="fa fa-leaf"></i></div>-->
+<!--                            <h4>供应早午晚餐<br>果零饮不间断</h4>-->
+<!--                        </div>-->
+<!--                    </div>-->
+<!--                    <div class="col-md-2 col-sm-6">-->
+<!--                        <div class="item">-->
+<!--                            <div class="icon-outlined icon-sm icon-thin"><i class="fa fa-clock-o"></i></div>-->
+<!--                            <h4>灵活工作时间<br>舒适工作环境</h4>-->
+<!--                        </div>-->
+<!--                    </div>-->
+<!--                    <div class="col-md-2 col-sm-6">-->
+<!--                        <div class="item">-->
+<!--                            <div class="icon-outlined icon-sm icon-thin"><i class="fa fa-users"></i></div>-->
+<!--                            <h4>年轻精英团队<br>超扁平化管理</h4>-->
+<!--                        </div>-->
+<!--                    </div>-->
+<!--                    <div class="col-md-2 col-sm-6">-->
+<!--                        <div class="item">-->
+<!--                            <div class="icon-outlined icon-sm icon-thin"><i class="fa fa-gift"></i></div>-->
+<!--                            <h4>关心成员成长<br>团建礼物惊喜</h4>-->
+<!--                        </div>-->
+<!--                    </div>-->
+<!--                    <div class="col-md-2 col-sm-6">-->
+<!--                        <div class="item">-->
+<!--                            <div class="icon-outlined icon-sm icon-thin"><i class="fa fa-paper-plane-o"></i></div>-->
+<!--                            <h4>高于行业薪酬<br>五险金加商保</h4>-->
+<!--                        </div>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </section>-->
         <section class="bar bg-gray">
             <div class="row">
                 <div class="col-md-12">

website/src/main/resources/templates/apply.html

@@ -65,7 +65,7 @@
                                 </div>
                             </li>
                             <span style="border-left: 1px solid #fff;line-height: 1.5;"></span>
-                            <li id="login" class="nav-item dropdown menu-large"><a href="login.html">登录 <b class="caret"></b></a></li>
+                            <li id="login" class="nav-item dropdown menu-large"><a href="/vip">登录 <b class="caret"></b></a></li>
                             <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="/vip">会员入口 <b class="caret"></b></a></li>
                         </ul>
                     </div>

website/src/main/resources/templates/case.html

@@ -64,7 +64,7 @@
                                 </div>
                             </li>
                             <span style="border-left: 1px solid #fff;line-height: 1.5;"></span>
-                            <li id="login" class="nav-item dropdown menu-large"><a href="login.html">登录 <b class="caret"></b></a></li>
+                            <li id="login" class="nav-item dropdown menu-large"><a href="/vip">登录 <b class="caret"></b></a></li>
                             <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="/vip">会员入口 <b class="caret"></b></a></li>
                         </ul>
                     </div>

website/src/main/resources/templates/caseDetail.html

@@ -64,7 +64,7 @@
                                 </div>
                             </li>
                             <span style="border-left: 1px solid #fff;line-height: 1.5;"></span>
-                            <li id="login" class="nav-item dropdown menu-large"><a href="login.html">登录 <b class="caret"></b></a></li>
+                            <li id="login" class="nav-item dropdown menu-large"><a href="/vip">登录 <b class="caret"></b></a></li>
                             <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="/vip">会员入口 <b class="caret"></b></a></li>
                         </ul>
                     </div>

website/src/main/resources/templates/goods.html

@@ -64,7 +64,7 @@
                                 </div>
                             </li>
                             <span style="border-left: 1px solid #fff;line-height: 1.5;"></span>
-                            <li id="login" class="nav-item dropdown menu-large"><a href="login.html">登录 <b class="caret"></b></a></li>
+                            <li id="login" class="nav-item dropdown menu-large"><a href="/vip">登录 <b class="caret"></b></a></li>
                             <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="/vip">会员入口 <b class="caret"></b></a></li>
                         </ul>
                     </div>

website/src/main/resources/templates/index.html

@@ -46,8 +46,8 @@
         <div id="navbar" role="navigation" class="navbar navbar-expand-lg">
             <div class="container">
                 <a href="index" class="navbar-brand home">
-                    <img src="img/logo.png" style="width:187px;" alt="Universal logo" class="d-none d-md-inline-block">
-                    <img src="img/logo-small.png" alt="Universal logo" class="d-inline-block d-md-none">
+                    <img src="img/logo_new.png" style="width:187px;" alt="Universal logo" class="d-none d-md-inline-block">
+<!--                    <img src="img/logo-small.png" alt="Universal logo" class="d-inline-block d-md-none">-->
                 </a>
                 <button type="button" data-toggle="collapse" data-target="#navigation"
                         class="navbar-toggler btn-template-outlined"><span class="sr-only">Toggle navigation</span><i
@@ -67,7 +67,7 @@
                             </div>
                         </li>
                         <span style="border-left: 1px solid #fff;line-height: 1.5;"></span>
-                        <li id="login" class="nav-item dropdown menu-large"><a href="login.html">登录 <b class="caret"></b></a></li>
+                        <li id="login" class="nav-item dropdown menu-large"><a href="/vip">登录 <b class="caret"></b></a></li>
                         <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="/vip">会员入口 <b class="caret"></b></a></li>
                     </ul>
                 </div>

website/src/main/resources/templates/job.html

@@ -67,7 +67,7 @@
                             </div>
                         </li>
                         <span style="border-left: 1px solid #fff;line-height: 1.5;"></span>
-                        <li id="login" class="nav-item dropdown menu-large"><a href="login.html">登录 <b
+                        <li id="login" class="nav-item dropdown menu-large"><a href="/vip">登录 <b
                                 class="caret"></b></a></li>
                         <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="/vip">会员入口 <b
                                 class="caret"></b></a></li>

website/src/main/resources/templates/login.html

@@ -64,7 +64,7 @@
                                     </div>
                                 </li>
                                 <span style="border-left: 1px solid #fff;line-height: 1.5;"></span>
-                                <li id="login" class="nav-item dropdown active"><a href="login.html">登录 <b class="caret"></b></a></li>
+                                <li id="login" class="nav-item dropdown active"><a href="/vip">登录 <b class="caret"></b></a></li>
                                 <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="/vip">会员入口 <b class="caret"></b></a></li>
                             </ul>
                         </div>

website/src/main/resources/templates/partner.html

@@ -64,7 +64,7 @@
                                 </div>
                             </li>
                             <span style="border-left: 1px solid #fff;line-height: 1.5;"></span>
-                            <li id="login" class="nav-item dropdown menu-large"><a href="login.html">登录 <b class="caret"></b></a></li>
+                            <li id="login" class="nav-item dropdown menu-large"><a href="/vip">登录 <b class="caret"></b></a></li>
                             <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="/vip">会员入口 <b class="caret"></b></a></li>
                         </ul>
                     </div>

website/src/main/resources/templates/product.html

@@ -64,7 +64,7 @@
                                 </div>
                             </li>
                             <span style="border-left: 1px solid #fff;line-height: 1.5;"></span>
-                            <li id="login" class="nav-item dropdown menu-large"><a href="login.html">登录 <b class="caret"></b></a></li>
+                            <li id="login" class="nav-item dropdown menu-large"><a href="/vip">登录 <b class="caret"></b></a></li>
                             <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="/vip">会员入口 <b class="caret"></b></a></li>
                         </ul>
                     </div>

website/src/main/resources/templates/vip.html

@@ -38,9 +38,9 @@
     <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
     <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script><![endif]-->
     <script>
-        if(sessionStorage.isLogin != 1) {
-            location.href = "./login.html"
-        }
+        // if(sessionStorage.isLogin != 1) {
+        //     location.href = "./login.html"
+        // }
     </script>
 </head>
 <body>
@@ -69,7 +69,7 @@
                             </div>
                         </li>
                         <span style="border-left: 1px solid #fff;line-height: 1.5;"></span>
-                        <li id="login" class="nav-item dropdown menu-large"><a href="login.html">登录 <b class="caret"></b></a></li>
+                        <li id="login" class="nav-item dropdown menu-large"><a href="/vip">登录 <b class="caret"></b></a></li>
                         <li id="vip" style="display: none;" class="nav-item dropdown active"><a href="/vip">会员入口 <b class="caret"></b></a></li>
                     </ul>
                 </div>

ys_int/src/views/detection/detection.vue

@@ -29,17 +29,13 @@
                     <a style="color: #409EFF; cursor: pointer" @click="toMould(scope.row.id)">{{scope.row.modelName}} {{scope.row.rfid}}</a>
                 </template>
             </el-table-column>
-            <!-- <el-table-column prop="equipmentNo" :label="$t('basic.equipmentNo')" width="180" sortable></el-table-column> -->
-            <el-table-column prop="equipmentNo" label="CCID" width="180" sortable></el-table-column>
-            <el-table-column prop="equipmentName" :label="$t('basic.proNum')" width="180" sortable></el-table-column>
             <el-table-column prop="projectName" :label="$t('mold.projectName')" width="200" sortable></el-table-column>
-            <el-table-column prop="produceCompany" :label="$t('mold.factoryName')" width="300" sortable></el-table-column>
-            <el-table-column prop="area" :label="$t('mold.area')" width="300" sortable></el-table-column>
             <el-table-column prop="runTimes" :label="$t('mold.runTimes')" align="center" width="100" sortable>
                 <template slot-scope="scope">
                     {{scope.row.runTimes.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,')}}
                 </template>
             </el-table-column>
+            
             <el-table-column prop="ocCycle" :label="$t('mold.ocCycle')" align="center" width="140" sortable></el-table-column>
             <el-table-column prop="hillNumber" :label="$t('mold.hillNumber')" align="center" width="80" sortable>
                 <template slot-scope="scope">{{scope.row.hillNumber}}<span v-if="scope.row.hillNumber">%</span></template>
@@ -47,21 +43,20 @@
             <el-table-column prop="temperature" :label="$t('runTest.temperature')" align="center" width="80" sortable>
                 <template slot-scope="scope">{{scope.row.temperature}}<span v-if="scope.row.temperature">℃</span></template>
             </el-table-column>
+            
             <el-table-column prop="lastOpenTime" :label="$t('runTest.lastOpenTime')" align="center" width="180" sortable></el-table-column>
+
             <el-table-column prop="initialModulus" :label="$t('runTest.initialModulus')" align="center" width="180" sortable>
                 <template slot-scope="scope">{{(parseInt(scope.row.initialModulus) + parseInt(scope.row.runTimes)).toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,')}}次</template>
             </el-table-column>
-            <el-table-column fixed="right" :label="$t('runTest.moldState')" align="center" width="100" sortable>
-                <template slot-scope="scope">
-                    <span style="color:#909399" v-if="scope.row.state == 0">{{$t('base.static')}}</span>
-                    <span style="color:#00CD66" v-else-if="scope.row.state == 1">{{$t('base.run')}}</span>
-                    <span style="color:#F56C6C" v-else-if="scope.row.state == 2">{{$t('base.warning')}}</span>
-                    <span style="color:#909399" v-else-if="scope.row.state == 3">{{$t('mold.beScrapped')}}</span>
-                    <span style="color:#909399" v-else-if="scope.row.state == 4">{{$t('mold.scraped')}}</span>
-                    <span style="color:#F56C6C" v-else-if="scope.row.state == 5">{{$t('mold.abnormal')}}</span>
-                    <span style="color:#F56C6C" v-else-if="scope.row.state == 6">{{$t('mold.dropped')}}</span>
-                </template>
-            </el-table-column>
+            
+            <el-table-column prop="produceCompany" :label="$t('mold.factoryName')" width="300" sortable></el-table-column>
+            
+            <el-table-column prop="area" :label="$t('mold.area')" width="300" sortable></el-table-column>
+            <el-table-column prop="equipmentNo" label="CCID" width="180" sortable></el-table-column>
+            <el-table-column prop="equipmentName" :label="$t('basic.proNum')" width="180" sortable></el-table-column>
+            
+            <!-- <el-table-column prop="equipmentNo" :label="$t('basic.equipmentNo')" width="180" sortable></el-table-column> -->
             <el-table-column :label="$t('runTest.stage')" align="center" width="160">
                 <template slot-scope="scope">
                     <span v-if="scope.row.stage == 0">{{$t('runTest.stage0')}}</span>
@@ -71,12 +66,25 @@
                     <span v-else>{{$t('runTest.stage4')}}</span>
                 </template>
             </el-table-column>
-            <el-table-column :label="$t('runTest.isMaintain')" align="center" width="100">
+            
+            
+            <el-table-column fixed="right" :label="$t('runTest.isMaintain')" align="center" width="100">
                 <template slot-scope="scope">
-                    <span v-if="scope.row.isMaintain == 1">{{$t('runTest.isMaintain0')}}</span>
+                    <span v-if="scope.row.isMaintain == 1" style="color:red">{{$t('runTest.isMaintain0')}}</span>
                     <span v-else>{{$t('runTest.isMaintain1')}}</span>
                 </template>
             </el-table-column>
+            <el-table-column fixed="right" :label="$t('runTest.moldState')" align="center" width="100" sortable>
+                <template slot-scope="scope">
+                    <span style="color:#909399" v-if="scope.row.state == 0">{{$t('base.static')}}</span>
+                    <span style="color:#00CD66" v-else-if="scope.row.state == 1">{{$t('base.run')}}</span>
+                    <span style="color:#F56C6C" v-else-if="scope.row.state == 2">{{$t('base.warning')}}</span>
+                    <span style="color:#909399" v-else-if="scope.row.state == 3">{{$t('mold.beScrapped')}}</span>
+                    <span style="color:#909399" v-else-if="scope.row.state == 4">{{$t('mold.scraped')}}</span>
+                    <span style="color:#F56C6C" v-else-if="scope.row.state == 5">{{$t('mold.abnormal')}}</span>
+                    <span style="color:#F56C6C" v-else-if="scope.row.state == 6">{{$t('mold.dropped')}}</span>
+                </template>
+            </el-table-column>
             <el-table-column fixed="right" :label="$t('runTest.process')" align="center" width="80">
                 <template slot-scope="scope">
                     <el-button size="small" type="primary" @click="toMaintenance(scope.row.id)">{{$t('base.detail')}}</el-button>