wangzhe hace 2 años
padre
commit
0263f84e10

+ 5 - 2
src/api/resources.js

@@ -18,11 +18,14 @@ export function selectResources(label) {
 }
 
 // 获取根据标签查询相应资源
-export function selectResourcesByLabel(label) {
+export function selectResourcesByLabel(label, name) {
   return request({
     url: '/center-traffic/traffic/selectResourcesByLabel',
     method: 'post',
-    data:{"label":label}
+    data:{
+      "name": name,
+      "label": label
+    }
   })
 }
 

+ 539 - 0
src/assets/iconfont/demo.css

@@ -0,0 +1,539 @@
+/* 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;
+}

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 2582 - 0
src/assets/iconfont/demo_index.html


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 222 - 14
src/assets/iconfont/iconfont.css


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
src/assets/iconfont/iconfont.js


+ 374 - 10
src/assets/iconfont/iconfont.json

@@ -6,6 +6,370 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "6850817",
+      "name": "三角警示",
+      "font_class": "centerdata-t-traffic-warning-sign",
+      "unicode": "e650",
+      "unicode_decimal": 58960
+    },
+    {
+      "icon_id": "11858521",
+      "name": "桥梁",
+      "font_class": "centerdata-t-traffic-bridge",
+      "unicode": "e651",
+      "unicode_decimal": 58961
+    },
+    {
+      "icon_id": "35253155",
+      "name": "-_新建斜交涵洞",
+      "font_class": "centerdata-t-traffic-culvert",
+      "unicode": "e666",
+      "unicode_decimal": 58982
+    },
+    {
+      "icon_id": "1287678",
+      "name": "企业认证",
+      "font_class": "centerdata-t-emergency-enterprise",
+      "unicode": "e64e",
+      "unicode_decimal": 58958
+    },
+    {
+      "icon_id": "11441202",
+      "name": "仓库库存",
+      "font_class": "centerdata-t-emergency-warehouse",
+      "unicode": "e64f",
+      "unicode_decimal": 58959
+    },
+    {
+      "icon_id": "26800916",
+      "name": "防汛抗旱应急队伍",
+      "font_class": "centerdata-t-emergency-team",
+      "unicode": "e7df",
+      "unicode_decimal": 59359
+    },
+    {
+      "icon_id": "35532604",
+      "name": "水鹤",
+      "font_class": "centerdata-t-forest-watercrane",
+      "unicode": "e64d",
+      "unicode_decimal": 58957
+    },
+    {
+      "icon_id": "35530153",
+      "name": "储水池",
+      "font_class": "chushuichi",
+      "unicode": "e63e",
+      "unicode_decimal": 58942
+    },
+    {
+      "icon_id": "35530154",
+      "name": "水井",
+      "font_class": "shuijing",
+      "unicode": "e63f",
+      "unicode_decimal": 58943
+    },
+    {
+      "icon_id": "35530155",
+      "name": "室内消火栓",
+      "font_class": "centerdata-t-forest-firehydrant-3",
+      "unicode": "e640",
+      "unicode_decimal": 58944
+    },
+    {
+      "icon_id": "35530156",
+      "name": "污水池",
+      "font_class": "wushuichi",
+      "unicode": "e641",
+      "unicode_decimal": 58945
+    },
+    {
+      "icon_id": "35530157",
+      "name": "消防水池",
+      "font_class": "xiaofangshuichi",
+      "unicode": "e642",
+      "unicode_decimal": 58946
+    },
+    {
+      "icon_id": "35530158",
+      "name": "河流",
+      "font_class": "heliu",
+      "unicode": "e644",
+      "unicode_decimal": 58948
+    },
+    {
+      "icon_id": "35530159",
+      "name": "地上消火栓",
+      "font_class": "centerdata-t-forest-firehydrant-1",
+      "unicode": "e645",
+      "unicode_decimal": 58949
+    },
+    {
+      "icon_id": "35530160",
+      "name": "湖泊",
+      "font_class": "hubo",
+      "unicode": "e647",
+      "unicode_decimal": 58951
+    },
+    {
+      "icon_id": "35530161",
+      "name": "消防水鹤",
+      "font_class": "xiaofangshuihe",
+      "unicode": "e648",
+      "unicode_decimal": 58952
+    },
+    {
+      "icon_id": "35530162",
+      "name": "地下消火栓",
+      "font_class": "centerdata-t-forest-firehydrant-2",
+      "unicode": "e649",
+      "unicode_decimal": 58953
+    },
+    {
+      "icon_id": "35530163",
+      "name": "消火栓井",
+      "font_class": "xiaohuoshuanjing",
+      "unicode": "e64b",
+      "unicode_decimal": 58955
+    },
+    {
+      "icon_id": "2761284",
+      "name": "水质监测站",
+      "font_class": "shuizhijiancezhan",
+      "unicode": "e646",
+      "unicode_decimal": 58950
+    },
+    {
+      "icon_id": "7335552",
+      "name": "水压",
+      "font_class": "shuiya",
+      "unicode": "eb33",
+      "unicode_decimal": 60211
+    },
+    {
+      "icon_id": "11647823",
+      "name": "多层土壤墒情",
+      "font_class": "duocengturangshangqing",
+      "unicode": "eb61",
+      "unicode_decimal": 60257
+    },
+    {
+      "icon_id": "26805914",
+      "name": "水文站",
+      "font_class": "shuiwenzhan",
+      "unicode": "e7e4",
+      "unicode_decimal": 59364
+    },
+    {
+      "icon_id": "26805955",
+      "name": "电子水尺",
+      "font_class": "dianzishuichi",
+      "unicode": "e7e5",
+      "unicode_decimal": 59365
+    },
+    {
+      "icon_id": "357804",
+      "name": "冶金矿产",
+      "font_class": "centerdata-t-resources-deposit",
+      "unicode": "e6f3",
+      "unicode_decimal": 59123
+    },
+    {
+      "icon_id": "2678644",
+      "name": "违章",
+      "font_class": "centerdata-t-resources-illegal-construction",
+      "unicode": "e663",
+      "unicode_decimal": 58979
+    },
+    {
+      "icon_id": "5390820",
+      "name": "地质灾害",
+      "font_class": "centerdata-t-resources-geologic-hazard",
+      "unicode": "e793",
+      "unicode_decimal": 59283
+    },
+    {
+      "icon_id": "20741717",
+      "name": "土地",
+      "font_class": "centerdata-t-resources-land",
+      "unicode": "e63d",
+      "unicode_decimal": 58941
+    },
+    {
+      "icon_id": "10083087",
+      "name": "GIS-图例、图层icon_排污井",
+      "font_class": "centerdata-t-environment-sewage-outlet",
+      "unicode": "e63c",
+      "unicode_decimal": 58940
+    },
+    {
+      "icon_id": "2121726",
+      "name": "旅游",
+      "font_class": "lvyou",
+      "unicode": "e637",
+      "unicode_decimal": 58935
+    },
+    {
+      "icon_id": "10164896",
+      "name": "警察",
+      "font_class": "jingcha",
+      "unicode": "e662",
+      "unicode_decimal": 58978
+    },
+    {
+      "icon_id": "19657701",
+      "name": "商城管理",
+      "font_class": "shangchengguanli",
+      "unicode": "e638",
+      "unicode_decimal": 58936
+    },
+    {
+      "icon_id": "31461858",
+      "name": "土地",
+      "font_class": "tudi",
+      "unicode": "100e7",
+      "unicode_decimal": 65767
+    },
+    {
+      "icon_id": "33191314",
+      "name": "重点服务企业",
+      "font_class": "centerdata-t-firecontrol-fire-key-places",
+      "unicode": "e66f",
+      "unicode_decimal": 58991
+    },
+    {
+      "icon_id": "21053689",
+      "name": "传感器",
+      "font_class": "centerdata-t-firecontrol-fire-pressure-sensor",
+      "unicode": "e674",
+      "unicode_decimal": 58996
+    },
+    {
+      "icon_id": "21492584",
+      "name": "5饲料",
+      "font_class": "farmenterprise_2",
+      "unicode": "e67a",
+      "unicode_decimal": 59002
+    },
+    {
+      "icon_id": "1486836",
+      "name": "生鲜",
+      "font_class": "farmenterprise_1",
+      "unicode": "e639",
+      "unicode_decimal": 58937
+    },
+    {
+      "icon_id": "2116698",
+      "name": "规模化畜禽养殖场",
+      "font_class": "filingslivestock",
+      "unicode": "e63a",
+      "unicode_decimal": 58938
+    },
+    {
+      "icon_id": "4670127",
+      "name": "农业",
+      "font_class": "protectinfo",
+      "unicode": "e63b",
+      "unicode_decimal": 58939
+    },
+    {
+      "icon_id": "5387788",
+      "name": "人工改站_o",
+      "font_class": "complexmodification",
+      "unicode": "eb56",
+      "unicode_decimal": 60246
+    },
+    {
+      "icon_id": "11831137",
+      "name": "菜刀",
+      "font_class": "farmenterprise_3",
+      "unicode": "e731",
+      "unicode_decimal": 59185
+    },
+    {
+      "icon_id": "6308127",
+      "name": "疑问说明",
+      "font_class": "yiwenshuoming",
+      "unicode": "e693",
+      "unicode_decimal": 59027
+    },
+    {
+      "icon_id": "11799014",
+      "name": "移动端",
+      "font_class": "yidongduan",
+      "unicode": "e653",
+      "unicode_decimal": 58963
+    },
+    {
+      "icon_id": "15718632",
+      "name": "工具",
+      "font_class": "gongju",
+      "unicode": "e6cf",
+      "unicode_decimal": 59087
+    },
+    {
+      "icon_id": "35419040",
+      "name": "泡沫液-copy",
+      "font_class": "centerdata-t-firecontrol-foam-liquid-copy",
+      "unicode": "100e8",
+      "unicode_decimal": 65768
+    },
+    {
+      "icon_id": "33526953",
+      "name": "禁烧区",
+      "font_class": "centerdata-t-environment-prohibition-area",
+      "unicode": "e62f",
+      "unicode_decimal": 58927
+    },
+    {
+      "icon_id": "33526954",
+      "name": "重点企业",
+      "font_class": "centerdata-t-environment-key-enterprise",
+      "unicode": "e630",
+      "unicode_decimal": 58928
+    },
+    {
+      "icon_id": "33526955",
+      "name": "污染源",
+      "font_class": "centerdata-t-environment-source-pollution",
+      "unicode": "e631",
+      "unicode_decimal": 58929
+    },
+    {
+      "icon_id": "33526963",
+      "name": "专职站",
+      "font_class": "station",
+      "unicode": "e632",
+      "unicode_decimal": 58930
+    },
+    {
+      "icon_id": "33526964",
+      "name": "其他联动力量",
+      "font_class": "centerdata-t-firecontrol-other-linkage-force",
+      "unicode": "e633",
+      "unicode_decimal": 58931
+    },
+    {
+      "icon_id": "33526965",
+      "name": "泡沫液",
+      "font_class": "centerdata-t-firecontrol-foam-liquid",
+      "unicode": "e634",
+      "unicode_decimal": 58932
+    },
+    {
+      "icon_id": "33526966",
+      "name": "基本联动力量",
+      "font_class": "centerdata-t-firecontrol-basic-linkage-force",
+      "unicode": "e635",
+      "unicode_decimal": 58933
+    },
+    {
+      "icon_id": "33526967",
+      "name": "消防力量",
+      "font_class": "centerdata-t-firecontrol-fire-force",
+      "unicode": "e636",
+      "unicode_decimal": 58934
+    },
+    {
       "icon_id": "552767",
       "name": "农药化肥",
       "font_class": "huafei",
@@ -15,7 +379,7 @@
     {
       "icon_id": "765262",
       "name": "首页",
-      "font_class": "xubao",
+      "font_class": "farmlivestock",
       "unicode": "e629",
       "unicode_decimal": 58921
     },
@@ -29,14 +393,14 @@
     {
       "icon_id": "8353896",
       "name": "三农补助",
-      "font_class": "buzhu",
+      "font_class": "greenhousefilm",
       "unicode": "e62a",
       "unicode_decimal": 58922
     },
     {
       "icon_id": "12875287",
       "name": "农机农具",
-      "font_class": "nongji",
+      "font_class": "machineryinfo",
       "unicode": "e62c",
       "unicode_decimal": 58924
     },
@@ -57,7 +421,7 @@
     {
       "icon_id": "18262823",
       "name": "畜禽养殖粪污处理情况30",
-      "font_class": "yangzhi",
+      "font_class": "excrementdispose",
       "unicode": "e82e",
       "unicode_decimal": 59438
     },
@@ -71,14 +435,14 @@
     {
       "icon_id": "21432644",
       "name": "农民合作社",
-      "font_class": "hezuoshe",
+      "font_class": "agriculturalcooperatives",
       "unicode": "e62e",
       "unicode_decimal": 58926
     },
     {
       "icon_id": "26393477",
       "name": "icon_盾、保护",
-      "font_class": "zhibao",
+      "font_class": "agriculturalsupervise",
       "unicode": "e64c",
       "unicode_decimal": 58956
     },
@@ -176,7 +540,7 @@
     {
       "icon_id": "30787117",
       "name": "防火检查站",
-      "font_class": "checkpoint",
+      "font_class": "centerdata-t-firecontrol-fulltime-station",
       "unicode": "e601",
       "unicode_decimal": 58881
     },
@@ -239,14 +603,14 @@
     {
       "icon_id": "30787127",
       "name": "林场",
-      "font_class": "farm",
+      "font_class": "level",
       "unicode": "e60a",
       "unicode_decimal": 58890
     },
     {
       "icon_id": "30787128",
       "name": "取水口",
-      "font_class": "waterintake",
+      "font_class": "centerdata-t-forest-waterintake",
       "unicode": "e60b",
       "unicode_decimal": 58891
     },
@@ -302,7 +666,7 @@
     {
       "icon_id": "30787137",
       "name": "消火栓",
-      "font_class": "firehydrant",
+      "font_class": "centerdata-t-forest-firehydrant",
       "unicode": "e614",
       "unicode_decimal": 58900
     },

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 116 - 12
src/assets/iconfont/iconfont.svg


BIN
src/assets/iconfont/iconfont.ttf


BIN
src/assets/iconfont/iconfont.woff


BIN
src/assets/iconfont/iconfont.woff2


BIN
src/assets/icons/sj-icon-map/traffic-resources-bridge.png


BIN
src/assets/icons/sj-icon-map/traffic-resources-culvert.png


BIN
src/assets/icons/sj-icon-map/traffic-resources-warning_sign.png


+ 2 - 2
src/router/index.js

@@ -31,7 +31,7 @@ import Layout from '@/layout'
 // 公共路由(可视化首页头部链接)
 export const constantRoutes = [{
 		path: '/',
-		redirect: 'forest',
+		redirect: 'resources',
 	},
 	{
 		//交通云图
@@ -75,7 +75,7 @@ export const constantRoutes = [{
 // 公共路由
 export const constantRoutesNew = [{
 		path: '/',
-		redirect: 'forest',
+		redirect: 'resources',
 	},
 	{
 		//林业中心

+ 62 - 15
src/views/resources.vue

@@ -12,9 +12,24 @@
             <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
             <div class="i-list-con h-78">
               <div class="d-l-con-icon">
+
+                <div class="i-list-con h-65" v-show="showSearch == true">
+                  <div class="head-container">
+                    <el-input
+                      v-model="searchName"
+                      placeholder="请输入名称"
+                      @blur="searchByName()"
+                      clearable
+                      size="small"
+                      prefix-icon="el-icon-search"
+                      style="margin-bottom: 20px"
+                    />
+                  </div>
+                </div>
+
                 <div class="icon-con" :class="{on:iconCurrentIndex==item.resourceTable}"
                      v-for="(item,index) in resourcesCountList"
-                     v-on:click="selectResourcesByLabel(item.type)">
+                     v-on:click="selectResourcesByLabel(item.type, searchName)">
                      <!--v-on:click="selectResourcesByLabel(item.label)">-->
                   <!--v-on:click="indentleftSetMarkers(item.resourceTable)">-->
                   <div class="iconfont icon icon-normal" :class="item.icon"></div>
@@ -113,6 +128,12 @@
     },
     data() {
       return {
+        // 搜索框
+        showSearch: false,
+        // 搜索名称
+        searchName: undefined,
+        // 搜索类型
+        searchType: undefined,
         iconCurrentIndex: '',
         /** ----------------------------------摄像头预览开始------------------------------------- */
         //海康
@@ -130,6 +151,11 @@
       }
     },
     methods: {
+      // 根据名称筛选资源点位
+      searchByName() {
+        this.$modal.msgSuccess("正在查询,请稍后...");
+        this.selectResourcesByLabel(this.searchType, this.searchName);
+      },
       //查询各类资源的数量
       getResourcesCount(){
         let that = this
@@ -138,9 +164,20 @@
           console.log("res.data=", res.data)
           this.resourcesCountList = res.data;
           this.resourcesCountList.forEach(function(data, index) {
-            // that.$set(that.resourcesList[index], 'icon', 'sj' + '-' + 'icon' + '-' + data.resourceTable.split('_').slice(-1))
-            console.log("data.type.split('_').slice(-1)", data.type.split('_').slice(-1));
-            that.$set(that.resourcesList[index], 'icon', 'sj' + '-' + 'icon' + '-' + data.type.replaceAll("_", "-"));
+            // // that.$set(that.resourcesList[index], 'icon', 'sj' + '-' + 'icon' + '-' + data.resourceTable.split('_').slice(-1))
+            // console.log("data.type.split('_').slice(-1)", data.type.split('_').slice(-1));
+            // that.$set(that.resourcesList[index], 'icon', 'sj' + '-' + 'icon' + '-' + data.type.replaceAll("_", "-"));
+            let icon ='sj' + '-' + 'icon' + '-' + data.type.replaceAll("_", "-").replaceAll("@", "-");
+            console.log("icon_" + (index + 1) + "=", icon);
+            that.$set(that.resourcesCountList[index], 'icon', icon);
+            // alert(resourcesCountList[i])
+            // console.log("data resourcesCountList[index]=", data.type)
+            // console.log("resourcesCountList[index]=", that.resourcesCountList[index])
+
+            // if(index < 5){
+            //   // that.fireControlViewPoint(data.type, 'undefined');
+            //   that.selectResourcesByLabel(data.type, '所有');
+            // }
           })
         })
       },
@@ -152,7 +189,17 @@
         })
       },
       //点击左侧某资源,将该资源进行落点
-      selectResourcesByLabel(label){
+      selectResourcesByLabel(label, name){
+        // 搜索框
+        // if(name == 'undefined' && this.showSearch == false){
+        // if(name == '所有' && this.showSearch == false){
+        if(name == '所有'){
+          name = undefined;
+        }else {
+          this.showSearch = true;
+        }
+        // 搜索类型
+        this.searchType = label;
         console.log(label)
         let that = this;
         //每次点击,先将原有点位清空后重新落点
@@ -160,7 +207,7 @@
         this.resourcesList = [];
         that.$refs.supermap.clearM(false);
         that.$refs.supermap.clearM(true);
-        selectResourcesByLabel(label).then(res => {
+        selectResourcesByLabel(label, name).then(res => {
           console.log("res.data=", res.data)
           // this.resourcesList = res.data;
           this.resourcesList = res.data.resourceList;
@@ -205,7 +252,7 @@
               '<span>' +
               ' <div class="d-l-con">' +
               '   <div class="d-l-l-text">' +
-              '     <h4>名称:' + list[i].name + '</h4>' +
+              '     <h4>名称:' + (list[i].name?list[i].name:"") + '</h4>' +
               '   </div>' +
               ' </div>' +
               '</span>';
@@ -214,14 +261,14 @@
                 '<span>' +
                 ' <div class="d-l-con">' +
                 '   <div class="d-l-l-text">' +
-                '     <h4>设置日期:' + (list[i].setTime?list[i].setTime:list[i].set_time) + '</h4>' +
+                '     <h4>设置日期:' + ((list[i].setTime?list[i].setTime:list[i].set_time)?(list[i].setTime?list[i].setTime:list[i].set_time):"") + '</h4>' +
                 '   </div>' +
                 ' </div>' +
                 '</span>' +
                 '<span>' +
                 ' <div class="d-l-con">' +
                 '   <div class="d-l-l-text">' +
-                '     <h4>用途:' + list[i].effect + '</h4>' +
+                '     <h4>用途:' + (list[i].effect?list[i].effect:"") + '</h4>' +
                 '   </div>' +
                 ' </div>' +
                 '</span>';
@@ -231,7 +278,7 @@
                 '<span>' +
                 ' <div class="d-l-con">' +
                 '   <div class="d-l-l-text">' +
-                '     <h4>竣工日期:' + (list[i].completionDate?list[i].completionDate:list[i].completion_date) + '</h4>' +
+                '     <h4>竣工日期:' + ((list[i].completionDate?list[i].completionDate:list[i].completion_date)?(list[i].completionDate?list[i].completionDate:list[i].completion_date):"") + '</h4>' +
                 '   </div>' +
                 ' </div>' +
                 '</span>' +
@@ -239,28 +286,28 @@
                 '<span>' +
                 ' <div class="d-l-con">' +
                 '   <div class="d-l-l-text">' +
-                '     <h4>管理单位:' + (list[i].managementUnit?list[i].managementUnit:list[i].management_unit) + '</h4>' +
+                '     <h4>管理单位:' + ((list[i].managementUnit?list[i].managementUnit:list[i].management_unit)?(list[i].managementUnit?list[i].managementUnit:list[i].management_unit):"") + '</h4>' +
                 '   </div>' +
                 ' </div>' +
                 '</span>' +
                 '<span>' +
                 ' <div class="d-l-con">' +
                 '   <div class="d-l-l-text">' +
-                '     <h4>联系电话:' + (list[i].manaTel?list[i].manaTel:list[i].phone) + '</h4>' +
+                '     <h4>联系电话:' + ((list[i].manaTel?list[i].manaTel:list[i].phone)?(list[i].manaTel?list[i].manaTel:list[i].phone):"") + '</h4>' +
                 '   </div>' +
                 ' </div>' +
                 '</span>' +
                 '<span>' +
                 ' <div class="d-l-con">' +
                 '   <div class="d-l-l-text">' +
-                '     <h4>养护单位:' + (list[i].maintenanceUnit?list[i].maintenanceUnit:list[i].maintenance_unit) + '</h4>' +
+                '     <h4>养护单位:' + ((list[i].maintenanceUnit?list[i].maintenanceUnit:list[i].maintenance_unit)?(list[i].maintenanceUnit?list[i].maintenanceUnit:list[i].maintenance_unit):"") + '</h4>' +
                 '   </div>' +
                 ' </div>' +
                 '</span>' +
                 '<span>' +
                 ' <div class="d-l-con">' +
                 '   <div class="d-l-l-text">' +
-                '     <h4>联系电话:' + (list[i].mainTel?list[i].mainTel:list[i].phone) + '</h4>' +
+                '     <h4>联系电话:' + ((list[i].mainTel?list[i].mainTel:list[i].phone)?(list[i].mainTel?list[i].mainTel:list[i].phone):"") + '</h4>' +
                 '   </div>' +
                 ' </div>' +
                 '</span>';
@@ -270,7 +317,7 @@
                 '<span>' +
                 ' <div class="d-l-con">' +
                 '   <div class="d-l-l-text">' +
-                '     <h4>备注:' + list[i].remark + '</h4>' +
+                '     <h4>备注:' + (list[i].remark?list[i].remark:"") + '</h4>' +
                 '   </div>' +
                 ' </div>' +
                 '</span>' ;