Merge branch 'master' of http://8.136.197.230:3000/ZheJiangNingBo/pingAnQiYeWeb

src/router/index.js

@@ -40,6 +40,24 @@ const routes = [
             name: 'systemManagement',
             component: () => import('@/views/systemManagement'),
             children: [
+              // 平安指数
+              {
+                path: 'safeIndex',
+                name: 'safeIndex',
+                component: () => import('@/views/systemManagement/safeIndex'),
+              },
+              // 企业赋分
+              {
+                path: 'companyScore',
+                name: 'companyScore',
+                component: () => import('@/views/systemManagement/companyScore'),
+              },
+              // 企业名单
+              {
+                path: 'companyList',
+                name: 'companyList',
+                component: () => import('@/views/systemManagement/companyList'),
+              },
               // 关联设备
               {
                 path: 'correlationEquipment',

src/views/systemManagement/companyList/components/companyDataDialog.vue

@@ -18,38 +18,42 @@
             class="commerceMessage_form"
           >
             <el-form-item label="企业名称">
-              <el-input v-model="commerceMessage_form.name"></el-input>
+              <el-input v-model="commerceMessage_form.companyName"></el-input>
             </el-form-item>
             <el-form-item label="统一社会信用代码">
-              <el-input v-model="commerceMessage_form.credit"></el-input>
+              <el-input
+                v-model="commerceMessage_form.socialCreditCode"
+              ></el-input>
             </el-form-item>
             <el-form-item label="企业性质">
-              <el-input v-model="commerceMessage_form.property"></el-input>
+              <el-input v-model="commerceMessage_form.companyNature"></el-input>
             </el-form-item>
             <el-form-item label="营业期限">
-              <el-input v-model="commerceMessage_form.time_limit"></el-input>
+              <el-input
+                v-model="commerceMessage_form.businessTermDate"
+              ></el-input>
             </el-form-item>
             <el-form-item label="发照日期">
-              <el-input v-model="commerceMessage_form.publish_time"></el-input>
-            </el-form-item>
-            <el-form-item label="成立日期">
               <el-input
-                v-model="commerceMessage_form.establish_time"
+                v-model="commerceMessage_form.businessLicenseDate"
               ></el-input>
             </el-form-item>
+            <el-form-item label="成立日期">
+              <el-input v-model="commerceMessage_form.establishDate"></el-input>
+            </el-form-item>
             <el-form-item label="注册资本">
               <el-input
-                v-model="commerceMessage_form.register_capital"
+                v-model="commerceMessage_form.registerCapital"
               ></el-input>
             </el-form-item>
             <el-form-item label="登记机关">
               <el-input
-                v-model="commerceMessage_form.registration_authority"
+                v-model="commerceMessage_form.registerAuthority"
               ></el-input>
             </el-form-item>
             <el-form-item label="企业经营状态">
               <el-input
-                v-model="commerceMessage_form.operating_status"
+                v-model="commerceMessage_form.businessStatus"
               ></el-input>
             </el-form-item>
           </el-form>
@@ -72,31 +76,30 @@
         >
           <el-form-item label="企业登记注册地">
             <el-input
-              v-model="commerceMessage_form_two.register_poisition"
+              v-model="commerceMessage_form_two.registerAddress"
             ></el-input>
           </el-form-item>
           <el-form-item label="企业类型">
-            <el-checkbox-group v-model="commerceMessage_form_two.company_type">
+            <el-checkbox-group v-model="commerceMessage_form_two.companyType">
-              <el-checkbox label="剧毒" name="company_type"></el-checkbox>
+              <el-checkbox label="剧毒" name="companyType"></el-checkbox>
-              <el-checkbox label="易剧毒" name="company_type"></el-checkbox>
+              <el-checkbox label="易剧毒" name="companyType"></el-checkbox>
-              <el-checkbox label="易致爆" name="company_type"></el-checkbox>
+              <el-checkbox label="易致爆" name="companyType"></el-checkbox>
-              <el-checkbox label="放射源" name="company_type"></el-checkbox>
+              <el-checkbox label="放射源" name="companyType"></el-checkbox>
-              <el-checkbox label="消防重点" name="company_type"></el-checkbox>
+              <el-checkbox label="消防重点" name="companyType"></el-checkbox>
-              <el-checkbox label="所管消防" name="company_type"></el-checkbox>
+              <el-checkbox label="所管消防" name="companyType"></el-checkbox>
-              <el-checkbox label="治安重点" name="company_type"></el-checkbox>
+              <el-checkbox label="治安重点" name="companyType"></el-checkbox>
-              <el-checkbox label="创安单位" name="company_type"></el-checkbox>
+              <el-checkbox label="创安单位" name="companyType"></el-checkbox>
-              <el-checkbox label="外资合资" name="company_type"></el-checkbox>
+              <el-checkbox label="外资合资" name="companyType"></el-checkbox>
             </el-checkbox-group>
           </el-form-item>
           <el-form-item label="企业主营范围">
             <el-input
               type="textarea"
-              v-model="commerceMessage_form_two.business_scope"
+              v-model="commerceMessage_form_two.businessStatus"
             ></el-input>
           </el-form-item>
         </el-form>
       </div>
-      <el-divider></el-divider>
       <!-- 企业联系人信息表单 -->
       <div class="company_person_message">
         <p>企业联系人信息</p>
@@ -106,14 +109,17 @@
           class="company_person_message_form"
         >
           <el-form-item label="安全责任人">
-            <el-input v-model="company_person_message_form.person"></el-input>
+            <el-input
+              v-model="company_person_message_form.emergencyContact"
+            ></el-input>
           </el-form-item>
           <el-form-item label="责任人电话">
-            <el-input v-model="company_person_message_form.phone"></el-input>
+            <el-input
+              v-model="company_person_message_form.emergencyContactPhone"
+            ></el-input>
           </el-form-item>
         </el-form>
       </div>
-      <el-divider></el-divider>
       <!-- 企业位置信息表单 -->
       <div class="company_position">
         <p>企业位置信息</p>
@@ -124,14 +130,14 @@
         >
           <el-form-item label="省份名称">
             <el-select
-              v-model="company_position_form.province"
+              v-model="company_position_form.provinceName"
               placeholder="请选择省份名称"
             >
               <el-option
-                v-for="item in company_position_form.province_name"
+                v-for="item in company_position_form.province"
-                :key="item.province_code"
+                :key="item.provinceCode"
-                :label="item.province_name"
+                :label="item.provinceName"
-                :value="item.province_code"
+                :value="item.provinceCode"
               >
               </el-option>
             </el-select>
@@ -203,9 +209,9 @@
           </el-form-item>
         </el-form>
       </div>
-      <el-divider></el-divider>
       <!-- 管辖区信息表单 -->
       <div class="jurisdiction">
+        <p>管辖区信息</p>
         <el-form
           ref="jurisdiction_form"
           :model="jurisdiction_form"
@@ -246,30 +252,30 @@ export default {
   name: "CompanyDataDialog",
   data() {
     return {
-      dialogTitle: "新增",
+      dialogTitle: "",
       visible: false,
       // 企业工商信息上半部分
       commerceMessage_form: {
-        name: "",
+        companyName: "",
-        credit: "",
+        socialCreditCode: "",
-        property: "",
+        companyNature: "",
-        time_limit: "",
+        businessTermDate: "",
-        publish_time: "",
+        businessLicenseDate: "",
-        establish_time: "",
+        establishDate: "",
-        register_capital: "",
+        registerCapital: "",
-        registration_authority: "",
+        registerAuthority: "",
-        operating_status: "",
+        businessStatus: "",
       },
       // 企业工商信息下半部分
       commerceMessage_form_two: {
-        register_poisition: "",
+        registerAddress: "",
-        company_type: [],
+        companyType: [],
-        business_scope: "",
+        businessStatus: "",
       },
       // 企业联系人信息表单
       company_person_message_form: {
-        person: "",
+        emergencyContact: "",
-        phone: "",
+        emergencyContactPhone: "",
       },
       // 企业位置信息表单
       company_position_form: {
@@ -291,12 +297,12 @@ export default {
   methods: {
     open(num) {
       this.visible = true;
-      if(num === 1) {
+      if (num === 1) {
-        this.dialogTitle = '新建'
+        this.dialogTitle = "新建";
       } else if (num === 2) {
-        this.dialogTitle = '查看档案'
+        this.dialogTitle = "查看档案";
       } else if (num === 3) {
-        this.dialogTitle = '编辑'
+        this.dialogTitle = "编辑";
       }
     },
     saveFormData: debounce(function () {
@@ -309,6 +315,7 @@ export default {
 /deep/.el-dialog {
   .el-dialog__title {
     color: #fff;
+    text-shadow: 0 0 9px rgba(21, 255, 198, 0.64);
   }
   background-image: url("~@/assets/companyFile/dialogBack.png");
   background-size: 100% 100%;
@@ -326,8 +333,11 @@ export default {
     padding-left: 15px;
     padding-right: 15px;
     p {
+      padding-top: 15px;
+      margin-left: 17px;
       font-size: 16px;
       color: #fff;
+      text-shadow: 0 0 9px rgba(21, 255, 198, 0.64);
     }
   }
   .el-button {
@@ -340,7 +350,7 @@ export default {
   .el-button:focus,
   .el-button:hover {
     color: #34e1b3;
-    background: url("~@/assets/companyFile/891771.png") no-repeat !important;
+    background: url("~@/assets/companyFile/btn05.png") no-repeat !important;
     background-size: 100% 100% !important;
   }
   .form_body {
@@ -348,12 +358,12 @@ export default {
     overflow-y: scroll;
   }
   .form_body::-webkit-scrollbar {
-    width: 10px;
+    width: 6px;
     background-color: #5e666a;
     border-radius: 4px;
   }
   .form_body::-webkit-scrollbar-thumb {
-    width: 9px;
+    width: 5px;
     background-color: #3c4b4a;
     border-radius: 4px;
   }
@@ -387,6 +397,14 @@ export default {
       }
     }
   }
+  .commerceMessage,
+  .company_person_message,
+  .company_position,
+  .jurisdiction {
+    background: url("~@/assets/companyFile/242112.png") no-repeat !important;
+    background-size: 100% 100% !important;
+    margin-top: 16px;
+  }
   /* 为适应上传图片表单布局把企业工商表单拆分 */
   .commerceMessage_one {
     display: flex;

src/views/systemManagement/companyList/index.vue

@@ -4,6 +4,8 @@
     <div class="main">
       <!-- 卡片标题 -->
       <el-card class="box-card">
+        <div class="topZS"></div>
+        <div class="bottomZS"></div>
         <div slot="header" class="clearfix">
           <span>企业名单</span>
         </div>
@@ -19,7 +21,7 @@
               >
               </el-input>
               <div class="top_search_button">
-                <i class="el-icon-search"></i>
+                <i class="el-icon-search" @click="getData_icon()"></i>
               </div>
             </div>
             <div class="top_add_btn">
@@ -31,17 +33,17 @@
             <ul>
               <li v-for="item in company_data" :key="item.id">
                 <img :src="item.picUrl" alt="" />
-                <span class="company_name"> {{ item.companyName }} </span>
+                <span class="company_name"> {{ item.name }} </span>
                 <div class="company_label">
                   <div
                     class="company_label_data"
-                    v-for="(val,index) in item.companyTypes"
+                    v-for="(val, index) in item.companyTypes"
                     :key="index"
                   >
                     {{ val }}
                   </div>
                 </div>
-                <span class="company_unit"> {{ item.companyAddress }}</span>
+                <span class="company_unit"> {{ item.unit }}</span>
                 <!-- 遮罩层 -->
                 <div class="image_mask">
                   <div class="btn">
@@ -58,10 +60,11 @@
           <!-- 分页区域 -->
           <div class="footer">
             <el-pagination
-              @size-change="handleSizeChange"
+              :background="true"
               @current-change="handleCurrentChange"
               :page-sizes="[6]"
-              :page-size="100"
+              :page-size="pageSize"
+              :current-page="pageNum"
               layout="total, sizes, prev, pager, next, jumper"
               :total="total"
             >
@@ -78,6 +81,7 @@
 import CompanyDataDialog from "./components/companyDataDialog";
 import ClearDialog from "./components/clearDialog";
 import { getCompanyList } from "@/api/systemManagement";
+import { debounce } from "@/utils/publicMethod_lxy/debounce.js";
 export default {
   name: "companyList",
   components: {
@@ -87,18 +91,7 @@ export default {
   data() {
     return {
       searchCompany: "",
-      company_data: [
+      company_data: [],
-        // {
-        //   value: "1",
-        //   name: "宁波镇海兴达化工有限公司",
-        //   unit: "宁波镇海兴达化工有限公司工业园",
-        // },
-        // { value: "2" },
-        // { value: "3" },
-        // { value: "4" },
-        // { value: "5" },
-        // { value: "6" },
-      ],
       pageSize: 6,
       pageNum: 1,
       total: "",
@@ -123,11 +116,40 @@ export default {
       const params = {
         pageSize: this.pageSize,
         pageNum: this.pageNum,
+        companyName: this.searchCompany, // 查询框条件
       };
       getCompanyList(params).then((res) => {
-        console.log("res.data", res.data);
+        if (res.code === 200) {
+          console.log("res.data", res);
           this.company_data = res.data;
+          this.total = res.total;
+        } else {
+          this.$message.warnning(res.msg);
+        }
+      });
+    },
+    // 放大镜点击查询防恶意点击
+    getData_icon: debounce(function () {
+      const params = {
+        pageSize: this.pageSize,
+        pageNum: this.pageNum,
+        companyName: this.searchCompany, // 查询框条件
+      };
+      console.log("params", params);
+      getCompanyList(params).then((res) => {
+        if (res.code === 200) {
+          console.log("res.data", res);
+          this.company_data = res.data;
+          this.total = res.total;
+        } else {
+          this.$message.warnning(res.msg);
+        }
       });
+    }, 300),
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+      this.pageNum = val;
+      this.getData();
     },
   },
 };
@@ -136,6 +158,7 @@ export default {
 /* card统一样式 */
 .el-card.box-card.is-always-shadow {
   height: calc(100vh - 116px); /* 控制card布局高度,用于适配 */
+  position: relative;
   /* card统一样式 */
   /deep/.el-card__header {
     border-bottom: 1px solid #a1a1a1 !important;
@@ -144,6 +167,7 @@ export default {
         font-size: 17px;
         font-weight: 400;
         color: #fff;
+        text-shadow: 0 0 9px rgba(21, 255, 198, 0.64);
       }
     }
   }
@@ -185,7 +209,7 @@ export default {
           }
         }
         .top_search_button {
-          width: 10%;
+          width: 7%;
           height: 100%;
           border-radius: 0px 4px 4px 0px;
           background: #0e3936;
@@ -194,7 +218,7 @@ export default {
           cursor: pointer;
           .el-icon-search {
             color: #fff;
-            padding: 12% 0;
+            padding: 11% 0;
           }
         }
         .top_search_button:focus,
@@ -206,23 +230,24 @@ export default {
       .top_add_btn {
         width: 10%;
         .el-button {
+          width: 82%;
           border: 1px solid #4a6072;
           color: #fff;
           border-radius: 0px !important;
-          background: #323f43;
+          background: url("~@/assets/companyFile/btn05.png") no-repeat !important;
+          background-size: 100% 100% !important;
         }
         .el-button:focus,
         .el-button:hover {
-          color: #34e1b3;
+          text-shadow: 0 0 9px #34e1b3;
-          background: url("~@/assets/companyFile/891771.png") no-repeat !important;
+          filter: brightness(150%);
-          background-size: 100% 100% !important;
         }
       }
     }
     /* 公司图片展示区域 */
     .center {
       width: 100%;
-      height: 640px;
+      height: 775px;
       margin-top: 22px;
       ul {
         display: flex;
@@ -234,20 +259,24 @@ export default {
           position: relative;
           list-style: none;
           width: 30%;
-          height: 45%;
+          height: 47%;
           background: #1b3736;
           border: 1px solid #fff;
           img {
-            width: 100%;
+            margin-left: 1%;
-            height: 100%;
+            margin-top: 1.2%;
+            width: 99%;
+            height: 98.4%;
           }
           /* 公司图片相关信息区域 */
           .company_name {
             position: absolute;
             z-index: 2;
             color: #fff;
+            text-shadow: 0 0 9px #ffe6d9;
             left: 10px;
             bottom: 70px;
+            font-size: 18px;
           }
           .company_label {
             display: flex;
@@ -261,7 +290,7 @@ export default {
               padding: 0px 5px 0px 5px;
               height: 30px;
               color: #34e1b3;
-              background: url("~@/assets/companyFile/891771.png") no-repeat !important;
+              background: url("~@/assets/companyFile/btn04.png") no-repeat !important;
               background-size: 100% 100% !important;
               margin-right: 5px;
             }
@@ -280,42 +309,48 @@ export default {
             width: 100%;
             height: 100%;
             bottom: 0;
-            background: rgba(101, 101, 101, 0.6);
+            background: rgba(73, 72, 72, 0.6);
             color: #ffffff;
             opacity: 0;
             /* 图片鼠标经过按钮 */
             .btn {
               margin-left: 25%;
-              margin-top: 28%;
+              margin-top: 30%;
               button {
-                height: 35px;
+                height: 40px;
-                margin-right: 15px;
+                margin-right: 25px;
-                font-size: 20px;
+                font-size: 18px;
                 color: #fff;
                 border: 1px;
                 border-radius: 0px;
                 cursor: pointer;
               }
               button.check {
-                background: #126a58;
+                background: url("~@/assets/companyFile/btn05.png") no-repeat !important;
+                background-size: 100% 100% !important;
               }
               /* 点击高亮 */
+              button.check:hover,
               button.check:focus {
-                background: #29b397;
+                filter: brightness(150%);
               }
               button.change {
-                background: rgb(7, 72, 92);
+                background: url("~@/assets/companyFile/btn06.png") no-repeat !important;
+                background-size: 100% 100% !important;
               }
               /* 点击高亮 */
+              button.change:hover,
               button.change:focus {
-                background: rgb(19, 125, 158);
+                filter: brightness(150%);
               }
               button.clear {
-                background: rgb(107, 14, 14);
+                background: url("~@/assets/companyFile/btn07.png") no-repeat !important;
+                background-size: 100% 100% !important;
               }
               /* 点击高亮 */
+              button.clear:hover,
               button.clear:focus {
-                background: rgb(151, 28, 28);
+                filter: brightness(150%);
               }
             }
           }
@@ -324,12 +359,21 @@ export default {
           opacity: 1;
           cursor: default;
         }
+        li:hover .company_label_data {
+          opacity: 0;
+        }
+        li:hover span {
+          opacity: 0;
+        }
       }
     }
     /* 底部分页展示区域 */
     .footer {
       .el-pagination {
-        margin-left: 75%;
+        margin-left: 59%;
+        /deep/.el-pagination__total {
+          color: #fff;
+        }
         /deep/.el-input__inner {
           border-radius: 0px;
           background: #3c4b4a;

src/views/systemManagement/components/leftNav.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 系统管理左侧导航菜单 -->
   <el-menu
-    default-active="this.$route.path"
+    :default-active="activeIndex"
     class="el-menu-vertical-demo"
     @open="handleOpen"
     @close="handleClose"
@@ -16,7 +16,9 @@
       :key="item.name"
       :index="item.name"
     >
-      <i :class="`el-icon-${item.icon}`"></i>
+      <i>
+        <img :src="item.src" alt="" />
+      </i>
       <span slot="title">{{ item.label }}</span>
     </el-menu-item>
   </el-menu>
@@ -27,41 +29,50 @@ export default {
   data() {
     return {
       isCollapse: false,
+      activeIndex: "/",
       menu: [
         // 导航数组
         {
           path: "/safeIndex",
           name: "safeIndex",
           label: "平安指数",
-          icon: "folder-checked",
+          src: require("@/assets/companyFile/menu01.png"),
         },
         {
           path: "/companyScore",
           name: "companyScore",
           label: "企业赋分",
-          icon: "folder-checked",
+          src: require("@/assets/companyFile/menu02.png"),
         },
         {
           path: "/companyList",
           name: "companyList",
           label: "企业名单",
-          icon: "folder-checked",
+          src: require("@/assets/companyFile/menu03.png"),
         },
         {
           path: "/correlationEquipment",
           name: "correlationEquipment",
           label: "关联设备",
-          icon: "folder-checked",
+          src: require("@/assets/companyFile/menu04.png"),
         },
       ],
     };
   },
+  watch: {
+    $route() {
+      this.setCurrentRoute();
+    },
+  },
   computed: {
     menuList() {
       // 一级菜单导航
       return this.menu.filter((item) => !item.children);
     },
   },
+  created() {
+    this.setCurrentRoute();
+  },
   methods: {
     // 点击跳转路由
     clickMenu(val) {
@@ -69,6 +80,9 @@ export default {
         name: val.name,
       });
     },
+    setCurrentRoute() {
+      this.activeIndex = this.$route.path; //监听到当前路由状态并激活当前菜单
+    },
     handleOpen(key, keyPath) {
       console.log(key, keyPath);
     },
@@ -88,14 +102,29 @@ export default {
 }
 .el-menu-vertical-demo.el-menu {
   .el-menu-item {
+    width: 240px;
+    margin-top: 20px;
+    margin-left: 17px;
     color: #fff;
     font-size: 18px;
+    background: url("~@/assets/companyFile/921.png") no-repeat;
+    background-size: 100% 100%;
+    i {
+      margin-right: 10px;
+      width: 20px;
+      height: 20px;
+      img {
+        margin-bottom: 4px;
+        width: 20px;
+        height: 20px;
+      }
+    }
   }
   .el-menu-item:focus,
   .el-menu-item:hover {
     /* 导航选项点击触碰效果 */
-    background: #daf4f6;
+    filter: brightness(150%);
-    color: #5a5e66;
+    text-shadow: 0 0 9px rgba(21, 255, 198, 0.64);
   }
 }
 </style>

src/views/systemManagement/correlationEquipment/index.vue

@@ -4,6 +4,8 @@
     <div class="main">
       <!-- 卡片标题 -->
       <el-card class="box-card">
+        <div class="topZS"></div>
+        <div class="bottomZS"></div>
         <div slot="header" class="clearfix">
           <span>关联设备</span>
         </div>
@@ -119,6 +121,7 @@ export default {
 /* card统一样式 */
 .el-card.box-card.is-always-shadow {
   height: calc(100vh - 116px); /* 控制card布局高度,用于适配 */
+  position: relative;
 }
 /* card统一样式 */
 /deep/.el-card__header {
@@ -128,6 +131,7 @@ export default {
       font-size: 17px;
       font-weight: 400;
       color: #fff;
+      text-shadow: 0 0 9px rgba(21, 255, 198, 0.64);
     }
   }
 }