李扬

master/src/main/java/com/ruoyi/project/sems/controller/SpecHomeController.java

@@ -579,8 +579,10 @@ public class SpecHomeController extends BaseController
                 .and(unitIds.size()>0 ,j -> j.in("unit",unitIds).or().in("plant_code",unitIds))
         );
         logger.info(all + ":::::::::::" +cc);
-        String per = new BigDecimal(cc).multiply(new BigDecimal(100)).divide(new BigDecimal(all) ,2, BigDecimal.ROUND_HALF_UP).setScale(1,BigDecimal.ROUND_HALF_DOWN).toString();
-
+        String per = "0";
+        if (all != 0) {
+            per = new BigDecimal(cc).multiply(new BigDecimal(100)).divide(new BigDecimal(all), 2, BigDecimal.ROUND_HALF_UP).setScale(1, BigDecimal.ROUND_HALF_DOWN).toString();
+        }
         Map<String, Object> res = new HashMap<String, Object>();
         res.put("per" , per);
         return AjaxResult.success(res);

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevYlrqController.java

@@ -65,9 +65,9 @@ public class TSpecdevYlrqController extends BaseController
         Thread t = new Thread(specOverLifeThead);
         t.start();
 
-        SpecDevYlrqThread specDevYlgdThread = new SpecDevYlrqThread(tSpecdevYlrqService);
-        Thread t2 = new Thread(specDevYlgdThread);
-        t2.start();
+//        SpecDevYlrqThread specDevYlgdThread = new SpecDevYlrqThread(tSpecdevYlrqService);
+//        Thread t2 = new Thread(specDevYlgdThread);
+//        t2.start();
         return getDataTable(list);
     }
 

master/src/main/java/com/ruoyi/project/sems/mapper/TMeasureRecordMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScopePlant;
 import com.ruoyi.project.sems.domain.TMeasureRecord;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -30,7 +31,7 @@ public interface TMeasureRecordMapper extends BaseMapper<TMeasureRecord>
      * @param tMeasureRecord 测厚记录
      * @return 测厚记录集合
      */
-    @DataScope(deptAlias = "d")
+    @DataScopePlant(deptAlias = "d")
     public List<TMeasureRecord> selectTMeasureRecordList(TMeasureRecord tMeasureRecord);
 
     /**

master/src/main/java/com/ruoyi/project/sems/mapper/TReportYlgdMapper.java

@@ -3,6 +3,7 @@ package com.ruoyi.project.sems.mapper;
 import java.util.List;
 
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScopePlant;
 import com.ruoyi.project.sems.domain.TReportYlgd;
 import com.ruoyi.project.sems.domain.TSpecdevYlgd;
 
@@ -65,7 +66,7 @@ public interface TReportYlgdMapper {
      * @param tReportYlgd 压力管道年检报告
      * @return 压力管道年检报告集合
      */
-    @DataScope(deptAlias = "d")
+    @DataScopePlant(deptAlias = "y")
     public List<TReportYlgd> selectTReportYlgdList(TReportYlgd tReportYlgd);
 
     /**

master/src/main/java/com/ruoyi/project/sems/mapper/TReportYlrqMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.project.sems.mapper;
 
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScopePlant;
 import com.ruoyi.project.sems.domain.TReportYlrq;
 import com.ruoyi.project.sems.domain.TSpecdevYlrq;
 
@@ -65,7 +66,7 @@ public interface TReportYlrqMapper {
      * @param tReportYlrq 压力容器年检报告
      * @return 压力容器年检报告集合
      */
-    @DataScope(deptAlias = "d")
+    @DataScopePlant(deptAlias = "y")
     public List<TReportYlrq> selectTReportYlrqList(TReportYlrq tReportYlrq);
 
     /**

master/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java

@@ -67,6 +67,7 @@ public class SysProfileController extends BaseController
             loginUser.getUser().setPhonenumber(user.getPhonenumber());
             loginUser.getUser().setEmail(user.getEmail());
             loginUser.getUser().setSex(user.getSex());
+            loginUser.getUser().setHomeType(user.getHomeType());
             tokenService.setLoginUser(loginUser);
             return AjaxResult.success();
         }

master/src/main/java/com/ruoyi/project/system/domain/SysUser.java

@@ -77,6 +77,7 @@ public class SysUser extends BaseEntity
     @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
     private Date loginDate;
 
+    private String homeType;
     /** 部门对象 */
     @Excels({
         @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
@@ -164,6 +165,14 @@ public class SysUser extends BaseEntity
         this.nickName = nickName;
     }
 
+    public String getHomeType() {
+        return homeType;
+    }
+
+    public void setHomeType(String homeType) {
+        this.homeType = homeType;
+    }
+
     @NotBlank(message = "用户账号不能为空")
     @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
     public String getUserName()

master/src/main/resources/application.yml

@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /data/cpmsfile/uploadPath）
-  profile: D:/ruoyi/uploadPath
+  profile: /data/cpmsfile/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证

master/src/main/resources/freeMaker/monthFMaker.ftl

@@ -17,7 +17,6 @@
 				content: element(footer)
 			}
 		}
-
 		.pageNext{page-break-after: always;}
 
 		#footer {

master/src/main/resources/mybatis/sems/TReportYlgdMapper.xml

@@ -114,7 +114,7 @@
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
-        ${params.dataScope}
+        ${params.dataScopePlant}
     </select>
 
     <select id="queryNeedInsertIds" resultType="Long">

master/src/main/resources/mybatis/sems/TReportYlrqMapper.xml

@@ -178,7 +178,7 @@
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
-        ${params.dataScope}
+        ${params.dataScopePlant}
     </select>
 
     <select id="selectTReportYlrqById" parameterType="Long" resultMap="TReportYlrqResult">

master/src/main/resources/mybatis/system/SysPlantMapper.xml

@@ -45,9 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         m.DEPT_NAME
         FROM
         SYS_DEPT m
-        LEFT JOIN SYS_ROLE_DEPT rm ON m.DEPT_ID = rm.DEPT_ID
-        LEFT JOIN sys_user_role ur ON rm.role_id = ur.role_id
-        LEFT JOIN sys_role ro ON ur.role_id = ro.role_id
+          LEFT JOIN SYS_USER_DEPT ur ON m.DEPT_ID = ur.DEPT_ID
         WHERE
         ur.user_id = #{plantId}
         )

master/src/main/resources/mybatis/system/SysUserMapper.xml

@@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateBy"     column="update_by"    />
 		<result property="updateTime"   column="update_time"  />
 		<result property="remark"       column="remark"       />
+		<result property="homeType"       column="home_type"       />
 		<result property="dataScope"          column="data_scope"            />
 		<result property="deptCheckStrictly"  column="dept_check_strictly"   />
 		<association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
@@ -49,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 
 	<sql id="selectUserVo">
-        select u.user_id,u.staffid, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
+        select u.user_id,u.staffid,u.home_type, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
 			   u.data_scope, u.dept_check_strictly,
         d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
@@ -96,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id,u.staffid, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		select u.user_id,u.staffid,u.home_type, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		where u.del_flag = '0'
 		<if test="userName != null and userName != ''">
@@ -183,6 +184,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="avatar != null and avatar != ''">avatar,</if>
  			<if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
  			<if test="sex != null and sex != ''">sex,</if>
+			<if test="homeType != null and homeType != ''">home_type,</if>
  			<if test="password != null and password != ''">password,</if>
  			<if test="status != null and status != ''">status,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
@@ -198,6 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="avatar != null and avatar != ''">#{avatar},</if>
  			<if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
  			<if test="sex != null and sex != ''">#{sex},</if>
+			<if test="homeType != null and homeType != ''">#{homeType},</if>
  			<if test="password != null and password != ''">#{password},</if>
  			<if test="status != null and status != ''">#{status},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
@@ -216,6 +219,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="email != null and email != ''">email = #{email},</if>
  			<if test="phonenumber != null and phonenumber != ''">phonenumber = #{phonenumber},</if>
  			<if test="sex != null and sex != ''">sex = #{sex},</if>
+			<if test="homeType != null and homeType != ''">home_type = #{homeType},</if>
  			<if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
  			<if test="password != null and password != ''">password = #{password},</if>
  			<if test="status != null and status != ''">status = #{status},</if>

ui/src/layout/components/Navbar.vue

@@ -9,11 +9,31 @@
 
         <search id="header-search" class="right-menu-item" />
 
-        <router-link class="right-menu-item" to="/notice/details">
-          <el-badge  is-dot style="">
-            <i class="el-icon-bell" style=" font-size:20px;"></i>
-          </el-badge>
-        </router-link>
+<!--          <router-link class="right-menu-item" to="/notice/details">-->
+        <div class="right-menu-item">
+            <el-popover
+              placement="bottom"
+              width="320"
+              trigger="click">
+                <el-table :data="gridData" max-height="500px" :show-header="false"
+                          empty-text="暂没有新消息"
+                >
+                  <el-table-column width="280" property="address" >
+                    <template slot-scope="scope">
+                      <router-link  to="/notice/details">{{ scope.row.address}}</router-link>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              <router-link style="height: 500px" to="/notice/details">
+                <el-button type="text" size="mini" style="float: right">{{ $t('查看全部') }}</el-button>
+              </router-link>
+              <div slot="reference">
+                <el-badge is-dot>
+                  <i class="el-icon-bell"  style=" font-size:20px;"></i>
+                </el-badge>
+              </div>
+            </el-popover>
+        </div>
 <!--        <el-tooltip content="源码地址" effect="dark" placement="bottom">-->
 <!--          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />-->
 <!--        </el-tooltip>-->
@@ -74,6 +94,11 @@ export default {
     RuoYiDoc,
     LangSelect
   },
+    data() {
+      return {
+        gridData: []
+      };
+    },
   computed: {
     ...mapGetters([
       'sidebar',
@@ -99,6 +124,9 @@ export default {
     }, 100000)
   },
   methods: {
+    rowClick(){
+        console.log("!!!")
+    },
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
     },
@@ -200,12 +228,20 @@ export default {
       }
     }
   }
-
   .svgStyle{
     margin-bottom: 12px;
     margin-right: 6px;
     height: 25.5px;
     width: 25.5px;
   }
+  .el-row {
+    margin-bottom: 20px;
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+  .bg-purple {
+    background: #d3dce6;
+  }
 }
 </style>

ui/src/store/modules/user.js

@@ -7,7 +7,8 @@ const user = {
     name: '',
     avatar: '',
     roles: [],
-    permissions: []
+    permissions: [],
+    sex: ''
   },
 
   mutations: {
@@ -25,6 +26,9 @@ const user = {
     },
     SET_PERMISSIONS: (state, permissions) => {
       state.permissions = permissions
+    },
+    SET_HOME: (state, homeType) => {
+      state.homeType = homeType
     }
   },
 
@@ -60,6 +64,7 @@ const user = {
           }
           commit('SET_NAME', user.userName)
           commit('SET_AVATAR', avatar)
+          commit('SET_HOME', user.homeType)
           resolve(res)
         }).catch(error => {
           reject(error)

ui/src/views/bccHome.vue

@@ -0,0 +1,210 @@
+<template>
+    <div id="front">
+      <dv-loading v-if="loading">Loading...</dv-loading>
+      <div v-else class="host-body bg">
+        <div class="d-flex jc-center">
+          <dv-decoration-10 style="width:33.3%;height:.0625rem;" />
+          <div class="d-flex jc-center">
+            <dv-decoration-8 :color="['#568aea', '#000000']" style="width:2.5rem;height:.625rem;" />
+            <div class="title">
+              <span class="title-text">BCC 生产运行总览</span>
+              <dv-decoration-6
+                class="title-bototm"
+                :reverse="true"
+                :color="['#50e3c2', '#67a1e5']"
+                style="width:3.125rem;height:.1rem;"
+              />
+            </div>
+            <dv-decoration-8
+              :reverse="true"
+              :color="['#568aea', '#000000']"
+              style="width:2.5rem;height:.625rem;"
+            />
+          </div>
+          <dv-decoration-10 style="width:33.3%;height:.0625rem; transform: rotateY(180deg);" />
+        </div>
+
+        <!-- 第二行 -->
+        <div class="d-flex jc-between px-2">
+          <div class="d-flex" style="width: 40%">
+            <div
+              class="react-right ml-4"
+              style="width: 3.25rem; text-align: left;background-color: #0f1325;"
+              @click="changeDashboard(1)"
+            >
+              <span class="react-before"></span>
+              <span class="text"></span>
+            </div>
+            <div class="react-right ml-3" style="background-color: #0f1325;" @click="changeDashboard(2)">
+              <span class="text colorBlue"></span>
+            </div>
+            <div class="react-right ml-3" style="background-color: #0f1325;" @click="changeDashboard(3)">
+              <span class="text colorBlue"></span>
+            </div>
+          </div>
+          <div style="width: 40%" class="d-flex">
+            <div class="react-left bg-color-blue mr-3">
+              <span class="text fw-b">北京时间：</span>
+            </div>
+            <div
+              class="react-left mr-4"
+              style="width: 6.25rem; background-color: #0f1325; text-align: right;"
+            >
+              <span class="react-after"></span>
+              <span class="text">{{dateYear}} {{dateWeek}} {{dateDay}}</span>
+            </div>
+          </div>
+        </div>
+
+        <div class="body-box" v-if="dashboard === 1">
+          <div class="three-content-box">
+            <div>
+              <material-balance />
+            </div>
+            <div>
+              <chart-right />
+            </div>
+          </div>
+          <div class="three-bototm-box">
+            <dv-border-box-12>
+              <nap-tank />
+            </dv-border-box-12>
+            <dv-border-box-12>
+              <ethylene-tank />
+            </dv-border-box-12>
+            <dv-border-box-12>
+              <acrylic-tank />
+            </dv-border-box-12>
+            <dv-border-box-12>
+              <product-tank />
+            </dv-border-box-12>
+          </div>
+        </div>
+        </div>
+
+        <div class="body-box" v-if="dashboard === 2">
+          <!-- 第三行数据 -->
+          <div>
+            <front-two />
+          </div>
+        </div>
+
+        <div class="body-box" v-if="dashboard === 3">
+          <!-- 第三行数据 -->
+          <div class="frist-content-box">
+            <div>
+              <dv-border-box-12>
+                <center-right2 />
+              </dv-border-box-12>
+            </div>
+            <div>
+              <dv-border-box-12>
+                <center-left2 />
+              </dv-border-box-12>
+            </div>
+            <!-- 中间 -->
+            <div>
+              <center-left1 />
+            </div>
+            <div>
+              <dv-border-box-13>
+                <center-right1 />
+              </dv-border-box-13>
+            </div>
+          </div>
+          <!-- 第四行数据 -->
+          <div class="bototm-box">
+            <dv-border-box-13>
+              <bottom-left />
+            </dv-border-box-13>
+            <dv-border-box-12>
+              <bottom-right />
+            </dv-border-box-12>
+          </div>
+      </div>
+  </div>
+</template>
+
+<script>
+  import centerLeft1 from "./front/centerLeft1";
+  import centerLeft2 from "./front/centerLeft2";
+  import centerRight1 from "./front/centerRight1";
+  import centerRight2 from "./front/centerRight2";
+  import center from "./front/center";
+  import bottomLeft from "./front/bottomLeft";
+  import bottomRight from "./front/bottomRight";
+  import frontTwo from "./front/frontTwo";
+  import materialBalance from "./front/materialBalance";
+  import chartRight from "./front/ChartRight";
+  import napTank from "./front/napTank";
+  import ethyleneTank from "./front/ethyleneTank";
+  import acrylicTank from "./front/acrylicTank";
+  import productTank from "./front/productTank";
+  import dayjs from "dayjs";
+  import '@/common/flexible.js';
+  import dataV from '@jiaminghi/data-view';
+
+  export default {
+    data() {
+      return {
+        loading: true,
+        dashboard: 1,
+        dateDay: null,
+        dateYear: null,
+        dateWeek: null,
+        weekday: ["周日", "周一", "周二", "周三", "周四", "周五", "周六"],
+        timer:null
+      };
+    },
+    components: {
+      centerLeft1,
+      centerLeft2,
+      centerRight1,
+      centerRight2,
+      center,
+      bottomLeft,
+      bottomRight,
+      frontTwo,
+      materialBalance,
+      chartRight,
+      napTank,
+      ethyleneTank,
+      acrylicTank,
+      productTank
+    },
+    mounted() {
+      this.cancelLoading();
+      this.timer = setInterval(()=>{
+        const date= dayjs(new Date());
+        this.dateDay = date.format('HH:mm:ss');
+        this.dateYear = date.format('YYYY年MM月DD日');
+        this.dateWeek = date.format(this.weekday[date.day()]);
+      },1000);
+    },
+    beforeDestroy(){
+      if(this.timer){
+        clearInterval(this.timer);
+      }
+    },
+    methods: {
+      cancelLoading() {
+        setTimeout(() => {
+          this.loading = false;
+        }, 500);
+      },
+      changeDashboard(val) {
+        if (val === 1) {
+          this.dashboard = 1
+        }else if (val === 2) {
+          this.dashboard = 2
+        }else if (val === 3) {
+          this.dashboard = 3
+        }
+      }
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+
+</style>

ui/src/views/index.vue

@@ -1,206 +1,32 @@
 <template>
-    <div id="front">
-      <dv-loading v-if="loading">Loading...</dv-loading>
-      <div v-else class="host-body bg">
-        <div class="d-flex jc-center">
-          <dv-decoration-10 style="width:33.3%;height:.0625rem;" />
-          <div class="d-flex jc-center">
-            <dv-decoration-8 :color="['#568aea', '#000000']" style="width:2.5rem;height:.625rem;" />
-            <div class="title">
-              <span class="title-text">BCC 生产运行总览</span>
-              <dv-decoration-6
-                class="title-bototm"
-                :reverse="true"
-                :color="['#50e3c2', '#67a1e5']"
-                style="width:3.125rem;height:.1rem;"
-              />
-            </div>
-            <dv-decoration-8
-              :reverse="true"
-              :color="['#568aea', '#000000']"
-              style="width:2.5rem;height:.625rem;"
-            />
-          </div>
-          <dv-decoration-10 style="width:33.3%;height:.0625rem; transform: rotateY(180deg);" />
-        </div>
 
-        <!-- 第二行 -->
-        <div class="d-flex jc-between px-2">
-          <div class="d-flex" style="width: 40%">
-            <div
-              class="react-right ml-4"
-              style="width: 3.25rem; text-align: left;background-color: #0f1325;"
-              @click="changeDashboard(1)"
-            >
-              <span class="react-before"></span>
-              <span class="text"></span>
-            </div>
-            <div class="react-right ml-3" style="background-color: #0f1325;" @click="changeDashboard(2)">
-              <span class="text colorBlue"></span>
-            </div>
-            <div class="react-right ml-3" style="background-color: #0f1325;" @click="changeDashboard(3)">
-              <span class="text colorBlue"></span>
-            </div>
-          </div>
-          <div style="width: 40%" class="d-flex">
-            <div class="react-left bg-color-blue mr-3">
-              <span class="text fw-b">北京时间：</span>
-            </div>
-            <div
-              class="react-left mr-4"
-              style="width: 6.25rem; background-color: #0f1325; text-align: right;"
-            >
-              <span class="react-after"></span>
-              <span class="text">{{dateYear}} {{dateWeek}} {{dateDay}}</span>
-            </div>
-          </div>
-        </div>
-
-        <div class="body-box" v-if="dashboard === 1">
-          <div class="three-content-box">
-            <div>
-              <material-balance />
-            </div>
-            <div>
-              <chart-right />
-            </div>
-          </div>
-          <div class="three-bototm-box">
-            <dv-border-box-12>
-              <nap-tank />
-            </dv-border-box-12>
-            <dv-border-box-12>
-              <ethylene-tank />
-            </dv-border-box-12>
-            <dv-border-box-12>
-              <acrylic-tank />
-            </dv-border-box-12>
-            <dv-border-box-12>
-              <product-tank />
-            </dv-border-box-12>
-          </div>
-        </div>
-        </div>
-
-        <div class="body-box" v-if="dashboard === 2">
-          <!-- 第三行数据 -->
-          <div>
-            <front-two />
-          </div>
-        </div>
-
-        <div class="body-box" v-if="dashboard === 3">
-          <!-- 第三行数据 -->
-          <div class="frist-content-box">
-            <div>
-              <dv-border-box-12>
-                <center-right2 />
-              </dv-border-box-12>
-            </div>
-            <div>
-              <dv-border-box-12>
-                <center-left2 />
-              </dv-border-box-12>
-            </div>
-            <!-- 中间 -->
-            <div>
-              <center-left1 />
-            </div>
-            <div>
-              <dv-border-box-13>
-                <center-right1 />
-              </dv-border-box-13>
-            </div>
-          </div>
-          <!-- 第四行数据 -->
-          <div class="bototm-box">
-            <dv-border-box-13>
-              <bottom-left />
-            </dv-border-box-13>
-            <dv-border-box-12>
-              <bottom-right />
-            </dv-border-box-12>
-          </div>
-      </div>
-  </div>
+  <bcchome v-if="homeType== 1"></bcchome>
+  <semshome v-else="homeType== 2"></semshome>
 </template>
 
 <script>
-  import centerLeft1 from "./front/centerLeft1";
-  import centerLeft2 from "./front/centerLeft2";
-  import centerRight1 from "./front/centerRight1";
-  import centerRight2 from "./front/centerRight2";
-  import center from "./front/center";
-  import bottomLeft from "./front/bottomLeft";
-  import bottomRight from "./front/bottomRight";
-  import frontTwo from "./front/frontTwo";
-  import materialBalance from "./front/materialBalance";
-  import chartRight from "./front/ChartRight";
-  import napTank from "./front/napTank";
-  import ethyleneTank from "./front/ethyleneTank";
-  import acrylicTank from "./front/acrylicTank";
-  import productTank from "./front/productTank";
+  import bcchome from "./bccHome";
+  import semshome from "./sems/specanalysis/index";
   import dayjs from "dayjs";
   import '@/common/flexible.js';
-  import dataV from '@jiaminghi/data-view';
 
   export default {
     data() {
       return {
-        loading: true,
-        dashboard: 1,
-        dateDay: null,
-        dateYear: null,
-        dateWeek: null,
-        weekday: ["周日", "周一", "周二", "周三", "周四", "周五", "周六"],
-        timer:null
+        homeType: '',
       };
     },
     components: {
-      centerLeft1,
-      centerLeft2,
-      centerRight1,
-      centerRight2,
-      center,
-      bottomLeft,
-      bottomRight,
-      frontTwo,
-      materialBalance,
-      chartRight,
-      napTank,
-      ethyleneTank,
-      acrylicTank,
-      productTank
+      bcchome,
+      semshome
     },
     mounted() {
-      this.cancelLoading();
-      this.timer = setInterval(()=>{
-        const date= dayjs(new Date());
-        this.dateDay = date.format('HH:mm:ss');
-        this.dateYear = date.format('YYYY年MM月DD日');
-        this.dateWeek = date.format(this.weekday[date.day()]);
-      },1000);
+      console.log(this.$store.state.user.homeType)
+      this.homeType = this.$store.state.user.homeType
     },
     beforeDestroy(){
-      if(this.timer){
-        clearInterval(this.timer);
-      }
     },
     methods: {
-      cancelLoading() {
-        setTimeout(() => {
-          this.loading = false;
-        }, 500);
-      },
-      changeDashboard(val) {
-        if (val === 1) {
-          this.dashboard = 1
-        }else if (val === 2) {
-          this.dashboard = 2
-        }else if (val === 3) {
-          this.dashboard = 3
-        }
-      }
     }
   };
 </script>

ui/src/views/system/notice/index.vue

@@ -111,7 +111,6 @@
             type="text"
             icon="el-icon-select"
             @click="handleSelect (scope.row)"
-            v-hasPermi="['system:notice:select']"
           >{{ $t('查看') }}</el-button>
           <el-button
             size="mini"
@@ -379,7 +378,6 @@ export default {
     },
     /** 查看 **/
     handleSelect(row) {
-      debugger;
       this.reset();
       const noticeId = row.noticeId || this.ids
       getNotice(noticeId).then(response => {

ui/src/views/system/user/index.vue

@@ -324,6 +324,18 @@
               <el-input v-model="form.staffId" :placeholder="$t('请输入') + $t('员工编号')" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('首页类型')">
+              <el-select v-model="form.homeType" :placeholder="$t('请选择')">
+                <el-option
+                  v-for="dict in homeTypeOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -460,6 +472,7 @@ export default {
       statusOptions: [],
       // 性别状态字典
       sexOptions: [],
+      homeTypeOptions: [],
       // 岗位选项
       postOptions: [],
       // 角色选项
@@ -517,7 +530,7 @@ export default {
           { required: true, message: this.$t('用户名称') + this.$t('不能为空'), trigger: "blur" }
         ],
         nickName: [
-          { required: true, message: this.$t('公告标题') + this.$t('不能为空'), trigger: "blur" }
+          { required: true, message: this.$t('用户姓名') + this.$t('不能为空'), trigger: "blur" }
         ],
         deptId: [
           { required: true, message: this.$t('归属部门') + this.$t('不能为空'), trigger: "change" }
@@ -559,6 +572,9 @@ export default {
     this.getDicts("sys_user_sex").then(response => {
       this.sexOptions = response.data;
     });
+    this.getDicts("sys_user_hometype").then(response => {
+      this.homeTypeOptions = response.data;
+    });
     this.getConfigKey("sys.user.initPassword").then(response => {
       this.initPassword = response.msg;
     });
@@ -622,6 +638,7 @@ export default {
         phonenumber: undefined,
         email: undefined,
         sex: undefined,
+        homeType: undefined,
         status: "0",
         remark: undefined,
         postIds: [],

ui/src/views/system/user/profile/userInfo.vue

@@ -18,6 +18,16 @@
         <el-radio label="1">女</el-radio>
       </el-radio-group>
     </el-form-item>
+    <el-form-item :label="$t('首页类型')">
+      <el-select v-model="user.homeType" :placeholder="$t('请选择')">
+        <el-option
+          v-for="dict in homeTypeOptions"
+          :key="dict.dictValue"
+          :label="dict.dictLabel"
+          :value="dict.dictValue"
+        ></el-option>
+      </el-select>
+    </el-form-item>
     <el-form-item>
       <el-button type="primary" size="mini" @click="submit">保存</el-button>
       <el-button type="danger" size="mini" @click="close">关闭</el-button>
@@ -36,6 +46,7 @@ export default {
   },
   data() {
     return {
+      homeTypeOptions: [],
       // 表单校验
       rules: {
         nickName: [
@@ -60,6 +71,11 @@ export default {
       }
     };
   },
+  created() {
+    this.getDicts("sys_user_hometype").then(response => {
+      this.homeTypeOptions = response.data;
+    });
+  },
   methods: {
     submit() {
       this.$refs["form"].validate(valid => {