up

.env.development

@@ -2,6 +2,6 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = 'http://safety.115.langye.net/'
+#VUE_APP_BASE_API = 'http://safety.115.langye.net/'
 
-#VUE_APP_BASE_API = http://192.168.60.99:9001/
+VUE_APP_BASE_API = http://192.168.60.99:9001/

src/components/LxHeader/index.vue

@@ -1,8 +1,16 @@
 <template>
   <div class="v-header">
     <div class="v-left-text">
-      <Icon size="20" :type="icon" />
+      <template v-if="/^iconfont\/.*/.test($route.meta.icon)">
-      <span>{{text}}</span>
+        <i class="iconfont" :class="$route.meta.icon.replace(/^iconfont\//,'')" style="padding: 0 6px;"></i>
+      </template>
+      <template v-else-if="/^el-icon.*/.test($route.meta.icon)">
+        <i :class="$route.meta.icon" style="padding: 0 6px;"></i>
+      </template>
+      <template v-else>
+        <Icon size="20" :type="$route.meta.icon" />
+      </template>
+      <span>{{text || $route.meta.title}}</span>
     </div>
     <div class="content">
       <slot name="content"></slot>
@@ -18,15 +26,9 @@
 <script>
 export default {
   props: {
-    icon: {
+    icon: String,
-      type: String,
+    text: String
-      default: ""
   },
-    text: {
-      type: String,
-      default: "未定义名称"
-    }
-  }
 };
 </script>
 <style lang="less" scoped>
@@ -40,12 +42,12 @@ export default {
     // padding-top: 10px;
     font-weight: bold;
     font-size: 15px;
-    color: #338de3;
+    color: #0077CC;
     white-space: nowrap;
-    border-bottom: 2px solid #338de3;
+    border-bottom: 2px solid #0077CC;
     > span {
       position: relative;
-      //top: 2px;
+
     }
   }
   .content {

src/router/index.js

@@ -42,6 +42,12 @@ export const constantRoutes = [{
     hidden: true
   },
 
+  {
+    path: '/404',
+    component: () => import('@/views/load'),
+    hidden: true
+  },
+
   {
     path: '/',
     component: Layout,

src/store/modules/permission.js

@@ -99,6 +99,7 @@ export function generaMenu(routes, data) {
       const menu = {
 
         path: (path.includes('#') ? item.id + '_key' : path),
+        //path: (path.includes('#') ? "/load" : path),
         redirect: (item.children.length > 0 ? "noRedirect" : ""),
         //component: item.url === '#' ? Layout : loadView(item.url),
         component:componentHandler(item),

src/styles/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3299651 */
-  src: url('//at.alicdn.com/t/font_3299651_jr61je4b4x.woff2?t=1651135362336') format('woff2'),
+  src: url('iconfont.woff2?t=1701320120401') format('woff2'),
-       url('//at.alicdn.com/t/font_3299651_jr61je4b4x.woff?t=1651135362336') format('woff'),
+       url('iconfont.woff?t=1701320120401') format('woff'),
-       url('//at.alicdn.com/t/font_3299651_jr61je4b4x.ttf?t=1651135362336') format('truetype');
+       url('iconfont.ttf?t=1701320120401') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,146 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-lishijilu:before {
+  content: "\e674";
+}
+
+.icon-renwu1:before {
+  content: "\e684";
+}
+
+.icon-yingjiyuan1:before {
+  content: "\e61f";
+}
+
+.icon-renwujihua:before {
+  content: "\e61d";
+}
+
+.icon-renwujincheng:before {
+  content: "\ec35";
+}
+
+.icon-jiu:before {
+  content: "\e944";
+}
+
+.icon-icon-shishi:before {
+  content: "\e687";
+}
+
+.icon-tuceng2:before {
+  content: "\e915";
+}
+
+.icon-woderenwu:before {
+  content: "\e604";
+}
+
+.icon-icon_xinyong_xianxing_jijin-243:before {
+  content: "\e675";
+}
+
+.icon-caozuoruanjian-12:before {
+  content: "\e60a";
+}
+
+.icon-daibanshixiang:before {
+  content: "\e602";
+}
+
+.icon-shenhe3x:before {
+  content: "\e671";
+}
+
+.icon-qingyan:before {
+  content: "\e600";
+}
+
+.icon-zyjs:before {
+  content: "\e60e";
+}
+
+.icon-a-3-2anquanzhidingguanli:before {
+  content: "\e672";
+}
+
+.icon-baoxiu:before {
+  content: "\e673";
+}
+
+.icon-a-12-anquanjianchajihua:before {
+  content: "\e6ed";
+}
+
+.icon-a-11-jiancharenwu:before {
+  content: "\e6ee";
+}
+
+.icon-a-10-yinhuanshangbao:before {
+  content: "\e6ef";
+}
+
+.icon-a-9-yingjiwuzijianchajihua:before {
+  content: "\e6f0";
+}
+
+.icon-a-8-yingjiwuzijiancharenwu:before {
+  content: "\e6f1";
+}
+
+.icon-a-7-xiaofangqicaijianchajihua:before {
+  content: "\e6f2";
+}
+
+.icon-a-5-shebeiyichangweixiu:before {
+  content: "\e6f4";
+}
+
+.icon-a-4-shebeijianchajilu:before {
+  content: "\e6f5";
+}
+
+.icon-a-36-wodezongjie:before {
+  content: "\e6f9";
+}
+
+.icon-a-28-yinhuanzhenggaitixing:before {
+  content: "\e701";
+}
+
+.icon-a-50-yibanrenwu:before {
+  content: "\e71e";
+}
+
+.icon-a-51-banjierenwu:before {
+  content: "\e71f";
+}
+
+.icon-a-52-shebeijiancharenwu:before {
+  content: "\e721";
+}
+
+.icon-guizeguanli:before {
+  content: "\e697";
+}
+
+.icon-fengxianguankong:before {
+  content: "\e60f";
+}
+
+.icon-yinhuanguankong:before {
+  content: "\e610";
+}
+
+.icon-anquanguanli:before {
+  content: "\e611";
+}
+
+.icon-anquanjiancha:before {
+  content: "\e613";
+}
+
 .icon-zhiduliucheng:before {
   content: "\e69d";
 }
@@ -380,3 +520,4 @@
 .icon-lianjie:before {
   content: "\e63e";
 }
+

src/views/dashboard/index.vue

@@ -40,9 +40,8 @@
           <div ref="lxTable" class="table-tree">
             <div style="padding: 15px;background-color: #fff;display: flex;align-items: center;" class="form-sub-title">
 
-              <el-link type="primary" style="font-size:18px;margin-right:5px"
+              <el-link icon="el-icon-s-opportunity" type="primary" style="font-size:18px;margin-right:5px"
                 href="/admin/#/lawsfile/index/article_1">动态信息</el-link>
-              <p class="no-redirect">浏览最近上传的文件</p>
             </div>
             <el-table :data="tableData" stripe class="v-table" height="300px" style="width: 100%">
               <el-table-column :prop="column.field" :fixed="column.fixed" :align="column.align"
@@ -68,7 +67,7 @@
         <el-col :span="12">
           <div ref="lxTable" class="table-tree">
             <div style="padding: 15px;background-color: #fff;" class="form-sub-title">
-              <el-link type="primary" style="font-size:18px" href="/admin/#/lawsfile/index/article_2">规章制度</el-link>
+              <el-link type="primary" icon="el-icon-s-order" style="font-size:18px" href="/admin/#/lawsfile/index/article_2">规章制度</el-link>
               <p class="no-redirect"></p>
             </div>
             <el-table :data="lawData" stripe class="v-table" height="300px" style="width: 100%">
@@ -94,7 +93,8 @@
         <el-col :span="24">
           <div ref="lxTable" stripe class="table-tree">
             <div style="padding: 15px;background-color: #fff;padding-bottom:5px;" class="form-sub-title">
-              <el-link type="primary" href="#/lawsfile/articleview" style="font-size:18px">我的任务</el-link>
+              <el-link icon='el-icon-user-solid
+' type="primary"  style="font-size:18px">我的任务</el-link>
             </div>
             <div style="height:370px;background-color: #fff;padding: 15px;padding-top:0">
               <el-tabs v-model="daliyName">
@@ -297,7 +297,7 @@
         <el-col :span="12">
           <div ref="lxTable" class="table-tree">
             <div style="display:flex;justify-content: space-between;;padding: 15px;padding-left: 20px;background-color: #fff;" class="form-sub-title">
-              <el-link type="primary" style="font-size:18px" href="#/lawsfile/article">综合数据</el-link>
+              <el-link type="primary" icon="el-icon-s-data" style="font-size:18px" href="#/lawsfile/article">综合数据</el-link>
               <div>
                 <span style="background-color: #95ca7a;display: inline-block;width:50px;height: 20px;
     vertical-align: bottom;border-radius: 5px;margin:0 5px"></span>已完成
@@ -427,7 +427,7 @@
           <div ref="lxTable" class="table-tree">
             <div style="padding: 15px;background-color: #fff;" class="form-sub-title">
               <div style="display: flex;justify-content: space-between;">
-                <el-link type="primary" style="font-size:18px" href="#/lawsfile/article">检查整改</el-link>
+                <el-link icon="el-icon-s-marketing" type="primary" style="font-size:18px" >检查整改</el-link>
                 <!-- <p class="no-redirect"></p> -->
                 <Select placeholder="数据类型" v-model="select.question_type" style="width:130px;margin-left:5px">
                   <Option v-for="item in typeList" :value="item.id" :key="item.value">{{ item.value }}</Option>

src/views/load.vue

@@ -0,0 +1,31 @@
+<template>
+  <div class="container">
+    <!-- 查询配置 -->
+    <div style="padding: 0px 20px">
+
+      <div ref="lxHeader">
+        <LxHeader style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+          <div slot="content"></div>
+          <slot>
+
+          </slot>
+        </LxHeader>
+      </div>
+      <el-empty description="模块建设中"></el-empty>
+    </div>
+  </div>
+</template>
+
+<script>
+  import LxHeader from "@/components/LxHeader/index.vue";
+  export default {
+    components: {
+      LxHeader
+    }
+  }
+</script>
+
+<style>
+  .container {
+  }
+</style>