From 3cff5aaea9dc59c62d2c42d169d8552cf4133c2f Mon Sep 17 00:00:00 2001
From: dhy1725534722 <1725534722@qq.com>
Date: Thu, 21 Sep 2023 09:22:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue         | 80 ++++++++++++++++++------
 src/layout/components/Sidebar/Logo.vue   |  2 +-
 src/views/components/dialog/index.vue    | 12 +++-
 src/views/components/dialogTwo/index.vue | 44 +++++++------
 src/views/yingji/enforcing.vue           | 11 ++--
 src/views/yingji/enterprise.vue          | 42 ++++++++++---
 src/views/yingji/focusEnter.vue          |  8 +--
 src/views/yingji/planManage.vue          |  7 ++-
 8 files changed, 146 insertions(+), 60 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index a9f63cb..ed642e9 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -14,32 +14,48 @@
     <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav" />
 
     <div class="right-menu">
-      <template v-if="device !== 'mobile'">
+      <!-- <template v-if="device !== 'mobile'">
         <search id="header-search" class="right-menu-item" />
 
-        <!-- <el-tooltip content="源码地址" effect="dark" placement="bottom">
+        <el-tooltip content="源码地址" effect="dark" placement="bottom">
           <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
-        </el-tooltip> -->
+        </el-tooltip>
 
-        <!-- <el-tooltip content="文档地址" effect="dark" placement="bottom">
+        <el-tooltip content="文档地址" effect="dark" placement="bottom">
           <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip> -->
+        </el-tooltip>
 
-        <!-- <screenfull id="screenfull" class="right-menu-item hover-effect" /> -->
+        <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
-        <!-- <el-tooltip content="布局大小" effect="dark" placement="bottom">
+        <el-tooltip content="布局大小" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
-        </el-tooltip> -->
-      </template>
-
-      <el-dropdown
+        </el-tooltip>
+      </template> -->
+      <header>
+        <el-dropdown trigger="click" @visible-change="getDrop">
+          <div>
+            <div class="avatar"></div>
+            <div class="header-text">
+              <span
+                >{{ dept.deptName }}&nbsp;&nbsp;&nbsp;&nbsp;{{ username }}
+              </span>
+              <i class="el-icon-caret-bottom" v-if="!avatarFlag"></i>
+              <i class="el-icon-caret-top" v-if="avatarFlag"></i>
+            </div>
+          </div>
+          <el-dropdown-menu slot="dropdown">
+            <router-link to="/user/profile">
+              <el-dropdown-item>个人中心</el-dropdown-item>
+            </router-link>
+            <el-dropdown-item @click.native="logout">退出登录</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </header>
+
+      <!-- <el-dropdown
         class="avatar-container right-menu-item hover-effect"
         trigger="click"
       >
-        <div class="avatar-wrapper">
-          <img :src="avatar" class="user-avatar" />
-          <i class="el-icon-caret-bottom" />
-        </div>
         <el-dropdown-menu slot="dropdown">
           <router-link to="/user/profile">
             <el-dropdown-item>个人中心</el-dropdown-item>
@@ -51,13 +67,13 @@
             <span>退出登录</span>
           </el-dropdown-item>
         </el-dropdown-menu>
-      </el-dropdown>
+      </el-dropdown> -->
     </div>
   </div>
 </template>
 
 <script>
-import { mapGetters } from "vuex";
+import { mapGetters, mapState } from "vuex";
 import Breadcrumb from "@/components/Breadcrumb";
 import TopNav from "@/components/TopNav";
 import Hamburger from "@/components/Hamburger";
@@ -96,6 +112,11 @@ export default {
         return this.$store.state.settings.topNav;
       },
     },
+    ...mapState({
+      dept: (state) => state.user.dept,
+      username: (state) => state.user.name,
+      roles: (state) => state.user.roles,
+    }),
   },
   methods: {
     toggleSideBar() {
@@ -119,6 +140,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+::v-deep .el-dropdown-selfdefine {
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  user-select: none;
+}
 .navbar {
   height: 50px;
   overflow: hidden;
@@ -156,7 +183,24 @@ export default {
   .right-menu {
     float: right;
     height: 100%;
-    line-height: 50px;
+    display: flex;
+    align-items: center;
+    // line-height: 50px;
+    header {
+      padding-right: 20px;
+      .avatar {
+        height: 25px;
+        width: 25px;
+        background-size: 100% 100%;
+        background-image: url("../../assets/images/gl-icon.png");
+      }
+      .header-text {
+        font-family: "Alibaba-PuHuiTi-Medium.otf";
+        span {
+          margin: 0 8px;
+        }
+      }
+    }
 
     &:focus {
       outline: none;
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 2774cc8..4df1a14 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import logoImg from '@/assets/logo/logo.png'
+import logoImg from '@/assets/images/logo.png'
 import variables from '@/assets/styles/variables.scss'
 
 export default {
diff --git a/src/views/components/dialog/index.vue b/src/views/components/dialog/index.vue
index 53e1fff..d35041f 100644
--- a/src/views/components/dialog/index.vue
+++ b/src/views/components/dialog/index.vue
@@ -287,7 +287,7 @@ export default {
       nextStep: false,
       nextText: "下一步",
       form: {
-        subdistrict: "",
+        subdistrict: [],
         frimType: "",
         indusTypeClass: "",
         isPoint: "",
@@ -331,7 +331,15 @@ export default {
     },
     // 重置
     reset() {
-      Object.keys(this.form).forEach((key) => (this.form[key] = ""));
+      this.form= {
+        subdistrict: [],
+        frimType: "",
+        indusTypeClass: "",
+        isPoint: "",
+        majorHazardLevel: "",
+        entprColor: "",
+        uscCode: "",
+      },
       this.pages.pageNum = 1;
       this.pages.pageSize = 10;
       this.getTable(this.pages);
diff --git a/src/views/components/dialogTwo/index.vue b/src/views/components/dialogTwo/index.vue
index 2b8c5d8..eeb0536 100644
--- a/src/views/components/dialogTwo/index.vue
+++ b/src/views/components/dialogTwo/index.vue
@@ -32,9 +32,11 @@
             <div>计划内容：</div>
             <div class="content">{{ content }}</div>
           </div>
+        </div>
+        <div class="plan-content">
           <div class="item-two">
             <div>备注：</div>
-            <div class="content">{{ remark }}</div>
+            <div class="content">{{ remark ?remark:'暂无备注'}}</div>
           </div>
         </div>
       </div>
@@ -76,7 +78,11 @@
             header-align="center"
           >
           </el-table-column>
-          <el-table-column prop="isPoint" label="是否重点" header-align="center">
+          <el-table-column
+            prop="isPoint"
+            label="是否重点"
+            header-align="center"
+          >
             <template slot-scope="scope">
               <div
                 style="font-family: 'Alibaba PuHuiTi'"
@@ -106,16 +112,16 @@ export default {
     return {
       dialogVisible: false,
       tableData: [],
-      total:0,
-      pages:{
-        pageNum:1,
-        pageSize:10,
+      total: 0,
+      pages: {
+        pageNum: 1,
+        pageSize: 10,
       },
-      loading:false,
-      year:'',
-      title:'',
-      content:'',
-      remark:''
+      loading: false,
+      year: "",
+      title: "",
+      content: "",
+      remark: "",
     };
   },
   methods: {
@@ -128,11 +134,11 @@ export default {
       this.pages.pageNum = 1;
       this.pages.pageSize = 10;
     },
-    async getList(item){
-      this.loading = true
+    async getList(item) {
+      this.loading = true;
       let data = await this.$api.yingji.bPlanManageTwo(item.id);
-      if(data.code == 200) {
-        this.loading = false
+      if (data.code == 200) {
+        this.loading = false;
       }
       this.year = data.data.plannedYear;
       this.title = data.data.planName;
@@ -207,7 +213,7 @@ export default {
         align-items: center;
         div {
           font-size: 15px;
-          font-family: 'Alibaba PuHuiTi';
+          font-family: "Alibaba PuHuiTi";
           font-weight: 400;
           color: #525966;
 
@@ -215,7 +221,7 @@ export default {
             width: 80px;
             text-align: right;
             font-size: 16px;
-            font-family: 'Alibaba PuHuiTi';
+            font-family: "Alibaba PuHuiTi";
             font-weight: 400;
             color: #525966;
           }
@@ -234,7 +240,7 @@ export default {
         display: flex;
         div {
           font-size: 15px;
-          font-family: 'Alibaba PuHuiTi';
+          font-family: "Alibaba PuHuiTi";
           font-weight: 400;
           color: #525966;
 
@@ -242,7 +248,7 @@ export default {
             text-align: right;
             width: 80px;
             font-size: 16px;
-            font-family: 'Alibaba PuHuiTi';
+            font-family: "Alibaba PuHuiTi";
             font-weight: 400;
             color: #525966;
           }
diff --git a/src/views/yingji/enforcing.vue b/src/views/yingji/enforcing.vue
index 5a6a802..4623bd0 100644
--- a/src/views/yingji/enforcing.vue
+++ b/src/views/yingji/enforcing.vue
@@ -25,7 +25,7 @@
           <div class="select-span">区划:</div>
           <el-cascader
             size="small"
-            v-model="district"
+            v-model="form.district"
             :options="compartment"
             :show-all-levels="false"
             :props="{
@@ -47,7 +47,7 @@
         <div class="export" @click="searchList" style="margin-right: 10px">
           <span>搜索</span>
         </div>
-        <div class="export" @click="chongzhiList" style="margin-right: 10px">
+        <div class="export" @click="chongzhiList" style="margin-right: 10px;background-color: #FDAB5B;">
           <span>重置</span>
         </div>
         <div class="export" @click="exportFile">
@@ -169,9 +169,8 @@ export default {
       total: 0,
       options: [],
       //这个是点击搜索之前的值
-      district: "",
       form: {
-        district: "",
+        district: [],
         plannedYear: "",
         //检测状态
         checkStatus: "",
@@ -313,7 +312,7 @@ export default {
   methods: {
     reset() {
       this.form = {
-        district: "",
+        district: [],
         plannedYear: "",
         //检测状态
         checkStatus: "",
@@ -369,7 +368,7 @@ export default {
       );
     },
     searchList() {
-      this.form.district = this.district[this.district.length - 1];
+      this.form.district = this.form.district[this.form.district.length - 1];
       this.searchBefore = { ...this.searchBefore, ...this.form };
       this.getList();
     },
diff --git a/src/views/yingji/enterprise.vue b/src/views/yingji/enterprise.vue
index 3846c63..e0542a1 100644
--- a/src/views/yingji/enterprise.vue
+++ b/src/views/yingji/enterprise.vue
@@ -9,7 +9,6 @@
             placeholder="请选择"
             :options="xzList"
             :props="props"
-            
           >
           </el-cascader>
         </div>
@@ -81,7 +80,13 @@
           </div>
         </div>
         <div class="select-btn" @click="searchList">搜索</div>
-        <div class="select-btn" @click="chongzhiList">重置</div>
+        <div
+          class="select-btn"
+          @click="chongzhiList"
+          style="background-color: #fdab5b"
+        >
+          重置
+        </div>
       </div>
     </div>
     <div class="tables">
@@ -99,15 +104,36 @@
           header-align="center"
         >
         </el-table-column>
-        <!-- <el-table-column
+        <el-table-column
           prop="majorHazardLevel"
           label="重大危险源等级"
           width="180"
           header-align="center"
         >
         </el-table-column>
-        <el-table-column prop="enterColorChart" label="企业分色" header-align="center">
-        </el-table-column> -->
+        <el-table-column
+          prop="indusTypeClass"
+          label="行业类型"
+          width="180"
+          header-align="center"
+        >
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.indusTypeClass!='null' ? scope.row.indusTypeClass : "" }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="enterColorChart"
+          label="企业分色"
+          header-align="center"
+        >
+        <template slot-scope="scope">
+            <div>
+              {{ scope.row.enterColorChart!='null' ? scope.row.enterColorChart : "" }}
+            </div>
+          </template>
+        </el-table-column>
 
         <el-table-column
           prop="uscCode"
@@ -193,7 +219,7 @@ export default {
     return {
       tableData: [],
       form: {
-        subdistrict: "",
+        subdistrict: [],
         frimType: "",
         indusTypeClass: "",
         isPoint: "",
@@ -205,7 +231,7 @@ export default {
         value: "subdistrict",
         label: "institutionName",
       },
-      xzqh:'',
+      xzqh: "",
       searchBefore: {
         pageSize: 10,
         pageNum: 1,
@@ -398,7 +424,7 @@ export default {
     },
     chongzhiList() {
       this.form = {
-        subdistrict: "",
+        subdistrict: [],
         frimType: "",
         indusTypeClass: "",
         isPoint: "",
diff --git a/src/views/yingji/focusEnter.vue b/src/views/yingji/focusEnter.vue
index 0733660..885880f 100644
--- a/src/views/yingji/focusEnter.vue
+++ b/src/views/yingji/focusEnter.vue
@@ -25,13 +25,13 @@
         </div>
       </div>
       <div style="display: flex">
-        <div class="export" @click="addkeys">
+        <div class="export" @click="addkeys" style="background-color: #28b384;">
           <span>新增</span>
         </div>
         <div class="export" @click="searchList">
           <span>搜索</span>
         </div>
-        <div class="export" @click="chongzhiList">
+        <div class="export" @click="chongzhiList" style="background-color: #FDAB5B;">
           <span>重置</span>
         </div>
         <div class="export" style="background: #f71052" @click="deleteItem">
@@ -83,8 +83,8 @@
           header-align="center"
         >
         </el-table-column>
-        <el-table-column prop="type" label="企业类别" header-align="center">
-        </el-table-column>
+        <!-- <el-table-column prop="type" label="企业类别" header-align="center">
+        </el-table-column> -->
 
         <el-table-column label="操作" header-align="center">
           <template slot-scope="scope">
diff --git a/src/views/yingji/planManage.vue b/src/views/yingji/planManage.vue
index 5738262..4896f27 100644
--- a/src/views/yingji/planManage.vue
+++ b/src/views/yingji/planManage.vue
@@ -163,7 +163,7 @@
 
         ],
         form:{
-          district:'',
+          district:[],
           plannedYear:''
         },
         props:{
@@ -228,7 +228,10 @@
       },
       // 重置筛选
       reset(){
-        Object.keys(this.form).forEach(key=>this.form[key]='')
+        this.form={
+          district:[],
+          plannedYear:''
+        },
         this.getList(this.pages)
       },
       // 新增成功后关闭dialog事件触发