diff --git a/src/api/progress/plan/index.ts b/src/api/progress/plan/index.ts index 6b37039..695508b 100644 --- a/src/api/progress/plan/index.ts +++ b/src/api/progress/plan/index.ts @@ -1,6 +1,6 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; -import { ProgressCategoryVO, ProgressCategoryForm, ProgressCategoryQuery, ProgressPlanForm, lastTimeVo, workScheduleListVO, workScheduleListQuery, progressPlanDetailForm } from '@/api/progress/plan/types'; +import { ProgressCategoryVO, ProgressCategoryForm, ProgressCategoryQuery, ProgressPlanForm, lastTimeVo, workScheduleListVO, workScheduleListQuery, progressPlanDetailForm, pvModuleListQuery, pvModuleListVO } from '@/api/progress/plan/types'; /** * 查询进度类别列表 @@ -99,7 +99,7 @@ export const workScheduleAddPlan = (data: ProgressPlanForm) => { /** * 获取进度计划详细信息 - * @param data + * @param params */ export const workScheduleList = (query: workScheduleListQuery):AxiosPromise => { return request({ @@ -109,6 +109,17 @@ export const workScheduleList = (query: workScheduleListQuery):AxiosPromise => { + return request({ + url: '/progress/progressCategory/coordinate/' + id, + method: 'get', + }); +}; + /** * 新增进度计划详情（百分比设施） * @param data @@ -120,9 +131,53 @@ export const workScheduleSubmit = (data: progressPlanDetailForm) => { data: data }); }; -export const workScheduleDel=()=>{} - -export const pvModuleList=()=>{} -export const addDaily=()=>{} -export const getDailyBook=()=>{} -export const deleteDaily=()=>{} \ No newline at end of file + +/** + * 获取进度计划详情未完成设施详细信息 + * @param params + */ +export const pvModuleList = (query: pvModuleListQuery):AxiosPromise => { + return request({ + url: '/progress/progressPlanDetail/detail/unFinish/' + query.id , + method: 'get', + params:query + }); +}; + +/** + * 新增进度计划详情（普通设施） + * @param data + */ +export const addDaily = (data: progressPlanDetailForm) => { + return request({ + url: '/progress/progressPlanDetail/insert/detail', + method: 'post', + data: data + }); +}; + +/** + * 获取进度计划详情已完成设施详细信息 + * @param params + */ +export const getDailyBook = (query: pvModuleListQuery):AxiosPromise => { + return request({ + url: '/progress/progressPlanDetail/detail/finished/'+ query.id, + method: 'get', + params: query + }); +}; + +/** + * 删除进度计划详情 + * @param id + */ +export const deleteDaily = (query: {id:string,detailIdList:string[]}) => { + return request({ + url: '/progress/progressPlanDetail/remove/detail', + method: 'delete', + params: query + }); +}; + +export const workScheduleDel=()=>{} \ No newline at end of file diff --git a/src/api/progress/plan/types.ts b/src/api/progress/plan/types.ts index 41495d8..7a4a6f0 100644 --- a/src/api/progress/plan/types.ts +++ b/src/api/progress/plan/types.ts @@ -28,6 +28,8 @@ export interface ProgressCategoryVO { * 子对象 */ children: ProgressCategoryVO[]; + threeChildren: any[]; + hasChildren:any; } export interface ProgressCategoryForm extends BaseEntity { @@ -88,9 +90,22 @@ export interface workScheduleListVO { }[]; } +export interface pvModuleListQuery { + id: string | number; + pageSize?: number; + pageNum?: number; +} + +export interface pvModuleListVO { + id: string | number; + name: string; + status: string; +} + export interface progressPlanDetailForm { id: string | number; - finishedNumber: number; + finishedNumber?: number; + finishedDetailIdList?: any[]; submitTime?: string; } diff --git a/src/api/progress/progressCategoryTemplate/index.ts b/src/api/progress/progressCategoryTemplate/index.ts new file mode 100644 index 0000000..3e80694 --- /dev/null +++ b/src/api/progress/progressCategoryTemplate/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { ProgressCategoryTemplateVO, ProgressCategoryTemplateForm, ProgressCategoryTemplateQuery } from '@/api/progress/progressCategoryTemplate/types'; + +/** + * 查询进度类别模版列表 + * @param query + * @returns {*} + */ + +export const listProgressCategoryTemplate = (query?: ProgressCategoryTemplateQuery): AxiosPromise => { + return request({ + url: '/progress/progressCategoryTemplate/list', + method: 'get', + params: query + }); +}; + +/** + * 查询进度类别模版详细 + * @param id + */ +export const getProgressCategoryTemplate = (id: string | number): AxiosPromise => { + return request({ + url: '/progress/progressCategoryTemplate/' + id, + method: 'get' + }); +}; + +/** + * 新增进度类别模版 + * @param data + */ +export const addProgressCategoryTemplate = (data: ProgressCategoryTemplateForm) => { + return request({ + url: '/progress/progressCategoryTemplate', + method: 'post', + data: data + }); +}; + +/** + * 修改进度类别模版 + * @param data + */ +export const updateProgressCategoryTemplate = (data: ProgressCategoryTemplateForm) => { + return request({ + url: '/progress/progressCategoryTemplate', + method: 'put', + data: data + }); +}; + +/** + * 删除进度类别模版 + * @param id + */ +export const delProgressCategoryTemplate = (id: string | number | Array) => { + return request({ + url: '/progress/progressCategoryTemplate/' + id, + method: 'delete' + }); +}; diff --git a/src/api/progress/progressCategoryTemplate/types.ts b/src/api/progress/progressCategoryTemplate/types.ts new file mode 100644 index 0000000..12e0292 --- /dev/null +++ b/src/api/progress/progressCategoryTemplate/types.ts @@ -0,0 +1,105 @@ +export interface ProgressCategoryTemplateVO { + /** + * 类别名称 + */ + name: string; + + /** + * 计量方式（0无 1数量 2百分比） + */ + unitType: string; + + /** + * 工作类型 + */ + workType: string; + + /** + * 项目id（0表示共用） + */ + projectId: string | number; + + /** + * 备注 + */ + remark: string; + + /** + * 子对象 + */ + children: ProgressCategoryTemplateVO[]; +} + +export interface ProgressCategoryTemplateForm extends BaseEntity { + /** + * 主键id + */ + id?: string | number; + + /** + * 父类别id + */ + pid?: string | number; + + /** + * 类别名称 + */ + name?: string; + + /** + * 计量方式（0无 1数量 2百分比） + */ + unitType?: string; + + /** + * 工作类型 + */ + workType?: string; + + /** + * 项目id（0表示共用） + */ + projectId?: string | number; + + /** + * 备注 + */ + remark?: string; + +} + +export interface ProgressCategoryTemplateQuery { + + /** + * 父类别id + */ + pid?: string | number; + + /** + * 类别名称 + */ + name?: string; + + /** + * 计量方式（0无 1数量 2百分比） + */ + unitType?: string; + + /** + * 工作类型 + */ + workType?: string; + + /** + * 项目id（0表示共用） + */ + projectId?: string | number; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/src/assets/fonts/fonts.scss b/src/assets/fonts/fonts.scss index 7c9829b..2e56167 100644 --- a/src/assets/fonts/fonts.scss +++ b/src/assets/fonts/fonts.scss @@ -161,4 +161,5 @@ font-weight: normal; font-weight: normal; font-style: normal; -} \ No newline at end of file +} + diff --git a/src/assets/iconfont/demo.css b/src/assets/iconfont/demo.css new file mode 100644 index 0000000..a67054a --- /dev/null +++ b/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; +} diff --git a/src/assets/iconfont/demo_index.html b/src/assets/iconfont/demo_index.html new file mode 100644 index 0000000..0bd7d54 --- /dev/null +++ b/src/assets/iconfont/demo_index.html @@ -0,0 +1,211 @@ + + + + + iconfont Demo + + + + + + + + + + + + + +
+

+ + +

+
+
    +
  • Unicode
    • +
  • Font class
    • +
  • Symbol
    • +
+ + 查看项目 + +
+
+
+
    + +
  • + +
    问号
    +
    
    +
    • + +
+
+

Unicode 引用

+
+ +

Unicode 是字体在网页端最原始的应用方式，特点是：

+
    +
  • 支持按字体的方式去动态调整图标大小，颜色等等。
    • +
  • 默认情况下不支持多色，直接添加多色图标会自动去色。
    • +
+
+

注意：新版 iconfont 支持两种方式引用多色图标：SVG symbol 引用方式和彩色字体图标模式。（使用彩色字体图标需要在「编辑项目」中开启「彩色」选项后并重新生成。）

+
+

Unicode 使用步骤如下：

+

第一步：拷贝项目下面生成的 @font-face

+
@font-face {
+  font-family: 'iconfont';
+  src: url('iconfont.woff2?t=1748505165241') format('woff2'),
+       url('iconfont.woff?t=1748505165241') format('woff'),
+       url('iconfont.ttf?t=1748505165241') format('truetype');
+}
+
+

第二步：定义使用 iconfont 的样式

+
.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+

第三步：挑选相应图标并获取字体编码，应用于页面

+
+<span class="iconfont">&#x33;</span>
+
+
+

"iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。

+
+
+
+
+
    + +
  • + +
    + 问号 +
    +
    .icon-wenhao +
    +
    • + +
+
+

font-class 引用

+
+ +

font-class 是 Unicode 使用方式的一种变种，主要是解决 Unicode 书写不直观，语意不明确的问题。

+

与 Unicode 使用方式相比，具有如下特点：

+
    +
  • 相比于 Unicode 语意明确，书写更直观。可以很容易分辨这个 icon 是什么。
    • +
  • 因为使用 class 来定义图标，所以当要替换图标时，只需要修改 class 里面的 Unicode 引用。
    • +
+

使用步骤如下：

+

第一步：引入项目下面生成的 fontclass 代码：

+
<link rel="stylesheet" href="./iconfont.css">
+
+

第二步：挑选相应图标并获取类名，应用于页面：

+
<span class="iconfont icon-xxx"></span>
+
+
+

" + iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。

+
+
+
+
+
    + +
  • + +
    问号
    +
    #icon-wenhao
    +
    • + +
+
+

Symbol 引用

+
+ +

这是一种全新的使用方式，应该说这才是未来的主流，也是平台目前推荐的用法。相关介绍可以参考这篇文章 + 这种用法其实是做了一个 SVG 的集合，与另外两种相比具有如下特点：

+
    +
  • 支持多色图标了，不再受单色限制。
    • +
  • 通过一些技巧，支持像字体那样，通过 font-size, color 来调整样式。
    • +
  • 兼容性较差，支持 IE9+，及现代浏览器。
    • +
  • 浏览器渲染 SVG 的性能一般，还不如 png。
    • +
+

使用步骤如下：

+

第一步：引入项目下面生成的 symbol 代码：

+
<script src="./iconfont.js"></script>
+
+

第二步：加入通用 CSS 代码（引入一次就行）：

+
<style>
+.icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
+</style>
+
+

第三步：挑选相应图标并获取类名，应用于页面：

+
<svg class="icon" aria-hidden="true">
+  <use xlink:href="#icon-xxx"></use>
+</svg>
+
+
+
+ +
+
+ + + diff --git a/src/assets/iconfont/iconfont.css b/src/assets/iconfont/iconfont.css new file mode 100644 index 0000000..a0e3113 --- /dev/null +++ b/src/assets/iconfont/iconfont.css @@ -0,0 +1,19 @@ +@font-face { + font-family: "iconfont"; /* Project id 4936044 */ + src: url('iconfont.woff2?t=1748505165241') format('woff2'), + url('iconfont.woff?t=1748505165241') format('woff'), + url('iconfont.ttf?t=1748505165241') format('truetype'); +} + +.iconfont { + font-family: "iconfont" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-wenhao:before { + content: "\e72d"; +} + diff --git a/src/assets/iconfont/iconfont.js b/src/assets/iconfont/iconfont.js new file mode 100644 index 0000000..22ea399 --- /dev/null +++ b/src/assets/iconfont/iconfont.js @@ -0,0 +1 @@ +window._iconfont_svg_string_4936044='',(n=>{var t=(e=(e=document.getElementsByTagName("script"))[e.length-1]).getAttribute("data-injectcss"),e=e.getAttribute("data-disable-injectsvg");if(!e){var i,o,c,d,s,a=function(t,e){e.parentNode.insertBefore(t,e)};if(t&&!n.__iconfont__svg__cssinject__){n.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(t){console&&console.log(t)}}i=function(){var t,e=document.createElement("div");e.innerHTML=n._iconfont_svg_string_4936044,(e=e.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",e=e,(t=document.body).firstChild?a(e,t.firstChild):t.appendChild(e))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(i,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),i()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(c=i,d=n.document,s=!1,r(),d.onreadystatechange=function(){"complete"==d.readyState&&(d.onreadystatechange=null,l())})}function l(){s||(s=!0,c())}function r(){try{d.documentElement.doScroll("left")}catch(t){return void setTimeout(r,50)}l()}})(window); \ No newline at end of file diff --git a/src/assets/iconfont/iconfont.json b/src/assets/iconfont/iconfont.json new file mode 100644 index 0000000..108d61f --- /dev/null +++ b/src/assets/iconfont/iconfont.json @@ -0,0 +1,16 @@ +{ + "id": "4936044", + "name": "no name", + "font_family": "iconfont", + "css_prefix_text": "icon-", + "description": "", + "glyphs": [ + { + "icon_id": "577319", + "name": "问号", + "font_class": "wenhao", + "unicode": "e72d", + "unicode_decimal": 59181 + } + ] +} diff --git a/src/assets/iconfont/iconfont.ttf b/src/assets/iconfont/iconfont.ttf new file mode 100644 index 0000000..e935254 Binary files /dev/null and b/src/assets/iconfont/iconfont.ttf differ diff --git a/src/assets/iconfont/iconfont.woff b/src/assets/iconfont/iconfont.woff new file mode 100644 index 0000000..70f3d7f Binary files /dev/null and b/src/assets/iconfont/iconfont.woff differ diff --git a/src/assets/iconfont/iconfont.woff2 b/src/assets/iconfont/iconfont.woff2 new file mode 100644 index 0000000..44fc1cb Binary files /dev/null and b/src/assets/iconfont/iconfont.woff2 differ diff --git a/src/components/openLayersMap/index.vue b/src/components/openLayersMap/index.vue index 7735c18..d288bd7 100644 --- a/src/components/openLayersMap/index.vue +++ b/src/components/openLayersMap/index.vue @@ -139,28 +139,37 @@ const handlePosition = (data: any, node) => { map.getView().setCenter(centerPosition.value); }; -const handleCheckChange = (data: any, bool) => { - // 处理树形结构的选中变化 - let features = treeData.value[data.index].features; +const handleCheckChange = (data: any, bool: boolean) => { if (isMenuVisible.value) isMenuVisible.value = false; + + const features = treeData.value[data.index].features; + if (bool) { - if (!layerData[features[0].properties.id]) { - features.forEach((item: any) => { - creatPoint(item.geometry.coordinates, item.geometry.type, item.geometry.id, item.properties.text); - }); - } else { - features.forEach((item: any) => { - map.addLayer(layerData[item.geometry.id]); - }); - } + features.forEach((item: any) => { + const fid = item.geometry.id; + + // 没创建过就先创建 + if (!featureMap[fid]) { + creatPoint(item.geometry.coordinates, item.geometry.type, fid, item.properties.text); + } + + // 添加到共享 source 中（避免重复添加） + const feature = featureMap[fid]; + if (!sharedSource.hasFeature(feature)) { + sharedSource.addFeature(feature); + } + }); } else { - features.forEach((item, index) => { - map.removeLayer(layerData[item.geometry.id]); + features.forEach((item: any) => { + const fid = item.geometry.id; + const feature = featureMap[fid]; + if (feature && sharedSource.hasFeature(feature)) { + sharedSource.removeFeature(feature); + } }); } - - // creatPoint(fromLonLat(data.geometry.coordinates), data.geometry.type); }; + function initOLMap() { // 创造地图实例 map = new Map({ @@ -246,58 +255,57 @@ function convertStrToNum(arr) { * @param {*} id 唯一id * @param {*} name 名称 * */ +// 共享 source 和图层（全局一次性创建） +const sharedSource = new VectorSource(); +const sharedLayer = new VectorLayer({ + source: sharedSource, + renderMode: 'image' // 提高渲染性能 +} as any); + +// id => Feature 映射表 +const featureMap: Record = {}; + const creatPoint = (pointObj: Array, type: string, id: string, name?: string) => { - // 创建多边形的几何对象 - let polygon; + let geometry; + if (type === 'Point') { - polygon = new Point(fromLonLat(pointObj)); + geometry = new Point(fromLonLat(pointObj)); } else if (type === 'LineString') { - const lineStringData = pointObj.map((arr: any) => fromLonLat(arr)); - polygon = new Polygon([lineStringData]); + const coords = pointObj.map((arr: any) => fromLonLat(arr)); + // 注意：这里虽然是 LineString 类型，但数据实际表示的是闭合面 + geometry = new Polygon([coords]); } else { - const polygonData = pointObj.map((arr: any) => arr.map((i: any) => fromLonLat(i))); - polygon = new Polygon(polygonData); + const coords = pointObj.map((arr: any) => arr.map((i: any) => fromLonLat(i))); + geometry = new Polygon(coords); } - // 创建特征（Feature） - let polygonFeature = new Feature({ - geometry: polygon - }); + + const feature = new Feature({ geometry }); const pointStyle = new Style({ image: new Circle({ radius: 2, - fill: new Fill({ - color: 'red' - }) + fill: new Fill({ color: 'red' }) }), text: new Text({ font: '12px Microsoft YaHei', text: name, scale: 1, - fill: new Fill({ - color: '#7bdd63' - }) + fill: new Fill({ color: '#7bdd63' }) }) }); + const polygonStyle = new Style({ stroke: new Stroke({ - color: type === 'LineString' ? 'skyblue' : 'purple', // 多边形边界线的颜色 - width: 2 // 多边形边界线的宽度 + color: type === 'LineString' ? 'skyblue' : 'purple', + width: 2 }), - fill: new Fill({ - color: 'transparent' // 多边形填充颜色，这里设置为半透明红色 - }) + fill: new Fill({ color: 'transparent' }) }); - // 设置多边形的样式（Style） - polygonFeature.setStyle(type === 'Point' ? pointStyle : polygonStyle); - // 创建和添加特征到源（Source） - let source = new VectorSource(); - source.addFeature(polygonFeature); - // 创建图层并设置源（Layer） - layerData[id] = new VectorLayer(); - layerData[id].setSource(source); - map.addLayer(layerData[id]); + feature.setStyle(type === 'Point' ? pointStyle : polygonStyle); + + // 缓存 feature（用于后续判断） + featureMap[id] = feature; }; // 控制菜单是否显示 @@ -490,6 +498,7 @@ watch( onMounted(() => { // 地图初始化 initOLMap(); + map.addLayer(sharedLayer); // creatPoint( // [ // [ diff --git a/src/main.ts b/src/main.ts index 757ae91..bdc3fcc 100644 --- a/src/main.ts +++ b/src/main.ts @@ -2,6 +2,7 @@ import { createApp } from 'vue'; // global css import 'virtual:uno.css'; import '@/assets/styles/index.scss'; +import '@/assets/iconfont/iconfont.css'; import 'element-plus/theme-chalk/dark/css-vars.css'; // App、router、store diff --git a/src/router/index.ts b/src/router/index.ts index 0c7f264..9da0283 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -103,7 +103,12 @@ export const constantRoutes: RouteRecordRaw[] = [ path: '/drone', component: () => import('@/views/drone/index.vue'), hidden: true - } + }, + { + path: '/progress/progressPaper', + component: () => import('@/views/progress/progressPaper/index.vue'), + hidden: true + }, ]; // 动态路由，基于用户权限动态去加载 diff --git a/src/views/progress/plan/component/createDaily.vue b/src/views/progress/plan/component/createDaily.vue index 97ed8fb..cffac3c 100644 --- a/src/views/progress/plan/component/createDaily.vue +++ b/src/views/progress/plan/component/createDaily.vue @@ -1,8 +1,16 @@