Главная Обзор Помощь
Вход
nightBoy
/
mh_fire
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

修改map和引入打印等

夜仔 3 лет назад
Родитель
9c778182f8
Сommit
1d798673f5
20 измененных файлов с 140 добавлено и 846 удалено
Разделённый вид Показать статистику Diff
  1. 3 3
      public/index.html
  2. 0 539
      src/assets/icon/demo.css
  3. 0 234
      src/assets/icon/demo_index.html
  4. 26 12
      src/assets/icon/iconfont.css
  5. 0 0
      src/assets/icon/iconfont.js
  6. 30 2
      src/assets/icon/iconfont.json
  7. BIN
      src/assets/icon/iconfont.ttf
  8. BIN
      src/assets/icon/iconfont.woff
  9. BIN
      src/assets/icon/iconfont.woff2
  10. 13 13
      src/assets/scss/common.scss
  11. 5 5
      src/components/line-smooth/index.vue
  12. 1 1
      src/components/mixins/map-gaode.js
  13. 46 27
      src/views/comprehensive-disposal.vue
  14. 2 1
      src/views/enforcement-dynamic.vue
  15. 2 1
      src/views/fire-data-analysis.vue
  16. 2 1
      src/views/rescue-station.vue
  17. 2 1
      src/views/security-plan.vue
  18. 2 1
      src/views/self-management.vue
  19. 2 1
      src/views/water-sources.vue
  20. 4 4
      vue.config.js

+ 3 - 3
public/index.html
Просмотреть файл 

@@ -10,10 +10,10 @@
 
         <%= htmlWebpackPlugin.options.title %>
 
     </title>
 
     <!-- 高德地图 -->
 
-    <!-- <script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.15&key=8e266e1ac2ad2383c7773ff504ac248f"></script>
 
-    <script type="text/javascript" src="//webapi.amap.com/ui/1.1/main.js"></script> -->
 
+    <script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.15&key=8e266e1ac2ad2383c7773ff504ac248f"></script>
 
+    <script type="text/javascript" src="//webapi.amap.com/ui/1.1/main.js"></script>
 
     <!-- 大数据地图 -->
 
-    <script src="http://gis.dcp.shmh.gov.cn/mh_map/js/index_v1.0.js"></script>
 
+    <!-- <script src="http://gis.dcp.shmh.gov.cn/mh_map/js/index_v1.0.js"></script> -->
 
 </head>
 
 
 <body>

+ 0 - 539
src/assets/icon/demo.css
Просмотреть файл 

@@ -1,539 +0,0 @@
 
-/* Logo 字体 */
 
-@font-face {
 
-  font-family: "iconfont logo";
 
-  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
 
-  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
 
-    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
 
-    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
 
-    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
 
-}
 
-
 
-.logo {
 
-  font-family: "iconfont logo";
 
-  font-size: 160px;
 
-  font-style: normal;
 
-  -webkit-font-smoothing: antialiased;
 
-  -moz-osx-font-smoothing: grayscale;
 
-}
 
-
 
-/* tabs */
 
-.nav-tabs {
 
-  position: relative;
 
-}
 
-
 
-.nav-tabs .nav-more {
 
-  position: absolute;
 
-  right: 0;
 
-  bottom: 0;
 
-  height: 42px;
 
-  line-height: 42px;
 
-  color: #666;
 
-}
 
-
 
-#tabs {
 
-  border-bottom: 1px solid #eee;
 
-}
 
-
 
-#tabs li {
 
-  cursor: pointer;
 
-  width: 100px;
 
-  height: 40px;
 
-  line-height: 40px;
 
-  text-align: center;
 
-  font-size: 16px;
 
-  border-bottom: 2px solid transparent;
 
-  position: relative;
 
-  z-index: 1;
 
-  margin-bottom: -1px;
 
-  color: #666;
 
-}
 
-
 
-
 
-#tabs .active {
 
-  border-bottom-color: #f00;
 
-  color: #222;
 
-}
 
-
 
-.tab-container .content {
 
-  display: none;
 
-}
 
-
 
-/* 页面布局 */
 
-.main {
 
-  padding: 30px 100px;
 
-  width: 960px;
 
-  margin: 0 auto;
 
-}
 
-
 
-.main .logo {
 
-  color: #333;
 
-  text-align: left;
 
-  margin-bottom: 30px;
 
-  line-height: 1;
 
-  height: 110px;
 
-  margin-top: -50px;
 
-  overflow: hidden;
 
-  *zoom: 1;
 
-}
 
-
 
-.main .logo a {
 
-  font-size: 160px;
 
-  color: #333;
 
-}
 
-
 
-.helps {
 
-  margin-top: 40px;
 
-}
 
-
 
-.helps pre {
 
-  padding: 20px;
 
-  margin: 10px 0;
 
-  border: solid 1px #e7e1cd;
 
-  background-color: #fffdef;
 
-  overflow: auto;
 
-}
 
-
 
-.icon_lists {
 
-  width: 100% !important;
 
-  overflow: hidden;
 
-  *zoom: 1;
 
-}
 
-
 
-.icon_lists li {
 
-  width: 100px;
 
-  margin-bottom: 10px;
 
-  margin-right: 20px;
 
-  text-align: center;
 
-  list-style: none !important;
 
-  cursor: default;
 
-}
 
-
 
-.icon_lists li .code-name {
 
-  line-height: 1.2;
 
-}
 
-
 
-.icon_lists .icon {
 
-  display: block;
 
-  height: 100px;
 
-  line-height: 100px;
 
-  font-size: 42px;
 
-  margin: 10px auto;
 
-  color: #333;
 
-  -webkit-transition: font-size 0.25s linear, width 0.25s linear;
 
-  -moz-transition: font-size 0.25s linear, width 0.25s linear;
 
-  transition: font-size 0.25s linear, width 0.25s linear;
 
-}
 
-
 
-.icon_lists .icon:hover {
 
-  font-size: 100px;
 
-}
 
-
 
-.icon_lists .svg-icon {
 
-  /* 通过设置 font-size 来改变图标大小 */
 
-  width: 1em;
 
-  /* 图标和文字相邻时，垂直对齐 */
 
-  vertical-align: -0.15em;
 
-  /* 通过设置 color 来改变 SVG 的颜色/fill */
 
-  fill: currentColor;
 
-  /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示
 
-      normalize.css 中也包含这行 */
 
-  overflow: hidden;
 
-}
 
-
 
-.icon_lists li .name,
 
-.icon_lists li .code-name {
 
-  color: #666;
 
-}
 
-
 
-/* markdown 样式 */
 
-.markdown {
 
-  color: #666;
 
-  font-size: 14px;
 
-  line-height: 1.8;
 
-}
 
-
 
-.highlight {
 
-  line-height: 1.5;
 
-}
 
-
 
-.markdown img {
 
-  vertical-align: middle;
 
-  max-width: 100%;
 
-}
 
-
 
-.markdown h1 {
 
-  color: #404040;
 
-  font-weight: 500;
 
-  line-height: 40px;
 
-  margin-bottom: 24px;
 
-}
 
-
 
-.markdown h2,
 
-.markdown h3,
 
-.markdown h4,
 
-.markdown h5,
 
-.markdown h6 {
 
-  color: #404040;
 
-  margin: 1.6em 0 0.6em 0;
 
-  font-weight: 500;
 
-  clear: both;
 
-}
 
-
 
-.markdown h1 {
 
-  font-size: 28px;
 
-}
 
-
 
-.markdown h2 {
 
-  font-size: 22px;
 
-}
 
-
 
-.markdown h3 {
 
-  font-size: 16px;
 
-}
 
-
 
-.markdown h4 {
 
-  font-size: 14px;
 
-}
 
-
 
-.markdown h5 {
 
-  font-size: 12px;
 
-}
 
-
 
-.markdown h6 {
 
-  font-size: 12px;
 
-}
 
-
 
-.markdown hr {
 
-  height: 1px;
 
-  border: 0;
 
-  background: #e9e9e9;
 
-  margin: 16px 0;
 
-  clear: both;
 
-}
 
-
 
-.markdown p {
 
-  margin: 1em 0;
 
-}
 
-
 
-.markdown>p,
 
-.markdown>blockquote,
 
-.markdown>.highlight,
 
-.markdown>ol,
 
-.markdown>ul {
 
-  width: 80%;
 
-}
 
-
 
-.markdown ul>li {
 
-  list-style: circle;
 
-}
 
-
 
-.markdown>ul li,
 
-.markdown blockquote ul>li {
 
-  margin-left: 20px;
 
-  padding-left: 4px;
 
-}
 
-
 
-.markdown>ul li p,
 
-.markdown>ol li p {
 
-  margin: 0.6em 0;
 
-}
 
-
 
-.markdown ol>li {
 
-  list-style: decimal;
 
-}
 
-
 
-.markdown>ol li,
 
-.markdown blockquote ol>li {
 
-  margin-left: 20px;
 
-  padding-left: 4px;
 
-}
 
-
 
-.markdown code {
 
-  margin: 0 3px;
 
-  padding: 0 5px;
 
-  background: #eee;
 
-  border-radius: 3px;
 
-}
 
-
 
-.markdown strong,
 
-.markdown b {
 
-  font-weight: 600;
 
-}
 
-
 
-.markdown>table {
 
-  border-collapse: collapse;
 
-  border-spacing: 0px;
 
-  empty-cells: show;
 
-  border: 1px solid #e9e9e9;
 
-  width: 95%;
 
-  margin-bottom: 24px;
 
-}
 
-
 
-.markdown>table th {
 
-  white-space: nowrap;
 
-  color: #333;
 
-  font-weight: 600;
 
-}
 
-
 
-.markdown>table th,
 
-.markdown>table td {
 
-  border: 1px solid #e9e9e9;
 
-  padding: 8px 16px;
 
-  text-align: left;
 
-}
 
-
 
-.markdown>table th {
 
-  background: #F7F7F7;
 
-}
 
-
 
-.markdown blockquote {
 
-  font-size: 90%;
 
-  color: #999;
 
-  border-left: 4px solid #e9e9e9;
 
-  padding-left: 0.8em;
 
-  margin: 1em 0;
 
-}
 
-
 
-.markdown blockquote p {
 
-  margin: 0;
 
-}
 
-
 
-.markdown .anchor {
 
-  opacity: 0;
 
-  transition: opacity 0.3s ease;
 
-  margin-left: 8px;
 
-}
 
-
 
-.markdown .waiting {
 
-  color: #ccc;
 
-}
 
-
 
-.markdown h1:hover .anchor,
 
-.markdown h2:hover .anchor,
 
-.markdown h3:hover .anchor,
 
-.markdown h4:hover .anchor,
 
-.markdown h5:hover .anchor,
 
-.markdown h6:hover .anchor {
 
-  opacity: 1;
 
-  display: inline-block;
 
-}
 
-
 
-.markdown>br,
 
-.markdown>p>br {
 
-  clear: both;
 
-}
 
-
 
-
 
-.hljs {
 
-  display: block;
 
-  background: white;
 
-  padding: 0.5em;
 
-  color: #333333;
 
-  overflow-x: auto;
 
-}
 
-
 
-.hljs-comment,
 
-.hljs-meta {
 
-  color: #969896;
 
-}
 
-
 
-.hljs-string,
 
-.hljs-variable,
 
-.hljs-template-variable,
 
-.hljs-strong,
 
-.hljs-emphasis,
 
-.hljs-quote {
 
-  color: #df5000;
 
-}
 
-
 
-.hljs-keyword,
 
-.hljs-selector-tag,
 
-.hljs-type {
 
-  color: #a71d5d;
 
-}
 
-
 
-.hljs-literal,
 
-.hljs-symbol,
 
-.hljs-bullet,
 
-.hljs-attribute {
 
-  color: #0086b3;
 
-}
 
-
 
-.hljs-section,
 
-.hljs-name {
 
-  color: #63a35c;
 
-}
 
-
 
-.hljs-tag {
 
-  color: #333333;
 
-}
 
-
 
-.hljs-title,
 
-.hljs-attr,
 
-.hljs-selector-id,
 
-.hljs-selector-class,
 
-.hljs-selector-attr,
 
-.hljs-selector-pseudo {
 
-  color: #795da3;
 
-}
 
-
 
-.hljs-addition {
 
-  color: #55a532;
 
-  background-color: #eaffea;
 
-}
 
-
 
-.hljs-deletion {
 
-  color: #bd2c00;
 
-  background-color: #ffecec;
 
-}
 
-
 
-.hljs-link {
 
-  text-decoration: underline;
 
-}
 
-
 
-/* 代码高亮 */
 
-/* PrismJS 1.15.0
 
-https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
 
-/**
 
- * prism.js default theme for JavaScript, CSS and HTML
 
- * Based on dabblet (http://dabblet.com)
 
- * @author Lea Verou
 
- */
 
-code[class*="language-"],
 
-pre[class*="language-"] {
 
-  color: black;
 
-  background: none;
 
-  text-shadow: 0 1px white;
 
-  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
 
-  text-align: left;
 
-  white-space: pre;
 
-  word-spacing: normal;
 
-  word-break: normal;
 
-  word-wrap: normal;
 
-  line-height: 1.5;
 
-
 
-  -moz-tab-size: 4;
 
-  -o-tab-size: 4;
 
-  tab-size: 4;
 
-
 
-  -webkit-hyphens: none;
 
-  -moz-hyphens: none;
 
-  -ms-hyphens: none;
 
-  hyphens: none;
 
-}
 
-
 
-pre[class*="language-"]::-moz-selection,
 
-pre[class*="language-"] ::-moz-selection,
 
-code[class*="language-"]::-moz-selection,
 
-code[class*="language-"] ::-moz-selection {
 
-  text-shadow: none;
 
-  background: #b3d4fc;
 
-}
 
-
 
-pre[class*="language-"]::selection,
 
-pre[class*="language-"] ::selection,
 
-code[class*="language-"]::selection,
 
-code[class*="language-"] ::selection {
 
-  text-shadow: none;
 
-  background: #b3d4fc;
 
-}
 
-
 
-@media print {
 
-
 
-  code[class*="language-"],
 
-  pre[class*="language-"] {
 
-    text-shadow: none;
 
-  }
 
-}
 
-
 
-/* Code blocks */
 
-pre[class*="language-"] {
 
-  padding: 1em;
 
-  margin: .5em 0;
 
-  overflow: auto;
 
-}
 
-
 
-:not(pre)>code[class*="language-"],
 
-pre[class*="language-"] {
 
-  background: #f5f2f0;
 
-}
 
-
 
-/* Inline code */
 
-:not(pre)>code[class*="language-"] {
 
-  padding: .1em;
 
-  border-radius: .3em;
 
-  white-space: normal;
 
-}
 
-
 
-.token.comment,
 
-.token.prolog,
 
-.token.doctype,
 
-.token.cdata {
 
-  color: slategray;
 
-}
 
-
 
-.token.punctuation {
 
-  color: #999;
 
-}
 
-
 
-.namespace {
 
-  opacity: .7;
 
-}
 
-
 
-.token.property,
 
-.token.tag,
 
-.token.boolean,
 
-.token.number,
 
-.token.constant,
 
-.token.symbol,
 
-.token.deleted {
 
-  color: #905;
 
-}
 
-
 
-.token.selector,
 
-.token.attr-name,
 
-.token.string,
 
-.token.char,
 
-.token.builtin,
 
-.token.inserted {
 
-  color: #690;
 
-}
 
-
 
-.token.operator,
 
-.token.entity,
 
-.token.url,
 
-.language-css .token.string,
 
-.style .token.string {
 
-  color: #9a6e3a;
 
-  background: hsla(0, 0%, 100%, .5);
 
-}
 
-
 
-.token.atrule,
 
-.token.attr-value,
 
-.token.keyword {
 
-  color: #07a;
 
-}
 
-
 
-.token.function,
 
-.token.class-name {
 
-  color: #DD4A68;
 
-}
 
-
 
-.token.regex,
 
-.token.important,
 
-.token.variable {
 
-  color: #e90;
 
-}
 
-
 
-.token.important,
 
-.token.bold {
 
-  font-weight: bold;
 
-}
 
-
 
-.token.italic {
 
-  font-style: italic;
 
-}
 
-
 
-.token.entity {
 
-  cursor: help;
 
-}

+ 0 - 234
src/assets/icon/demo_index.html
Просмотреть файл 

@@ -1,234 +0,0 @@
 
-<!DOCTYPE html>
 
-<html>
 
-<head>
 
-  <meta charset="utf-8"/>
 
-  <title>iconfont Demo</title>
 
-  <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i2/O1CN01ZyAlrn1MwaMhqz36G_!!6000000001499-73-tps-64-64.ico" type="image/x-icon"/>
 
-  <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01EYTRnJ297D6vehehJ_!!6000000008020-55-tps-64-64.svg"/>
 
-  <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
 
-  <link rel="stylesheet" href="demo.css">
 
-  <link rel="stylesheet" href="iconfont.css">
 
-  <script src="iconfont.js"></script>
 
-  <!-- jQuery -->
 
-  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/7bfddb60-08e8-11e9-9b04-53e73bb6408b.js"></script>
 
-  <!-- 代码高亮 -->
 
-  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/a3f714d0-08e6-11e9-8a15-ebf944d7534c.js"></script>
 
-  <style>
 
-    .main .logo {
 
-      margin-top: 0;
 
-      height: auto;
 
-    }
 
-
 
-    .main .logo a {
 
-      display: flex;
 
-      align-items: center;
 
-    }
 
-
 
-    .main .logo .sub-title {
 
-      margin-left: 0.5em;
 
-      font-size: 22px;
 
-      color: #fff;
 
-      background: linear-gradient(-45deg, #3967FF, #B500FE);
 
-      -webkit-background-clip: text;
 
-      -webkit-text-fill-color: transparent;
 
-    }
 
-  </style>
 
-</head>
 
-<body>
 
-  <div class="main">
 
-    <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" target="_blank">
 
-      <img width="200" src="https://img.alicdn.com/imgextra/i3/O1CN01Mn65HV1FfSEzR6DKv_!!6000000000514-55-tps-228-59.svg">
 
-      
-    </a></h1>
 
-    <div class="nav-tabs">
 
-      <ul id="tabs" class="dib-box">
 
-        <li class="dib active"><span>Unicode</span></li>
 
-        <li class="dib"><span>Font class</span></li>
 
-        <li class="dib"><span>Symbol</span></li>
 
-      </ul>
 
-      
-      <a href="https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=2563497" target="_blank" class="nav-more">查看项目</a>
 
-      
-    </div>
 
-    <div class="tab-container">
 
-      <div class="content unicode" style="display: block;">
 
-          <ul class="icon_lists dib-box">
 
-          
-            <li class="dib">
 
-              <span class="icon iconfont">&#xe6e7;</span>
 
-                <div class="name">火</div>
 
-                <div class="code-name">&amp;#xe6e7;</div>
 
-              </li>
 
-          
-            <li class="dib">
 
-              <span class="icon iconfont">&#xe637;</span>
 
-                <div class="name">社会救助_fill</div>
 
-                <div class="code-name">&amp;#xe637;</div>
 
-              </li>
 
-          
-          </ul>
 
-          <div class="article markdown">
 
-          <h2 id="unicode-">Unicode 引用</h2>
 
-          <hr>
 
-
 
-          <p>Unicode 是字体在网页端最原始的应用方式，特点是：</p>
 
-          <ul>
 
-            <li>支持按字体的方式去动态调整图标大小，颜色等等。</li>
 
-            <li>默认情况下不支持多色，直接添加多色图标会自动去色。</li>
 
-          </ul>
 
-          <blockquote>
 
-            <p>注意：新版 iconfont 支持两种方式引用多色图标：SVG symbol 引用方式和彩色字体图标模式。（使用彩色字体图标需要在「编辑项目」中开启「彩色」选项后并重新生成。）</p>
 
-          </blockquote>
 
-          <p>Unicode 使用步骤如下：</p>
 
-          <h3 id="-font-face">第一步：拷贝项目下面生成的 <code>@font-face</code></h3>
 
-<pre><code class="language-css"
 
->@font-face {
 
-  font-family: 'iconfont';
 
-  src: url('iconfont.woff2?t=1621587980967') format('woff2'),
 
-       url('iconfont.woff?t=1621587980967') format('woff'),
 
-       url('iconfont.ttf?t=1621587980967') format('truetype');
 
-}
 
-</code></pre>
 
-          <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
 
-<pre><code class="language-css"
 
->.iconfont {
 
-  font-family: "iconfont" !important;
 
-  font-size: 16px;
 
-  font-style: normal;
 
-  -webkit-font-smoothing: antialiased;
 
-  -moz-osx-font-smoothing: grayscale;
 
-}
 
-</code></pre>
 
-          <h3 id="-">第三步：挑选相应图标并获取字体编码，应用于页面</h3>
 
-<pre>
 
-<code class="language-html"
 
->&lt;span class="iconfont"&gt;&amp;#x33;&lt;/span&gt;
 
-</code></pre>
 
-          <blockquote>
 
-            <p>"iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
 
-          </blockquote>
 
-          </div>
 
-      </div>
 
-      <div class="content font-class">
 
-        <ul class="icon_lists dib-box">
 
-          
-          <li class="dib">
 
-            <span class="icon iconfont icon-icon-test"></span>
 
-            <div class="name">
 
-              火
 
-            </div>
 
-            <div class="code-name">.icon-icon-test
 
-            </div>
 
-          </li>
 
-          
-          <li class="dib">
 
-            <span class="icon iconfont icon-minzhengtubiao1-08"></span>
 
-            <div class="name">
 
-              社会救助_fill
 
-            </div>
 
-            <div class="code-name">.icon-minzhengtubiao1-08
 
-            </div>
 
-          </li>
 
-          
-        </ul>
 
-        <div class="article markdown">
 
-        <h2 id="font-class-">font-class 引用</h2>
 
-        <hr>
 
-
 
-        <p>font-class 是 Unicode 使用方式的一种变种，主要是解决 Unicode 书写不直观，语意不明确的问题。</p>
 
-        <p>与 Unicode 使用方式相比，具有如下特点：</p>
 
-        <ul>
 
-          <li>相比于 Unicode 语意明确，书写更直观。可以很容易分辨这个 icon 是什么。</li>
 
-          <li>因为使用 class 来定义图标，所以当要替换图标时，只需要修改 class 里面的 Unicode 引用。</li>
 
-        </ul>
 
-        <p>使用步骤如下：</p>
 
-        <h3 id="-fontclass-">第一步：引入项目下面生成的 fontclass 代码：</h3>
 
-<pre><code class="language-html">&lt;link rel="stylesheet" href="./iconfont.css"&gt;
 
-</code></pre>
 
-        <h3 id="-">第二步：挑选相应图标并获取类名，应用于页面：</h3>
 
-<pre><code class="language-html">&lt;span class="iconfont icon-xxx"&gt;&lt;/span&gt;
 
-</code></pre>
 
-        <blockquote>
 
-          <p>"
 
-            iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
 
-        </blockquote>
 
-      </div>
 
-      </div>
 
-      <div class="content symbol">
 
-          <ul class="icon_lists dib-box">
 
-          
-            <li class="dib">
 
-                <svg class="icon svg-icon" aria-hidden="true">
 
-                  <use xlink:href="#icon-icon-test"></use>
 
-                </svg>
 
-                <div class="name">火</div>
 
-                <div class="code-name">#icon-icon-test</div>
 
-            </li>
 
-          
-            <li class="dib">
 
-                <svg class="icon svg-icon" aria-hidden="true">
 
-                  <use xlink:href="#icon-minzhengtubiao1-08"></use>
 
-                </svg>
 
-                <div class="name">社会救助_fill</div>
 
-                <div class="code-name">#icon-minzhengtubiao1-08</div>
 
-            </li>
 
-          
-          </ul>
 
-          <div class="article markdown">
 
-          <h2 id="symbol-">Symbol 引用</h2>
 
-          <hr>
 
-
 
-          <p>这是一种全新的使用方式，应该说这才是未来的主流，也是平台目前推荐的用法。相关介绍可以参考这篇<a href="">文章</a>
 
-            这种用法其实是做了一个 SVG 的集合，与另外两种相比具有如下特点：</p>
 
-          <ul>
 
-            <li>支持多色图标了，不再受单色限制。</li>
 
-            <li>通过一些技巧，支持像字体那样，通过 <code>font-size</code>, <code>color</code> 来调整样式。</li>
 
-            <li>兼容性较差，支持 IE9+，及现代浏览器。</li>
 
-            <li>浏览器渲染 SVG 的性能一般，还不如 png。</li>
 
-          </ul>
 
-          <p>使用步骤如下：</p>
 
-          <h3 id="-symbol-">第一步：引入项目下面生成的 symbol 代码：</h3>
 
-<pre><code class="language-html">&lt;script src="./iconfont.js"&gt;&lt;/script&gt;
 
-</code></pre>
 
-          <h3 id="-css-">第二步：加入通用 CSS 代码（引入一次就行）：</h3>
 
-<pre><code class="language-html">&lt;style&gt;
 
-.icon {
 
-  width: 1em;
 
-  height: 1em;
 
-  vertical-align: -0.15em;
 
-  fill: currentColor;
 
-  overflow: hidden;
 
-}
 
-&lt;/style&gt;
 
-</code></pre>
 
-          <h3 id="-">第三步：挑选相应图标并获取类名，应用于页面：</h3>
 
-<pre><code class="language-html">&lt;svg class="icon" aria-hidden="true"&gt;
 
-  &lt;use xlink:href="#icon-xxx"&gt;&lt;/use&gt;
 
-&lt;/svg&gt;
 
-</code></pre>
 
-          </div>
 
-      </div>
 
-
 
-    </div>
 
-  </div>
 
-  <script>
 
-  $(document).ready(function () {
 
-      $('.tab-container .content:first').show()
 
-
 
-      $('#tabs li').click(function (e) {
 
-        var tabContent = $('.tab-container .content')
 
-        var index = $(this).index()
 
-
 
-        if ($(this).hasClass('active')) {
 
-          return
 
-        } else {
 
-          $('#tabs li').removeClass('active')
 
-          $(this).addClass('active')
 
-
 
-          tabContent.hide().eq(index).fadeIn()
 
-        }
 
-      })
 
-    })
 
-  </script>
 
-</body>
 
-</html>

+ 26 - 12
src/assets/icon/iconfont.css
Просмотреть файл 

@@ -1,23 +1,37 @@
 
 @font-face {
 
-  font-family: "iconfont"; /* Project id 2563497 */
 
-  src: url('iconfont.woff2?t=1621587980967') format('woff2'),
 
-       url('iconfont.woff?t=1621587980967') format('woff'),
 
-       url('iconfont.ttf?t=1621587980967') format('truetype');
 
+    font-family: "iconfont";
 
+    /* Project id 2755069 */
 
+    src: url('./iconfont.woff2?t=1629361024839') format('woff2'), url('./iconfont.woff?t=1629361024839') format('woff'), url('./iconfont.ttf?t=1629361024839') format('truetype');
 
 }
 
 
 .iconfont {
 
-  font-family: "iconfont" !important;
 
-  font-size: 16px;
 
-  font-style: normal;
 
-  -webkit-font-smoothing: antialiased;
 
-  -moz-osx-font-smoothing: grayscale;
 
+    font-family: "iconfont" !important;
 
+    font-size: 16px;
 
+    font-style: normal;
 
+    -webkit-font-smoothing: antialiased;
 
+    -moz-osx-font-smoothing: grayscale;
 
+}
 
+
 
+.icon-xiajiantou-:before {
 
+    content: "\e630";
 
+}
 
+
 
+.icon-arrowTop-fill:before {
 
+    content: "\e65d";
 
+}
 
+
 
+.icon-jiuyuan:before {
 
+    content: "\e61a";
 
 }
 
 
 .icon-icon-test:before {
 
-  content: "\e6e7";
 
+    content: "\e6e7";
 
 }
 
 
-.icon-minzhengtubiao1-08:before {
 
-  content: "\e637";
 
+.icon-nav_icon_bjgl_spe:before {
 
+    content: "\e601";
 
 }
 
 
+.icon-minzhengtubiao1-08:before {
 
+    content: "\e637";
 
+}

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/assets/icon/iconfont.js


+ 30 - 2
src/assets/icon/iconfont.json
Просмотреть файл 

@@ -1,10 +1,31 @@
 
 {
 
-  "id": "2563497",
 
-  "name": "MH",
 
+  "id": "2755069",
 
+  "name": "闵行",
 
   "font_family": "iconfont",
 
   "css_prefix_text": "icon-",
 
   "description": "",
 
   "glyphs": [
 
+    {
 
+      "icon_id": "7678915",
 
+      "name": "下箭头-3",
 
+      "font_class": "xiajiantou-",
 
+      "unicode": "e630",
 
+      "unicode_decimal": 58928
 
+    },
 
+    {
 
+      "icon_id": "14835600",
 
+      "name": "上箭头",
 
+      "font_class": "arrowTop-fill",
 
+      "unicode": "e65d",
 
+      "unicode_decimal": 58973
 
+    },
 
+    {
 
+      "icon_id": "479412",
 
+      "name": "救援",
 
+      "font_class": "jiuyuan",
 
+      "unicode": "e61a",
 
+      "unicode_decimal": 58906
 
+    },
 
     {
 
       "icon_id": "1810277",
 
       "name": "火",
 
@@ -12,6 +33,13 @@
 
       "unicode": "e6e7",
 
       "unicode_decimal": 59111
 
     },
 
+    {
 
+      "icon_id": "17739976",
 
+      "name": "报警管理实心",
 
+      "font_class": "nav_icon_bjgl_spe",
 
+      "unicode": "e601",
 
+      "unicode_decimal": 58881
 
+    },
 
     {
 
       "icon_id": "19474834",
 
       "name": "社会救助_fill",

BIN
src/assets/icon/iconfont.ttf
Просмотреть файл


BIN
src/assets/icon/iconfont.woff
Просмотреть файл


BIN
src/assets/icon/iconfont.woff2
Просмотреть файл


+ 13 - 13
src/assets/scss/common.scss
Просмотреть файл 

@@ -188,16 +188,6 @@ body {
 
             bottom: 0.2rem;
 
             z-index: 9;
 
             width: min-content;
 
-            .el-col {
 
-                width: 1.6875rem;
 
-                height: .6875rem;
 
-                margin-bottom: .0625rem;
 
-                line-height: .6875rem;
 
-                padding-left: .5625rem;
 
-                text-align: center;
 
-                font-size: .175rem;
 
-                background-size: 100% 100%;
 
-            }
 
             &>.greenImage {
 
                 background: url('~@a/img/icon/tip1.png') no-repeat;
 
             }
 
@@ -211,17 +201,27 @@ body {
 
                 background: url('~@a/img/icon/tip4.png') no-repeat;
 
             }
 
             &>.blueImageTip {
 
-                width: 2.1875rem;
 
+                width: 1.625rem;
 
                 background: url('~@a/img/icon/tip11.png') no-repeat;
 
             }
 
             &>.yellowImageTip {
 
-                width: 2.1875rem;
 
+                width: 1.625rem;
 
                 background: url('~@a/img/icon/tip12.png') no-repeat;
 
             }
 
             &>.redImageTip {
 
-                width: 2.1875rem;
 
+                width: 1.625rem;
 
                 background: url('~@a/img/icon/tip13.png') no-repeat;
 
             }
 
+            .el-col {
 
+                width: 1.25rem;
 
+                height: .5rem;
 
+                margin-bottom: .0625rem;
 
+                line-height: .5rem;
 
+                padding-left: .4375rem;
 
+                text-align: center;
 
+                font-size: .15rem;
 
+                background-size: 100% 100%;
 
+            }
 
         }
 
         .btnW {
 
             position: absolute;

+ 5 - 5
src/components/line-smooth/index.vue
Просмотреть файл 

@@ -27,8 +27,8 @@ export default {
 
       let echartsMap = echarts.init(this.$refs.echartD);
 
       echartsMap.setOption({
 
         color: [
 
+          "rgba(79, 255, 70,.8)",
 
           "rgba(62,175,64,.8)",
 
-          "rgba(62, 175, 64,.8)",
 
           "rgba(239,107,61,.8)",
 
           "rgba(250, 223, 43,.8)",
 
           "rgba(20, 225, 234,.8)",
 
@@ -133,11 +133,11 @@ export default {
 
               color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
 
                 {
 
                   offset: 0,
 
-                  color: "rgba(62,175,64)",
 
+                  color: "rgba(79, 255, 70,1)",
 
                 },
 
                 {
 
                   offset: 1,
 
-                  color: "rgba(62,175,64,.1)",
 
+                  color: "rgba(79, 255, 70,.1)",
 
                 },
 
               ]),
 
             },
 
@@ -155,11 +155,11 @@ export default {
 
               color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
 
                 {
 
                   offset: 0,
 
-                  color: "rgba(62, 175, 64,1)",
 
+                  color: "rgba(62,175,64)",
 
                 },
 
                 {
 
                   offset: 1,
 
-                  color: "rgba(62, 175, 64,.1)",
 
+                  color: "rgba(62,175,64,.1)",
 
                 },
 
               ]),
 
             },

+ 1 - 1
src/components/mixins/map-gaode.js
Просмотреть файл 

@@ -59,7 +59,7 @@ export default {
 
         },
 
         async initMap() {
 
             this.map = await new AMap.Map('mapF', {
 
-                mapStyle: 'amap://styles/706effbde9cf9c72e136dfad8b9f6891', //设置地图的显示样式
 
+                mapStyle: 'amap://styles/d0ddc09bd7cbd7331a8e8fa691e5b0da', //设置地图的显示样式
 
                 resizeEnable: true,
 
                 zoom: 13,
 
                 zooms: [3, 16],

+ 46 - 27
src/views/comprehensive-disposal.vue
Просмотреть файл 

@@ -65,7 +65,10 @@
 
               <el-row class="rightTopNumber">
 
                 <span>
 
                   同比：{{proptionList.find(val=>val.type === '火灾') && (proptionList.find(val=>val.type === '火灾').radio * 100).toFixed(2) || 0}}%
 
-                  <span :style="{color: proptionList.find(val=>val.type === '火灾') && proptionList.find(val=>val.type === '火灾').sameStatus === 2 ? 'green' : 'red'}">{{proptionList.find(val=>val.type === '火灾') && proptionList.find(val=>val.type === '火灾').sameStatus === 2 ? '↓' : proptionList.find(val=>val.type === '火灾') && proptionList.find(val=>val.type === '火灾').sameStatus === 2?'↑':''}}</span>
 
+                  <span :style="{color: proptionList.find(val=>val.type === '火灾') && proptionList.find(val=>val.type === '火灾').sameStatus === 2 ? 'green' : 'red'}">
 
+                    <i class="iconfont" v-if="proptionList.find(val=>val.type === '火灾')"
 
+                    :class="proptionList.find(val=>val.type === '火灾').sameStatus === 1 ? 'icon-arrowTop-fill' : proptionList.find(val=>val.type === '火灾').sameStatus === 2 ? 'icon-xiajiantou-' : ''"></i>
 
+                  </span>
 
                 </span>
 
               </el-row>
 
             </el-row>
 
@@ -77,7 +80,10 @@
 
               <el-row class="rightTopNumber">
 
                 <span>
 
                   同比：{{proptionList.find(val=>val.type === '社会救助') && (proptionList.find(val=>val.type === '社会救助').radio * 100).toFixed(2) || 0}}%
 
-                  <span :style="{color: proptionList.find(val=>val.type === '社会救助') && proptionList.find(val=>val.type === '社会救助').sameStatus === 2 ? 'green' : 'red'}">{{proptionList.find(val=>val.type === '社会救助') && proptionList.find(val=>val.type === '社会救助').sameStatus === 2 ? '↓' : proptionList.find(val=>val.type === '社会救助') && proptionList.find(val=>val.type === '社会救助').sameStatus === 2?'↑':''}}</span>
 
+                  <span :style="{color: proptionList.find(val=>val.type === '社会救助') && proptionList.find(val=>val.type === '社会救助').sameStatus === 2 ? 'green' : 'red'}">
 
+                    <i class="iconfont" v-if="proptionList.find(val=>val.type === '社会救助')"
 
+                    :class="proptionList.find(val=>val.type === '社会救助').sameStatus === 1 ? 'icon-arrowTop-fill' : proptionList.find(val=>val.type === '社会救助').sameStatus === 2 ? 'icon-xiajiantou-' : ''"></i>
 
+                  </span>
 
                 </span>
 
               </el-row>
 
             </el-row>
 
@@ -89,7 +95,10 @@
 
               <el-row class="rightTopNumber">
 
                 <span>
 
                   同比：{{proptionList.find(val=>val.type === '抢险救援') && (proptionList.find(val=>val.type === '抢险救援').radio * 100).toFixed(2) || 0}}%
 
-                  <span :style="{color: proptionList.find(val=>val.type === '抢险救援') && proptionList.find(val=>val.type === '抢险救援').sameStatus === 2 ? 'green' : 'red'}">{{proptionList.find(val=>val.type === '抢险救援') && proptionList.find(val=>val.type === '抢险救援').sameStatus === 2 ? '↓' : proptionList.find(val=>val.type === '抢险救援') && proptionList.find(val=>val.type === '抢险救援').sameStatus === 2?'↑':''}}</span>
 
+                  <span :style="{color: proptionList.find(val=>val.type === '抢险救援') && proptionList.find(val=>val.type === '抢险救援').sameStatus === 2 ? 'green' : 'red'}">
 
+                    <i class="iconfont" v-if="proptionList.find(val=>val.type === '抢险救援')"
 
+                    :class="proptionList.find(val=>val.type === '抢险救援').sameStatus === 1 ? 'icon-arrowTop-fill' : proptionList.find(val=>val.type === '抢险救援').sameStatus === 2 ? 'icon-xiajiantou-' : ''"></i>
 
+                    </span>
 
                 </span>
 
               </el-row>
 
             </el-row>
 
@@ -112,7 +121,7 @@
 
               :key="item.prop"
 
               :prop="item.prop"
 
               align="center"
 
-              min-width="20"
 
+              :min-width="item.prop === 'type' && 30 || item.prop === 'zhongdui' && 40"
 
               :label="item.name"
 
             >
 
               <template v-if="item.prop === 'type'" #default="scope">
 
@@ -155,31 +164,38 @@
 
                     </div>
 
                   </template>
 
                   <template>
 
-                    <i class="iconfont icon-icon-test" v-if="item.prop === 'type'"></i>
 
+                    <i class="iconfont" 
+                    :class="{
 
+                      'icon-icon-test' : scope.row['ajlxdm'] == 1,
 
+                      'icon-jiuyuan': scope.row['ajlxdm'] == 2,
 
+                      'icon-minzhengtubiao1-08':scope.row['ajlxdm'] == 3,
 
+                    }"
 
+                    :style="{color: scope.row['ajdj'] == '零级' ? 'green' : scope.row['ajdj'] == '一级' ? '#eec10d' : scope.row['ajdj'] == '二级' ? '#ff730c' : scope.row['ajdj'] == '三级' ? '#ff0012' : '#2e98f2'}"
 
+                     v-if="item.prop === 'type'"></i>
 
                     <div class="name-wrapper" v-else>{{ scope.row[item.prop] }}</div>
 
                   </template>
 
                 </el-tooltip>
 
               </template>
 
               <template v-else #default="scope">
 
-                  {{ item.prop === 'type' ? '' : (item.prop === 'status' ? (scope.row[item.prop] == 1 ? '可用' : '不可用') : scope.row[item.prop])}}
 
+                  {{ item.prop === 'type' ? '' : item.prop === 'lasj' ? scope.row[item.prop] && scope.row[item.prop].slice(5) :  item.prop === 'afdz' ? scope.row[item.prop].replace(new RegExp("闵行区 ",""),"") : item.prop === 'status' ? (scope.row[item.prop] == 1 ? '可用' : '不可用') : scope.row[item.prop]}}
 
               </template>
 
             </el-table-column>
 
           </el-table>
 
-           <el-card class="box-card" v-if="isVideo">
 
-            <template #header>
 
-              <div class="card-header">
 
-                <span>实时视频</span>
 
-                <i class="el-icon-close" @click="isVideo = false"></i>
 
-              </div>
 
-            </template>
 
-            <!-- <img src="~@a/img/test/car.png" alt=""> -->
 
-            <!-- controls -->
 
-            <video src="~@a/img/test/card.mp4" class="videoBox" autoplay height="auto"></video>
 
-            <!-- <video-player class="video-player vjs-custom-skin"
 
-              ref="videoPlayer"
 
-              :playsinline="true"
 
-              :options="playerOptions">
 
-            </video-player> -->
 
+          <el-card class="box-card" v-if="isVideo">
 
+          <template #header>
 
+            <div class="card-header">
 
+              <span>实时视频</span>
 
+              <i class="el-icon-close" @click="isVideo = false"></i>
 
+            </div>
 
+          </template>
 
+          <!-- <img src="~@a/img/test/car.png" alt=""> -->
 
+          <!-- controls -->
 
+          <video src="~@a/img/test/card.mp4" class="videoBox" autoplay height="auto"></video>
 
+          <!-- <video-player class="video-player vjs-custom-skin"
 
+            ref="videoPlayer"
 
+            :playsinline="true"
 
+            :options="playerOptions">
 
+          </video-player> -->
 
           </el-card>
 
         </el-col>
 
       </el-col>
 
@@ -192,7 +208,8 @@ import barChart from "@c/bar";
 
 import lineSmooth from "@c/line-smooth";
 
 import gauge from "@c/gauge";
 
 import linstener from "@c/mixins/linstener";
 
-import map from "@c/mixins/map-data";
 
+// import map from "@c/mixins/map-data";
 
+import map from "@c/mixins/map-gaode";
 
 
 
 export default {
 
@@ -202,12 +219,13 @@ export default {
 
       headerData: [
 
         { prop: "type", name: "类型" },
 
         { prop: "lasj", name: "立案时间" },
 
-        { prop: "ajdj", name: "警情等级" },
 
+        // { prop: "ajdj", name: "警情等级" },
 
         { prop: "afdz", name: "案发地址" },
 
-        { prop: "cdcl", name: "调动车辆" },
 
-        { prop: "bcxx", name: "原因" },
 
+        // { prop: "cdcl", name: "调动车辆" },
 
+        // { prop: "bcxx", name: "原因" },
 
+        { prop: "czdx", name: "处置对象" },
 
         { prop: "zhongdui", name: "所属中队" },
 
-        { prop: "ajzt", name: "状况" },
 
+        // { prop: "ajzt", name: "状况" },
 
       ],
 
       isVideo:false,
 
       playerOptions: {
 
@@ -322,7 +340,7 @@ export default {
 
     },
 
     // 创建标点和点击事件
 
     addMarker(lnglats) {
 
-        let target = lnglats.map((val, ind) => {
 
+        let target = lnglats.map((val) => {
 
             let marker = {
 
                 id: val.id,
 
                 attrbutes: val,
 
@@ -593,6 +611,7 @@ export default {
 
             padding: 0.1rem 0.2rem;
 
             font-size: 0.2125rem;
 
             border-radius: 0.1875rem;
 
+            display: flex;
 
             box-shadow: inset 0 0 0.2rem 0.0125rem #30cfff;
 
           }
 
         }

+ 2 - 1
src/views/enforcement-dynamic.vue
Просмотреть файл 

@@ -163,7 +163,8 @@
 
 <script>
 
 import wordCloud from "@c/wordCloud";
 
 import linstener from "@c/mixins/linstener";
 
-import map from "@c/mixins/map-data";
 
+// import map from "@c/mixins/map-data";
 
+import map from "@c/mixins/map-gaode";
 
 import category from "@c/category";
 
 import liquidFill from "@c/liquid-fill";
 
 export default {

+ 2 - 1
src/views/fire-data-analysis.vue
Просмотреть файл 

@@ -120,7 +120,8 @@ import categoryLine from "@c/category-line";
 
 import firePie from "@c/fire-pie";
 
 import scatter from "@c/scatter";
 
 // import AMap from 'AMap'
 
-import map from "@c/mixins/map-data";
 
+// import map from "@c/mixins/map-data";
 
+import map from "@c/mixins/map-gaode";
 
 
 export default {
 
   components: { categoryLine, firePie, scatter },

+ 2 - 1
src/views/rescue-station.vue
Просмотреть файл 

@@ -204,7 +204,8 @@
 
 
 <script>
 
 import linstener from "@c/mixins/linstener";
 
-import map from "@c/mixins/map-data";
 
+// import map from "@c/mixins/map-data";
 
+import map from "@c/mixins/map-gaode";
 
 import seTable from "@c/se-table";
 
 export default {
 
   data() {

+ 2 - 1
src/views/security-plan.vue
Просмотреть файл 

@@ -165,7 +165,8 @@
 
 
 <script>
 
 import linstener from "@c/mixins/linstener";
 
-import map from "@c/mixins/map-data";
 
+// import map from "@c/mixins/map-data";
 
+import map from "@c/mixins/map-gaode";
 
 import gauge from "@c/gauge";
 
 export default {
 
   mixins: [linstener, map],

+ 2 - 1
src/views/self-management.vue
Просмотреть файл 

@@ -127,7 +127,8 @@ import linstener from "@c/mixins/linstener";
 
 import categoryEnterprise from "@c/category-enterprise";
 
 import seTable from "@c/se-table";
 
 import gauge from "@c/gauge";
 
-import map from "@c/mixins/map-data";
 
+// import map from "@c/mixins/map-data";
 
+import map from "@c/mixins/map-gaode";
 
 import radarChart from "@c/radar";
 
 export default {
 
   components: { categoryEnterprise, seTable, radarChart, gauge},

+ 2 - 1
src/views/water-sources.vue
Просмотреть файл 

@@ -172,7 +172,8 @@
 
 
 <script>
 
 import linstener from "@c/mixins/linstener";
 
-import map from "@c/mixins/map-data";
 
+// import map from "@c/mixins/map-data";
 
+import map from "@c/mixins/map-gaode";
 
 import waterGauge from "@c/water-gauge";
 
 import gauge from "@c/gauge";
 
 import seTable from "@c/se-table";

+ 4 - 4
vue.config.js
Просмотреть файл 

@@ -45,12 +45,12 @@ module.exports = {
 
         Object.assign(config, {
 
             externals: {
 
                 // 大数据地图
 
-                'JMap': 'JMap',
 
-                'JMapQuery': 'JMapQuery',
 
+                // 'JMap': 'JMap',
 
+                // 'JMapQuery': 'JMapQuery',
 
 
                 // 高德地图
 
-                // 'AMap': 'AMap',
 
-                // 'AMapUI': 'AMapUI'
 
+                'AMap': 'AMap',
 
+                'AMapUI': 'AMapUI'
 
             }
 
         })
 
     },

Некоторые файлы не были показаны из-за большого количества измененных файлов