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

cloud-model/src/main/java/com/hssx/cloudmodel/controller/CompanyController.java

@@ -79,6 +79,7 @@ public class CompanyController {
     public HttpRespMsg deleteRole(@RequestParam(required = false)String keyName, HttpServletRequest request,
                                   HttpServletResponse response, PageUtil page,@RequestParam(required = false)Integer companyType) {
         HttpRespMsg msg = new HttpRespMsg();
+        System.out.println("====>"+companyType);
         msg = companyService.pageList(page,keyName,companyType);
         return msg;
     }

cloud-model/src/main/java/com/hssx/cloudmodel/entity/vo/CompanyVO.java

@@ -31,6 +31,6 @@ public class CompanyVO extends Company{
 
         private List<Mould> list  = new ArrayList<>();
 
-        private List<CompanyVO> relateCompanyList = new ArrayList<>();
+        private List<Company> relateCompanyList = new ArrayList<>();
 
 }

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

@@ -18,7 +18,7 @@ import java.util.List;
  */
 public interface CompanyMapper extends BaseMapper<Company> {
 
-    List<CompanyVO> getListByKeyName(@Param("keyName") String keyName, @Param("companyType")Integer companyType);
+//    List<CompanyVO> getListByKeyName(@Param("keyName") String keyName, @Param("companyType")Integer companyType);
 
     List<CompanyVO> getCustomerListByKeyName(@Param("keyName") String keyName, @Param("companyType")Integer companyType);
 

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

@@ -180,11 +180,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         HttpRespMsg msg = new HttpRespMsg();
         List<CompanyVO> list = new ArrayList<>();
         PageHelper.startPage(page.getPageNum(),page.getPageSize());
-        if (companyType == 0) {
-            list = companyMapper.getListByKeyName(keyName, companyType);
-        } else {
-            list = companyMapper.getCustomerListByKeyName(keyName, companyType);
-        }
+        list = companyMapper.getCustomerListByKeyName(keyName, companyType);
         PageInfo<CompanyVO> pageInfos = new PageInfo<>(list);
         msg.data = pageInfos;
         return msg;

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

@@ -21,10 +21,11 @@
         <id column="id" property="id" />
         <result column="company_name" property="companyName" />
         <result column="company_address" property="companyAddress" />
-        <result column="company_type" property="companyType" />
+        <result column="companytype" property="companyType" />
         <result column="y_lng" property="yLng" />
         <result column="x_lat" property="xLat" />
-        <collection property="relateCompanyList" javaType="java.util.List" select="selectRelateCompanyList" column="{Id = id,companyType = company_type}"
+        <collection property="relateCompanyList" javaType="java.util.List" select="selectRelateCompanyList"
+                    column="{Id=id,companyType = companytype}"
                     ofType="com.hssx.cloudmodel.entity.Company"/>
     </resultMap>
     <resultMap id="BaseResultMapMouldVO" type="com.hssx.cloudmodel.entity.vo.CompanyVO">
@@ -39,23 +40,23 @@
     </resultMap>
 
 
-    <select id="getListByKeyName" resultMap="BaseResultMapVO">
-        select
-        <include refid="Base_Column_List"/>
-        from
-        tb_company
-        <where>
-            <if test="keyName != null and keyName != ''">
-                and company_name like concat('%',#{keyName},'%')
-            </if>
-            <if test="companyType != null">
-                and company_type = #{companyType}
-            </if>
-        </where>
-    </select>
+    <!--<select id="getListByKeyName" resultMap="BaseResultMapVO">-->
+        <!--select-->
+        <!--<include refid="Base_Column_List"/>-->
+        <!--from-->
+        <!--tb_company-->
+        <!--<where>-->
+            <!--<if test="keyName != null and keyName != ''">-->
+                <!--and company_name like concat('%',#{keyName},'%')-->
+            <!--</if>-->
+            <!--<if test="companyType != null">-->
+                <!--and company_type = #{companyType}-->
+            <!--</if>-->
+        <!--</where>-->
+    <!--</select>-->
     <select id="getCustomerListByKeyName" resultMap="BaseResultMapVO">
         select
-        t.id, t.company_name, t.company_address, t.company_type,tc.y_lng, tc.x_lat
+        t.id, t.company_name, t.company_address, t.company_type companytype,tc.y_lng, tc.x_lat
         from
         tb_company t
         left join
@@ -70,25 +71,25 @@
             </if>
         </where>
     </select>
-    <select id="selectRelateCompanyList" resultType="com.hssx.cloudmodel.entity.vo.CompanyVO" parameterType="java.util.Map">
+    <select id="selectRelateCompanyList" resultType="com.hssx.cloudmodel.entity.Company" parameterType="java.util.Map">
       SELECT
-        t.id, t.company_name
+        t.id, t.company_name,t.company_type
         from
         tb_company t
         left join
         tb_asset_custom_company tbcc
-        <if test="#{companyType}==0">
+        <if test="companyType == 0">
             on t.id = tbcc.custom_id
         </if>
-        <if test="#{companyType}==1">
+        <if test="companyType == 1">
             on t.id = tbcc.assert_id
         </if>
         <where>
-          <if test="#{companyType}==0">
-              tbcc.assert_id = #{id}
+          <if test="companyType == 0">
+              tbcc.assert_id = #{Id}
           </if>
-          <if test="#{companyType}==1">
-              tbcc.custom_id = #{id}
+          <if test="companyType == 1">
+              tbcc.custom_id = #{Id}
           </if>
         </where>
 

ys_vue/src/views/Home.vue

@@ -16,7 +16,7 @@
         </div>
       </el-col>
       <el-col :span="6" class="userinfo">
-        <el-badge :is-dot="tips" class="itemNew">
+        <el-badge :value="messageCount[0] == 0 ? false : messageCount[0]" class="itemNew">
           <i class="el-icon-message-solid" style="font-size:24px" v-popover:popover1></i>
           <!-- 消息中心 -->
           <el-popover
@@ -26,11 +26,14 @@
             trigger="hover"
             popper-class="popover-self"
           >
-            <div class="popover-main">消息盒子</div>
             <!-- 消息盒子中间部分 -->
-            <el-tabs v-model="activePage" @tab-click="handleClick" type="card" stretch>
+            <el-tabs v-model="activePage" @tab-click="handleClick" stretch>
               <!-- 审批的页面 -->
-              <el-tab-pane label="审批" name="0">
+              <el-tab-pane name="0">
+                <span slot="label">
+                  <span v-if="messageCount[1] == 0">审批</span>
+                  <span v-else>审批（{{messageCount[1]}}）</span>
+                </span>
                 <div class="popover-item" v-if="popoverData.length == 0">暂无审批消息</div>
                 <div class="popover-item" v-for="item in popoverData">
                   <p class="popover-title">
@@ -44,7 +47,11 @@
               </el-tab-pane>
 
               <!-- 警告的页面 -->
-              <el-tab-pane label="警告" name="1">
+              <el-tab-pane name="1">
+                <span slot="label">
+                  <span v-if="messageCount[2] == 0">警告</span>
+                  <span v-else>警告{{messageCount[2]}}）</span>
+                </span>
                 <div class="popover-item" v-if="popoverData.length == 0">暂无警告消息</div>
                 <div class="popover-item" v-for="item in popoverData">
                   <p class="popover-title">
@@ -58,7 +65,11 @@
               </el-tab-pane>
 
               <!-- 保养的页面 -->
-              <el-tab-pane label="保养" name="2">
+              <el-tab-pane name="2">
+                <span slot="label">
+                  <span v-if="messageCount[3] == 0">保养</span>
+                  <span v-else>保养{{messageCount[3]}}）</span>
+                </span>
                 <div class="popover-item" v-if="popoverData.length == 0">暂无保养消息</div>
                 <div class="popover-item" v-for="item in popoverData">
                   <p class="popover-title">
@@ -230,7 +241,8 @@ export default {
       //消息数据
       popoverData: [],
       tips: false,
-      activePage: 0
+      activePage: 0,
+      messageCount: [0, 0, 0, 0]
     };
   },
   methods: {
@@ -609,11 +621,6 @@ export default {
   }
 }
 
-.popover-main {
-  font-weight: 700;
-  padding: 10px;
-}
-
 .popover-item {
   padding: 10px;
   border-bottom: 1px #eee solid;

ys_vue/src/views/detection/detection.vue

@@ -46,13 +46,16 @@
       <el-table-column prop="ocCycle" label="每模平均周期" align="center" width="140" sortable></el-table-column>
       <el-table-column prop="hillNumber" label="电量" align="center" width="80" sortable></el-table-column>
       <el-table-column prop="state" label="当前状态" align="center" width="100" sortable></el-table-column>
-      <el-table-column label="云模盒报警N/A" align="center" fixed="right" width="160">低电量、温度过高</el-table-column>
-      <el-table-column label="模具保养" align="center" fixed="right" width="100">
+      <el-table-column label="云模盒报警N/A" align="center" width="160">低电量、温度过高</el-table-column>
+      <el-table-column label="模具保养" align="center" width="100">
         <template slot-scope="scope">
-          <a style="color: #409EFF; cursor: pointer" @click="toMaintenance(scope.row.id)">
-            <span v-if="scope.row.isMaintain == 1">需要</span>
-            <span v-else>正常</span>
-          </a>
+          <span v-if="scope.row.isMaintain == 1">需要</span>
+          <span v-else>正常</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" width="85">
+        <template slot-scope="scope">
+          <el-button type="primary" @click="toMaintenance(scope.row.id)">详情</el-button>
         </template>
       </el-table-column>
     </el-table>

ys_vue/src/views/detection/maintenance.vue

@@ -25,21 +25,39 @@
     <!-- v-if="requirement" -->
     <!-- 模具处理 -->
     <el-col :span="24" class="title">模具处理</el-col>
-    <el-col :span="12" style="line-height: 32px;">
+    <el-col :span="6" style="line-height: 32px; border-right: #c3c3c3 1px solid;">
       当前保养状态：
       <span v-if="requirement" style="color: #ff4949;">需要</span>
       <span v-else style="color: black;">正常</span>
-      <el-button size="small" type="primary" @click="showMaintenance" style="margin-left: 16px;">立即处理</el-button>
+      <el-button
+        size="small"
+        type="primary"
+        @click="showMaintenance"
+        style="margin-left: 16px;"
+      >立即处理</el-button>
     </el-col>
-    <el-col :span="12" style="line-height: 32px;">
+    <el-col :span="4" :offset="2" style="line-height: 32px;">
       云模盒告警：{{warning}}
       <el-button size="small" type="primary" style="margin-left: 16px;">立即处理</el-button>
     </el-col>
 
     <!-- 操作记录 -->
-    <el-col :span="24" class="title">操作记录</el-col>
+    <el-col :span="24" class="title">处理记录</el-col>
     <!--列表-->
     <!-- :height="tableHeight" -->
+
+    <!-- <el-tabs v-model="activePage" @tab-click="handleClick">
+      <el-tab-pane label="模具保养" name="0">0</el-tab-pane>
+      <el-tab-pane label="模具告警" name="1">1</el-tab-pane>
+    </el-tabs>-->
+    <!-- <el-col :span="24">
+      <el-tabs v-model="activePage" @tab-click="handleClick">
+        <el-tab-pane label="用户管理" name="1">用户管理</el-tab-pane>
+        <el-tab-pane label="配置管理" name="2">配置管理</el-tab-pane>
+        <el-tab-pane label="角色管理" name="3">角色管理</el-tab-pane>
+        <el-tab-pane label="定时任务补偿" name="4">定时任务补偿</el-tab-pane>
+      </el-tabs>
+    </el-col> -->
     <el-table :data="records" highlight-current-row v-loading="listLoading" style="width: 100%;">
       <el-table-column type="index" width="60"></el-table-column>
       <el-table-column prop="maintainUserName" label="保养人" width="100" sortable></el-table-column>
@@ -179,6 +197,8 @@ export default {
       size: 20,
       total: 0,
       tableHeight: 0,
+      //活跃页面
+      activePage: 0,
       formRules: {},
       //保养界面 种类
       type: [{ label: "动作", value: 0 }, { label: "易损件", value: 1 }],
@@ -219,6 +239,11 @@ export default {
       this.size = val;
       this.getList();
     },
+    //标签页面切换时
+    handleClick(tab, event) {
+      this.activeTab = tab.name;
+      //应该是取得对应的消息
+    },
     selsChange: function(sels) {
       this.sels = sels;
     },

ys_vue/src/views/mold/moldDetail.vue

@@ -437,7 +437,7 @@
         </el-dialog>
 
         <!-- 批量导出操作记录弹窗 -->
-        <el-dialog title="批量导出操作记录" v-if="centerDialog5Visible" :visible.sync="centerDialog5Visible" width="50" center>
+        <el-dialog title="批量导出操作记录" v-if="centerDialog5Visible" :visible.sync="centerDialog5Visible" width="35%" center>
             <span style="line-height: 40px;">请输入需要导出的时间段</span>
             <el-date-picker v-model="recordTime" type="datetimerange" placeholder="选择日期时间" style="float: right;"></el-date-picker>
             <span slot="footer" class="dialog-footer">