diff --git a/package.json b/package.json
index 80777fa7..a2a56cde 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "scripts": {
     "local": "vue-cli-service serve --mode local",
-    "dev": "vue-cli-service serve --mode dev",
+    "dev": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --mode dev",
     "front": "vue-cli-service serve --mode front",
     "build:prod": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build --mode prod",
     "build:stage": "vue-cli-service build --mode stage",
diff --git a/src/api/group/Schedule.js b/src/api/group/Schedule.js
index c0dd2319..e229aa5d 100644
--- a/src/api/group/Schedule.js
+++ b/src/api/group/Schedule.js
@@ -57,7 +57,66 @@ export function listByDeptId(id) {
     method: 'get'
   })
 }
+// 作废计划
+export function disablePlan(id) {
+  return request({
+    url: '/base/group-scheduling-plan/disablePlan?id='+id,
+    method: 'delete',
+  })
+}
+// 同步节假日
+export function updateScheduleLater(data) {
+  return request({
+    url: '/base/group-holiday/updateScheduleLater',
+    method: 'post',
+    data:data
+  })
+}
+// 复制计划
+export function copyPlan(id) {
+  return request({
+    url: '/base/group-scheduling-plan/copyPlan?id='+id,
+    method: 'get'
+  })
+}
 
+// 列表草稿编辑
+export function draftEditing(id) {
+  return request({
+    url: '/base/group-scheduling-plan/draftEditing?id='+id,
+    method: 'get'
+  })
+}
+// 排班计划-详情
+export function getPlan(id) {
+  return request({
+    url: '/base/group-scheduling-plan/get?id='+id,
+    method: 'get'
+  })
+}
+// 弹窗-取消
+export function cancelStepThree(id) {
+  return request({
+    url: '/base/group-scheduling-plan/cancelStepThree?id='+id,
+    method: 'delete',
+  })
+}
+// 第三步确认并执行 检查计划时间是否冲突，如果有，返回冲突的计划列表
+export function checkPlan(data) {
+  return request({
+    url: '/base/group-scheduling-plan/checkPlan',
+    method: 'post',
+    data:data
+  })
+}
+// 第三步确认并执行 执行
+export function createStepFour(id) {
+  return request({
+    url: '/base/group-scheduling-plan/createStepFour',
+    method: 'post',
+    data:id
+  })
+}
 // 班组班次下一步至获取预览
 export function createStepTwo(data) {
   return request({
@@ -73,3 +132,22 @@ export function returnStepTwo(id) {
     method: 'delete',
   })
 }
+
+// 第三步获取预览
+export function getPerView(data) {
+  return request({
+    url: '/base/group-scheduling-plan/getPerView',
+    method: 'post',
+    data:data
+  })
+}
+
+// 导出 Excel
+export function exportExcel(query) {
+  return request({
+    url: '/base/group-scheduling-plan/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
diff --git a/src/api/group/calendar.js b/src/api/group/calendar.js
new file mode 100644
index 00000000..0a3893a3
--- /dev/null
+++ b/src/api/group/calendar.js
@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 获取部门及下级部门排班list
+export function getDeptSchedulingList(data) {
+  return request({
+    url: '/base/group-team-scheduling/getDeptSchedulingList',
+    method: 'post',
+    data: data
+  })
+}
+// 某个班组的排班list
+export function getClassSchedulingList(data) {
+  return request({
+    url: '/base/group-team-scheduling/getClassSchedulingList',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/api/group/groupSetting.js b/src/api/group/groupSetting.js
index ab211c58..73902961 100644
--- a/src/api/group/groupSetting.js
+++ b/src/api/group/groupSetting.js
@@ -26,6 +26,13 @@ export function getGroup(id) {
     method: 'get'
   })
 }
+// 检查更新-生产班组
+export function updateIsProduction(id) {
+  return request({
+    url: '/base/group-team/updateIsProduction?id=' + id,
+    method: 'get'
+  })
+}
 
 // 获得班组基础信息分页
 export function getGroupPage(query) {
diff --git a/src/api/group/holidaySetting.js b/src/api/group/holidaySetting.js
index d2ee97d8..1fea77e6 100644
--- a/src/api/group/holidaySetting.js
+++ b/src/api/group/holidaySetting.js
@@ -2,19 +2,28 @@
  * @Author: zwq
  * @Date: 2025-10-18 21:24:37
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-18 23:07:37
+ * @LastEditTime: 2025-10-22 14:34:29
  * @Description:
  */
 import request from '@/utils/request'
 
 // 获得节假日基础信息分页
-export function deptHolidayList(query) {
+export function deptHolidayPage(query) {
   return request({
     url: '/base/group-holiday/page',
     method: 'get',
     params: query
   })
 }
+// 获得部门节假日信息
+export function deptHolidayList(data) {
+  return request({
+    url: '/base/group-holiday/deptHolidayList',
+    method: 'post',
+    data: data
+  })
+}
+
 
 // 创建节假日基础信息
 export function createHoliday(data) {
@@ -24,6 +33,14 @@ export function createHoliday(data) {
     data: data
   })
 }
+// 节假日操作后直接更新排班日历
+export function updateSchedule(data) {
+  return request({
+    url: '/base/group-holiday/updateSchedule',
+    method: 'post',
+    data: data
+  })
+}
 
 // 更新节假日基础信息
 export function updateHoliday(data) {
@@ -33,14 +50,30 @@ export function updateHoliday(data) {
     data: data
   })
 }
+// 删除节假日基础信息前校验是否影响排班
+export function checkDeleteHoliday(id) {
+  return request({
+    url: '/base/group-holiday/checkDelete?id=' + id,
+    method: 'delete'
+  })
+}
+
 // 删除
-export function deleteHolidayn(id) {
+export function deleteHoliday(id) {
   return request({
     url: '/base/group-holiday/delete?id=' + id,
     method: 'delete'
   })
 }
 
+// 获得节假日基础信息
+export function getHoliday(id) {
+  return request({
+    url: '/base/group-holiday/get?id=' + id,
+    method: 'get'
+  })
+}
+
 // 获得节假日变动日志分页
 export function deptHolidayLogList(query) {
   return request({
@@ -49,3 +82,37 @@ export function deptHolidayLogList(query) {
     params: query
   })
 }
+
+// 获得用户本人及以下的部门扁平化结构
+export function getEnableData() {
+  return request({
+    url: '/base/group-team-scheduling/getEnableData',
+    method: 'get',
+  })
+}
+
+// 解除继承节假日
+export function disExtends(data) {
+  return request({
+    url: '/base/group-holiday/disExtends',
+    method: 'post',
+    data: data
+  })
+}
+// 恢复继承节假日
+export function reExtends(data) {
+  return request({
+    url: '/base/group-holiday/reExtends',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获得部门节假日继承设置信息设置
+export function getSet(query) {
+  return request({
+    url: '/base/group-holiday-dept-set/getSet',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/assets/img/cold-data-board-msg1.png b/src/assets/img/cold-data-board-msg1.png
new file mode 100644
index 00000000..ad6eae83
Binary files /dev/null and b/src/assets/img/cold-data-board-msg1.png differ
diff --git a/src/assets/img/cold-data-board-msg2.png b/src/assets/img/cold-data-board-msg2.png
new file mode 100644
index 00000000..9c09c1ee
Binary files /dev/null and b/src/assets/img/cold-data-board-msg2.png differ
diff --git a/src/assets/img/home-bg.png b/src/assets/img/home-bg.png
new file mode 100644
index 00000000..5ef3977f
Binary files /dev/null and b/src/assets/img/home-bg.png differ
diff --git a/src/assets/img/home-progress-bg.png b/src/assets/img/home-progress-bg.png
new file mode 100644
index 00000000..39ddb5ef
Binary files /dev/null and b/src/assets/img/home-progress-bg.png differ
diff --git a/src/mixins/basic-page.js b/src/mixins/basic-page.js
index 549a15a6..050a141e 100644
--- a/src/mixins/basic-page.js
+++ b/src/mixins/basic-page.js
@@ -16,7 +16,7 @@ export default {
       },
       tableData: [], //table数据
       listQuery: { //分页
-        pageSize: 10,
+        pageSize: 20,
         pageNo: 1,
         total: 1,
       },
diff --git a/src/utils/request.js b/src/utils/request.js
index 89cd58b7..6a3cf0c7 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,10 +1,10 @@
 import axios from 'axios'
-import {Message, MessageBox, Notification, Loading} from 'element-ui'
+import { Message, MessageBox, Notification, Loading } from 'element-ui'
 import store from '@/store'
-import {getAccessToken, getRefreshToken, getTenantId, setToken} from '@/utils/auth'
+import { getAccessToken, getRefreshToken, getTenantId, setToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
-import {getPath, getTenantEnable} from "@/utils/ruoyi";
-import {refreshToken} from "@/api/login";
+import { getPath, getTenantEnable } from "@/utils/ruoyi";
+import { refreshToken } from "@/api/login";
 
 // 需要忽略的提示。忽略后，自动 Promise.reject('error')
 const ignoreMsgs = [
@@ -86,7 +86,7 @@ service.interceptors.request.use(config => {
     for (const propName of Object.keys(config.params)) {
       const value = config.params[propName];
       const part = encodeURIComponent(propName) + '='
-      if (value !== null && typeof(value) !== "undefined") {
+      if (value !== null && typeof (value) !== "undefined") {
         if (typeof value === 'object') {
           for (const key of Object.keys(value)) {
             let params = propName + '[' + key + ']';
@@ -104,9 +104,9 @@ service.interceptors.request.use(config => {
   }
   return config
 }, error => {
-    tryHideFullScreenLoading()
-    console.log(error)
-    Promise.reject(error)
+  tryHideFullScreenLoading()
+  console.log(error)
+  Promise.reject(error)
 })
 
 // 响应拦截器
@@ -176,36 +176,38 @@ service.interceptors.response.use(async res => {
         + '<div>5 分钟搭建本地环境</div>',
     })
     return Promise.reject(new Error(msg))
+  } else if (code === 400) {
+    //【班组管理】【排班计划】提交的校验按照原型图补充完整,排班计划是否重叠code400 有两个不同的返回信息
+    return res.data
   } else if (code !== 200) {
     if (msg === '无效的刷新令牌') { // hard coding：忽略这个提示，直接登出
       console.log(msg)
     } else {
-      Notification.error({
-        title: msg
-      })
+      //【班组管理】【排班计划】提交的校验按照原型图补充完整,排班计划是否重叠code400 有两个不同的返回信息
+      return res.data
     }
     return Promise.reject('error')
   } else {
     return res.data
   }
 }, error => {
-    tryHideFullScreenLoading()
-    console.log('err' + error)
-    let {message} = error;
-    if (message === "Network Error") {
-      message = "后端接口连接异常";
-    } else if (message.includes("timeout")) {
-      message = "系统接口请求超时";
-    } else if (message.includes("Request failed with status code")) {
-      message = "系统接口" + message.substr(message.length - 3) + "异常";
-    }
-    Message({
-      message: message,
-      type: 'error',
-      duration: 5 * 1000
-    })
-    return Promise.reject(error)
+  tryHideFullScreenLoading()
+  console.log('err' + error)
+  let { message } = error;
+  if (message === "Network Error") {
+    message = "后端接口连接异常";
+  } else if (message.includes("timeout")) {
+    message = "系统接口请求超时";
+  } else if (message.includes("Request failed with status code")) {
+    message = "系统接口" + message.substr(message.length - 3) + "异常";
   }
+  Message({
+    message: message,
+    type: 'error',
+    duration: 5 * 1000
+  })
+  return Promise.reject(error)
+}
 )
 
 export function getBaseHeader() {
@@ -219,10 +221,10 @@ function handleAuthorized() {
   if (!isRelogin.show) {
     isRelogin.show = true;
     MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
-        confirmButtonText: '重新登录',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }
+      confirmButtonText: '重新登录',
+      cancelButtonText: '取消',
+      type: 'warning'
+    }
     ).then(() => {
       isRelogin.show = false;
       store.dispatch('LogOut').then(() => {
diff --git a/src/views/cost/costStatistics/index.vue b/src/views/cost/costStatistics/index.vue
index a984c3e5..87f67855 100644
--- a/src/views/cost/costStatistics/index.vue
+++ b/src/views/cost/costStatistics/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<div style="background: #f2f4f9; height: 40px; width: 100%">
+		<!-- <div style="background: #f2f4f9; height: 40px; width: 100%">
 			<ButtonNav :menus="['按日期', '按规格']" @change="currentMenu">
 				<template v-slot:tab1>
 					<div>按日期</div>
@@ -9,7 +9,7 @@
 					<div>按规格</div>
 				</template>
 			</ButtonNav>
-		</div>
+		</div> -->
 		<div class="app-container energyOverlimitLog">
 			<div v-show="activeName === 'his'">
 				<!-- 搜索工作栏 -->
@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getDataList" />
+				@pagination="getNavDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -86,32 +86,36 @@ import ButtonNav from '@/components/ButtonNav';
 
 const tableProps = [
 	{
-		prop: 'recTime',
+		prop: 'time',
 		label: '日期',
-		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
 	},
 	{
 		prop: 'originArea',
 		label: '原片下片面积',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'deepArea',
 		label: '深加工下片面积',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'originPrice',
 		label: '原片成本/元',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'deepPrice',
 		label: '深加工成本/元',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'price',
 		label: '总成本/元',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 ];
 const tableProps2 = [
@@ -244,19 +248,12 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
-			if (val.statisticType === 2) {
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年第{w}周');
-			}else{
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年{m}月{d}日');
-      }
 			this.formConfig2[0].startPlaceholder = '开始时间';
 			this.formConfig2[0].endPlaceholder = '结束时间';
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.bindObjectId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
@@ -274,7 +271,7 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.bindObjectId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
@@ -334,12 +331,19 @@ export default {
 				this.otherMethods(val);
 			}
 		},
+    getNavDataList(){
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+    },
 		/** 导出按钮操作 */
 		handleExport() {
 			let exportURL, title;
 			if (this.activeName === 'his') {
 				exportURL = exportCostSumExcel;
-        title = '总成本统计-按日期';
+        title = '总成本统计';
 			} else {
 				exportURL = exportRawStatisticsRealtimeExcel;
         title = '总成本统计-按规格';
diff --git a/src/views/cost/deep/24hourCostMonitor/index.vue b/src/views/cost/deep/24hourCostMonitor/index.vue
index 5210f68b..6fbb11fc 100644
--- a/src/views/cost/deep/24hourCostMonitor/index.vue
+++ b/src/views/cost/deep/24hourCostMonitor/index.vue
@@ -77,7 +77,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name||null;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
@@ -90,7 +90,7 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name;
 					this.listQuery.recTime = val.searchTime;
 					this.handleExport();
diff --git a/src/views/cost/deep/costDeepEnergy/index.vue b/src/views/cost/deep/costDeepEnergy/index.vue
index 50bed04b..3813a81e 100644
--- a/src/views/cost/deep/costDeepEnergy/index.vue
+++ b/src/views/cost/deep/costDeepEnergy/index.vue
@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getDataList" />
+				@pagination="getNavDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -86,24 +86,27 @@ import ButtonNav from '@/components/ButtonNav';
 
 const tableProps = [
 	{
-		prop: 'recTime',
+		prop: 'time',
 		label: '日期',
-		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
+	},
+	{
+		prop: 'remark',
+		label: '备注',
 	},
 	{
 		prop: 'energyTypeName',
 		label: '能源类型',
 	},
-	{
-		prop: 'bindObjectName',
-		label: '监控对象',
-		filter: (val) => (val != null ? val : '--'),
-	},
-	{
-		prop: 'meterName',
-		label: '抄表名',
-		filter: (val) => (val != null ? val : '--'),
-	},
+	// {
+	// 	prop: 'bindObjectName',
+	// 	label: '监控对象',
+	// 	filter: (val) => (val != null ? val : '--'),
+	// },
+	// {
+	// 	prop: 'meterName',
+	// 	label: '抄表名',
+	// 	filter: (val) => (val != null ? val : '--'),
+	// },
 	{
 		prop: 'quantity',
 		label: '累计使用量',
@@ -115,20 +118,24 @@ const tableProps = [
 	},
 ];
 const tableProps2 = [
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 	{
 		prop: 'energyTypeName',
 		label: '能源类型',
 	},
-	{
-		prop: 'bindObjectName',
-		label: '监控对象',
-		filter: (val) => (val != null ? val : '--'),
-	},
-	{
-		prop: 'meter',
-		label: '抄表名',
-		filter: (val) => (val != null ? val : '--'),
-	},
+	// {
+	// 	prop: 'bindObjectName',
+	// 	label: '监控对象',
+	// 	filter: (val) => (val != null ? val : '--'),
+	// },
+	// {
+	// 	prop: 'meter',
+	// 	label: '抄表名',
+	// 	filter: (val) => (val != null ? val : '--'),
+	// },
 	{
 		prop: 'quantity',
 		label: '累计使用量',
@@ -207,13 +214,16 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间范围',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
+					dateType: 'datetimerange',
+					format: 'yyyy-MM-dd HH:mm:ss',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
+					defaultTime: ['08:30:00', '08:30:00'],
 					param: 'searchTime',
+					width: 350,
+					clearable: false,
 				},
 				{
 					type: 'button',
@@ -262,26 +272,18 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
-			if (val.statisticType === 2) {
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年第{w}周');
-			}else{
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年{m}月{d}日');
-      }
-			this.formConfig2[1].startPlaceholder = '开始时间';
-			this.formConfig2[1].endPlaceholder = '结束时间';
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.energyTypeId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-						: null;
+					this.listQuery.endTime = val.searchTime ? val.searchTime[1] : null;
 					if (this.activeName === 'his') {
+						this.listQuery.endTime = val.searchTime
+							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+							: null;
 						this.getDataList();
 					} else {
 						this.getDataList2();
@@ -292,13 +294,18 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.energyTypeId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+						? val.searchTime[1]
 						: null;
+					if (this.activeName === 'his') {
+						this.listQuery.endTime = val.searchTime
+							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+							: null;
+					}
 					this.handleExport();
 					break;
 				default:
@@ -320,15 +327,26 @@ export default {
 				const end = new Date();
 				const start = new Date();
 				start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 00:00:00';
-				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 23:59:59';
-				this.formConfig2[1].startPlaceholder = parseTime(start).substr(0, 10);
-				this.formConfig2[1].endPlaceholder = parseTime(end).substr(0, 10);
+				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 08:30:00';
+				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 08:30:00';
+				this.$nextTick(() => {
+					this.$refs.searchBarForm2.formInline.searchTime = [
+						this.listQuery.startTime,
+						this.listQuery.endTime,
+					];
+				});
 				this.listQuery.name = null;
 				this.listQuery.pageNo = 1;
 				this.getDataList2();
 			}
 		},
+    getNavDataList(){
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+    },
 		// 获取数据2列表
 		getDataList2() {
 			if (this.listQuery.startTime) {
diff --git a/src/views/cost/deep/costDeepOthercostHis/index.vue b/src/views/cost/deep/costDeepOthercostHis/index.vue
index 74f25aa6..875f1e8d 100644
--- a/src/views/cost/deep/costDeepOthercostHis/index.vue
+++ b/src/views/cost/deep/costDeepOthercostHis/index.vue
@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getDataList" />
+				@pagination="getNavDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -87,9 +87,12 @@ import ButtonNav from '@/components/ButtonNav';
 
 const tableProps = [
 	{
-		prop: 'recTime',
+		prop: 'time',
 		label: '日期',
-		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
+	},
+	{
+		prop: 'remark',
+		label: '备注',
 	},
 	{
 		prop: 'otherCostName',
@@ -99,9 +102,14 @@ const tableProps = [
 		prop: 'price',
 		label: '总价（元）',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 ];
 const tableProps2 = [
+	// {
+	// 	prop: 'remark',
+	// 	label: '备注',
+	// },
 	{
 		prop: 'otherCostName',
 		label: '成本名称',
@@ -110,6 +118,7 @@ const tableProps2 = [
 		prop: 'price',
 		label: '总价（元）',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 ];
 export default {
@@ -182,13 +191,16 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间范围',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
+					dateType: 'datetimerange',
+					format: 'yyyy-MM-dd HH:mm:ss',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
+					defaultTime: ['08:30:00', '08:30:00'],
 					param: 'searchTime',
+					width: 350,
+					clearable: false,
 				},
 				{
 					type: 'button',
@@ -237,26 +249,20 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
-			if (val.statisticType === 2) {
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年第{w}周');
-			}else{
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年{m}月{d}日');
-      }
-			this.formConfig2[1].startPlaceholder = '开始时间';
-			this.formConfig2[1].endPlaceholder = '结束时间';
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+						? val.searchTime[1]
 						: null;
 					if (this.activeName === 'his') {
+						this.listQuery.endTime = val.searchTime
+							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+							: null;
 						this.getDataList();
 					} else {
 						this.getDataList2();
@@ -267,13 +273,18 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+						? val.searchTime[1]
 						: null;
+					if (this.activeName === 'his') {
+						this.listQuery.endTime = val.searchTime
+							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+							: null;
+					}
 					this.handleExport();
 					break;
 				default:
@@ -295,15 +306,26 @@ export default {
 				const end = new Date();
 				const start = new Date();
 				start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 00:00:00';
-				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 23:59:59';
-				this.formConfig2[1].startPlaceholder = parseTime(start).substr(0, 10);
-				this.formConfig2[1].endPlaceholder = parseTime(end).substr(0, 10);
+				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 08:30:00';
+				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 08:30:00';
+				this.$nextTick(() => {
+					this.$refs.searchBarForm2.formInline.searchTime = [
+						this.listQuery.startTime,
+						this.listQuery.endTime,
+					];
+				});
 				this.listQuery.name = null;
 				this.listQuery.pageNo = 1;
 				this.getDataList2();
 			}
 		},
+    getNavDataList(){
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+    },
 		// 获取数据2列表
 		getDataList2() {
 			getRawOthercostSunPage(this.listQuery).then((response) => {
diff --git a/src/views/cost/deep/costDeepOthercostLog/index.vue b/src/views/cost/deep/costDeepOthercostLog/index.vue
index 0e41f5f7..d8b76d4c 100644
--- a/src/views/cost/deep/costDeepOthercostLog/index.vue
+++ b/src/views/cost/deep/costDeepOthercostLog/index.vue
@@ -65,6 +65,7 @@ const tableProps = [
 		prop: 'price',
 		label: '成本金额',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'remark',
@@ -161,7 +162,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name||null;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
@@ -174,7 +175,7 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name||null;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
diff --git a/src/views/cost/deep/costDeepOthercostRule/typeRule.vue b/src/views/cost/deep/costDeepOthercostRule/typeRule.vue
index d5ebce60..fc26ca89 100644
--- a/src/views/cost/deep/costDeepOthercostRule/typeRule.vue
+++ b/src/views/cost/deep/costDeepOthercostRule/typeRule.vue
@@ -10,9 +10,9 @@
 		<span>
 			{{
 				injectData.type == 1
-					? `每天等价,${injectData.price}元`
+					? `每天等价,${Number(injectData.price)}元`
 					: injectData.type == 2
-					? `总价${injectData.price}元,年折旧率${injectData.ratio}%,折旧年限${injectData.timeLimit}年`
+					? `总价${Number(injectData.price)}元,年折旧率${injectData.ratio}%,折旧年限${injectData.timeLimit}年`
 					: '-'
 			}}
 		</span>
diff --git a/src/views/cost/deep/costDeepRatioHis/index.vue b/src/views/cost/deep/costDeepRatioHis/index.vue
index 3dd40db1..3d5157c1 100644
--- a/src/views/cost/deep/costDeepRatioHis/index.vue
+++ b/src/views/cost/deep/costDeepRatioHis/index.vue
@@ -52,7 +52,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getDataList" />
+				@pagination="getNavDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -85,9 +85,12 @@ import ButtonNav from '@/components/ButtonNav';
 
 const tableProps = [
 	{
-		prop: 'recTime',
+		prop: 'time',
 		label: '日期',
-		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
+	},
+	{
+		prop: 'remark',
+		label: '备注',
 	},
 	{
 		prop: 'productionLineName',
@@ -100,22 +103,27 @@ const tableProps = [
 	{
 		prop: 'innum',
 		label: '上片数量',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'outnum',
 		label: '下片数量',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'ratio',
 		label: '良品率',
-		filter: (val) => (val ? val * 100 + '%' : '-'),
+		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
 	},
 ];
 const tableProps2 = [
 	{
-		prop: 'recTime',
+		prop: 'time',
 		label: '日期',
-		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
+	},
+	{
+		prop: 'remark',
+		label: '备注',
 	},
 	{
 		prop: 'productionLineName',
@@ -128,15 +136,17 @@ const tableProps2 = [
 	{
 		prop: 'innum',
 		label: '进片数量',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'outnum',
 		label: '出片数量',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'ratio',
 		label: '良品率',
-		filter: (val) => (val ? val * 100 + '%' : '-'),
+		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
 	},
 ];
 export default {
@@ -170,13 +180,15 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间范围',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
+					dateType: 'datetimerange',
+					format: 'yyyy-MM-dd HH:mm:ss',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
+					defaultTime: ['08:30:00', '08:30:00'],
 					param: 'searchTime',
+					width: 350,
 				},
 				{
 					type: 'button',
@@ -225,22 +237,15 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
-			if (val.statisticType === 2) {
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年第{w}周');
-			}else{
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年{m}月{d}日');
-      }
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.productionLineId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+						? val.searchTime[1]
 						: null;
 					if (this.activeName === 'his') {
 						this.getDataList();
@@ -253,12 +258,12 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.productionLineId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+						? val.searchTime[1]
 						: null;
 					this.handleExport();
 					break;
@@ -309,10 +314,20 @@ export default {
 				this.otherMethods(val);
 			}
 		},
+    getNavDataList(){
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+    },
 		successSubmit() {
 			this.handleCancel();
-			const val = this.activeName === 'his' ? '产线良品率' : 'now';
-			this.currentMenu(val);
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
 		},
 		/** 导出按钮操作 */
 		handleExport() {
diff --git a/src/views/cost/deep/costStatistics/index.vue b/src/views/cost/deep/costStatistics/index.vue
index 319db503..5ae2769e 100644
--- a/src/views/cost/deep/costStatistics/index.vue
+++ b/src/views/cost/deep/costStatistics/index.vue
@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getDataList" />
+				@pagination="getNavDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -87,9 +87,12 @@ import ButtonNav from '@/components/ButtonNav';
 
 const tableProps = [
 	{
-		prop: 'recTime',
+		prop: 'time',
 		label: '时间',
-		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
+	},
+	{
+		prop: 'remark',
+		label: '备注',
 	},
 	{
 		prop: 'bindObjectName',
@@ -102,33 +105,42 @@ const tableProps = [
 	{
 		prop: 'inCount',
 		label: '上片数量',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'outCount',
 		label: '下片数量',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'ratio',
 		label: '良品率',
-		filter: (val) => (val ? val * 100 + '%' : '-'),
+		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
 	},
 	{
 		prop: 'costSum',
 		label: '深加工成本/元',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'costPiece',
 		label: '单片成本/元',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'costArea',
 		label: '每平米成本/元',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 ];
 const tableProps2 = [
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 	{
 		prop: 'bindObjectName',
 		label: '产线',
@@ -140,30 +152,35 @@ const tableProps2 = [
 	{
 		prop: 'inCount',
 		label: '上片数量',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'outCount',
 		label: '下片数量',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'ratio',
 		label: '良品率',
-		filter: (val) => (val ? val * 100 + '%' : '-'),
+		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
 	},
 	{
 		prop: 'costSum',
 		label: '深加工成本/元',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'costPiece',
 		label: '单片成本/元',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'costArea',
 		label: '每平米成本/元',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 ];
 export default {
@@ -225,13 +242,16 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间范围',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
+					dateType: 'datetimerange',
+					format: 'yyyy-MM-dd HH:mm:ss',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
+					defaultTime: ['08:30:00', '08:30:00'],
 					param: 'searchTime',
+					width: 350,
+					clearable: false,
 				},
 				{
 					type: 'select',
@@ -288,26 +308,20 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
-			if (val.statisticType === 2) {
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年第{w}周');
-			}else{
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年{m}月{d}日');
-      }
-			this.formConfig2[0].startPlaceholder = '开始时间';
-			this.formConfig2[0].endPlaceholder = '结束时间';
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.bindObjectId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+						? val.searchTime[1]
 						: null;
 					if (this.activeName === 'his') {
+						this.listQuery.endTime = val.searchTime
+							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+							: null;
 						this.getDataList();
 					} else {
 						this.getDataList2();
@@ -318,13 +332,18 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.bindObjectId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+						? val.searchTime[1]
 						: null;
+					if (this.activeName === 'his') {
+						this.listQuery.endTime = val.searchTime
+							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+							: null;
+					}
 					this.handleExport();
 					break;
 				default:
@@ -346,15 +365,26 @@ export default {
 				const end = new Date();
 				const start = new Date();
 				start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 00:00:00';
-				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 23:59:59';
-				this.formConfig2[0].startPlaceholder = parseTime(start).substr(0, 10);
-				this.formConfig2[0].endPlaceholder = parseTime(end).substr(0, 10);
+				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 08:30:00';
+				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 08:30:00';
+				this.$nextTick(() => {
+					this.$refs.searchBarForm2.formInline.searchTime = [
+						this.listQuery.startTime,
+						this.listQuery.endTime,
+					];
+				});
 				this.listQuery.name = null;
 				this.listQuery.pageNo = 1;
 				this.getDataList2();
 			}
 		},
+    getNavDataList(){
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+    },
 		// 获取数据2列表
 		getDataList2() {
 			if (this.listQuery.startTime) {
diff --git a/src/views/cost/index.vue b/src/views/cost/index.vue
new file mode 100644
index 00000000..35aae8d9
--- /dev/null
+++ b/src/views/cost/index.vue
@@ -0,0 +1,423 @@
+<template>
+	<div class="home-page">
+		<div class="date-tabs">
+			<!-- @tab-click="handleClick" -->
+			<el-tabs v-model="activeName" @tab-click="timedayChange" :stretch="true">
+				<el-tab-pane
+					:label="'\u2002\u2002日\u2002\u2002'"
+					name="日"></el-tab-pane>
+				<el-tab-pane
+					:label="'\u2002\u2002周\u2002\u2002'"
+					name="周"></el-tab-pane>
+				<el-tab-pane
+					:label="'\u2002\u2002月\u2002\u2002'"
+					name="月"></el-tab-pane>
+				<el-tab-pane
+					:label="'\u2002\u2002年\u2002\u2002'"
+					name="年"></el-tab-pane>
+			</el-tabs>
+			<div class="detail">
+				<el-date-picker
+					v-model="timeday"
+					align="right"
+					type="date"
+					format="yyyy-MM-dd"
+					valueFormat="yyyy-MM-dd"
+					:clearable="false"
+					@change="timedayChange"
+					placeholder="选择日期"
+					:picker-options="pickerOptions"></el-date-picker>
+			</div>
+		</div>
+		<el-row class="main-top" :gutter="16">
+			<el-col :span="24" style="position: relative">
+				<div class="title">
+					<svg-icon icon-class="home-produce" />
+					<span class="title-inner">生产总成本</span>
+				</div>
+				<el-row class="box">
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.priceS }}万元</div>
+						<div class="unit-style">总计成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.matPriceS }}万元</div>
+						<div class="unit-style">原料成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.energyPriceS }}万元</div>
+						<div class="unit-style">能源成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.otherPriceS }}万元</div>
+						<div class="unit-style">其他成本</div>
+					</el-col>
+					<!-- <el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.ratioS }}</div>
+						<div class="unit-style">综合良品率/%</div>
+					</el-col> -->
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.areaPriceS }}元</div>
+						<div class="unit-style">综合每平米成本</div>
+					</el-col>
+				</el-row>
+			</el-col>
+			<el-col :span="24" style="position: relative">
+				<div class="title">
+					<svg-icon icon-class="home-produce" />
+					<span class="title-inner">原片成本</span>
+				</div>
+				<el-row class="box">
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.priceO }}万元</div>
+						<div class="unit-style">原片总成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.matPriceO }}万元</div>
+						<div class="unit-style">原料成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.energyPriceO }}万元</div>
+						<div class="unit-style">能源成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.otherPriceO }}万元</div>
+						<div class="unit-style">其他成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.ratioO }}</div>
+						<div class="unit-style">原片良品率/%</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.areaPriceO }}元</div>
+						<div class="unit-style">原片每平米成本</div>
+					</el-col>
+				</el-row>
+			</el-col>
+			<el-col :span="24" style="position: relative">
+				<div class="title">
+					<svg-icon icon-class="home-produce" />
+					<span class="title-inner">深加工成本</span>
+				</div>
+				<el-row class="box">
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.priceD }}万元</div>
+						<div class="unit-style">深加工总成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.energyPriceD }}万元</div>
+						<div class="unit-style">能源成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.otherPriceD }}万元</div>
+						<div class="unit-style">其他成本</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.ratioD }}</div>
+						<div class="unit-style">深加工良品率/%</div>
+					</el-col>
+					<el-col :span="4" class="num-box shadow">
+						<div class="num-style">{{ homeData.areaPriceD }}元</div>
+						<div class="unit-style">深加工每平米成本</div>
+					</el-col>
+				</el-row>
+			</el-col>
+		</el-row>
+		<el-row class="main-bottom" :gutter="16" v-if="false">
+			<el-col :span="9">
+				<div class="chart-wrapper">
+					<line-chart :chart-data="lineChartData" />
+				</div>
+			</el-col>
+			<el-col :span="7">
+				<div class="chart-wrapper">
+					<pie-chart />
+				</div>
+			</el-col>
+			<el-col :span="8">
+				<div class="chart-wrapper">
+					<bar-chart />
+				</div>
+			</el-col>
+		</el-row>
+		<div
+			class="main-footer"
+			style="
+				color: #c7c7c7;
+				user-select: none;
+				font-size: 14px;
+				letter-spacing: 1px;
+				height: 30px;
+				display: grid;
+				place-content: center;
+			">
+			&copy; 中建材智能自动化研究院有限公司
+		</div>
+	</div>
+</template>
+
+<script>
+import moment from 'moment';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+import LineChart from '../dashboard/LineChart';
+import PieChart from '../dashboard/PieChart';
+import BarChart from '../dashboard/BarChart';
+import PanelGroup from '../dashboard/PanelGroup';
+import { getData } from '@/api/cost/allCost';
+import { getUserProfile } from '@/api/system/user';
+
+const lineChartData = {
+	newVisitis: {
+		expectedData: [100, 120, 161, 134, 105, 160, 165],
+		actualData: [120, 82, 91, 154, 162, 140, 145],
+	},
+	messages: {
+		expectedData: [200, 192, 120, 144, 160, 130, 140],
+		actualData: [180, 160, 151, 106, 145, 150, 130],
+	},
+	purchases: {
+		expectedData: [80, 100, 121, 104, 105, 90, 100],
+		actualData: [120, 90, 100, 138, 142, 130, 130],
+	},
+	shoppings: {
+		expectedData: [130, 140, 141, 142, 145, 150, 160],
+		actualData: [120, 82, 91, 154, 162, 140, 130],
+	},
+};
+
+export default {
+	name: 'Home',
+	mixins: [tableHeightMixin],
+	components: {
+		LineChart,
+		PieChart,
+		PanelGroup,
+		BarChart,
+	},
+	computed: {
+		gradientBackground() {
+			return {
+				'background-image':
+					'linear-gradient(90deg, #f0f0f0 25%, rgba(255, 255, 255, 0) 25%, rgba(255, 255, 255, 0) 50%, #f0f0f0 50%, #f0f0f0 75%, rgba(255, 255, 255, 0) 75%, rgba(255, 255, 255, 0))',
+				'background-size': '100px 100px', // 调整条纹的大小
+			};
+		},
+	},
+	data() {
+		return {
+			activeName: '日',
+			user: '',
+			lineChartData: lineChartData.newVisitis,
+			homeData: {},
+			timeday: moment(new Date()).subtract(1, 'days').format('YYYY-MM-DD'),
+			startTime:
+				moment(new Date()).subtract(0, 'days').format('YYYY-MM-DD') +
+				' 00:00:00',
+			endTime:
+				moment(new Date()).subtract(-1, 'days').format('YYYY-MM-DD') +
+				' 00:00:00',
+
+			pickerOptions: {
+				disabledDate(time) {
+					return time.getTime() + 3600 * 1000 * 24 > Date.now();
+				},
+				shortcuts: [
+					{
+						text: '今天',
+						onClick(picker) {
+							picker.$emit('pick', new Date());
+						},
+					},
+					{
+						text: '昨天',
+						onClick(picker) {
+							const date = new Date();
+							date.setTime(date.getTime() - 3600 * 1000 * 24);
+							picker.$emit('pick', date);
+						},
+					},
+					{
+						text: '一周前',
+						onClick(picker) {
+							const date = new Date();
+							date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
+							picker.$emit('pick', date);
+						},
+					},
+				],
+			},
+		};
+	},
+	created() {
+	},
+	beforeDestroy() {
+	},
+	methods: {
+		getData() {
+			let listQuery = {
+				//分页
+				pageSize: 10,
+				pageNo: 1,
+				statisticType: ['', '日', '周', '月', '年'].indexOf(this.activeName),
+				startTime: this.timeday + ' 00:00:00',
+			};
+			getData(listQuery).then((response) => {
+				this.homeData = response.data;
+				for (let i in this.homeData) {
+					this.homeData[i] = Number(this.homeData[i]).toFixed(2);
+				}
+			});
+		},
+		timedayChange() {
+			let listQuery = {
+				//分页
+				pageSize: 10,
+				pageNo: 1,
+				statisticType: ['', '日', '周', '月', '年'].indexOf(this.activeName),
+				startTime: this.timeday + ' 00:00:00',
+			};
+				getData(listQuery).then((response) => {
+					this.homeData = response.data;
+					for (let i in this.homeData) {
+						this.homeData[i] = Number(this.homeData[i]).toFixed(2);
+					}
+				});
+		},
+		goDetail() {
+			this.$router.push({ path: 'indexDetail' });
+		},
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+.home-page::before {
+	background-image: url('~@/assets/img/home-bg.png');
+	background-size: cover;
+	background-repeat: no-repeat;
+	background-position: center;
+	content: '';
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	transform: rotate(180deg);
+}
+.date-tabs {
+	padding-left: 40px;
+	padding-top: 20px;
+	position: relative;
+	margin-bottom: 20px;
+}
+:deep(.date-tabs) {
+	.el-tabs__header {
+		margin-bottom: 8px;
+		display: inline-block;
+		transform: translateY(-12px);
+	}
+
+	.el-tabs__content {
+		overflow: visible;
+	}
+
+	.el-tabs__item {
+		font-size: 18px;
+		color: #fff;
+		padding-left: 0 !important;
+		padding-right: 0 !important;
+		line-height: 36px !important;
+		height: 36px;
+	}
+	.el-tabs__item.is-active {
+		color: #0b58ff;
+	}
+}
+.detail {
+	display: inline-block;
+	position: absolute;
+	left: 260px;
+	top: 10px;
+}
+:deep(.detail) {
+	.el-input__inner {
+		background-color: transparent;
+		color: white;
+	}
+}
+// .current-date {
+// 	color: #fff;
+// 	font-size: 18px;
+// 	position: absolute;
+// 	left: 260px;
+// 	top: 14px;
+// }
+.current-time {
+	color: #fff;
+	font-size: 18px;
+	position: absolute;
+	right: 38px;
+	top: 14px;
+}
+.main-top {
+	width: 100%;
+	padding: 0 20px 0 40px;
+	.title {
+		position: absolute;
+		left: 34px;
+		top: 20px;
+		width: 180px;
+		font-size: 32px;
+		z-index: 10;
+		.title-inner {
+			position: absolute;
+			left: 42px;
+			top: 5px;
+			font-size: calc(100vw * 20 / 1920);
+		}
+	}
+	.box {
+		background-color: #fff;
+		border-radius: 24px;
+		height: 192px;
+		padding: 40px 24px 32px 24px;
+		margin-bottom: 20px;
+		box-shadow: 0 8px 8px 0 gray;
+		.num-box {
+			height: 120px;
+			padding-top: 26px;
+			text-align: center;
+			.num-style {
+				color: #000;
+				font-size: calc(100vw * 40 / 1920);
+			}
+			.unit-style {
+				color: rgba(0, 0, 0, 0.7);
+				font-size: calc(100vw * 18 / 1920);
+			}
+		}
+		.shadow {
+			background: linear-gradient(90deg, #ffffff 80%, #f2f4f9 100%);
+		}
+	}
+}
+.main-bottom {
+	width: 100%;
+	margin-top: 20px;
+	.chart-wrapper {
+		margin-left: 10px;
+		height: 425px;
+		background: #fff;
+		border-radius: 5px;
+		box-shadow: 0 3px 3px 0 gray;
+	}
+}
+</style>
+<style lang="scss">
+.home-page {
+	.el-progress-bar__inner {
+		background-image: url('~@/assets/img/home-progress-bg.png');
+		background-size: cover;
+	}
+}
+</style>
diff --git a/src/views/cost/indexDetail.vue b/src/views/cost/indexDetail.vue
new file mode 100644
index 00000000..3d469aaa
--- /dev/null
+++ b/src/views/cost/indexDetail.vue
@@ -0,0 +1,199 @@
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			:table-props="tableProps1"
+			:page="1"
+			:limit="100"
+			:table-data="tableData1"></base-table>
+		<base-table
+			:table-props="tableProps2"
+			:page="1"
+			:limit="100"
+			:table-data="tableData2"></base-table>
+	</div>
+</template>
+
+<script>
+import { getDetailData } from '@/api/cost/allCost';
+import moment from 'moment';
+
+const tableProps1 = [
+	{
+		prop: 'name',
+		label: '成本项目-原片',
+	},
+	{
+		prop: 'f1',
+		label: '本期领用',
+		children: [
+			{
+				prop: 'quantity',
+				label: '数量',
+			},
+			{
+				prop: 'price',
+				label: '单价',
+			},
+			{
+				prop: 'sumPrice',
+				label: '金额',
+			},
+		],
+	},
+	{
+		prop: 'sprice',
+		label: '单位成本',
+	},
+];
+
+const tableProps2 = [
+	{
+		prop: 'name',
+		label: '成本项目-加工',
+	},
+	{
+		prop: 'quantity',
+		label: '耗用数量',
+	},
+	{
+		prop: 'price',
+		label: '平均耗用单价',
+	},
+	{
+		prop: 'sumPrice',
+		label: '总成本',
+	},
+	{
+		prop: 'sprice',
+		label: '综合单位成本',
+	},
+];
+export default {
+	data() {
+		return {
+			tableProps1,
+			tableData1: [],
+			tableProps2,
+			tableData2: [],
+			listQuery: {
+				pageSize: 10,
+				pageNo: 1,
+				statisticType: 1,
+			},
+			activeName: '日',
+			startTime:
+				moment(new Date()).subtract(1, 'days').format('YYYY-MM-DD') +
+				' 00:00:00',
+			endTime:
+				moment(new Date()).subtract(-1, 'days').format('YYYY-MM-DD') +
+				' 00:00:00',
+			formConfig: [
+				{
+					type: 'select',
+					label: '维度',
+					selectOptions: [
+						{ id: 1, name: '日' },
+						{ id: 2, name: '周' },
+						{ id: 3, name: '月' },
+						{ id: 4, name: '年' },
+					],
+					param: 'statisticType',
+					defaultSelect: 1, // 默认值,
+					clearable: false,
+				},
+				{
+					// 日期选择
+					type: 'datePicker',
+					// label: '日期',
+					dateType: 'date',
+					placeholder: '选择日期',
+					format: 'yyyy-MM-dd',
+					valueFormat: 'yyyy-MM-dd',
+					param: 'timeday',
+					clearable: false,
+					pickerOptions: {
+						disabledDate(time) {
+							return (time.getTime()+ 3600 * 1000 * 24) > Date.now();
+						},
+						shortcuts: [
+							{
+								text: '今天',
+								onClick(picker) {
+									picker.$emit('pick', new Date());
+								},
+							},
+							{
+								text: '昨天',
+								onClick(picker) {
+									const date = new Date();
+									date.setTime(date.getTime() - 3600 * 1000 * 24);
+									picker.$emit('pick', date);
+								},
+							},
+							{
+								text: '一周前',
+								onClick(picker) {
+									const date = new Date();
+									date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
+									picker.$emit('pick', date);
+								},
+							},
+						],
+					},
+				},
+				{
+					type: 'button',
+					btnName: '搜索',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: 'button',
+					btnName: '返回首页',
+					name: 'back',
+					color: 'warning',
+				},
+			],
+		};
+	},
+	created() {},
+	mounted() {
+		this.listQuery.startTime = this.startTime;
+    this.$refs.searchBarForm.formInline.timeday = this.startTime.substr(0, 10)
+		this.getDataList();
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			getDetailData(this.listQuery).then((response) => {
+				this.tableData1 = response.data.odata;
+				this.tableData2 = response.data.ddata;
+			});
+		},
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+          console.log(val.timeday)
+					this.listQuery.statisticType = val.statisticType || 1;
+					this.listQuery.startTime = val.timeday
+						? val.timeday + ' 00:00:00'
+						: null;
+					this.getDataList();
+					break;
+				case 'back':
+          this.$router.go(-1)
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>
diff --git a/src/views/cost/raw/24hourCostMonitor/index.vue b/src/views/cost/raw/24hourCostMonitor/index.vue
index 5210f68b..6fbb11fc 100644
--- a/src/views/cost/raw/24hourCostMonitor/index.vue
+++ b/src/views/cost/raw/24hourCostMonitor/index.vue
@@ -77,7 +77,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name||null;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
@@ -90,7 +90,7 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name;
 					this.listQuery.recTime = val.searchTime;
 					this.handleExport();
diff --git a/src/views/cost/raw/costEnergy/index.vue b/src/views/cost/raw/costEnergy/index.vue
index cba5f4f8..0177d17e 100644
--- a/src/views/cost/raw/costEnergy/index.vue
+++ b/src/views/cost/raw/costEnergy/index.vue
@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getDataList" />
+				@pagination="getNavDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -86,24 +86,27 @@ import ButtonNav from '@/components/ButtonNav';
 
 const tableProps = [
 	{
-		prop: 'recTime',
+		prop: 'time',
 		label: '日期',
-		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
+	},
+	{
+		prop: 'remark',
+		label: '备注',
 	},
 	{
 		prop: 'energyTypeName',
 		label: '能源类型',
 	},
-	{
-		prop: 'bindObjectName',
-		label: '监控对象',
-		filter: (val) => (val != null ? val : '--'),
-	},
-	{
-		prop: 'meterName',
-		label: '抄表名',
-		filter: (val) => (val != null ? val : '--'),
-	},
+	// {
+	// 	prop: 'bindObjectName',
+	// 	label: '监控对象',
+	// 	filter: (val) => (val != null ? val : '--'),
+	// },
+	// {
+	// 	prop: 'meterName',
+	// 	label: '抄表名',
+	// 	filter: (val) => (val != null ? val : '--'),
+	// },
 	{
 		prop: 'quantity',
 		label: '累计使用量',
@@ -115,20 +118,24 @@ const tableProps = [
 	},
 ];
 const tableProps2 = [
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 	{
 		prop: 'energyTypeName',
 		label: '能源类型',
 	},
-	{
-		prop: 'bindObjectName',
-		label: '监控对象',
-		filter: (val) => (val != null ? val : '--'),
-	},
-	{
-		prop: 'meter',
-		label: '抄表名',
-		filter: (val) => (val != null ? val : '--'),
-	},
+	// {
+	// 	prop: 'bindObjectName',
+	// 	label: '监控对象',
+	// 	filter: (val) => (val != null ? val : '--'),
+	// },
+	// {
+	// 	prop: 'meter',
+	// 	label: '抄表名',
+	// 	filter: (val) => (val != null ? val : '--'),
+	// },
 	{
 		prop: 'quantity',
 		label: '累计使用量',
@@ -207,13 +214,16 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间范围',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
+					dateType: 'datetimerange',
+					format: 'yyyy-MM-dd HH:mm:ss',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
+					defaultTime: ['08:30:00', '08:30:00'],
 					param: 'searchTime',
+					width: 350,
+					clearable: false,
 				},
 				{
 					type: 'button',
@@ -237,10 +247,11 @@ export default {
 			activeName: 'his',
 			tableProps,
 			tableProps2,
-			tableBtn: [{
-							type: 'edit',
-							btnName: '编辑',
-					  }
+			tableBtn: [
+				{
+					type: 'edit',
+					btnName: '编辑',
+				},
 			].filter((v) => v),
 			tableData: [],
 			tableData2: [],
@@ -262,26 +273,18 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
-			if (val.statisticType === 2) {
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年第{w}周');
-			}else{
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年{m}月{d}日');
-      }
-			this.formConfig2[1].startPlaceholder = '开始时间';
-			this.formConfig2[1].endPlaceholder = '结束时间';
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.energyTypeId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-						: null;
+					this.listQuery.endTime = val.searchTime ? val.searchTime[1] : null;
 					if (this.activeName === 'his') {
+						this.listQuery.endTime = val.searchTime
+							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+							: null;
 						this.getDataList();
 					} else {
 						this.getDataList2();
@@ -292,13 +295,16 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.energyTypeId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
-					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
-						: null;
+					this.listQuery.endTime = val.searchTime ? val.searchTime[1] : null;
+					if (this.activeName === 'his') {
+						this.listQuery.endTime = val.searchTime
+							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+							: null;
+					}
 					this.handleExport();
 					break;
 				default:
@@ -320,15 +326,26 @@ export default {
 				const end = new Date();
 				const start = new Date();
 				start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 00:00:00';
-				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 23:59:59';
-				this.formConfig2[1].startPlaceholder = parseTime(start).substr(0, 10);
-				this.formConfig2[1].endPlaceholder = parseTime(end).substr(0, 10);
+				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 08:30:00';
+				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 08:30:00';
+				this.$nextTick(() => {
+					this.$refs.searchBarForm2.formInline.searchTime = [
+						this.listQuery.startTime,
+						this.listQuery.endTime,
+					];
+				});
 				this.listQuery.name = null;
 				this.listQuery.pageNo = 1;
 				this.getDataList2();
 			}
 		},
+		getNavDataList() {
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+		},
 		// 获取数据2列表
 		getDataList2() {
 			if (this.listQuery.startTime) {
diff --git a/src/views/cost/raw/costMaterial/add-or-updata.vue b/src/views/cost/raw/costMaterial/add-or-updata.vue
index f9e04897..2f7afc71 100644
--- a/src/views/cost/raw/costMaterial/add-or-updata.vue
+++ b/src/views/cost/raw/costMaterial/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2024-09-05 15:34:28
+ * @LastEditTime: 2024-12-27 09:18:43
  * @Description:
 -->
 <template>
@@ -22,7 +22,7 @@
 						placeholder="请输入原料名称" />
 				</el-form-item>
 			</el-col>
-			<el-col :span="12">
+			<!-- <el-col :span="12">
 				<el-form-item label="单价" prop="matPrice">
 					<el-input
 						v-model="dataForm.matPrice"
@@ -31,7 +31,7 @@
 						placeholder="请输入单价" />
 					(元/吨)
 				</el-form-item>
-			</el-col>
+			</el-col> -->
 			<el-col :span="12">
 				<el-form-item label="累计用量" prop="quantity">
 					<el-input-number
diff --git a/src/views/cost/raw/costMaterial/index.vue b/src/views/cost/raw/costMaterial/index.vue
index f49526a3..46e2e6c9 100644
--- a/src/views/cost/raw/costMaterial/index.vue
+++ b/src/views/cost/raw/costMaterial/index.vue
@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getDataList" />
+				@pagination="getNavDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -87,9 +87,12 @@ import ButtonNav from '@/components/ButtonNav';
 
 const tableProps = [
 	{
-		prop: 'recTime',
+		prop: 'time',
 		label: '日期',
-		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
+	},
+	{
+		prop: 'remark',
+		label: '备注',
 	},
 	{
 		prop: 'materialName',
@@ -97,13 +100,13 @@ const tableProps = [
 	},
 	{
 		prop: 'quantity',
-		label: '累计使用量(吨)',
-	},
-	{
-		prop: 'matPrice',
-		label: '单价(元/吨)',
-		align: 'right',
+		label: '累计使用量(千克)',
 	},
+	// {
+	// 	prop: 'matPrice',
+	// 	label: '单价(元/千克)',
+	// 	align: 'right',
+	// },
 	{
 		prop: 'price',
 		label: '总价(元)',
@@ -111,6 +114,10 @@ const tableProps = [
 	},
 ];
 const tableProps2 = [
+	// {
+	// 	prop: 'remark',
+	// 	label: '备注',
+	// },
 	{
 		prop: 'materialName',
 		label: '原料名称',
@@ -123,13 +130,13 @@ const tableProps2 = [
 	},
 	{
 		prop: 'quantity',
-		label: '累计使用量(吨)',
-	},
-	{
-		prop: 'materialPrice',
-		label: '单价(元/吨)',
-		align: 'right',
+		label: '累计使用量(千克)',
 	},
+	// {
+	// 	prop: 'materialPrice',
+	// 	label: '单价(元/千克)',
+	// 	align: 'right',
+	// },
 	{
 		prop: 'price',
 		label: '总价(元)',
@@ -204,13 +211,16 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间范围',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
+					dateType: 'datetimerange',
+					format: 'yyyy-MM-dd HH:mm:ss',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
+					defaultTime: ['08:30:00', '08:30:00'],
 					param: 'searchTime',
+					width: 350,
+					clearable: false,
 				},
 				{
 					type: 'button',
@@ -234,10 +244,11 @@ export default {
 			activeName: 'his',
 			tableProps,
 			tableProps2,
-			tableBtn: [{
-							type: 'edit',
-							btnName: '编辑',
-					  }
+			tableBtn: [
+				{
+					type: 'edit',
+					btnName: '编辑',
+				},
 			].filter((v) => v),
 			tableData: [],
 			tableData2: [],
@@ -259,26 +270,20 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
-			if (val.statisticType === 2) {
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年第{w}周');
-			}else{
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年{m}月{d}日');
-      }
-			this.formConfig2[1].startPlaceholder = '开始时间';
-			this.formConfig2[1].endPlaceholder = '结束时间';
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.materialId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+						? val.searchTime[1]
 						: null;
 					if (this.activeName === 'his') {
+						this.listQuery.endTime = val.searchTime
+							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+							: null;
 						this.getDataList();
 					} else {
 						this.getDataList2();
@@ -289,13 +294,18 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.materialId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+						? val.searchTime[1]
 						: null;
+					if (this.activeName === 'his') {
+						this.listQuery.endTime = val.searchTime
+							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+							: null;
+					}
 					this.handleExport();
 					break;
 				default:
@@ -317,15 +327,26 @@ export default {
 				const end = new Date();
 				const start = new Date();
 				start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 00:00:00';
-				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 23:59:59';
-				this.formConfig2[1].startPlaceholder = parseTime(start).substr(0, 10);
-				this.formConfig2[1].endPlaceholder = parseTime(end).substr(0, 10);
+				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 08:30:00';
+				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 08:30:00';
+				this.$nextTick(() => {
+					this.$refs.searchBarForm2.formInline.searchTime = [
+						this.listQuery.startTime,
+						this.listQuery.endTime,
+					];
+				});
 				this.listQuery.name = null;
 				this.listQuery.pageNo = 1;
 				this.getDataList2();
 			}
 		},
+		getNavDataList() {
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+		},
 		// 获取数据2列表
 		getDataList2() {
 			if (this.listQuery.startTime) {
diff --git a/src/views/cost/raw/costOriginRatioHis/add-or-updata.vue b/src/views/cost/raw/costOriginRatioHis/add-or-updata.vue
index 325cdad5..b9bfe514 100644
--- a/src/views/cost/raw/costOriginRatioHis/add-or-updata.vue
+++ b/src/views/cost/raw/costOriginRatioHis/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2024-09-05 15:33:16
+ * @LastEditTime: 2025-06-13 10:59:54
  * @Description:
 -->
 <template>
@@ -15,7 +15,9 @@
 		label-width="80px">
 		<el-row :gutter="20">
 			<el-col :span="12">
-				<el-form-item label="产线" prop="bindObjectName">
+				<el-form-item
+					:label="activeName === 'his' ? '产线' : '工段'"
+					prop="bindObjectName">
 					<el-input
 						style="width: 100%"
 						v-model="dataForm.bindObjectName"
@@ -33,7 +35,7 @@
 						placeholder="选择所属日期"></el-date-picker>
 				</el-form-item>
 			</el-col>
-			<el-col :span="12">
+			<el-col :span="12" v-if="activeName === 'his'">
 				<el-form-item label="厚度" prop="thick">
 					<el-input-number
 						:min="0"
@@ -43,7 +45,7 @@
 						placeholder="请输入厚度" />
 				</el-form-item>
 			</el-col>
-			<el-col :span="12">
+			<el-col :span="12" v-if="activeName === 'his'">
 				<el-form-item label="在线速度" prop="speed">
 					<el-input-number
 						:min="0"
@@ -53,7 +55,7 @@
 						placeholder="请输入在线速度" />
 				</el-form-item>
 			</el-col>
-			<el-col :span="12">
+			<el-col :span="12" v-if="activeName === 'his'">
 				<el-form-item label="掰边宽度" prop="width">
 					<el-input-number
 						:min="0"
@@ -64,25 +66,27 @@
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-				<el-form-item label="拉引量" prop="inArea">
+				<el-form-item
+					:label="activeName === 'his' ? '拉引量' : '进片数'"
+					prop="inArea">
 					<el-input-number
 						:min="0"
 						style="width: 85%"
 						v-model="dataForm.inArea"
-						clearable
-						placeholder="请输入拉引量" />
-					(m²)
+						clearable />
+					{{ activeName === 'his' ? '(m²)' : '片' }}
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-				<el-form-item label="下片面积" prop="outArea">
+				<el-form-item
+					:label="activeName === 'his' ? '下片面积' : '出片数'"
+					prop="outArea">
 					<el-input-number
 						:min="0"
 						style="width: 85%"
 						v-model="dataForm.outArea"
-						clearable
-						placeholder="请输入下片面积" />
-					(m²)
+						clearable />
+					{{ activeName === 'his' ? '(m²)' : '片' }}
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
@@ -129,10 +133,12 @@ export default {
 				recTime: undefined,
 			},
 			dataRule: {},
+			activeName: 'his',
 		};
 	},
 	methods: {
-		init(val, statisticType) {
+		init(val, statisticType, activeName) {
+			this.activeName = activeName;
 			this.visible = true;
 			this.$nextTick(() => {
 				this.$refs['dataForm'].resetFields();
@@ -148,17 +154,22 @@ export default {
 				if (!valid) {
 					return false;
 				}
-				const udata = {
+				let udata = {
 					id: this.dataForm.id,
 					statisticType: this.dataForm.statisticType,
-					modifyThick: this.dataForm.thick,
-					modifySpeed: this.dataForm.speed,
-					modifyWidth: this.dataForm.width,
 					modifyInArea: this.dataForm.inArea,
 					modifyOutArea: this.dataForm.outArea,
 					modifyRatio:
 						this.dataForm.ratio >= 0 ? this.dataForm.ratio / 100 : '',
 				};
+				if (this.activeName === 'his') {
+					udata = {
+						...udata,
+						modifyThick: this.dataForm.thick,
+						modifySpeed: this.dataForm.speed,
+						modifyWidth: this.dataForm.width,
+					};
+				}
 				// 修改的提交
 				this.urlOptions.updateURL(udata).then((response) => {
 					this.$modal.msgSuccess('修改成功');
diff --git a/src/views/cost/raw/costOriginRatioHis/index.vue b/src/views/cost/raw/costOriginRatioHis/index.vue
index b1db84fa..faefd721 100644
--- a/src/views/cost/raw/costOriginRatioHis/index.vue
+++ b/src/views/cost/raw/costOriginRatioHis/index.vue
@@ -1,42 +1,71 @@
 <template>
-	<div class="app-container energyOverlimitLog">
-		<!-- 搜索工作栏 -->
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<!-- 列表 -->
-		<base-table
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
-			:table-props="tableProps"
-			:table-data="tableData"
-			:max-height="tableH">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="80"
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:page.sync="listQuery.pageNo"
-			:limit.sync="listQuery.pageSize"
-			:total="listQuery.total"
-			@pagination="getDataList" />
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			width="50%">
-			<add-or-update
-				ref="addOrUpdate"
-				:name-arr="formConfig[1].selectOptions"
-				@refreshDataList="successSubmit"></add-or-update>
-		</base-dialog>
+	<div>
+		<div style="background: #f2f4f9; height: 40px; width: 100%">
+			<ButtonNav :menus="['产线良品率', '工段良品率']" @change="currentMenu">
+				<template v-slot:tab1>
+					<div>产线良品率</div>
+				</template>
+				<template v-slot:tab2>
+					<div>工段良品率</div>
+				</template>
+			</ButtonNav>
+		</div>
+		<div class="app-container energyOverlimitLog">
+			<search-bar
+				:formConfigs="formConfig"
+				ref="searchBarForm"
+				@headBtnClick="buttonClick" />
+			<!-- 列表 -->
+			<div v-if="activeName === 'his'">
+				<base-table
+					:page="listQuery.pageNo"
+					:limit="listQuery.pageSize"
+					:table-props="tableProps"
+					:table-data="tableData"
+					:max-height="tableH">
+					<method-btn
+						v-if="tableBtn.length"
+						slot="handleBtn"
+						:width="80"
+						label="操作"
+						:method-list="tableBtn"
+						@clickBtn="handleClick" />
+				</base-table>
+			</div>
+			<div v-if="activeName === 'now'">
+				<base-table
+					:page="listQuery.pageNo"
+					:limit="listQuery.pageSize"
+					:table-props="tableProps2"
+					:table-data="tableData2"
+					:max-height="tableH">
+					<method-btn
+						v-if="tableBtn.length"
+						slot="handleBtn"
+						:width="80"
+						label="操作"
+						:method-list="tableBtn"
+						@clickBtn="handleClick" />
+				</base-table>
+			</div>
+			<pagination
+				:page.sync="listQuery.pageNo"
+				:limit.sync="listQuery.pageSize"
+				:total="listQuery.total"
+				@pagination="getNavDataList" />
+			<base-dialog
+				:dialogTitle="addOrEditTitle"
+				:dialogVisible="addOrUpdateVisible"
+				@cancel="handleCancel"
+				@confirm="handleConfirm"
+				:before-close="handleCancel"
+				width="50%">
+				<add-or-update
+					ref="addOrUpdate"
+					:name-arr="formConfig[1].selectOptions"
+					@refreshDataList="successSubmit"></add-or-update>
+			</base-dialog>
+		</div>
 	</div>
 </template>
 
@@ -44,16 +73,27 @@
 import AddOrUpdate from './add-or-updata';
 import basicPage from '@/mixins/basic-page';
 import { getLinePage } from '@/api/base/productionLine';
-import { getcostOriginRatioHisPage,exportcostOriginRatioHisExcel } from '@/api/cost/costOriginRatioHis';
+import {
+	getcostOriginRatioHisPage,
+	getcostOriginWSRatioHisPage,
+	exportcostOriginWSRatioHisExcel,
+	exportcostOriginRatioHisExcel,
+} from '@/api/cost/costOriginRatioHis';
 import { parseTime } from '@/filter/code-filter';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+import ButtonNav from '@/components/ButtonNav';
+
+
 const tableProps = [
 	{
-		prop: 'recTime',
+		prop: 'time',
 		label: '日期',
-		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
     width:130,
 	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 	{
 		prop: 'bindObjectName',
 		label: '产线',
@@ -62,27 +102,67 @@ const tableProps = [
 	{
 		prop: 'thick',
 		label: '厚度',
+    filter: (val) => (val != null ? Number(val).toFixed(1) : '-'),
 	},
 	{
 		prop: 'speed',
 		label: '在线速度',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'width',
 		label: '掰边宽度',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'inArea',
 		label: '拉引量/m²',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'outArea',
 		label: '下片面积/m²',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'ratio',
 		label: '良品率',
-		filter: (val) => (val ? val * 100 + '%' : '-'),
+		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
+	},
+];
+const tableProps2  = [
+	{
+		prop: 'time',
+		label: '日期',
+    width:130,
+	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
+	{
+		prop: 'bindObjectName',
+		label: '工段',
+    width:145,
+	},
+	{
+		prop: 'spec',
+		label: '规格',
+	},
+	{
+		prop: 'inArea',
+		label: '进片数',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
+	},
+	{
+		prop: 'outArea',
+		label: '出片数',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
+	},
+	{
+		prop: 'ratio',
+		label: '良品率',
+		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
 	},
 ];
 export default {
@@ -116,13 +196,15 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间范围',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
+					dateType: 'datetimerange',
+					format: 'yyyy-MM-dd HH:mm:ss',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
+					defaultTime: ['08:30:00', '08:30:00'],
 					param: 'searchTime',
+					width: 350,
 				},
 				{
 					type: 'button',
@@ -143,23 +225,27 @@ export default {
 			listQuery: {
 				statisticType: 1,
 			},
+			activeName: 'his',
 			tableProps,
+			tableProps2,
 			tableBtn: [{
 							type: 'edit',
 							btnName: '编辑',
 					  }
 			].filter((v) => v),
 			tableData: [],
+			tableData2: [],
 		};
 	},
 	components: {
 		AddOrUpdate,
+		ButtonNav,
 	},
 	created() {
     const params ={
       pageNo: 1,
       pageSize: 100,
-      pdType: 1
+      pdType: 0
     }
 		getLinePage(params).then((response) => {
 			this.formConfig[1].selectOptions = response.data.list;
@@ -167,36 +253,33 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
-			if (val.statisticType === 2) {
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年第{w}周');
-			}else{
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年{m}月{d}日');
-      }
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.bindObjectId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+						? val.searchTime[1]
 						: null;
-					this.getDataList();
+					if (this.activeName === 'his') {
+						this.getDataList();
+					} else {
+						this.getDataList2();
+					}
 					break;
 				case 'add':
 					this.addOrUpdateHandle();
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.bindObjectId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+						? val.searchTime[1]
 						: null;
 					this.handleExport();
 					break;
@@ -204,23 +287,74 @@ export default {
 					console.log(val);
 			}
 		},
+		currentMenu(val) {
+			this.activeName = val === '产线良品率' ? 'his' : 'now';
+			if (this.activeName === 'his') {
+				this.$refs.searchBarForm.resetForm();
+				this.listQuery.bindObjectId = null;
+				this.listQuery.startTime = null;
+				this.listQuery.endTime = null;
+				this.listQuery.statisticType = 1;
+				this.listQuery.pageNo = 1;
+				this.getDataList();
+			} else {
+				this.$refs.searchBarForm.resetForm();
+				this.listQuery.bindObjectId = null;
+				this.listQuery.startTime = null;
+				this.listQuery.endTime = null;
+				this.listQuery.statisticType = 1;
+				this.listQuery.pageNo = 1;
+				this.getDataList2();
+			}
+		},
+		// 获取数据2列表
+		getDataList2() {
+			getcostOriginWSRatioHisPage(this.listQuery).then((response) => {
+				this.tableData2 = response.data.list;
+				this.listQuery.total = response.data.total;
+			});
+		},
 		//tableBtn点击
 		handleClick(val) {
 			if (val.type === 'edit') {
 				this.addOrUpdateVisible = true;
 				this.addOrEditTitle = '编辑';
 				this.$nextTick(() => {
-					this.$refs.addOrUpdate.init(val.data, this.listQuery.statisticType);
+					this.$refs.addOrUpdate.init(
+						val.data,
+						this.listQuery.statisticType,
+						this.activeName
+					);
 				});
 			} else {
 				this.otherMethods(val);
 			}
 		},
+    getNavDataList(){
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+    },
+		successSubmit() {
+			this.handleCancel();
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+		},
 		/** 导出按钮操作 */
 		handleExport() {
 			let exportURL, title;
+			if (this.activeName === 'his') {
 				exportURL = exportcostOriginRatioHisExcel;
-        title = '原片成本-原片良品率';
+				title = '原片-产线良品率';
+			} else {
+				exportURL = exportcostOriginWSRatioHisExcel;
+				title = '原片-工段良品率';
+			}
 			// 处理查询参数
 			let params = { ...this.listQuery };
 			params.pageNo = undefined;
diff --git a/src/views/cost/raw/costOthercostHis/index.vue b/src/views/cost/raw/costOthercostHis/index.vue
index 1c6c8b29..8a3cff11 100644
--- a/src/views/cost/raw/costOthercostHis/index.vue
+++ b/src/views/cost/raw/costOthercostHis/index.vue
@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getDataList" />
+				@pagination="getNavDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -87,9 +87,12 @@ import ButtonNav from '@/components/ButtonNav';
 
 const tableProps = [
 	{
-		prop: 'recTime',
+		prop: 'time',
 		label: '日期',
-		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
+	},
+	{
+		prop: 'remark',
+		label: '备注',
 	},
 	{
 		prop: 'otherCostName',
@@ -102,6 +105,10 @@ const tableProps = [
 	},
 ];
 const tableProps2 = [
+	// {
+	// 	prop: 'remark',
+	// 	label: '备注',
+	// },
 	{
 		prop: 'otherCostName',
 		label: '成本名称',
@@ -182,13 +189,16 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间范围',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
+					dateType: 'datetimerange',
+					format: 'yyyy-MM-dd HH:mm:ss',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
+					defaultTime: ['08:30:00', '08:30:00'],
 					param: 'searchTime',
+					width: 350,
+					clearable: false,
 				},
 				{
 					type: 'button',
@@ -237,24 +247,20 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
-			if (val.statisticType === 2) {
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年第{w}周');
-			}else{
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年{m}月{d}日');
-      }
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+						? val.searchTime[1]
 						: null;
 					if (this.activeName === 'his') {
+						this.listQuery.endTime = val.searchTime
+							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+							: null;
 						this.getDataList();
 					} else {
 						this.getDataList2();
@@ -265,13 +271,18 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+						? val.searchTime[1]
 						: null;
+					if (this.activeName === 'his') {
+						this.listQuery.endTime = val.searchTime
+							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+							: null;
+					}
 					this.handleExport();
 					break;
 				default:
@@ -297,6 +308,13 @@ export default {
 				this.getDataList2();
 			}
 		},
+    getNavDataList(){
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+    },
 		// 获取数据2列表
 		getDataList2() {
 			getRawOthercostSunPage(this.listQuery).then((response) => {
diff --git a/src/views/cost/raw/costOthercostLog/index.vue b/src/views/cost/raw/costOthercostLog/index.vue
index a15d2453..b34aae95 100644
--- a/src/views/cost/raw/costOthercostLog/index.vue
+++ b/src/views/cost/raw/costOthercostLog/index.vue
@@ -65,6 +65,7 @@ const tableProps = [
 		prop: 'price',
 		label: '成本金额',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'remark',
@@ -161,7 +162,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name||null;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
@@ -174,7 +175,7 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name||null;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
diff --git a/src/views/cost/raw/costOthercostRule/typeRule.vue b/src/views/cost/raw/costOthercostRule/typeRule.vue
index d5ebce60..1c7f8670 100644
--- a/src/views/cost/raw/costOthercostRule/typeRule.vue
+++ b/src/views/cost/raw/costOthercostRule/typeRule.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-12-05 13:45:59
  * @LastEditors: zwq
- * @LastEditTime: 2024-04-15 17:12:03
+ * @LastEditTime: 2024-12-25 16:20:38
  * @Description
 -->
 <template>
@@ -10,9 +10,9 @@
 		<span>
 			{{
 				injectData.type == 1
-					? `每天等价,${injectData.price}元`
+					? `每天等价,${Number(injectData.price)}元`
 					: injectData.type == 2
-					? `总价${injectData.price}元,年折旧率${injectData.ratio}%,折旧年限${injectData.timeLimit}年`
+					? `总价${Number(injectData.price)}元,年折旧率${injectData.ratio}%,折旧年限${injectData.timeLimit}年`
 					: '-'
 			}}
 		</span>
diff --git a/src/views/cost/raw/costStatistics/index.vue b/src/views/cost/raw/costStatistics/index.vue
index b5c5e36b..b416e1f5 100644
--- a/src/views/cost/raw/costStatistics/index.vue
+++ b/src/views/cost/raw/costStatistics/index.vue
@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getDataList" />
+				@pagination="getNavDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -87,9 +87,12 @@ import ButtonNav from '@/components/ButtonNav';
 
 const tableProps = [
 	{
-		prop: 'recTime',
+		prop: 'time',
 		label: '时间',
-		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
+	},
+	{
+		prop: 'remark',
+		label: '备注',
 	},
 	{
 		prop: 'bindObjectName',
@@ -98,32 +101,41 @@ const tableProps = [
 	{
 		prop: 'thick',
 		label: '厚度',
+    filter: (val) => (val != null ? Number(val).toFixed(1) : '-'),
 	},
 	{
 		prop: 'inArea',
 		label: '拉引量/m²',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'outArea',
 		label: '下片面积/m²',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'ratio',
 		label: '良品率',
-		filter: (val) => (val ? val * 100 + '%' : '-'),
+		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
 	},
 	{
 		prop: 'costSum',
 		label: '原片成本/元',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'costArea',
 		label: '每平米成本/元',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 ];
 const tableProps2 = [
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 	{
 		prop: 'bindObjectName',
 		label: '产线',
@@ -135,34 +147,40 @@ const tableProps2 = [
 	{
 		prop: 'inArea',
 		label: '拉引量/m²',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'outArea',
 		label: '下片面积/m²',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'outCount',
 		label: '下片数量',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'ratio',
 		label: '良品率',
-		filter: (val) => (val ? val * 100 + '%' : '-'),
+		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
 	},
 	{
 		prop: 'costSum',
 		label: '原片成本/元',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'costPiece',
 		label: '单片成本/元',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'costArea',
 		label: '每平米成本/元',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 ];
 export default {
@@ -224,13 +242,16 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间范围',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
+					dateType: 'datetimerange',
+					format: 'yyyy-MM-dd HH:mm:ss',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
+					defaultTime: ['08:30:00', '08:30:00'],
 					param: 'searchTime',
+					width: 350,
+					clearable: false,
 				},
 				{
 					type: 'select',
@@ -287,26 +308,20 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
-			if (val.statisticType === 2) {
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年第{w}周');
-			}else{
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年{m}月{d}日');
-      }
-			this.formConfig2[0].startPlaceholder = '开始时间';
-			this.formConfig2[0].endPlaceholder = '结束时间';
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.bindObjectId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+						? val.searchTime[1]
 						: null;
 					if (this.activeName === 'his') {
+						this.listQuery.endTime = val.searchTime
+							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+							: null;
 						this.getDataList();
 					} else {
 						this.getDataList2();
@@ -317,13 +332,18 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.bindObjectId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+						? val.searchTime[1]
 						: null;
+					if (this.activeName === 'his') {
+						this.listQuery.endTime = val.searchTime
+							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+							: null;
+					}
 					this.handleExport();
 					break;
 				default:
@@ -345,15 +365,26 @@ export default {
 				const end = new Date();
 				const start = new Date();
 				start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 00:00:00';
-				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 23:59:59';
-				this.formConfig2[0].startPlaceholder = parseTime(start).substr(0, 10);
-				this.formConfig2[0].endPlaceholder = parseTime(end).substr(0, 10);
+				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 08:30:00';
+				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 08:30:00';
+				this.$nextTick(() => {
+					this.$refs.searchBarForm2.formInline.searchTime = [
+						this.listQuery.startTime,
+						this.listQuery.endTime,
+					];
+				});
 				this.listQuery.name = null;
 				this.listQuery.pageNo = 1;
 				this.getDataList2();
 			}
 		},
+    getNavDataList(){
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+    },
 		// 获取数据2列表
 		getDataList2() {
 			if (this.listQuery.startTime) {
diff --git a/src/views/group/Calendar/holidayLog.vue b/src/views/group/Calendar/holidayLog.vue
new file mode 100644
index 00000000..d29287f3
--- /dev/null
+++ b/src/views/group/Calendar/holidayLog.vue
@@ -0,0 +1,96 @@
+<!--
+ * @Author: zwq
+ * @Date: 2025-10-23 13:43:55
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-11-14 21:13:10
+ * @Description:
+-->
+<template>
+	<div class="app-container" style="padding-top: 0">
+		<div v-for="item in groupClassArr" :key="item.planId">
+			<small-title style="margin: 16px 0" size="sm" :no-padding="true">
+				{{ item.deptName + ' - ' + item.planName }}
+			</small-title>
+			<base-table
+				:table-props="tableProps"
+				:table-data="
+					tableData.filter((titem) => titem.schedulingPlanId == item.planId)
+				"></base-table>
+		</div>
+	</div>
+</template>
+
+<script>
+import SmallTitle from '../Schedule/SmallTitle';
+
+const tableProps = [
+	{
+		prop: 'classesName',
+		label: '班次名称',
+	},
+	{
+		prop: 'workTime',
+		label: '班次时间',
+	},
+	{
+		prop: 'teamName',
+		label: '班组名称',
+	},
+	{
+		prop: 'teamLeader',
+		label: '组长',
+	},
+	{
+		prop: 'teamLeaderPhone',
+		label: '组长电话',
+	},
+];
+
+export default {
+	components: {
+		SmallTitle,
+	},
+	data() {
+		return {
+			tableProps,
+			tableData: [],
+			groupClassArr: [],
+		};
+	},
+	created() {},
+	methods: {
+		init(det, detSort) {
+			this.tableData = det;
+			//返回计划名和id
+			const arr = det.map((item) => {
+				const obj = {
+					planName: item.schedulingPlanName,
+					planId: item.schedulingPlanId,
+					deptName: item.belongDeptName,
+				};
+				return obj;
+			});
+			//去重
+			const map = new Map();
+			arr.forEach((item) => {
+				if (!map.has(item.planId)) {
+					map.set(item.planId, item);
+				}
+			});
+			const newArr = Array.from(map.values());
+			// 创建B数组中id的顺序映射
+			const orderMap = new Map();
+			detSort.forEach((item, index) => {
+				orderMap.set(item, index);
+			});
+
+			// 根据B的顺序对A进行排序
+			this.groupClassArr = [...newArr].sort((a, b) => {
+				const orderA = orderMap.get(a.planId);
+				const orderB = orderMap.get(b.planId);
+				return orderA - orderB;
+			});
+		},
+	},
+};
+</script>
diff --git a/src/views/group/Calendar/index.vue b/src/views/group/Calendar/index.vue
new file mode 100644
index 00000000..cd9dfa0d
--- /dev/null
+++ b/src/views/group/Calendar/index.vue
@@ -0,0 +1,612 @@
+<!--
+ * @Author: zwq
+ * @Date: 2025-10-23 13:43:55
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-11-25 09:39:43
+ * @Description:
+-->
+<template>
+	<div
+		class="app-container"
+		style="
+			background-color: #f2f4f9;
+			padding: 0;
+			display: grid;
+			grid-template-columns: 1fr 5fr;
+			gap: 10px;
+		">
+		<div class="head-container">
+			<el-tabs v-model="activeName" stretch @tab-click="tabsClick">
+				<el-tab-pane label="部门" name="first"></el-tab-pane>
+				<el-tab-pane label="班组" name="second"></el-tab-pane>
+			</el-tabs>
+			<div v-if="activeName == 'first'">
+				<el-input
+					v-model="deptName"
+					placeholder="请输入部门名称"
+					clearable
+					size="small"
+					prefix-icon="el-icon-search"
+					style="margin-bottom: 20px" />
+				<el-tree
+					:data="deptOptions"
+					:props="defaultProps"
+					:expand-on-click-node="false"
+					:filter-node-method="filterNode"
+					ref="tree"
+					node-key="id"
+					default-expand-all
+					highlight-current
+					@node-click="handleNodeClick" />
+			</div>
+			<div v-else>
+				<el-input
+					v-model="groupName"
+					placeholder="请输入班组名称"
+					clearable
+					size="small"
+					prefix-icon="el-icon-search"
+					style="margin-bottom: 20px" />
+				<el-tree
+					:data="groupOptions"
+					:props="defaultProps"
+					:expand-on-click-node="false"
+					:filter-node-method="filterNode"
+					ref="tree1"
+					node-key="id"
+					default-expand-all
+					highlight-current
+					@node-click="handleNodeClick1" />
+			</div>
+		</div>
+		<div class="groupTeamScheduling">
+			<div class="operationArea">
+				<el-form :inline="true" class="demo-form-inline">
+					<span class="blue-block"></span>
+					<el-form-item label="月份选择">
+						<el-date-picker
+							v-model="startDay"
+							type="month"
+							placeholder="选择月"
+							size="small"
+							@change="selectMonth"
+							:clearable="false"
+							style="width: 120px"></el-date-picker>
+						<span
+							style="color: #909399; font-size: 12px"
+							v-if="activeName == 'first'">
+							提示：排班日历仅展示当前选中部门的节假日设置，若休假日中仍有排班，则表示下级组织已通过自定义假期进行排班。
+						</span>
+						<span v-else style="margin-left: 10px">
+							组长:
+							<span style="font-weight: 600; margin: 0 10px">
+								{{ showTeamName?.leaderName || '-' }}
+							</span>
+							组长电话:
+							<span style="font-weight: 600; margin: 0 10px">
+								{{ showTeamName?.leaderPhone || '-' }}
+							</span>
+						</span>
+					</el-form-item>
+					<el-form-item style="float: right">
+						<el-button
+							size="small"
+							type="primary"
+							@click="(startDay = new Date()), getHolidayPage()">
+							跳转到今天
+						</el-button>
+					</el-form-item>
+				</el-form>
+			</div>
+			<!-- 日历区域 -->
+			<div class="calenderArea">
+				<el-calendar v-model="startDay">
+					<template slot="dateCell" slot-scope="{ data }">
+						<div v-if="data.type === 'current-month'">
+							<!-- 日期 -->
+							<div class="dateStyle">
+								<el-row :gutter="20">
+									<!-- 公历和农历 -->
+									<el-col :span="18">
+										{{ Number(data.day.split('-')[2]) }}
+										<div class="lunar-date">{{ getLunarDate(data.day) }}</div>
+									</el-col>
+									<!-- 显示假或班 -->
+									<el-col :span="6">
+										<div
+											class="work-tip"
+											:style="{
+												backgroundColor: HolidayList[
+													Number(data.day.split('-')[2]) - 1
+												]?.isHoliday
+													? '#67C23A'
+													: '#409EFF',
+											}">
+											{{
+												HolidayList[Number(data.day.split('-')[2]) - 1]
+													?.isHoliday
+													? '假'
+													: '班'
+											}}
+											<!-- //变更节假日未更新排班计划的角标 -->
+											<div
+												class="subIcon"
+												v-if="
+													HolidayList[Number(data.day.split('-')[2]) - 1]
+														?.isUpdate
+												">
+												<el-tooltip
+													effect="dark"
+													content="本日节假日变更已影响当前排班计划，但尚未同步，请及时处理。"
+													placement="top">
+													<i class="el-icon-warning" style="color: #f56c6c"></i>
+												</el-tooltip>
+											</div>
+										</div>
+									</el-col>
+									<!-- 显示排班 -->
+									<div
+										v-if="
+											HolidayList[Number(data.day.split('-')[2]) - 1]?.det
+												.length > 0
+										">
+										<el-col
+											:span="24"
+											v-for="(item, index) in HolidayList[
+												Number(data.day.split('-')[2]) - 1
+											]?.det.filter(
+												(item) =>
+													item.schedulingPlanId ==
+													HolidayList[Number(data.day.split('-')[2]) - 1]
+														?.schedulingPlanId
+											)"
+											:key="index">
+											<el-tooltip
+												effect="dark"
+												content="点击展示全部排班计划"
+												placement="top-start">
+												<div
+													class="holiday-div"
+													:style="{
+														backgroundColor: holidayDivColor[item?.classesCode],
+													}"
+													@click="
+														holidayLog(
+															HolidayList[Number(data.day.split('-')[2]) - 1]
+																?.det,
+															HolidayList[Number(data.day.split('-')[2]) - 1]
+																?.date,
+															HolidayList[Number(data.day.split('-')[2]) - 1]
+																?.detSort
+														)
+													"
+													:title="
+														item.classesName +
+														' | ' +
+														item.teamName +
+														' | ' +
+														item.workTime
+													">
+													{{
+														item.classesName +
+														' | ' +
+														item.teamName +
+														' | ' +
+														item.workTime
+													}}
+												</div>
+											</el-tooltip>
+										</el-col>
+									</div>
+								</el-row>
+							</div>
+						</div>
+						<div
+							v-else
+							style="font-size: 20px; font-weight: 500; text-align: left">
+							<el-row :gutter="20">
+								<el-col :span="24">
+									{{ Number(data.day.split('-')[2]) }}
+									<span style="font-size: 12px">
+										{{ getLunarDate(data.day) }}
+									</span>
+								</el-col>
+							</el-row>
+						</div>
+					</template>
+				</el-calendar>
+			</div>
+		</div>
+		<base-dialog
+			:dialogTitle="dialogTitle"
+			:dialogVisible="logVisible"
+			@cancel="cancelLog"
+			:before-close="cancelLog"
+			:destroy-on-close="true"
+			width="70%">
+			<holiday-log ref="holidayLogRef"></holiday-log>
+			<template #footer>
+				<slot name="footer">
+					<el-row slot="footer" type="flex" justify="end">
+						<el-col :span="24">
+							<el-button size="small" class="btnTextStyle" @click="cancelLog">
+								取消
+							</el-button>
+						</el-col>
+					</el-row>
+				</slot>
+			</template>
+		</base-dialog>
+	</div>
+</template>
+
+<script>
+import moment from 'moment';
+import { solarToLunar } from 'chinese-lunar';
+
+import { getUserProfile } from '@/api/system/user';
+import { listByDeptId } from '@/api/group/Schedule';
+import { getEnableData } from '@/api/group/holidaySetting';
+import {
+	getDeptSchedulingList,
+	getClassSchedulingList,
+} from '@/api/group/calendar';
+import holidayLog from './holidayLog';
+
+export default {
+	name: '',
+	components: {
+		holidayLog,
+	},
+	data() {
+		return {
+			activeName: 'first',
+			startDay: '', // 查询参数
+			HolidayList: [],
+			// 选择的部门名称
+			showDeptName: undefined,
+			showTeamName: {},
+			// 部门树选项
+			deptOptions: undefined,
+			groupOptions: undefined,
+			// 查询的部门名称
+			deptName: undefined,
+			groupName: undefined,
+
+			topDept: {}, // 保存当前用户的部门id为最高级部门id
+			deptId: undefined,
+			teamId: undefined,
+
+			defaultProps: {
+				children: 'children',
+				label: 'name',
+			},
+			logVisible: false,
+			dialogTitle: '',
+			holidayDivColor: ['#67c23a', '#69d983', '#f5c931', '#4fa6f0'],
+		};
+	},
+	watch: {
+		// 根据名称筛选部门树
+		deptName(val) {
+			this.$refs.tree.filter(val);
+		},
+		groupName(val) {
+			this.$refs.tree1.filter(val);
+		},
+	},
+	created() {
+		this.startDay = new Date();
+		// 查询用户个人信息
+		getUserProfile().then((response) => {
+			this.showDeptName = response.data.dept.name || '';
+			this.topDept = {
+				name: response.data.dept.name || '',
+				id: response.data.dept.id || '',
+			}; // 保存当前用户的部门为最高级部门id
+			this.deptId = response.data.dept.id || '';
+			this.getHolidayPage();
+			this.getTreeselect();
+		});
+	},
+	methods: {
+		getHolidayPage() {
+			const now = new Date(this.startDay);
+			const year = now.getFullYear();
+			const month = now.getMonth();
+			const startTime = `${year}-${String(month + 1).padStart(2, '0')}-01`;
+			const lastDate = new Date(year, month + 1, 0).getDate();
+			const endTime = `${year}-${String(month + 1).padStart(2, '0')}-${String(
+				lastDate
+			).padStart(2, '0')}`;
+
+			this.HolidayList = [];
+			if (this.activeName == 'first') {
+				getDeptSchedulingList({
+					deptId: this.deptId,
+					startTime: Date.parse(startTime),
+					endTime: Date.parse(endTime),
+				}).then((res) => {
+					this.HolidayList = res.data;
+				});
+			} else {
+				getClassSchedulingList({
+					teamId: this.teamId,
+					startTime: Date.parse(startTime),
+					endTime: Date.parse(endTime),
+				}).then((res) => {
+					this.HolidayList = res.data;
+				});
+			}
+		},
+		// 切换月份
+		selectMonth() {
+			this.getHolidayPage();
+		},
+		/** 查询部门下拉树结构 */
+		getTreeselect() {
+			getEnableData().then((response) => {
+				// 处理 deptOptions 参数
+				this.deptOptions = [];
+				this.deptOptions.push(...this.handleTree1(response.data, 'id'));
+				this.$nextTick(() => {
+					this.$refs.tree.setCurrentKey(this.deptId);
+				});
+			});
+			listByDeptId(this.topDept.id).then((response) => {
+				this.groupOptions = [];
+				this.groupOptions.push(...response.data);
+			});
+		},
+		//大整数精度丢失
+		handleTree1(data, fid) {
+			const id = fid || 'id';
+			const parentId = 'parentId';
+			const children = 'children';
+			const rootId =
+				data
+					.map((item) => item[parentId].toString())
+					.reduce((min, current) => {
+						if (current.length < min.length) return current;
+						if (current.length > min.length) return min;
+						return current < min ? current : min;
+					}) || 0;
+			//对源数据深度克隆
+			const cloneData = JSON.parse(JSON.stringify(data));
+			//循环所有项
+			const treeData = cloneData.filter((father) => {
+				let branchArr = cloneData.filter((child) => {
+					//返回每一项的子级数组
+					return father[id] == child[parentId];
+				});
+				branchArr.length > 0 ? (father.children = branchArr) : '';
+				//返回第一层
+				return father[parentId] == rootId;
+			});
+			return treeData !== '' ? treeData : data;
+		},
+		// 筛选节点
+		filterNode(value, data) {
+			if (!value) return true;
+			return data.name.indexOf(value) !== -1;
+		},
+		tabsClick() {
+			if (this.activeName == 'second' && this.groupOptions.length > 0) {
+				this.teamId = this.groupOptions[0].id;
+				this.showTeamName = {
+					leaderName: this.groupOptions[0].leaderName || '-',
+					leaderPhone: this.groupOptions[0].leaderPhone || '-',
+				};
+				this.$nextTick(() => {
+					this.$refs.tree1.setCurrentKey(this.teamId);
+				});
+			} else if (this.activeName == 'first') {
+				this.deptId = this.topDept.id;
+				this.$nextTick(() => {
+					this.$refs.tree.setCurrentKey(this.deptId);
+				});
+			}
+			this.getHolidayPage();
+		},
+		// 节点单击事件
+		handleNodeClick(data) {
+			this.deptId = data.id;
+			this.showDeptName = data.name;
+			this.getHolidayPage();
+		},
+		handleNodeClick1(data) {
+			this.teamId = data.id;
+			this.showTeamName = {
+				leaderName: data.leaderName || '-',
+				leaderPhone: data.leaderPhone || '-',
+			};
+			this.getHolidayPage();
+		},
+		//获取农历
+		getLunarDate(solarDate) {
+			try {
+				const [year, month, day] = solarDate.split('-').map(Number);
+
+				const date = new Date(year, month - 1, day);
+				const lunar = solarToLunar(date);
+
+				// 将数字月份和日期转换为中文
+				const monthMap = {
+					1: '正',
+					2: '二',
+					3: '三',
+					4: '四',
+					5: '五',
+					6: '六',
+					7: '七',
+					8: '八',
+					9: '九',
+					10: '十',
+					11: '冬',
+					12: '腊',
+				};
+
+				const dayMap = {
+					1: '初一',
+					2: '初二',
+					3: '初三',
+					4: '初四',
+					5: '初五',
+					6: '初六',
+					7: '初七',
+					8: '初八',
+					9: '初九',
+					10: '初十',
+					11: '十一',
+					12: '十二',
+					13: '十三',
+					14: '十四',
+					15: '十五',
+					16: '十六',
+					17: '十七',
+					18: '十八',
+					19: '十九',
+					20: '二十',
+					21: '廿一',
+					22: '廿二',
+					23: '廿三',
+					24: '廿四',
+					25: '廿五',
+					26: '廿六',
+					27: '廿七',
+					28: '廿八',
+					29: '廿九',
+					30: '三十',
+				};
+
+				// 返回 "三月初四" 格式
+				return `${monthMap[lunar.month]}月${dayMap[lunar.day]}`;
+			} catch (error) {
+				console.log(error);
+				return '';
+			}
+		},
+		holidayLog(det, date, detSort) {
+			this.dialogTitle = this.showDeptName + '-' + date + '-排班详情';
+			this.logVisible = true;
+			this.$nextTick(() => {
+				this.$refs.holidayLogRef.init(det, detSort);
+			});
+		},
+		cancelLog() {
+			this.dialogTitle = '';
+			this.logVisible = false;
+		},
+	},
+};
+</script>
+<style lang="scss">
+.head-container {
+	padding: 20px 10px 0;
+	background-color: #fff;
+	border-radius: 8px;
+	height: 100%;
+}
+.groupTeamScheduling {
+	.operationArea {
+		padding: 14px 10px 0 16px;
+		margin-bottom: 8px;
+		background-color: #fff;
+		border-radius: 8px;
+		.blue-block {
+			display: inline-block;
+			width: 4px;
+			height: 16px;
+			background-color: #0b58ff;
+			border-radius: 1px;
+			margin-right: 8px;
+			margin-top: 10px;
+		}
+		.el-form-item {
+			margin-bottom: 10px;
+		}
+	}
+	// 日历
+	.calenderArea {
+		padding: 14px 10px 0 20px;
+		background-color: #fff;
+		border-radius: 8px;
+		min-height: calc(100vh - 120px - 8px - 168px);
+		.el-calendar__body {
+			padding: 10px 16px 16px 0;
+		}
+		.el-calendar__header {
+			display: none;
+		}
+		.el-calendar-table > thead {
+			height: 48px;
+			font-size: 20px;
+			font-weight: 500;
+			color: #000000;
+			background-color: rgba(242, 244, 249, 1);
+		}
+		.el-calendar-table__row {
+			height: 133px;
+			.prev,
+			.next {
+				pointer-events: none;
+			}
+			.is-selected,
+			.is-today {
+				background-color: #e4f0fd;
+			}
+			.el-calendar-day {
+				padding: 0;
+				height: 100%;
+				:hover {
+					background-color: #e4f0fd;
+				}
+				.dateStyle {
+					font-size: 20px;
+					font-weight: 500;
+					color: #000000;
+					text-align: left;
+					height: 133px;
+					line-height: 28px;
+					padding: 10px;
+					overflow: hidden;
+
+					.lunar-date {
+						display: inline-block;
+						font-size: 12px;
+						color: #909399;
+					}
+					.work-tip {
+						background: #87c1ff;
+						color: white;
+						font-size: 18px;
+						width: 30px;
+						text-align: center;
+						float: right;
+						position: relative;
+						.subIcon {
+							position: absolute;
+							top: -18px;
+							right: -10px;
+							font-size: 10px;
+						}
+					}
+					.holiday-div {
+						background-color: #67c23a;
+						border-radius: 3px;
+						height: 25px;
+						text-align: center;
+						font-size: 12px;
+						line-height: 24px;
+						color: #fff;
+						margin-bottom: 2px;
+						white-space: nowrap;
+						overflow: hidden;
+						text-overflow: ellipsis;
+					}
+				}
+			}
+		}
+	}
+}
+</style>
diff --git a/src/views/group/Schedule/add-group.vue b/src/views/group/Schedule/add-group.vue
index 09930d81..6051b2b2 100644
--- a/src/views/group/Schedule/add-group.vue
+++ b/src/views/group/Schedule/add-group.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2025-10-11 14:27:37
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-15 16:47:28
+ * @LastEditTime: 2025-11-14 22:00:10
  * @Description:
 -->
 <template>
@@ -12,6 +12,9 @@
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
 		<base-table
+			ref="groupTableRef"
+			:id="'groupTableSelectRef'"
+			row-key="id"
 			:selectWidth="55"
 			@selection-change="selectChange"
 			:table-props="tableProps"
@@ -22,7 +25,7 @@
 </template>
 
 <script>
-import { listByDeptId } from '@/api/group/Schedule';
+import { getGroupPage } from '@/api/group/groupSetting';
 
 const tableProps = [
 	{
@@ -36,7 +39,7 @@ const tableProps = [
 		width: 100,
 	},
 	{
-		prop: 'deptId',
+		prop: 'deptName',
 		label: '所属部门',
 	},
 	{
@@ -46,6 +49,7 @@ const tableProps = [
 	{
 		prop: 'remark',
 		label: '备注',
+		showOverflowtooltip: true,
 	},
 ];
 
@@ -53,7 +57,7 @@ export default {
 	data() {
 		return {
 			urlOptions: {
-				getDataListURL: listByDeptId,
+				getDataListURL: getGroupPage,
 			},
 			tableProps,
 			tableData: [],
@@ -82,24 +86,55 @@ export default {
 				pageSize: 100,
 				code: '',
 				name: '',
+				deptId: undefined,
 			},
 			selectedList: [],
-      deptId: undefined
+			selectedArr: [], //已选的班组，从父组件传过来的
 		};
 	},
 	created() {},
 	methods: {
-    init(id){
-      this.deptId = id
-      this.getDataList()
-    },
+		init(id, tableData) {
+			this.formInline.deptId = id;
+			this.selectedArr = tableData || [];
+			this.$nextTick(() => {
+				this.getDataList();
+			});
+		},
 		// 获取数据列表
 		getDataList() {
-			this.urlOptions
-				.getDataListURL(this.deptId)
-				.then((response) => {
-					this.tableData = response.data;
+			this.urlOptions.getDataListURL(this.formInline).then((response) => {
+				this.tableData = response.data.list.filter(item=>item.enabled===1);
+        this.tableData.forEach(item=>item.teamId= item.id)
+				this.$nextTick(() => {
+					if (this.selectedArr.length > 0) {
+						this.setSelectedRows();
+					}
 				});
+			});
+		},
+		setSelectedRows() {
+			const table = this.$refs.groupTableRef.$children[0];
+
+			// 先清空选择
+			table.clearSelection();
+
+			this.selectedArr.forEach((item) => {
+				const rowInTable = this.tableData.find((i) => i.teamId === item.teamId);
+				if (rowInTable) {
+					//这里一定要用table.tableData，这样才是指向同一个数组
+					this.$set(table.store.states, 'selection', [
+						...table.store.states.selection,
+						table.tableData.find((i) => i.teamId === item.teamId),
+					]);
+				}
+			});
+
+			// 强制更新视图
+			this.$nextTick(() => {
+				table.$forceUpdate();
+				this.$forceUpdate();
+			});
 		},
 		buttonClick(val) {
 			switch (val.btnName) {
@@ -115,9 +150,22 @@ export default {
 		selectChange(val) {
 			this.selectedList = val;
 		},
+		// 判断两个数组是否有重复的 id,去重
+		hasDuplicateIds(arr1, arr2) {
+			return arr2.filter(
+				(item2) => !arr1.some((item1) => item1.teamId === item2.teamId)
+			);
+		},
+
 		dataFormSubmit() {
 			if (this.selectedList && this.selectedList.length > 0) {
+				this.selectedList = this.hasDuplicateIds(
+					this.selectedArr,
+					this.selectedList
+				);
 				this.$emit('refreshTableData', this.selectedList);
+			} else if (this.selectedArr.length > 0) {
+				this.$message('请不要重复添加数组');
 			}
 		},
 	},
diff --git a/src/views/group/Schedule/add-or-updata.vue b/src/views/group/Schedule/add-or-updata.vue
index a87c4536..dd4f8991 100644
--- a/src/views/group/Schedule/add-or-updata.vue
+++ b/src/views/group/Schedule/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2025-10-13 15:07:24
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-17 17:01:35
+ * @LastEditTime: 2025-12-01 14:40:46
  * @Description:
 -->
 <template>
@@ -54,10 +54,11 @@
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
-						<el-form-item label="部门">
+						<el-form-item label="部门" prop="deptId">
 							<dept-select
 								style="width: 100%"
 								ref="deptSelect"
+								v-model="dataForm.deptId"
 								@DeptId="setDeptId"></dept-select>
 						</el-form-item>
 					</el-col>
@@ -111,20 +112,12 @@
 							</el-select>
 						</el-form-item>
 					</el-col>
-					<el-col :span="6">
+					<el-col :span="6" v-if="dataForm.shiftType > 1">
 						<el-form-item label="同班次连排" prop="shiftSustainedNum">
 							<el-input
 								v-model="dataForm.shiftSustainedNum"
 								oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
-								<el-select
-									style="width: 80px"
-									v-model="dataForm.shiftSustainedType"
-									slot="append">
-									<el-option label="日" :value="1"></el-option>
-									<el-option label="周" :value="2"></el-option>
-									<el-option label="月" :value="3"></el-option>
-									<el-option label="季" :value="4"></el-option>
-								</el-select>
+								<span slot="append">日</span>
 							</el-input>
 						</el-form-item>
 					</el-col>
@@ -142,6 +135,18 @@
 		<div v-if="stepNum == 2">
 			<small-title style="margin: 16px 0" size="sm" :no-padding="true">
 				班次
+				<el-tag type="warning" style="color: black" v-if="!isClassTimePass">
+					<i class="el-icon-warning" style="color: #ffbd02"></i>
+					两班倒和三班倒的班次设置时间
+					<span style="color: red">不能重叠</span>
+					，且 在24小时。
+				</el-tag>
+				<el-tag type="warning" style="color: black" v-if="!covers24Hours">
+					<i class="el-icon-warning" style="color: #ffbd02"></i>
+					两班倒和三班倒的班次设置时间,班次时间
+					<span style="color: red">必须连续</span>
+					在24小时。
+				</el-tag>
 			</small-title>
 			<base-table
 				:table-props="tableProps1"
@@ -158,6 +163,12 @@
 			</base-table>
 			<small-title style="margin: 16px 0" size="sm" :no-padding="true">
 				班组
+				<el-tag type="warning" style="color: black">
+					<i class="el-icon-warning" style="color: #ffbd02"></i>
+					排班从计划开始时间对应的第一个班次开始，按
+					<span style="color: red">班组列表顺序</span>
+					依次循环执行
+				</el-tag>
 			</small-title>
 			<base-table
 				:table-props="tableProps2"
@@ -165,6 +176,7 @@
 				:limit="10"
 				:table-data="tableData2"
 				:add-button-show="'新增'"
+				@emitFun="handleSort"
 				@emitButtonClick="addNewGroup">
 				<method-btn
 					v-if="tableBtn2.length"
@@ -176,11 +188,13 @@
 			</base-table>
 		</div>
 		<div v-if="stepNum == 3">
-			<small-title style="margin: 16px 0" size="sm" :no-padding="true">
+			<small-title
+				style="margin: 16px 0; font-size: 16px"
+				size="de"
+				:no-padding="true">
 				排班计划预览
 				<span style="font-size: 14px; color: #ff1c15">
-					系统将根据以下设置，按班组轮班顺序依次循环每日班次，生成正式排班计划，请确认。
-
+					系统将根据
 					<el-popover
 						placement="right"
 						title="比如三班两倒，同班次连排2天，不休周末排班如下"
@@ -197,9 +211,10 @@
 						</el-table>
 						<i
 							slot="reference"
-							class="el-icon-warning-outline"
-							style="color: #ff1c15"></i>
+							class="el-icon-chat-dot-square"
+							style="color: #409eff; font-size: 18px"></i>
 					</el-popover>
+					设置，按班组轮班顺序依次循环每日班次，生成正式排班计划，请确认。
 				</span>
 			</small-title>
 			<el-tag>
@@ -232,7 +247,7 @@
 						<div style="color: rgba(0, 0, 0, 0.6)">同班次连排</div>
 						<div style="color: #000000">
 							{{
-								dataForm.shiftSustainedNum +
+								(dataForm.shiftSustainedNum ? dataForm.shiftSustainedNum : '') +
 								['日', '周', '月', '季'][dataForm.shiftSustainedType - 1]
 							}}
 						</div>
@@ -263,12 +278,38 @@
 					</div>
 				</div>
 			</div>
+			<small-title
+				style="margin: 16px 0; font-size: 16px"
+				size="de"
+				:no-padding="true">
+				预览周期
+				<span>
+					<el-select
+						style="height: 20px"
+						v-model="period"
+						size="mini"
+						@change="setPeriod"
+						placeholder="请选择">
+						<el-option
+							v-for="item in periodArr"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value"></el-option>
+					</el-select>
+				</span>
+			</small-title>
+
+			<base-table
+				v-if="tableProps3.length > 0"
+				:table-props="tableProps3"
+				:table-data="tableData3"></base-table>
 		</div>
 		<base-dialog
 			:dialogTitle="'修改班次'"
 			:dialogVisible="addOrUpdateVisible1"
 			@cancel="cancel1"
 			@confirm="handleConfirm1"
+			:before-close="cancel1"
 			:destroy-on-close="true"
 			append-to-body
 			width="40%">
@@ -281,6 +322,7 @@
 			:dialogVisible="addOrUpdateVisible2"
 			@cancel="cancel2"
 			@confirm="handleConfirm2"
+			:before-close="cancel2"
 			:destroy-on-close="true"
 			append-to-body
 			width="40%">
@@ -293,6 +335,7 @@
 			:dialogVisible="addOrUpdateVisible3"
 			@cancel="cancel3"
 			@confirm="handleConfirm3"
+			:before-close="cancel3"
 			:destroy-on-close="true"
 			append-to-body
 			width="50%">
@@ -306,11 +349,25 @@
 <script>
 import deptSelect from './../deptSelect.vue';
 import SmallTitle from './SmallTitle';
+import propfirstSpan from './propfirstSpan.vue';
+import propSpan from './propSpan.vue';
 import { parseTime } from '@/filter/code-filter';
 import editClass from './edit-class.vue';
 import addGroup from './add-group.vue';
 import bindLine from './bind-line.vue';
-import { getCode, createStepOne, returnStepOne } from '@/api/group/Schedule';
+import sortSet from './sortSet.vue';
+import {
+	getCode,
+	createStepOne,
+	returnStepOne,
+	createStepTwo,
+	returnStepTwo,
+	getPerView,
+	draftEditing,
+	cancelStepThree,
+	checkPlan,
+	createStepFour,
+} from '@/api/group/Schedule';
 
 const tableProps1 = [
 	{
@@ -318,18 +375,18 @@ const tableProps1 = [
 		label: '班次名称',
 	},
 	{
-		prop: 'startDay',
+		prop: 'startTime',
 		label: '开始时间',
-		// filter: (val) => {
-		// 	parseTime(val, '{H}:{mm}');
-		// },
+		filter: (val) => {
+			return val ? val.slice(0, -3) : '-';
+		},
 	},
 	{
-		prop: 'endDay',
+		prop: 'endTime',
 		label: '结束时间',
-		// filter: (val) => {
-		// 	parseTime(val, '{H}:{mm}');
-		// },
+		filter: (val) => {
+			return val ? val.slice(0, -3) : '-';
+		},
 	},
 	{
 		prop: 'remark',
@@ -338,10 +395,17 @@ const tableProps1 = [
 ];
 
 const tableProps2 = [
+	{
+		prop: 'shunxu',
+		label: '顺序',
+		width: 70,
+		subcomponent: sortSet,
+	},
 	{
 		prop: 'code',
 		label: '班组编号',
 		width: 140,
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'name',
@@ -356,8 +420,9 @@ const tableProps2 = [
 		width: 110,
 	},
 	{
-		prop: 'code1',
+		prop: 'lineName',
 		label: '产线及工段',
+		showOverflowtooltip: true,
 	},
 ];
 
@@ -368,6 +433,8 @@ export default {
 		editClass,
 		addGroup,
 		bindLine,
+		propfirstSpan,
+		propSpan,
 	},
 	data() {
 		return {
@@ -383,6 +450,8 @@ export default {
 				},
 			],
 			stepNum: 1, // 当前第几步
+			isEdit: false, //是否是编辑状态，编辑的时候，让前端上一步和取消都不用接口
+			shiftTypeEdit: undefined, //该值为编辑时获取的shiftType，到第二步，判断dataForm.shiftType是否改变，同时改变班次信息
 			//第一步参数
 			dataForm: {
 				id: undefined,
@@ -436,6 +505,7 @@ export default {
 				name: [
 					{ required: true, message: '计划名称不能为空', trigger: 'blur' },
 				],
+				deptId: [{ required: true, message: '部门不能为空', trigger: 'blur' }],
 				startDay: [
 					{ required: true, message: '开始时间不能为空', trigger: 'change' },
 				],
@@ -468,12 +538,24 @@ export default {
 					btnName: '编辑',
 				},
 			].filter((v) => v),
+			isClassTimePass: true, //修改班次时间后，需要判断时间是否有重叠，且是否在24小时内 true是没问题的
+			covers24Hours: true, //修改班次时间后，需要判断时间是否覆盖24小时连续的时间 true是没问题的
 			tableData1: [],
 			tableProps2,
 			tableBtn2: [
 				{
 					type: 'bind',
 					btnName: '绑定产线',
+					showParam: {
+						type: '&',
+						data: [
+							{
+								type: 'equal',
+								name: 'isProduction',
+								value: true,
+							},
+						],
+					},
 				},
 				{
 					type: 'delete',
@@ -527,52 +609,92 @@ export default {
 					class2: 'B',
 				},
 			],
+			period: 7, //预览周期
+			periodArr: [
+				{
+					value: 7,
+					label: '7天',
+				},
+				{
+					value: 14,
+					label: '14天',
+				},
+				{
+					value: 30,
+					label: '30天',
+				},
+			],
+			tableProps3: [],
+			tableData3: [],
 		};
 	},
 	methods: {
-		//子组件获取的部门id
-		setDeptId(val) {
-			this.dataForm.deptId = val;
-		},
-		//详情时传给子组件的部门id
-		setDataForm() {
-			this.$refs.deptSelect.setID(this.dataForm.deptId);
-		},
-		init() {
+		init(id, isEdit) {
+			this.dataForm.id = id || undefined;
+			this.isEdit = isEdit || false;
 			this.$nextTick(() => {
 				this.$refs['dataForm'].resetFields();
-				getCode().then((res) => {
-					this.dataForm.code = res.data;
-				});
+				if (this.dataForm.id) {
+					draftEditing(this.dataForm.id).then((res) => {
+						this.dataForm = res.data?.stepOne;
+						this.shiftTypeEdit = res.data?.stepOne.shiftType;
+						this.setDataForm();
+						this.tableData1 = res.data?.stepTwo.groupPlanClassesBaseVOList;
+						this.tableData2 = res.data?.stepTwo.groupPlanTeamBaseVOList;
+						this.tableData2.forEach((item, index) => {
+							let lineName = [];
+							if (item.isProduction) {
+								lineName = this.setLineName(item.bindLineTree);
+								this.$set(
+									this.tableData2[index],
+									'lineName',
+									lineName.join(';')
+								);
+							}
+						});
+						this.stepNum = 3;
+						this.getThreeGroup(7); // 第三步，进来加载预览排班,默认7天预览周期
+					});
+				} else {
+					getCode().then((res) => {
+						this.dataForm.code = res.data;
+					});
+				}
 			});
 		},
-		handleClick1(val) {
-			this.addOrUpdateVisible1 = true;
-			this.$nextTick(() => {
-				this.$refs.editClassRef.init(val.data);
-			});
-		},
-		handleClick2(val) {
-			if (val.type === 'bind') {
-				this.addOrUpdateVisible3 = true;
-				this.$nextTick(() => {
-					this.$refs.bindLineRef.init(val.data.id);
-				});
-			} else if (val.type === 'delete') {
-				this.tableData2.splice(val.data._pageIndex - 1, 1);
-			}
-		},
+		//上一步
 		upSubmit() {
 			if (this.stepNum == 2) {
-				returnStepOne(this.dataForm.id).then((res) => {
+				if (!this.isEdit) {
+					//编辑的时候，让前端上一步和取消都不用接口，
+					returnStepOne(this.dataForm.id).then((res) => {
+						this.stepNum -= 1;
+						this.$emit('setSN', this.stepNum);
+						this.$nextTick(() => {
+							this.setDataForm();
+						});
+					});
+				} else {
 					this.stepNum -= 1;
 					this.$emit('setSN', this.stepNum);
 					this.$nextTick(() => {
 						this.setDataForm();
 					});
-				});
+				}
+			} else if (this.stepNum == 3) {
+				if (!this.dataForm.id) {
+					//编辑的时候，让前端上一步和取消都不用接口，
+					returnStepTwo(this.dataForm.id).then((res) => {
+						this.stepNum -= 1;
+						this.$emit('setSN', this.stepNum);
+					});
+				} else {
+					this.stepNum -= 1;
+					this.$emit('setSN', this.stepNum);
+				}
 			}
 		},
+		//下一步
 		nextSubmit() {
 			if (this.stepNum == 1) {
 				this.$refs['dataForm'].validate((valid) => {
@@ -584,99 +706,362 @@ export default {
 						this.$message('部门不能为空');
 						return;
 					}
+					const compareDate = this.compareDates(
+						this.dataForm.startDay,
+						this.dataForm.endDay
+					);
+
+					if (compareDate > 0) {
+						this.$message('开始时间不能大于结束时间');
+						return;
+					}
 					createStepOne(this.dataForm).then((res) => {
-						this.dataForm.id = res.data;
+						if (!this.dataForm.id) {
+							this.dataForm.id = res.data;
+						}
 						this.stepNum += 1;
 						this.$emit('setSN', this.stepNum);
-						this.setTWOclass(); // 第一步提交后，根据倒班方式设置第二部班次
+						if (
+							!this.dataForm.id ||
+							this.dataForm.shiftType !== this.shiftTypeEdit
+						) {
+							this.setTWOclass(); // (新增时或者编辑时倒班方式变了)第一步提交后，根据倒班方式设置第二部班次
+						}
 					});
 				});
 				return;
 			}
 			if (this.stepNum == 2) {
-        let data = {}
-        data.planId = this.dataForm.id
-        data.groupPlanClassesBaseVOList = [] //排班-班次信息list
-        this.tableData1.forEach((item,index)=>{
-          const obj = {
-            sort: index+1,
-            name : item.name,
-            remark: item.remark,
-            startTime: {
-              hour:item.startDay.split(':')[0],
-              minute:item.startDay.split(':')[1],
-            },
-            endTime: {
-              hour:item.endDay.split(':')[0],
-              minute:item.endDay.split(':')[1],
-            }
-          }
-          data.groupPlanClassesBaseVOList.push(obj)
-        })
-        data.groupPlanTeamBaseVOList = [] //排班-班组信息list
-        this.tableData2.forEach(item=>{
-          const obj = {
-            teamId:item.id,
-            bindData: ''
-          }
-          data.groupPlanTeamBaseVOList.push(obj)
-        })
-				this.stepNum += 1;
-				this.$emit('setSN', this.stepNum);
+				//班组验证
+				if (!this.tableData2 || this.tableData2.length == 0) {
+					this.$message('班组不能为空');
+					return;
+				}
+
+				let isbindLine = false;
+				this.tableData2.forEach((item) => {
+					if (
+						item.isProduction &&
+						(!item.bindLineTree || item.bindLineTree.length == 0)
+					) {
+						isbindLine = true;
+					}
+				});
+				if (isbindLine) {
+					this.$message('生产班组必须绑定产线或工段');
+					return;
+				}
+
+				const ids = this.tableData2.map((item) => item.id);
+				const uniqueIds = [...new Set(ids)];
+				if (ids.length !== uniqueIds.length) {
+					this.$message('存在重复的班组,请检查！');
+					return;
+				}
+
+				if (this.dataForm.shiftType == 1 && this.tableData2.length > 1) {
+					this.$message('白班，班组数量仅支持 1个 班组');
+					return;
+				} else if (this.dataForm.shiftType == 2 && this.tableData2.length < 2) {
+					this.$message('两班倒，班组数量至少 2个 班组');
+					return;
+				} else if (this.dataForm.shiftType == 3 && this.tableData2.length < 3) {
+					this.$message('三班倒，班组数量至少 3个 班组');
+					return;
+				}
+
+				//班次验证
+				if (!this.isClassTimePass || !this.covers24Hours) {
+					this.$message('班次内时间有误，请重新填写!');
+					return;
+				}
+				let data = {};
+				data.planId = this.dataForm.id;
+				data.groupPlanClassesBaseVOList = []; //排班-班次信息list
+				this.tableData1.forEach((item, index) => {
+					const obj = {
+						sort: index + 1,
+						name: item.name,
+						remark: item.remark,
+						startTime: item.startTime,
+						endTime: item.endTime,
+						daySpan: item.daySpan,
+						code: item.code,
+					};
+					data.groupPlanClassesBaseVOList.push(obj);
+				});
+				data.groupPlanTeamBaseVOList = []; //排班-班组信息list
+				this.tableData2.forEach((item, index) => {
+					const obj = {
+						sort: index + 1,
+						teamId: item.teamId || item.id,
+						name: item.name,
+						leaderName: item.leaderName,
+						leaderPhone: item.leaderPhone,
+						bindData: JSON.stringify(item.bindLineTree),
+					};
+					data.groupPlanTeamBaseVOList.push(obj);
+				});
+				createStepTwo(data).then((res) => {
+					if (res.code === 200 || res.code === 0) {
+						this.stepNum += 1;
+						this.$emit('setSN', this.stepNum);
+						this.getThreeGroup(7); // 第三步，进来加载预览排班,默认7天预览周期
+					} else {
+						this.$message(res.msg);
+					}
+				});
 				return;
 			}
 			if (this.stepNum == 3) {
-				this.stepNum = 1;
-				this.$emit('setSN', this.stepNum);
+				let data = { planId: this.dataForm.id };
+				data.groupPlanTeamBaseVOList = []; //排班-班组信息list
+				this.tableData2.forEach((item) => {
+					const obj = {
+						teamId: item.teamId || item.id,
+						name: item.name,
+						bindData: JSON.stringify(item.bindLineTree),
+					};
+					data.groupPlanTeamBaseVOList.push(obj);
+				});
+				checkPlan(data).then((RES) => {
+					createStepFour(this.dataForm.id).then((res) => {
+						this.$modal.msgSuccess('创建计划成功');
+						this.stepNum = 1;
+						this.$emit('setSN', this.stepNum);
+						this.$emit('refreshDataList');
+					});
+				});
 				return;
 			}
 		},
+		//第一步
+		//子组件获取的部门id
+		setDeptId(val) {
+			this.dataForm.deptId = val;
+		},
+		//详情时传给子组件的部门id
+		setDataForm() {
+			this.$refs.deptSelect.setID(this.dataForm.deptId);
+		},
+		//比较时间，开始时间在结束时间前
+		compareDates(date1, date2) {
+			const d1 = date1;
+			const d2 = date2;
+
+			if (d1 === d2) {
+				return 0; // 日期相等
+			} else if (d1 < d2) {
+				return -1; // date1 在 date2 之前
+			} else {
+				return 1; // date1 在 date2 之后
+			}
+		},
+		//第二步
 		//设置第二部班次
 		setTWOclass() {
 			this.tableData1 = [];
 			if (this.dataForm.shiftType == 1) {
 				const obj = {
+					sort: 1,
 					name: '长白班',
-					startDay: '8:00',
-					endDay: '17:00',
+					startTime: '08:00:00',
+					endTime: '17:00:00',
+					daySpan: 0, //是否跨天
+					code: 1, //排版日历页面，根据这个字段显示颜色
 				};
 				this.tableData1.push(obj);
 			} else if (this.dataForm.shiftType == 2) {
 				const obj1 = {
+					sort: 1,
 					name: '白班',
-					startDay: '8:00',
-					endDay: '20:00',
+					startTime: '08:00:00',
+					endTime: '20:00:00',
+					daySpan: 0,
+					code: 1,
 				};
 				const obj2 = {
+					sort: 2,
 					name: '夜班',
-					startDay: '20:00',
-					endDay: '8:00',
+					startTime: '20:00:00',
+					endTime: '08:00:00',
+					daySpan: 1,
+					code: 3,
 				};
 				this.tableData1.push(obj1, obj2);
 			} else if (this.dataForm.shiftType == 3) {
 				const obj1 = {
+					sort: 1,
 					name: '早班',
-					startDay: '8:00',
-					endDay: '16:00',
+					startTime: '08:00:00',
+					endTime: '16:00:00',
+					daySpan: 0,
+					code: 1,
 				};
 				const obj2 = {
+					sort: 2,
 					name: '中班',
-					startDay: '16:00',
-					endDay: '00:00',
+					startTime: '16:00:00',
+					endTime: '00:00:00',
+					daySpan: 1,
+					code: 2,
 				};
 				const obj3 = {
+					sort: 3,
 					name: '夜班',
-					startDay: '00:00',
-					endDay: '8:00',
+					startTime: '00:00:00',
+					endTime: '08:00:00',
+					daySpan: 0,
+					code: 3,
 				};
 				this.tableData1.push(obj1, obj2, obj3);
 			}
 		},
+
+		/**
+		 * 将时间字符串转换为分钟数
+		 * @param {string} timeStr - 时间字符串，如 "08:00:00"
+		 * @returns {number} 分钟数
+		 */
+		timeToMinutes(timeStr) {
+			const [hours, minutes, s] = timeStr.split(':').map(Number);
+			return hours * 60 + minutes;
+		},
+		/**
+		 * 修改班次时间后，需要判断时间是否有覆盖，且是否覆盖24小时
+		 * @param {string} start1 - 开始时间1
+		 * @param {string} end1 - 结束时间1
+		 * @param {string} start2 - 开始时间2
+		 * @param {string} end2 - 结束时间2
+		 * @returns {boolean} 是否重叠 true则重叠，false则可以使用
+		 */
+		isTimeOverlap(start1, end1, start2, end2) {
+			const start1Min = this.timeToMinutes(start1);
+			const end1Min = this.timeToMinutes(end1);
+			const start2Min = this.timeToMinutes(start2);
+			const end2Min = this.timeToMinutes(end2);
+
+			// 处理跨天情况
+			const totalMinutes = 24 * 60;
+
+			// 如果结束时间小于开始时间，说明跨天
+			const isEnd1NextDay = end1Min < start1Min;
+			const isEnd2NextDay = end2Min < start2Min;
+
+			if (isEnd1NextDay && isEnd2NextDay) {
+				// 两个时间段都跨天，直接比较
+				return true;
+			} else if (isEnd1NextDay) {
+				// 第一个时间段跨天
+				return start2Min < end1Min || end2Min > start1Min;
+			} else if (isEnd2NextDay) {
+				// 第二个时间段跨天
+				return start1Min < end2Min || end1Min > start2Min;
+			} else {
+				// 都不跨天，正常比较
+				return start1Min < end2Min && end1Min > start2Min;
+			}
+		},
+		/**
+		 * 检查多个班次是否连续覆盖24小时
+		 * @param {Array} shifts - 班次数组，每个班次包含startTime和endTime
+		 * @returns {boolean} 是否连续覆盖24小时
+		 */
+		isCover24Hours(shifts) {
+			if (!shifts || shifts.length === 0) return false;
+
+			const totalMinutes = 24 * 60;
+
+			// 将班次转换为时间段对象
+			const intervals = shifts.map((shift) => ({
+				start: this.timeToMinutes(shift.startTime),
+				end: this.timeToMinutes(shift.endTime),
+			}));
+
+			// 处理跨天情况：如果结束时间小于开始时间，加上24小时
+			const normalizedIntervals = intervals.map((interval) => {
+				let { start, end } = interval;
+				if (end < start) {
+					end += totalMinutes;
+				}
+				return { start, end, originalEnd: interval.end };
+			});
+
+			// 按开始时间排序
+			normalizedIntervals.sort((a, b) => a.start - b.start);
+
+			// 检查是否连续覆盖
+			let coveredUntil = normalizedIntervals[0].end;
+			let hasGap = false;
+
+			for (let i = 1; i < normalizedIntervals.length; i++) {
+				const current = normalizedIntervals[i];
+
+				// 如果当前班次的开始时间大于已覆盖的结束时间，说明有间隔
+				if (current.start > coveredUntil) {
+					hasGap = true;
+					break;
+				}
+
+				// 更新已覆盖的结束时间
+				coveredUntil = Math.max(coveredUntil, current.end);
+			}
+
+			// 检查是否覆盖完整的24小时
+			const firstStart = normalizedIntervals[0].start;
+
+			// 判断条件：没有间隔且覆盖时间达到24小时
+			return !hasGap && coveredUntil - firstStart >= totalMinutes;
+		},
+		//编辑班次
+		handleClick1(val) {
+			this.addOrUpdateVisible1 = true;
+			this.$nextTick(() => {
+				this.$refs.editClassRef.init(val.data);
+			});
+		},
+		//班组操作
+		handleClick2(val) {
+			if (val.type === 'bind') {
+				this.addOrUpdateVisible3 = true;
+				this.$nextTick(() => {
+					this.$refs.bindLineRef.init(val.data);
+				});
+			} else if (val.type === 'delete') {
+				this.tableData2.splice(val.data._pageIndex - 1, 1);
+			}
+		},
+		//班组改变顺序
+		handleSort(val) {
+			if (val.type == 'up') {
+				const temp = this.tableData2[val.index];
+				this.tableData2.splice(val.index, 1);
+				let i = 0;
+				//如果是数组第一个，再向上则放到最后
+				if (val.index == 0) {
+					i = this.tableData2.length;
+				} else {
+					i = val.index - 1;
+				}
+				this.tableData2.splice(i, 0, temp);
+			} else {
+				const temp = this.tableData2[val.index];
+				this.tableData2.splice(val.index, 1);
+				let i = 0;
+				//如果是数组最后一个，再向下则放到第一个(因为先splice(val.index, 1)所以这里length不用-1)
+				if (val.index == this.tableData2.length) {
+					i = 0;
+				} else {
+					i = val.index + 1;
+				}
+				this.tableData2.splice(i, 0, temp);
+			}
+		},
 		// 新增班组
 		addNewGroup() {
 			this.addOrUpdateVisible2 = true;
 			this.$nextTick(() => {
-				this.$refs.addGroupRef.init(this.dataForm.deptId);
+				this.$refs.addGroupRef.init(this.dataForm.deptId, this.tableData2);
 			});
 		},
 		cancel1() {
@@ -699,16 +1084,176 @@ export default {
 		},
 		refreshTableData1(index, val) {
 			this.tableData1.splice(index, 1, val);
+			this.tableData1.sort((a, b) => {
+				if (a.sort === b.sort) {
+					return -1; // sort相等时，a排在b前面
+				}
+				return a.sort - b.sort;
+			});
+			this.tableData1.forEach((item, index) => {
+				item.sort = index + 1;
+			});
+			//修改班次时间后，需要判断时间是否有重叠，且是否在24小时内,isTimeOverlap方法返回false才是校验通过
+			if (this.dataForm.shiftType == 2) {
+				const twoClass = this.tableData1.map(({ startTime, endTime }) => ({
+					startTime,
+					endTime,
+				}));
+
+				this.isClassTimePass = !this.isTimeOverlap(
+					twoClass[0].startTime,
+					twoClass[0].endTime,
+					twoClass[1].startTime,
+					twoClass[1].endTime
+				);
+			} else if (this.dataForm.shiftType == 3) {
+				const threeClass = this.tableData1.map(({ startTime, endTime }) => ({
+					startTime,
+					endTime,
+				}));
+				const result1 = this.isTimeOverlap(
+					threeClass[0].startTime,
+					threeClass[0].endTime,
+					threeClass[1].startTime,
+					threeClass[1].endTime
+				);
+				const result2 = this.isTimeOverlap(
+					threeClass[1].startTime,
+					threeClass[1].endTime,
+					threeClass[2].startTime,
+					threeClass[2].endTime
+				);
+				const result3 = this.isTimeOverlap(
+					threeClass[0].startTime,
+					threeClass[0].endTime,
+					threeClass[2].startTime,
+					threeClass[2].endTime
+				);
+				this.isClassTimePass = !(result1 || result2 || result3);
+			}
+			//修改班次时间后，两班倒和三班倒需要判断时间是否连续覆盖24小时内
+			if (this.dataForm.shiftType > 1) {
+				this.covers24Hours = this.isCover24Hours(this.tableData1);
+				console.log(1111, this.covers24Hours);
+			}
 			this.cancel1();
 		},
 		refreshTableData2(val) {
 			this.tableData2.push(...val);
 			this.cancel2();
 		},
-		refreshTableData3(val) {
-			console.log(val);
+		refreshTableData3(index, val) {
+			this.tableData2[index].bindLineTree = val;
+			let lineName = this.setLineName(val);
+			if (lineName) {
+				this.$set(this.tableData2[index], 'lineName', lineName.join(';'));
+			}
 			this.cancel3();
 		},
+		//提取绑定的产线工段名展示出来
+		setLineName(data) {
+			const paths = [];
+
+			const processNode = (node, currentPath = []) => {
+				const newPath = [...currentPath, node.name];
+
+				if (node.children && node.children.length > 0) {
+					// 检查子节点是否都是叶子节点
+					const allChildrenAreLeaves = node.children.every(
+						(child) => !child.children || child.children.length === 0
+					);
+
+					if (allChildrenAreLeaves && node.children.length > 1) {
+						// 如果所有子节点都是叶子节点且多于1个，用括号合并显示
+						const leafNames = node.children
+							.map((child) => child.name)
+							.join(' 、 ');
+						paths.push(`${newPath.join('/')}/(${leafNames})`);
+					} else if (allChildrenAreLeaves && node.children.length === 1) {
+						// 只有一个叶子子节点，用括号显示
+						paths.push(`${newPath.join('/')}/（${node.children[0].name}）`);
+					} else {
+						// 继续处理子节点
+						node.children.forEach((child) => processNode(child, newPath));
+					}
+				} else {
+					// 没有子节点的节点（如原片产线1），用括号显示
+					paths.push(`${currentPath.join('/')}/（${node.name}）`);
+				}
+			};
+			data.forEach((node) => processNode(node));
+			return paths;
+		},
+		//第三步
+		// 进来加载预览排班
+		getThreeGroup(day) {
+			const data = {
+				id: this.dataForm.id,
+				count: day,
+			};
+			this.period = day;
+			this.tableProps3 = [];
+			this.tableData3 = [];
+			getPerView(data).then((res) => {
+				this.setThreeData(res.data);
+			});
+		},
+		setPeriod(val) {
+			this.getThreeGroup(val);
+		},
+
+		setThreeData(data) {
+			//表头第一个为班次名称
+			const propfirst = {
+				prop: 'name',
+				label: '',
+				align: 'center',
+				fixed: true,
+				subcomponent: propfirstSpan,
+			};
+			this.tableProps3.push(propfirst);
+			data.forEach((item, index) => {
+				//设置所有日期为表头
+				const obj = {
+					prop: 'daydata' + index,
+					label: item.day,
+					work: item.work,
+					subcomponent: propSpan,
+					showOverflowtooltip: true,
+				};
+				this.tableProps3.push(obj);
+				item.det.forEach((sItem, sIndex) => {
+					if (index === 0) {
+						let sObj = {
+							name: sItem.classesName + '/' + sItem.time,
+							sort: sItem.sort,
+						};
+						sObj['daydata' + index] = item.work
+							? sItem.teamName
+							: item.holidayName;
+						this.tableData3.push(sObj);
+					} else {
+						this.$set(
+							this.tableData3[sIndex],
+							'daydata' + index,
+							item.work ? sItem.teamName : item.holidayName
+						);
+						this.$set(this.tableData3[sIndex], 'sort', sItem.sort);
+					}
+				});
+			});
+		},
+		cancelStep() {
+			if (this.stepNum > 1 && !this.isEdit) {
+				//编辑的时候，让前端上一步和取消都不用接口，
+				cancelStepThree(this.dataForm.id).then((res) => {
+					this.$message('已取消计划');
+					this.$emit('refreshDataList');
+				});
+			} else {
+				this.$emit('refreshDataList');
+			}
+		},
 	},
 };
 </script>
diff --git a/src/views/group/Schedule/bind-line.vue b/src/views/group/Schedule/bind-line.vue
index 2dbdd8c9..af0e1aed 100644
--- a/src/views/group/Schedule/bind-line.vue
+++ b/src/views/group/Schedule/bind-line.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-16 16:37:40
+ * @LastEditTime: 2025-11-25 15:49:17
  * @Description:
 -->
 <template>
@@ -13,10 +13,14 @@
 			:to_data="toData"
 			@add-btn="add"
 			@remove-btn="remove"
-			pid="pid"
-			:defaultProps="{ label: 'name' }"
+			pid="fid"
+			:node_key="'uniqueId'"
+			:defaultProps="{
+				label: 'name',
+				children: 'children',
+			}"
 			height="450px"
-      style="padding-bottom:20px"
+			style="padding-bottom: 20px"
 			:mode="mode"
 			filter
 			openAll></tree-transfer>
@@ -31,7 +35,6 @@ export default {
 	components: { treeTransfer },
 	data() {
 		return {
-			groupId: undefined,
 			title: ['待选', '已选'],
 			mode: 'transfer',
 			fromData: [], //左边内容
@@ -39,30 +42,68 @@ export default {
 		};
 	},
 	methods: {
-		init(id) {
+		init(val) {
+			this._pageIndex = val._pageIndex - 1;
 			this.fromData = [];
 			this.toData = [];
-			this.groupId = id;
 			getGroupPlanTree().then((res) => {
-				this.fromData = res.data;
-				this.fromData.forEach((item) => {
+				res.data.forEach((item) => {
 					item.productionLineId = 0;
 				});
+				this.fromData = this.generateUniqueData(res.data);
+				this.$nextTick(() => {
+					this.toData = val.bindLineTree || [];
+					this.getFilterLeftData(this.fromData, this.toData); //编辑时组件有bug，左边相同数据不消失
+				});
 			});
 		},
+		generateUniqueData(data) {
+			return data.map((node) => this.processNode(node));
+		},
+		processNode(node) {
+			// 创建唯一ID：类型-原始ID
+			const uniqueId = node.type+'L'+node.id;
+			if (node.type > 0) {
+				node.fid = (node.type - 1)+'L'+node.pid;
+			}
+
+			return {
+				...node,
+				uniqueId,
+				children: node.children
+					? node.children.map((child) => this.processNode(child))
+					: [],
+			};
+		},
 		// 监听穿梭框组件添加
 		add(fromData, toData, obj) {
 			console.log('fromData:', fromData);
-			console.log('toData:', toData,obj);
+			console.log('toData:', toData, obj);
 		},
 		// 监听穿梭框组件移除
 		remove(fromData, toData, obj) {
 			console.log('fromData:', fromData);
 			console.log('toData:', toData);
 		},
+		/** 消除组件左边与右边选中数据相同项 */
+		// 处理过滤数据
+		getFilterLeftData(data, selData) {
+			for (let i = data.length - 1; i >= 0; i--) {
+				for (let j = selData.length - 1; j >= 0; j--) {
+					if (data[i] && data[i].id === selData[j].id) {
+						// 当id相等可以删除的情况 即：没有子级可以删除；
+						if (!data[i].children || data[i].children.length == 0) {
+							data.splice(i, 1);
+						} else {
+							this.getFilterLeftData(data[i].children, selData[j].children);
+						}
+					}
+				}
+			}
+		},
 		// 表单提交
 		dataFormSubmit() {
-			this.$emit('refreshTableData',this.toData);
+			this.$emit('refreshTableData', this._pageIndex, this.toData);
 		},
 	},
 };
diff --git a/src/views/group/Schedule/detail.vue b/src/views/group/Schedule/detail.vue
new file mode 100644
index 00000000..201430c5
--- /dev/null
+++ b/src/views/group/Schedule/detail.vue
@@ -0,0 +1,206 @@
+<!--
+ * @Author: zwq
+ * @Date: 2025-10-21 14:27:23
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-11-25 15:14:53
+ * @Description:
+-->
+<template>
+	<div>
+		<div class="info-div">
+			<div>
+				<span class="title">计划编号:</span>
+				{{ infoData.code }}
+			</div>
+			<div>
+				<span class="title">计划状态:</span>
+				{{ ['', '草稿', '已确认', '已作废'][infoData.status] }}
+			</div>
+			<div>
+				<span class="title">计划名称:</span>
+				{{ infoData.name }}
+			</div>
+			<div>
+				<span class="title">部门:</span>
+				{{ infoData.deptName }}
+			</div>
+			<div>
+				<span class="title">开始时间:</span>
+				{{ parseTime(infoData.startDay) }}
+			</div>
+			<div>
+				<span class="title">结束时间:</span>
+				{{ parseTime(infoData.endDay) }}
+			</div>
+			<div>
+				<span class="title">周末休假方式:</span>
+				{{ ['', '双休', '周六休', '周日休', '不休'][infoData.weekType] }}
+			</div>
+			<div>
+				<span class="title">倒班方式:</span>
+				{{ ['', '长白班', '两班倒', '三班倒'][infoData.shiftType] }}
+			</div>
+			<div>
+				<span class="title">同班次连排:</span>
+				{{ infoData.shiftSustainedNum }}日
+			</div>
+			<div>
+				<span class="title">创建人:</span>
+				{{ infoData.creatorName }}
+			</div>
+			<div>
+				<span class="title">创建时间:</span>
+				{{ parseTime(infoData.createTime) }}
+			</div>
+			<div v-if="infoData.status == 3">
+				<span class="title">作废时间:</span>
+				{{ parseTime(infoData.disableTime) }}
+			</div>
+			<div>
+				<span class="title">备注:</span>
+				{{ infoData.remark }}
+			</div>
+		</div>
+		<div>
+			<el-tabs v-model="activeName" stretch>
+				<el-tab-pane label="班次" name="first"></el-tab-pane>
+				<el-tab-pane label="班组" name="second"></el-tab-pane>
+			</el-tabs>
+			<base-table
+				v-if="activeName == 'first'"
+				:table-props="tableProps1"
+				:page="1"
+				:limit="10"
+				:table-data="tableData1"></base-table>
+			<base-table
+				v-else
+				:table-props="tableProps2"
+				:page="1"
+				:limit="10"
+				:table-data="tableData2"></base-table>
+		</div>
+	</div>
+</template>
+
+<script>
+import { parseTime } from '@/filter/code-filter';
+import { getPlan } from '@/api/group/Schedule';
+
+const tableProps1 = [
+	{
+		prop: 'name',
+		label: '班次名称',
+	},
+	{
+		prop: 'startTime',
+		label: '开始时间',
+		filter: (val) => {
+			return val ? val.slice(0, -3) : '-';
+		},
+	},
+	{
+		prop: 'endTime',
+		label: '结束时间',
+		filter: (val) => {
+			return val ? val.slice(0, -3) : '-';
+		},
+	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
+];
+
+const tableProps2 = [
+	{
+		prop: 'code',
+		label: '班组编号',
+		width: 140,
+	},
+	{
+		prop: 'name',
+		label: '班组名称',
+	},
+	{
+		prop: 'isProduction',
+		label: '是否生产班组',
+		filter: (val) => {
+			return val ? '是' : '否';
+		},
+		width: 110,
+	},
+	{
+		prop: 'lineName',
+		label: '产线及工段',
+	},
+];
+export default {
+	data() {
+		return {
+			infoData: {},
+			activeName: 'first',
+			tableProps1,
+			tableData1: [],
+			tableProps2,
+			tableData2: [],
+		};
+	},
+	methods: {
+		init(id) {
+			this.infoData = {};
+			getPlan(id).then((res) => {
+				this.infoData = res.data || {};
+				this.tableData1 = res.data?.groupPlanClassesBaseVOList.sort(
+					(a, b) => a.sort - b.sort
+				);
+				this.tableData2 = res.data?.groupPlanTeamBaseVOList;
+				this.tableData2.forEach((item, index) => {
+					let lineName = '';
+					if (item.isProduction) {
+						lineName = this.setLineName(item.bindLineTree);
+					}
+					this.$set(this.tableData2[index], 'lineName', lineName);
+				});
+			});
+		},
+		//提取绑定的产线工段名展示出来
+		setLineName(val) {
+			if (!val || val.length === 0) return '';
+
+			const currentLevelNames = val.map((item) => item.name);
+
+			// 处理当前层级显示
+			let currentDisplay = '';
+			if (currentLevelNames.length > 1) {
+				currentDisplay = `(${currentLevelNames.join(' 、 ')})`;
+			} else {
+				currentDisplay = currentLevelNames[0];
+			}
+
+			// 查找所有子节点（取第一个有子节点的元素）
+			const childNode = val.find(
+				(item) => item.children && item.children.length > 0
+			);
+			if (childNode) {
+				const childPath = this.setLineName(childNode.children);
+				if (childPath) {
+					return `${currentDisplay} / ${childPath}`;
+				}
+			}
+
+			return currentDisplay;
+		},
+	},
+};
+</script>
+
+<style scoped>
+.info-div {
+	display: grid;
+	grid-template-columns: 1fr 1fr 1fr;
+	gap: 10px;
+}
+.title {
+	font-weight: bold;
+}
+</style>
diff --git a/src/views/group/Schedule/edit-class.vue b/src/views/group/Schedule/edit-class.vue
index 4eac6585..c7ae0bb1 100644
--- a/src/views/group/Schedule/edit-class.vue
+++ b/src/views/group/Schedule/edit-class.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-15 16:31:11
+ * @LastEditTime: 2025-11-04 14:08:47
  * @Description:
 -->
 <template>
@@ -15,9 +15,10 @@
 		label-width="80px">
 		<el-row :gutter="20">
 			<el-col :span="12">
-				<el-form-item label="序号" prop="index">
+				<el-form-item label="排序" prop="sort">
 					<el-input-number
-						v-model="dataForm.index"
+						style="width: 100%"
+						v-model="dataForm.sort"
 						:step="1"
 						:min="1"
 						step-strictly />
@@ -32,23 +33,36 @@
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-				<el-form-item label="开始时间" prop="startDay">
+				<el-form-item label="开始时间" prop="startTime">
 					<el-time-picker
 						style="width: 100%"
 						format="H:mm"
-						value-format="H:mm"
-						v-model="dataForm.startDay"
-						placeholder="选择日期时间"></el-time-picker>
+						value-format="HH:mm:ss"
+						v-model="dataForm.startTime"
+            @change="timeFun('start')"
+						placeholder="选择时间"></el-time-picker>
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-				<el-form-item label="结束时间" prop="endDay">
+				<el-form-item label="结束时间" prop="endTime">
 					<el-time-picker
 						style="width: 100%"
 						format="H:mm"
-						value-format="H:mm"
-						v-model="dataForm.endDay"
-						placeholder="选择日期时间"></el-time-picker>
+						value-format="HH:mm:ss"
+						v-model="dataForm.endTime"
+            @change="timeFun('end')"
+						placeholder="选择时间"></el-time-picker>
+				</el-form-item>
+			</el-col>
+			<el-col :span="12">
+				<el-form-item label="是否跨天" prop="daySpan">
+					<el-switch
+						v-model="dataForm.daySpan"
+            disabled
+						:active-value="1"
+						:inactive-value="0"
+						active-text="隔天"
+						inactive-text="当天"></el-switch>
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
@@ -70,22 +84,24 @@ export default {
 		return {
 			dataForm: {
 				id: undefined,
-				index: undefined,
+				sort: undefined,
 				name: undefined,
-				startDay: undefined,
-				endDay: undefined,
+				startTime: undefined,
+				endTime: undefined,
+				daySpan: 0,
+				code: 1,
 				remark: undefined,
 			},
 			_pageIndex: 1,
 			dataRule: {
-				index: [{ required: true, message: '序号不能为空', trigger: 'blur' }],
+				sort: [{ required: true, message: '排序不能为空', trigger: 'blur' }],
 				name: [
 					{ required: true, message: '班次名称不能为空', trigger: 'blur' },
 				],
-				startDay: [
+				startTime: [
 					{ required: true, message: '开始时间不能为空', trigger: 'change' },
 				],
-				endDay: [
+				endTime: [
 					{ required: true, message: '结束时间不能为空', trigger: 'change' },
 				],
 			},
@@ -93,13 +109,31 @@ export default {
 	},
 	methods: {
 		init(val) {
-			this._pageIndex = val._pageIndex-1;
-			this.dataForm.index = val._pageIndex || 1;
+			this._pageIndex = val._pageIndex - 1;
+			this.dataForm.sort = val._pageIndex || 1;
 			this.dataForm.name = val.name || undefined;
-			this.dataForm.startDay = val.startDay || undefined;
-			this.dataForm.endDay = val.endDay || undefined;
+			this.dataForm.startTime = val.startTime || undefined;
+			this.dataForm.endTime = val.endTime || undefined;
 			this.dataForm.remark = val.remark || undefined;
+			this.dataForm.daySpan = val.daySpan || 0;
+			this.dataForm.code = val.code || 1;
 		},
+    timeFun(val) {
+      if (this.dataForm.startTime && this.dataForm.endTime) {
+        if (this.dataForm.startTime > this.dataForm.endTime) {
+          this.dataForm.daySpan = 1
+        } else if (this.dataForm.startTime < this.dataForm.endTime) {
+          this.dataForm.daySpan = 0
+        } else {
+          if (val === 'start') {
+            this.dataForm.startTime = ''
+          } else {
+            this.dataForm.endTime = ''
+          }
+          this.$modal.msgWarning('班次开始时间和结束时间不能相同')
+        }
+      }
+    },
 		// 表单提交
 		dataFormSubmit() {
 			this.$refs['dataForm'].validate((valid) => {
diff --git a/src/views/group/Schedule/index.vue b/src/views/group/Schedule/index.vue
index c51533e3..a1e28693 100644
--- a/src/views/group/Schedule/index.vue
+++ b/src/views/group/Schedule/index.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
- * @Date: 2025-10-11 14:27:37
+ * @Date: 2025-10-13 15:07:24
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-15 16:42:28
+ * @LastEditTime: 2025-11-28 09:56:09
  * @Description:
 -->
 <template>
@@ -31,13 +31,17 @@
 				<el-form-item label="开始时间" prop="startDay">
 					<el-date-picker
 						v-model="formInline.startDay"
+						size="small"
 						type="datetime"
+						value-format="yyyy-MM-dd HH:mm:ss"
 						placeholder="选择日期时间"></el-date-picker>
 				</el-form-item>
 				<el-form-item label="结束时间" prop="endDay">
 					<el-date-picker
 						v-model="formInline.endDay"
+						size="small"
 						type="datetime"
+						value-format="yyyy-MM-dd HH:mm:ss"
 						placeholder="选择日期时间"></el-date-picker>
 				</el-form-item>
 				<el-form-item label="部门" prop="deptId">
@@ -46,8 +50,12 @@
 						ref="deptSelect"
 						@DeptId="setDeptId"></dept-select>
 				</el-form-item>
-				<el-form-item label="状态" prop="leaderName">
-					<el-select v-model="formInline.status" placeholder="请选择状态">
+				<el-form-item label="状态" prop="status">
+					<el-select
+						v-model="formInline.status"
+						size="small"
+						clearable
+						placeholder="请选择状态">
 						<el-option
 							v-for="item in options"
 							:key="item.value"
@@ -59,12 +67,15 @@
 					<el-button
 						type="primary"
 						size="small"
+						v-hasPermi="['base:group-scheduling-plan:query']"
 						@click="buttonClick({ btnName: 'search' })">
 						查询
 					</el-button>
 				</el-form-item>
 				<el-form-item>
-					<span class="separateStyle"></span>
+					<span
+						class="separateStyle"
+						v-hasPermi="['base:group-scheduling-plan:query']"></span>
 				</el-form-item>
 				<el-form-item>
 					<el-button size="small" @click="buttonClick({ btnName: 'reset' })">
@@ -72,17 +83,31 @@
 					</el-button>
 				</el-form-item>
 				<el-form-item>
-					<span class="separateStyle"></span>
+					<span
+						class="separateStyle"
+						v-hasPermi="['base:group-scheduling-plan:create']"></span>
 				</el-form-item>
 				<el-form-item>
 					<el-button
 						type="success"
 						size="small"
 						:plain="true"
+						v-hasPermi="['base:group-scheduling-plan:create']"
 						@click="buttonClick({ btnName: 'add' })">
 						新增
 					</el-button>
 				</el-form-item>
+				<el-form-item>
+					<el-button
+						type="warning"
+						plain
+						size="small"
+						@click="handleExport"
+						:loading="exportLoading"
+						v-hasPermi="['base:group-scheduling-plan:export']">
+						导出
+					</el-button>
+				</el-form-item>
 			</el-form>
 		</div>
 		<base-table
@@ -95,7 +120,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="80"
+				:width="270"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -112,7 +137,7 @@
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
 			:destroy-on-close="true"
-      append-to-body
+			append-to-body
 			width="60%">
 			<add-or-update
 				ref="addOrUpdate"
@@ -141,7 +166,7 @@
 								class="btnTextStyle"
 								size="small"
 								plain
-								@click="handleConfirm">
+								@click="successSubmit">
 								保存草稿
 							</el-button>
 							<el-button
@@ -156,6 +181,30 @@
 				</slot>
 			</template>
 		</base-dialog>
+		<base-dialog
+			:dialogTitle="'排班计划详情'"
+			:dialogVisible="detailVisible"
+			@cancel="detailCancel"
+			:before-close="detailCancel"
+			:destroy-on-close="true"
+			append-to-body
+			width="50%">
+			<detail ref="detailRef"></detail>
+			<template #footer>
+				<slot name="footer">
+					<el-row slot="footer" type="flex" justify="end">
+						<el-col :span="24">
+							<el-button
+								size="small"
+								class="btnTextStyle"
+								@click="detailCancel">
+								取消
+							</el-button>
+						</el-col>
+					</el-row>
+				</slot>
+			</template>
+		</base-dialog>
 	</div>
 </template>
 
@@ -165,8 +214,16 @@ import deptSelect from './../deptSelect.vue';
 import basicPage from '@/mixins/basic-page';
 import subSpan from './subSpan.vue';
 import subStatus from './subStatus.vue';
+import detail from './detail.vue';
 import { parseTime } from '@/filter/code-filter';
-import { getGroupPlanPage, deleteGroupPlan } from '@/api/group/Schedule';
+import {
+	getGroupPlanPage,
+	deleteGroupPlan,
+	copyPlan,
+	disablePlan,
+	updateScheduleLater,
+	exportExcel,
+} from '@/api/group/Schedule';
 
 const tableProps = [
 	{
@@ -206,7 +263,7 @@ const tableProps = [
 		subcomponent: subSpan,
 	},
 	{
-		prop: 'deptId',
+		prop: 'deptName',
 		label: '部门',
 	},
 	{
@@ -233,85 +290,97 @@ export default {
 			},
 			tableProps,
 			tableBtn: [
-				{
-					type: 'edit',
-					btnName: '编辑',
-					showParam: {
-						type: '&',
-						data: [
-							{
-								type: 'equal',
-								name: 'status',
-								value: 1,
+				this.$auth.hasPermi('base:group-scheduling-plan:update')
+					? {
+							type: 'edit',
+							btnName: '编辑',
+							showParam: {
+								type: '&',
+								data: [
+									{
+										type: 'equal',
+										name: 'status',
+										value: 1,
+									},
+								],
 							},
-						],
-					},
-				},
-				{
-					type: 'delete',
-					btnName: '删除',
-					showParam: {
-						type: '&',
-						data: [
-							{
-								type: 'equal',
-								name: 'status',
-								value: 1,
+					  }
+					: undefined,
+				this.$auth.hasPermi('base:group-scheduling-plan:delete')
+					? {
+							type: 'delete',
+							btnName: '删除',
+							showParam: {
+								type: '&',
+								data: [
+									{
+										type: 'equal',
+										name: 'status',
+										value: 1,
+									},
+								],
 							},
-						],
-					},
-				},
-				{
-					type: 'detail',
-					btnName: '查看',
-					showParam: {
-						type: '&',
-						data: [
-							{
-								type: 'unequal',
-								name: 'status',
-								value: 1,
+					  }
+					: undefined,
+				this.$auth.hasPermi('base:group-scheduling-plan:query')
+					? {
+							type: 'detail',
+							btnName: '查看',
+							showParam: {
+								type: '&',
+								data: [
+									{
+										type: 'unequal',
+										name: 'status',
+										value: 1,
+									},
+								],
 							},
-						],
-					},
-				},
-				{
-					type: 'cancel',
-					btnName: '作废',
-					showParam: {
-						type: '&',
-						data: [
-							{
-								type: 'equal',
-								name: 'status',
-								value: 2,
+					  }
+					: undefined,
+				this.$auth.hasPermi('base:group-scheduling-plan:delete')
+					? {
+							type: 'cancel',
+							btnName: '作废',
+							showParam: {
+								type: '&',
+								data: [
+									{
+										type: 'equal',
+										name: 'status',
+										value: 2,
+									},
+								],
 							},
-						],
-					},
-				},
-				{
-					type: 'sync',
-					btnName: '同步节假日',
-					showParam: {
-						type: '&',
-						data: [
-							{
-								type: 'equal',
-								name: 'status',
-								value: 2,
+					  }
+					: undefined,
+				this.$auth.hasPermi('base:group-holiday:update')
+					? {
+							type: 'sync',
+							btnName: '同步节假日',
+							showParam: {
+								type: '&',
+								data: [
+									{
+										type: 'equal',
+										name: 'status',
+										value: 2,
+									},
+									{
+										type: 'equal',
+										name: 'updateFlag',
+										value: true,
+									},
+								],
 							},
-							{
-								type: 'updateFlag',
-								name: 'status',
-								value: true,
-							},
-						],
-					},
-				},
-				{
-					type: 'copy',
-					btnName: '复制',
-				},
+					  }
+					: undefined,
+				this.$auth.hasPermi('base:group-scheduling-plan:create')
+					? {
+							type: 'copy',
+							btnName: '复制',
+					  }
+					: undefined,
 			].filter((v) => v),
 			tableData: [],
 			options: [
@@ -329,48 +398,52 @@ export default {
 				},
 			],
 			formInline: {
-				code: '',
-				name: '',
-				startDay: '',
-				endDay: '',
-				deptId: '',
-				status: '',
+				code: null,
+				name: null,
+				startDay: null,
+				endDay: null,
+				deptId: null,
+				status: null,
 			},
 			stepNum: 1, // 新增编辑时当前第几步
+			detailVisible: false,
+			// 导出遮罩层
+			exportLoading: false,
 		};
 	},
 	components: {
 		AddOrUpdate,
 		deptSelect,
+		detail,
 	},
 	created() {},
 	methods: {
 		buttonClick(val) {
 			switch (val.btnName) {
 				case 'search':
-					const date1 = new Date(this.formInline.startDay).getTime();
-					const date2 = new Date(this.formInline.endDay).getTime();
-
-					if (date1 > date2) {
+					if (this.formInline.startDay > this.formInline.endDay) {
 						this.$message('开始时间不得晚于结束时间');
 						return;
 					}
 					this.listQuery = {
 						pageNo: 1,
-						pageSize: 10,
+						pageSize: 20,
 						total: 1,
 						...this.formInline,
 					};
 					this.getDataList();
 					break;
 				case 'reset':
+					this.$refs.searchBarForm.resetFields();
 					this.formInline.name = null;
 					this.formInline.code = null;
 					this.formInline.deptId = null;
 					this.$refs.deptSelect.clear();
-					this.formInline.leaderName = null;
+					this.formInline.status = null;
+					this.formInline.startDay = null;
+					this.formInline.endDay = null;
 					this.listQuery = {
-						pageSize: 10,
+						pageSize: 20,
 						pageNo: 1,
 						total: 1,
 					};
@@ -396,10 +469,15 @@ export default {
 		setStepNum(val) {
 			this.stepNum = val;
 		},
-		// dialog取消
-		handleCancel() {
+		successSubmit() {
 			this.addOrUpdateVisible = false;
 			this.addOrEditTitle = '';
+			this.stepNum = 1;
+			this.getDataList();
+		},
+		// dialog取消
+		handleCancel() {
+			this.$refs.addOrUpdate.cancelStep();
 		},
 		handleConfirm(val) {
 			if (val == 'up') {
@@ -408,6 +486,81 @@ export default {
 				this.$refs.addOrUpdate.nextSubmit();
 			}
 		},
+		//tableBtn点击
+		handleClick(val) {
+			if (val.type === 'edit') {
+				this.addOrUpdateVisible = true;
+				this.addOrEditTitle = '编辑';
+				this.$nextTick(() => {
+					this.stepNum = 3;
+					this.$refs.addOrUpdate.init(val.data.id, true);
+				});
+			} else if (val.type === 'delete') {
+				this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex);
+			} else if (val.type === 'detail') {
+				this.detailVisible = true;
+				this.$nextTick(() => {
+					this.$refs.detailRef.init(val.data.id);
+				});
+			} else if (val.type === 'cancel') {
+				disablePlan(val.data.id).then((res) => {
+					this.$modal.msgSuccess('作废成功');
+					this.getDataList();
+				});
+			} else if (val.type === 'sync') {
+				this.$confirm(
+					'当前节假日包含尚未同步的节假日变更，是否立即将上述节假日同步更新到排班计划？',
+					'同步节假日',
+					{
+						confirmButtonText: '确认同步',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						updateScheduleLater({
+							planId: val.data.id,
+							logId: val.data.updateLogId,
+						}).then((res) => {
+							this.$modal.msgSuccess('同步节假日成功');
+							this.getDataList();
+						});
+					})
+					.catch((res) => {
+						this.getDataList();
+						this.$message({
+							type: 'info',
+							message: '已取消',
+						});
+					});
+			} else if (val.type === 'copy') {
+				copyPlan(val.data.id).then((res) => {
+					this.$modal.msgSuccess('复制成功');
+					this.getDataList();
+				});
+			}
+		},
+		detailCancel() {
+			this.detailVisible = false;
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			// 处理查询参数
+			let params = { ...this.formInline };
+			params.pageNo = undefined;
+			params.pageSize = undefined;
+			this.$modal
+				.confirm('是否确认导出所有数据项?')
+				.then(() => {
+					this.exportLoading = true;
+					return exportExcel(params);
+				})
+				.then((response) => {
+					this.$download.excel(response, '排班计划.xls');
+					this.exportLoading = false;
+				})
+				.catch(() => {});
+		},
 	},
 };
 </script>
@@ -449,21 +602,21 @@ export default {
 	margin: 4px 0;
 }
 body .el-dialog__header {
-  font-size: 16px;
-  color: rgba(0, 0, 0, 0.85);
-  font-weight: 500;
-  padding: 13px 24px;
-  border-bottom: 1px solid #e9e9e9;
+	font-size: 16px;
+	color: rgba(0, 0, 0, 0.85);
+	font-weight: 500;
+	padding: 13px 24px;
+	border-bottom: 1px solid #e9e9e9;
 }
-body .el-dialog__header .titleStyle::before{
-  content: '';
-  display: inline-block;
-  width: 4px;
-  height: 16px;
-  background-color: #0B58FF;
-  border-radius: 1px;
-  margin-right: 8px;
-  position: relative;
-  top: 2px;
+body .el-dialog__header .titleStyle::before {
+	content: '';
+	display: inline-block;
+	width: 4px;
+	height: 16px;
+	background-color: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	position: relative;
+	top: 2px;
 }
 </style>
diff --git a/src/views/group/Schedule/propSpan.vue b/src/views/group/Schedule/propSpan.vue
new file mode 100644
index 00000000..518c779a
--- /dev/null
+++ b/src/views/group/Schedule/propSpan.vue
@@ -0,0 +1,36 @@
+<!--
+ * @Author: zwq
+ * @Date: 2025-10-13 16:18:41
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-10-21 13:54:52
+ * @Description:
+-->
+<template>
+	<span>
+		<el-tag
+			v-if="injectData.work"
+			size="small"
+			:type="['', 'success', 'warning'][injectData.sort]">
+			{{ injectData[injectData.prop] }}
+		</el-tag>
+		<el-tag v-else effect="dark" size="small" type="info">
+			{{ injectData[injectData.prop] }}
+		</el-tag>
+	</span>
+</template>
+
+<script>
+export default {
+	props: {
+		injectData: {
+			type: Object,
+			default: () => ({}),
+		},
+	},
+	data() {
+		return {};
+	},
+	created() {},
+	methods: {},
+};
+</script>
diff --git a/src/views/group/Schedule/propfirstSpan.vue b/src/views/group/Schedule/propfirstSpan.vue
new file mode 100644
index 00000000..c47f1488
--- /dev/null
+++ b/src/views/group/Schedule/propfirstSpan.vue
@@ -0,0 +1,33 @@
+<!--
+ * @Author: zwq
+ * @Date: 2025-10-13 16:18:41
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-10-20 10:13:26
+ * @Description:
+-->
+<template>
+	<div>
+		<div>
+			{{ injectData.name.split('/')[0] }}
+		</div>
+		<div>
+			{{ injectData.name.split('/')[1] }}
+		</div>
+	</div>
+</template>
+
+<script>
+export default {
+	props: {
+		injectData: {
+			type: Object,
+			default: () => ({}),
+		},
+	},
+	data() {
+		return {};
+	},
+	created() {},
+	methods: {},
+};
+</script>
diff --git a/src/views/group/Schedule/sortSet.vue b/src/views/group/Schedule/sortSet.vue
new file mode 100644
index 00000000..d02391e5
--- /dev/null
+++ b/src/views/group/Schedule/sortSet.vue
@@ -0,0 +1,44 @@
+<!--
+ * @Author: zwq
+ * @Date: 2025-10-13 16:40:08
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-11-04 16:08:57
+ * @Description:
+-->
+<template>
+	<div>
+		<el-button type="text" size="mini" @click="moveUp()" style="display:inline-block">↑</el-button>
+		<el-button type="text" size="mini" @click="moveDown()" style="display:inline-block;float:right">↓</el-button>
+	</div>
+</template>
+
+<script>
+export default {
+	props: {
+		injectData: {
+			type: Object,
+			default: () => ({}),
+		},
+	},
+	data() {
+		return {};
+	},
+	created() {},
+	methods: {
+		moveUp() {
+			const val = {
+				type: 'up',
+				index: this.injectData._pageIndex - 1,
+			};
+			this.$emit('emitData', val);
+		},
+		moveDown() {
+			const val = {
+				type: 'down',
+				index: this.injectData._pageIndex - 1,
+			};
+			this.$emit('emitData', val);
+		},
+	},
+};
+</script>
diff --git a/src/views/group/Schedule/subSpan.vue b/src/views/group/Schedule/subSpan.vue
index f25b681c..599bf7ff 100644
--- a/src/views/group/Schedule/subSpan.vue
+++ b/src/views/group/Schedule/subSpan.vue
@@ -1,9 +1,16 @@
+<!--
+ * @Author: zwq
+ * @Date: 2025-10-13 16:18:41
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-11-04 10:54:19
+ * @Description:
+-->
 <template>
 	<span>
 		{{
-			injectData.shiftSustainedNum +
-			(injectDatashiftSustainedType
-				? ['', '日', '周', '月', '季'][injectDatashiftSustainedType]
+			(injectData.shiftSustainedNum?injectData.shiftSustainedNum:'') +
+			(injectData.shiftSustainedType
+				? ['', '日', '周', '月', '季'][injectData.shiftSustainedType]
 				: '')
 		}}
 	</span>
diff --git a/src/views/group/deptSelect.vue b/src/views/group/deptSelect.vue
index d6da9744..0095cfa2 100644
--- a/src/views/group/deptSelect.vue
+++ b/src/views/group/deptSelect.vue
@@ -48,7 +48,6 @@ export default {
 			this.deptId = id;
 		},
 		clear() {
-			console.log(this.$refs.treeselect);
 			this.$refs.treeselect.clear();
 		},
 		// 格式化部门的下拉框
diff --git a/src/views/group/groupSetting/add-or-updata.vue b/src/views/group/groupSetting/add-or-updata.vue
index 03bc639f..49aa240d 100644
--- a/src/views/group/groupSetting/add-or-updata.vue
+++ b/src/views/group/groupSetting/add-or-updata.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-13 15:44:18
+ * @LastEditTime: 2025-11-27 14:49:34
  * @Description:
 -->
 <template>
@@ -25,24 +25,28 @@
 			<el-col :span="8">
 				<el-form-item label="班组名称" prop="name">
 					<el-input
+						:disabled="nameDisable"
 						v-model="dataForm.name"
 						clearable
 						placeholder="请输入班组名称" />
 				</el-form-item>
 			</el-col>
 			<el-col :span="8">
-				<el-form-item label="部门">
+				<el-form-item label="部门" prop="deptId">
 					<dept-select
-						style="width: 200px"
+						style="width: 100%"
 						ref="deptSelect"
+						v-model="dataForm.deptId"
 						@DeptId="setDeptId"></dept-select>
 				</el-form-item>
 			</el-col>
 			<el-col :span="8">
 				<el-form-item label="组长" prop="leaderId">
 					<el-select
+						style="width: 100%"
 						v-model="dataForm.leaderId"
 						@change="setLeaderName"
+						filterable
 						placeholder="请选择组长">
 						<el-option
 							v-for="item in leaderArr"
@@ -57,12 +61,14 @@
 					<el-input
 						v-model="dataForm.leaderPhone"
 						clearable
+						maxlength="11"
 						placeholder="请输入组长电话" />
 				</el-form-item>
 			</el-col>
 			<el-col :span="8">
 				<el-form-item label="班组人数" prop="num">
 					<el-input-number
+						style="width: 100%"
 						v-model="dataForm.num"
 						:step="1"
 						:min="0"
@@ -72,6 +78,8 @@
 			<el-col :span="8">
 				<el-form-item label="生产班组" prop="isProduction">
 					<el-select
+						style="width: 100%"
+						@change="setIsProduction"
 						v-model="dataForm.isProduction"
 						placeholder="请选择是否为生产班组">
 						<el-option
@@ -103,6 +111,7 @@ import {
 	updateGroup,
 	getGroup,
 	getCode,
+	updateIsProduction,
 } from '@/api/group/groupSetting';
 
 export default {
@@ -132,7 +141,8 @@ export default {
 				num: undefined,
 				remark: undefined,
 			},
-      setData: true,
+			setData: true,
+			nameDisable: false, //班组被使用时，班组名称不能修改
 			leaderArr: [],
 			options: [
 				{
@@ -151,12 +161,21 @@ export default {
 				name: [
 					{ required: true, message: '班组名称不能为空', trigger: 'blur' },
 				],
+				deptId: [{ required: true, message: '部门不能为空', trigger: 'blur' }],
 				leaderId: [
 					{ required: true, message: '组长不能为空', trigger: 'change' },
 				],
 				isProduction: [
 					{ required: true, message: '生产班组不能为空', trigger: 'change' },
 				],
+				leaderPhone: [
+					{
+						pattern:
+							/^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,
+						message: '请输入正确的手机号码',
+						trigger: 'blur',
+					},
+				],
 			},
 		};
 	},
@@ -172,9 +191,43 @@ export default {
 				})
 				.catch(() => {});
 		},
-    setDataForm(){
-      this.$refs.deptSelect.setID(this.dataForm.deptId)
-    },
+		setDataForm() {
+			this.$refs.deptSelect.setID(this.dataForm.deptId);
+			this.nameDisable = false;
+			updateIsProduction(this.dataForm.id).then(({ data }) => {
+				if (data) {
+					this.$notify({
+						title: '警告',
+						message: '当前班组仍参与排班计划或正在执行工单。班组名称不能修改',
+						type: 'warning',
+					});
+					this.nameDisable = true;
+				}
+			});
+		},
+		setIsProduction() {
+			// 修改的提交
+			if (this.dataForm.id && this.nameDisable) {
+				this.$confirm(
+					'当前班组仍参与排班计划或正在执行工单。<br/>修改<strong> 是否是生产班组 </strong>不会自动更新排班内容，可能导致排班信息与班组属性不一致，请注意核查！<br/>是否确认修改是否是生产班组？',
+					'修改是否是生产班组',
+					{
+						dangerouslyUseHTMLString: true,
+						confirmButtonText: '确认修改',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {})
+					.catch((res) => {
+						this.$message({
+							type: 'info',
+							message: '已取消',
+						});
+						this.dataForm.isProduction = !this.dataForm.isProduction;
+					});
+			}
+		},
 		setLeaderName(val) {
 			this.leaderArr.map((item) => {
 				if (val === item.id) {
@@ -182,33 +235,33 @@ export default {
 				}
 			});
 		},
-    // 表单提交
-    dataFormSubmit() {
-      this.$refs["dataForm"].validate((valid) => {
-        if (!valid) {
-          return false;
-        }
-        if(!this.dataForm.deptId){
-						this.$message('部门不能为空');
-            return
-        }
-        // 修改的提交
-        if (this.dataForm.id) {
-          this.urlOptions.updateURL(this.dataForm).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.visible = false;
-            this.$emit("refreshDataList");
-          });
-          return;
-        }
-        // 添加的提交
-        this.urlOptions.createURL(this.dataForm).then(response => {
-          this.$modal.msgSuccess("新增成功");
-          this.visible = false;
-          this.$emit("refreshDataList");
-        });
-      });
-    },
+		// 表单提交
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (!valid) {
+					return false;
+				}
+				if (!this.dataForm.deptId) {
+					this.$message('部门不能为空');
+					return;
+				}
+				// 修改的提交
+				if (this.dataForm.id) {
+					this.urlOptions.updateURL(this.dataForm).then((response) => {
+						this.$modal.msgSuccess('修改成功');
+						this.visible = false;
+						this.$emit('refreshDataList');
+					});
+					return;
+				}
+				// 添加的提交
+				this.urlOptions.createURL(this.dataForm).then((response) => {
+					this.$modal.msgSuccess('新增成功');
+					this.visible = false;
+					this.$emit('refreshDataList');
+				});
+			});
+		},
 	},
 };
 </script>
diff --git a/src/views/group/groupSetting/changeStatus.vue b/src/views/group/groupSetting/changeStatus.vue
index b9744b78..eb598f51 100644
--- a/src/views/group/groupSetting/changeStatus.vue
+++ b/src/views/group/groupSetting/changeStatus.vue
@@ -1,14 +1,21 @@
+<!--
+ * @Author: zwq
+ * @Date: 2025-10-11 14:41:12
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-11-27 14:19:39
+ * @Description:
+-->
 <template>
 	<el-switch
 		@change="changeStatus"
 		size="small"
-		v-model="list.enabled"
+		v-model="injectData.enabled"
 		:active-value="1"
 		:inactive-value="0"></el-switch>
 </template>
 
 <script>
-import { updateGroup } from '@/api/group/groupSetting';
+import { updateGroup, updateIsProduction } from '@/api/group/groupSetting';
 export default {
 	props: {
 		injectData: {
@@ -17,17 +24,51 @@ export default {
 		},
 	},
 	data() {
-		return {
-			list: this.injectData,
-		};
+		return {};
 	},
 	created() {},
 	methods: {
 		changeStatus(val) {
-			const data = { ...this.injectData, enabled: val };
-			updateGroup(data).then((res) => {
-				this.$modal.msgSuccess('修改成功');
-					this.$emit('emitData');
+			const pdata = { ...this.injectData, enabled: val };
+			updateIsProduction(this.injectData.id).then(({ data }) => {
+				if (data) {
+					this.$confirm(
+						'当前班组仍参与排班计划或正在执行工单。<br/>修改<strong> 班组状态 </strong>不会自动更新排班内容，可能导致排班信息与班组属性不一致，请注意核查！<br/>是否确认修改班组状态？',
+						'更新班组状态',
+						{
+							dangerouslyUseHTMLString: true,
+							confirmButtonText: '确认修改',
+							cancelButtonText: '取消',
+							type: 'warning',
+						}
+					)
+						.then(() => {
+							updateGroup(pdata).then((res) => {
+								if (res.code === 0 || res.code === 200) {
+									this.$modal.msgSuccess('修改成功');
+									this.$emit('emitData');
+								} else {
+									this.$modal.msg(res.msg);
+								}
+							});
+						})
+						.catch((res) => {
+							this.$emit('emitData');
+							this.$message({
+								type: 'info',
+								message: '已取消',
+							});
+						});
+				} else {
+					updateGroup(pdata).then((res) => {
+						if (res.code === 0 || res.code === 200) {
+							this.$modal.msgSuccess('修改成功');
+							this.$emit('emitData');
+						} else {
+							this.$modal.msg(res.msg);
+						}
+					});
+				}
 			});
 		},
 	},
diff --git a/src/views/group/groupSetting/index.vue b/src/views/group/groupSetting/index.vue
index 951bd660..f0263f76 100644
--- a/src/views/group/groupSetting/index.vue
+++ b/src/views/group/groupSetting/index.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2025-10-11 14:27:37
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-13 14:44:29
+ * @LastEditTime: 2025-11-14 21:50:40
  * @Description:
 -->
 <template>
@@ -25,7 +25,7 @@
 					<dept-select
 						style="width: 200px"
 						ref="deptSelect"
-            @DeptId="setDeptId"></dept-select>
+						@DeptId="setDeptId"></dept-select>
 				</el-form-item>
 				<el-form-item label="班组名称" prop="name">
 					<el-input
@@ -45,12 +45,15 @@
 					<el-button
 						type="primary"
 						size="small"
+						v-hasPermi="['base:group-team:query']"
 						@click="buttonClick({ btnName: 'search' })">
 						查询
 					</el-button>
 				</el-form-item>
 				<el-form-item>
-					<span class="separateStyle"></span>
+					<span
+						class="separateStyle"
+						v-hasPermi="['base:group-team:query']"></span>
 				</el-form-item>
 				<el-form-item>
 					<el-button size="small" @click="buttonClick({ btnName: 'reset' })">
@@ -58,13 +61,16 @@
 					</el-button>
 				</el-form-item>
 				<el-form-item>
-					<span class="separateStyle"></span>
+					<span
+						class="separateStyle"
+						v-hasPermi="['base:group-team:create']"></span>
 				</el-form-item>
 				<el-form-item>
 					<el-button
 						type="success"
 						size="small"
 						:plain="true"
+						v-hasPermi="['base:group-team:create']"
 						@click="buttonClick({ btnName: 'add' })">
 						新增
 					</el-button>
@@ -97,7 +103,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-      :destroy-on-close="true"
+			:destroy-on-close="true"
 			width="50%">
 			<add-or-update
 				ref="addOrUpdate"
@@ -118,16 +124,16 @@ const tableProps = [
 	{
 		prop: 'code',
 		label: '班组编号',
-		width: 140,
+		width: 210,
 	},
 	{
 		prop: 'name',
 		label: '班组名称',
-		width: 100,
 	},
 	{
-		prop: 'deptId',
+		prop: 'deptName',
 		label: '所属部门',
+		width: 110,
 	},
 	{
 		prop: 'leaderName',
@@ -136,6 +142,7 @@ const tableProps = [
 	{
 		prop: 'leaderPhone',
 		label: '组长电话',
+		width: 110,
 	},
 	{
 		prop: 'num',
@@ -145,12 +152,15 @@ const tableProps = [
 	{
 		prop: 'isProduction',
 		label: '是否生产班组',
-    filter: val=>{return val?'是':'否'},
+		filter: (val) => {
+			return val ? '是' : '否';
+		},
 		width: 110,
 	},
 	{
 		prop: 'remark',
 		label: '备注',
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'createTime',
@@ -175,10 +185,12 @@ export default {
 			},
 			tableProps,
 			tableBtn: [
-				{
-					type: 'edit',
-					btnName: '编辑',
-				},
+				this.$auth.hasPermi('base:group-team:update')
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
 			].filter((v) => v),
 			tableData: [],
 			formInline: {
@@ -200,7 +212,7 @@ export default {
 				case 'search':
 					this.listQuery = {
 						pageNo: 1,
-						pageSize: 10,
+						pageSize: 20,
 						total: 1,
 						...this.formInline,
 					};
@@ -213,7 +225,7 @@ export default {
 					this.$refs.deptSelect.clear();
 					this.formInline.leaderName = null;
 					this.listQuery = {
-						pageSize: 10,
+						pageSize: 20,
 						pageNo: 1,
 						total: 1,
 					};
@@ -231,9 +243,9 @@ export default {
 					console.log(val);
 			}
 		},
-    setDeptId(val){
-      this.formInline.deptId = val
-    }
+		setDeptId(val) {
+			this.formInline.deptId = val;
+		},
 	},
 };
 </script>
diff --git a/src/views/group/holidaySetting/add-or-updata.vue b/src/views/group/holidaySetting/add-or-updata.vue
index 6b680b81..2339a38d 100644
--- a/src/views/group/holidaySetting/add-or-updata.vue
+++ b/src/views/group/holidaySetting/add-or-updata.vue
@@ -2,104 +2,199 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-19 00:09:11
+ * @LastEditTime: 2025-11-27 14:06:11
  * @Description:
 -->
 <template>
-	<el-form
-		:model="dataForm"
-		:rules="dataRule"
-		ref="dataForm"
-		@keyup.enter.native="dataFormSubmit()"
-		label-position="top"
-		label-width="80px">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item label="节假日名称" prop="name">
-					<el-input
-						v-model="dataForm.name"
-						clearable
-						:disabled="detail"
-						placeholder="请输入节假日名称" />
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="日历类型" prop="calendarType">
-					<el-select
-						v-model="dataForm.calendarType"
-						:disabled="detail"
-						style="width: 100%">
-						<el-option
-							v-for="item in options1"
-							:key="item.value"
-							:label="item.label"
-							:value="item.value"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="日期类型" prop="dateType">
-					<el-select
-						style="width: 100%"
-						:disabled="detail"
-						v-model="dataForm.dateType">
-						<el-option
-							v-for="item in options2"
-							:key="item.value"
-							:label="item.label"
-							:value="item.value"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="日期" prop="dateTime">
-					<el-date-picker
-						:disabled="detail"
-						style="width: 100%"
-						v-if="dataForm.dateType == 1"
-						key="date"
-						v-model="dataForm.dateDay"
-						type="date"
-						placeholder="选择日期"
-						format="yyyy-MM-dd"
-						value-format="yyyy-MM-dd"></el-date-picker>
-					<el-date-picker
-						:disabled="detail"
-						style="width: 100%"
-						v-else
-						key="daterange"
-						v-model="dataForm.dateDayArr"
-						type="daterange"
-						format="yyyy-MM-dd"
-						value-format="yyyy-MM-dd"
-						range-separator="至"
-						start-placeholder="开始日期"
-						end-placeholder="结束日期"></el-date-picker>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item label="是否每年重复" prop="repeat">
-					<el-select
-						v-model="dataForm.repeat"
-						:disabled="detail"
-						style="width: 100%">
-						<el-option
-							v-for="item in options3"
-							:key="item.value"
-							:label="item.label"
-							:value="item.value"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
+	<div>
+		<el-form
+			:model="dataForm"
+			:rules="dataRule"
+			ref="dataForm"
+			@keyup.enter.native="dataFormSubmit()"
+			label-position="top"
+			label-width="80px">
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<el-form-item label="节假日名称" prop="name">
+						<el-input
+							ref="inputWidth"
+							v-model="dataForm.name"
+							clearable
+							:disabled="detail"
+							placeholder="请输入节假日名称" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="日历类型" prop="calendarType">
+						<el-select
+							v-model="dataForm.calendarType"
+							:disabled="detail"
+							style="width: 100%">
+							<el-option
+								v-for="item in options1"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="日期类型" prop="dateType">
+						<el-select
+							style="width: 100%"
+							:disabled="detail"
+							v-model="dataForm.dateType">
+							<el-option
+								v-for="item in options2"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item
+						v-if="dataForm.dateType == 1 && dataForm.calendarType == 1"
+						label="日期"
+						prop="dateDay">
+						<el-date-picker
+							:disabled="detail"
+							style="width: 100%"
+							key="date"
+							v-model="dataForm.dateDay"
+							type="date"
+							placeholder="选择日期"
+							format="yyyy-MM-dd"
+							value-format="--MM-dd"
+							@blur="$forceUpdate()"
+							:picker-options="pickerOptions"></el-date-picker>
+					</el-form-item>
+					<el-form-item
+						v-else-if="dataForm.dateType == 2 && dataForm.calendarType == 1"
+						label="日期"
+						prop="dateDayArr">
+						<el-date-picker
+							:disabled="detail"
+							style="width: 100%"
+							key="daterange"
+							v-model="dataForm.dateDayArr"
+							type="daterange"
+							format="yyyy-MM-dd"
+							value-format="--MM-dd"
+							range-separator="至"
+							start-placeholder="开始日期"
+							end-placeholder="结束日期"
+							@blur="$forceUpdate()"
+							:picker-options="pickerOptions"></el-date-picker>
+					</el-form-item>
+					<el-form-item
+						v-else-if="dataForm.dateType == 1 && dataForm.calendarType == 2"
+						label="日期"
+						prop="dateDayChinese">
+						<j-date-picker
+							ref="JDatePicker1"
+							style="line-height: 18px"
+							v-model="dataForm.dateDayChinese"
+							id="value1"
+							:width="width1"
+							:placeholder="placeholder"
+							:picker-options="pickerOptions"
+							:rangeSeparator="rangeSeparator"
+							@change="onDateChange"
+							:disabled="detail"
+							:showLunarClass="showLunarClass"
+							:showLunarControl="showLunarControl"
+							type="DATE"
+							:showBackYears="showBackYears"
+							:showLunarIcon="showLunarIcon"
+							:format="format"></j-date-picker>
+					</el-form-item>
+					<el-form-item
+						v-else-if="dataForm.dateType == 2 && dataForm.calendarType == 2"
+						label="日期"
+						prop="dateDayArrChinese">
+						<j-date-picker
+							style="line-height: 18px"
+							ref="JDatePicker2"
+							v-model="dataForm.dateDayArrChinese"
+							id="value2"
+							:width="width1"
+							:placeholder="placeholder"
+							:picker-options="pickerOptions"
+							:rangeSeparator="rangeSeparator"
+							@change="onDateChange"
+							:disabled="detail"
+							:showLunarClass="showLunarClass"
+							:showLunarControl="showLunarControl"
+							type="DATERANGE"
+							:showBackYears="showBackYears"
+							:showLunarIcon="showLunarIcon"
+							:format="format"></j-date-picker>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="是否每年重复" prop="repeat">
+						<el-select
+							v-model="dataForm.repeat"
+							:disabled="detail"
+							style="width: 100%">
+							<el-option
+								v-for="item in options3"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12" v-if="detail">
+					<el-form-item label="来源" prop="inherited">
+						<el-radio-group disabled v-model="dataForm.inherited">
+							<el-radio :label="true">继承</el-radio>
+							<el-radio :label="false">自定义</el-radio>
+						</el-radio-group>
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+		<el-dialog
+			title="删除确认"
+			:visible.sync="dialogVisible"
+			width="30%"
+			append-to-body>
+			<span>
+				确认删除该节假日吗？
+				<br />
+				该节假日已被排班计划使用，建议确认是否同步更新排班计划。
+				<br />
+				此操作不可恢复，请确认是否继续
+			</span>
+			<span slot="footer" class="dialog-footer">
+				<el-button @click="dialogVisible = false">取 消</el-button>
+				<el-button @click="onlyDelete">仅删除</el-button>
+				<el-button type="primary" @click="deleteAndUpdate">
+					删除并更新
+				</el-button>
+			</span>
+		</el-dialog>
+	</div>
 </template>
 
 <script>
-import { createHoliday, updateHoliday,deleteHolidayn } from '@/api/group/holidaySetting';
+import JDatePicker from './components/JDatePicker.vue';
+import {
+	createHoliday,
+	updateHoliday,
+	checkDeleteHoliday,
+	deleteHoliday,
+	updateSchedule,
+	getHoliday,
+} from '@/api/group/holidaySetting';
 
 export default {
-	components: {},
+	components: {
+		JDatePicker,
+	},
 	data() {
 		return {
 			dataForm: {
@@ -109,9 +204,16 @@ export default {
 				dateType: 1,
 				dateDay: undefined,
 				dateDayArr: [],
+				dateDayChinese: undefined,
+				dateDayArrChinese: [],
+				noRepeatYear: undefined,
+				noRepeatYearChinese: undefined,
 				repeat: true,
+				inherited: true, //	是否为继承
+				deptId: undefined,
 			},
 			detail: false,
+			inherited: true,
 			options1: [
 				{
 					value: 1,
@@ -158,6 +260,12 @@ export default {
 				dateDayArr: [
 					{ required: true, message: '日期不能为空', trigger: 'change' },
 				],
+				dateDayChinese: [
+					{ required: true, message: '日期不能为空', trigger: 'change' },
+				],
+				dateDayArrChinese: [
+					{ required: true, message: '日期不能为空', trigger: 'change' },
+				],
 				repeat: [
 					{
 						required: true,
@@ -166,41 +274,266 @@ export default {
 					},
 				],
 			},
+			pickerOptions: {
+				disabledDate(time) {
+					return time.getTime() < Date.now();
+				},
+			},
+			dialogVisible: false,
+			//农历组件数据
+			showLunarClass: 'LUNAR', //农历日期的展示类型 MIX(混合)FULLLUNAR(全农历)LUNAR(农历)NUMBER(数字)
+			showBackYears: 2, //向后展示年数;见于年份列表;
+			showLunarIcon: true, //是否显示农历控制组件
+			showLunarControl: false, //是否显示农历控制组件
+			width1: '300', //这个设置成100%，原组件写死了px需要修改
+			format: 'yyyy-MM-dd',
+			placeholder: '',
+			rangeSeparator: '-',
+			editable: true,
+			clearable: true,
+			pickerOptions: {
+				disabledDate(time) {
+					return time.getTime() < Date.now() - 8.64e7;
+				},
+			},
 		};
 	},
-	methods: {
-		init(id, detail) {
-			this.dataForm.id = id || undefined;
-			this.detail = detail || false;
+
+	watch: {
+		'dataForm.calendarType': function (newValue, oldValue) {
+			this.$nextTick(() => {
+				if (this.$refs.JDatePicker1) {
+					this.$refs.JDatePicker1.isLunar = true; //默认转为农历
+					this.$refs.JDatePicker1.onLunarChange();
+				}
+				if (this.$refs.JDatePicker2) {
+					this.$refs.JDatePicker2.isLunar = true;
+					this.$refs.JDatePicker2.onLunarChange();
+				}
+			});
+		},
+		'dataForm.dateType': function (newValue, oldValue) {
+			this.$nextTick(() => {
+				if (this.$refs.JDatePicker1) {
+					this.$refs.JDatePicker1.isLunar = true; //默认转为农历
+					this.$refs.JDatePicker1.onLunarChange();
+				}
+				if (this.$refs.JDatePicker2) {
+					this.$refs.JDatePicker2.isLunar = true;
+					this.$refs.JDatePicker2.onLunarChange();
+				}
+			});
+		},
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.width1 = this.$refs.inputWidth.$el.offsetWidth + '';
+		});
+	},
+	methods: {
+		init(deptId, val, detail, inherited) {
+			this.dataForm.deptId = deptId || undefined;
+			this.dataForm.id = val.holidayId || undefined;
+			this.dataForm.inherited = val.isInherit || false;
+			this.detail = detail || false;
+			this.inherited = inherited; //编辑的时候，该部门如果是自定义的，但这个val数据是继承的，修改之后，则变成自定义的inherited
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+				if (this.dataForm.id) {
+					getHoliday(this.dataForm.id).then((res) => {
+						this.dataForm = res.data;
+						if (
+							this.dataForm.dateType == 1 &&
+							this.dataForm.calendarType == 1
+						) {
+							this.dataForm.dateDay = this.dataForm.oneDay;
+						} else if (
+							this.dataForm.dateType == 2 &&
+							this.dataForm.calendarType == 1
+						) {
+							this.dataForm.dateDayArr = [
+								this.dataForm.startDay,
+								this.dataForm.endDay,
+							];
+						} else if (
+							this.dataForm.dateType == 1 &&
+							this.dataForm.calendarType == 2
+						) {
+							this.dataForm.dateDayChinese =
+								'L' +
+								new Date().getFullYear() +
+								this.dataForm.oneDayChinese.slice(-6);
+						} else if (
+							this.dataForm.dateType == 2 &&
+							this.dataForm.calendarType == 2
+						) {
+							this.dataForm.dateDayArrChinese = [
+								'L' +
+									new Date().getFullYear() +
+									this.dataForm.startDayChinese.slice(-6),
+								'L' +
+									new Date().getFullYear() +
+									this.dataForm.endDayChinese.slice(-6),
+							];
+						}
+					});
+				}
+			});
+		},
+		editHoliday() {
+			this.detail = false;
+		},
+		deleteHoliday() {
+			//删除节假日基础信息前校验是否影响排班
+			checkDeleteHoliday(this.dataForm.id).then((res) => {
+				if (res.data) {
+					this.dialogVisible = true;
+				} else {
+					this.$confirm(
+						'确认删除该节假日吗？<br/>此操作不可恢复，请确认是否继续',
+						'删除确认',
+						{
+							dangerouslyUseHTMLString: true,
+							confirmButtonText: '确认删除',
+							cancelButtonText: '取消',
+							type: 'warning',
+						}
+					)
+						.then(() => {
+							deleteHoliday(this.dataForm.id).then((res) => {
+								console.log(res);
+								this.$modal.msgSuccess('删除成功');
+								this.$emit('refreshPage');
+							});
+						})
+						.catch(() => {
+							this.$message({
+								type: 'info',
+								message: '已取消',
+							});
+						});
+				}
+			});
+		},
+		onlyDelete() {
+			deleteHoliday(this.dataForm.id).then((res) => {
+				this.dialogVisible = false;
+				this.$modal.msgSuccess('删除成功');
+				this.$emit('refreshPage');
+			});
+		},
+		deleteAndUpdate() {
+			deleteHoliday(this.dataForm.id).then((res) => {
+				this.dialogVisible = false;
+				this.$modal.msgSuccess('删除成功');
+				updateSchedule({ logId: res.data.logId }).then((res1) => {
+					this.$modal.msgSuccess('更新成功');
+				});
+				this.$emit('refreshPage');
+			});
+		},
+		onDateChange(val) {
+			console.log(val);
 		},
-    editHoliday(){
-      this.detail = false
-    },
-    deleteHoliday(){
-      deleteHolidayn(this.dataForm.id).then(res=>{
-        console.log(res)
-      })
-    },
 		// 表单提交
 		dataFormSubmit() {
 			this.$refs['dataForm'].validate((valid) => {
 				if (!valid) {
 					return false;
 				}
+				if (this.dataForm.dateType == 1 && this.dataForm.calendarType == 1) {
+					this.dataForm.oneDay = this.dataForm.dateDay;
+				} else if (
+					this.dataForm.dateType == 2 &&
+					this.dataForm.calendarType == 1
+				) {
+					this.dataForm.startDay = this.dataForm.dateDayArr[0];
+					this.dataForm.endDay = this.dataForm.dateDayArr[1];
+				} else if (
+					this.dataForm.dateType == 1 &&
+					this.dataForm.calendarType == 2
+				) {
+					this.dataForm.oneDayChinese =
+						'--' + this.dataForm.dateDayChinese.slice(-5);
+				} else if (
+					this.dataForm.dateType == 2 &&
+					this.dataForm.calendarType == 2
+				) {
+					this.dataForm.startDayChinese =
+						'--' + this.dataForm.dateDayArrChinese[0].slice(-5);
+					this.dataForm.endDayChinese =
+						'--' + this.dataForm.dateDayArrChinese[1].slice(-5);
+				}
+				if (this.dataForm.calendarType == 1 && !this.dataForm.repeat) {
+					this.dataForm.noRepeatYear = new Date().getFullYear();
+				} else if (this.dataForm.calendarType == 2 && !this.dataForm.repeat) {
+					this.dataForm.noRepeatYearChinese = new Date().getFullYear();
+				}
 				// 修改的提交
 				if (this.dataForm.id) {
-					updateHoliday(this.dataForm).then((response) => {
-						this.$modal.msgSuccess('修改成功');
-						this.visible = false;
-						this.$emit('refreshPage');
+					if (!this.inherited) {
+						this.dataForm.inherited = false;
+					}
+					updateHoliday(this.dataForm).then((res) => {
+						if (!res.data.updateFlag) {
+							this.$modal.msgSuccess('修改成功');
+							this.$emit('refreshPage');
+						} else {
+							this.$confirm(
+								'新增节假日影响已有排班计划，是否立即更新？',
+								'更新排班',
+								{
+									confirmButtonText: '立即更新',
+									cancelButtonText: '暂不更新',
+									type: 'warning',
+								}
+							)
+								.then(() => {
+									updateSchedule({ logId: res.data.logId }).then((res1) => {
+										this.$modal.msgSuccess('更新成功');
+									});
+									this.$emit('refreshPage');
+								})
+								.catch(() => {
+									this.$message({
+										type: 'info',
+										message: '已取消',
+									});
+									this.$emit('refreshPage');
+								});
+						}
 					});
 					return;
 				}
 				// 添加的提交
-				createHoliday(this.dataForm).then((response) => {
-					this.$modal.msgSuccess('新增成功');
-					this.visible = false;
-					this.$emit('refreshPage');
+				createHoliday(this.dataForm).then((res) => {
+					if (!res.data.updateFlag) {
+						this.$modal.msgSuccess('新增成功');
+						this.$emit('refreshPage');
+					} else {
+						this.$confirm(
+							'新增节假日影响已有排班计划，是否立即更新？',
+							'更新排班',
+							{
+								confirmButtonText: '立即更新',
+								cancelButtonText: '暂不更新',
+								type: 'warning',
+							}
+						)
+							.then(() => {
+								updateSchedule({ logId: res.data.logId }).then((res1) => {
+									this.$modal.msgSuccess('更新成功');
+								});
+								this.$emit('refreshPage');
+							})
+							.catch(() => {
+								this.$message({
+									type: 'info',
+									message: '已取消',
+								});
+								this.$emit('refreshPage');
+							});
+					}
 				});
 			});
 		},
diff --git a/src/views/group/holidaySetting/components/JDatePicker.vue b/src/views/group/holidaySetting/components/JDatePicker.vue
new file mode 100644
index 00000000..52fd7b23
--- /dev/null
+++ b/src/views/group/holidaySetting/components/JDatePicker.vue
@@ -0,0 +1,735 @@
+<template>
+  <div class="full-jcalendar" :style="{width:handleWidth+'px'}">
+
+    <p class="input-icon__tip" v-show="isLunar && showLunarIcon">
+      <i v-if="isLeap">闰</i>
+      <i v-else>农</i>
+    </p>
+    <p class="input-icon" @mouseover="onInputOver" @mouseout="onInputOut">
+      <i class="iconfont el-icon-date" ></i>
+      <i class="iconfont icon-richeng" v-show="!clearVisible"></i>
+      <i class="iconfont icon-guanbi is-clear" v-show="clearable && clearVisible" @click="onClearInput"></i>
+    </p>
+
+    <input type="text" :value="inputText" :class="['input__inner',{'is-disabled':disabled}]" :placeholder="placeholder" @click="onInputFocus" :readonly="!editable || type.toUpperCase() ==='DATERANGE' || (isLunar && showLunarClass.toUpperCase()!='NUMBER')" :disabled="disabled" @input="inputText = $event.target.value" @change="handleInputChange" />
+
+    <!--日期控件弹窗主体-->
+    <div class="full-jcalendar__main" :class="{'is-daterange':type.toUpperCase() === 'DATERANGE'}" v-show="calendarVisible">
+      <!--单日期模式-->
+      <div v-show="type.toUpperCase() === 'DATE'">
+
+        <div class="full-jcalendar-header">
+          <span class="title-year" @click="showYearList">{{year}}年</span>
+          <span style="width:10px;"></span>
+          <span class="title-month" @click="monthVisible = true">{{month}}月</span>
+          <span style="width:10px;" v-if="showLunarControl"></span>
+          <label v-if="showLunarControl"><input type="checkbox" v-model="isLunar" @change="onLunarChange" />农历</label>
+          <!-- header 切换月份 -->
+          <p class="prev-month" @click.stop="goPrev"><i class="icon iconfont el-icon-arrow-left"></i></p>
+          <p class="next-month" @click.stop="goNext"><i class="icon iconfont el-icon-arrow-right"></i></p>
+        </div>
+        <!-- body  日期和事件 -->
+        <div class="full-jcalendar__body">
+          <div class="weeks">
+            <strong class="week">日</strong>
+            <strong class="week">一</strong>
+            <strong class="week">二</strong>
+            <strong class="week">三</strong>
+            <strong class="week">四</strong>
+            <strong class="week">五</strong>
+            <strong class="week">六</strong>
+          </div>
+          <!--日期 周  行-->
+          <div class="week-row" v-for="(week,index) in calendarDatas" :key="index">
+            <!--日期 日  单元格-->
+            <div class="day-cell" v-for="(day,index) in week" :key="index"
+                 :class="[{'today': day.isToday,'not-optional':isNotOptional(day),'select':day.isSelect,'not-cur-month': !day.isCurMonth }]"
+                 @click="onDateSelect(day)">
+              <!-- 日期 节气 农历 -->
+              <div class="day-number">
+                <p class="solar">
+                  <!--<span class="is-leap" v-if="day.lDate.isLeap && day.lDate.lMonth>10 &&day.lDate.IDayCn==='初一'">闰</span>-->
+                  <span class="is-leap" v-if="day.lDate.isLeap && day.lDate.IDayCn==='初一'">闰</span>
+                  <span :class="['number',{'is-today':day.isToday,'is-empty':day.isToday && !day.lDate.isFestival && !day.lDate.isTerm}]">{{day.isToday?'今天':day.day}}</span>
+                </p>
+                <p class="lunar" v-show="!day.isToday || day.lDate.isFestival || day.lDate.isTerm">
+                  <span class="festival" v-if="day.lDate.isFestival">{{day.lDate.festival[0]}}</span>
+                  <span class="term" v-else-if="day.lDate.isTerm">{{day.lDate.Term}}</span>
+                  <!--<span v-else-if="day.lDate.IDayCn==='初一'">{{day.lDate.isLeap && day.lDate.lMonth>10?day.lDate.IMonthCn.replace('闰',''):day.lDate.IMonthCn}}</span>-->
+                  <span v-else-if="day.lDate.IDayCn==='初一'">{{day.lDate.IMonthCn.replace('闰','')}}</span>
+                  <span v-else>{{day.lDate.IDayCn}}</span>
+                </p>
+              </div>
+
+            </div>
+
+          </div>
+        </div>
+
+        <!-- 月份切换 -->
+        <div class="full-jcalendar__month" v-show="monthVisible">
+
+          <div class="full-jcalendar-header">
+            <span>{{month}}月</span>
+          </div>
+
+          <div class="full-jcalendar__body">
+            <ul class="data-list">
+              <li @click="onMonthSelect(m-1)" v-for="m in 12" :key="m">{{m}}月</li>
+            </ul>
+            <p class="clearfix"></p>
+            <p class="close" @click="monthVisible=false">取 消</p>
+          </div>
+
+        </div>
+        <!-- 年份切换 -->
+        <div class="full-jcalendar__year" v-show="yearVisible">
+
+          <div class="full-jcalendar-header">
+            <span>{{year}}年</span>
+            <!-- header 年份翻页 -->
+            <p class="prev-month" @click.stop="goYearPrevList"><i class="icon iconfont el-icon-arrow-left"></i></p>
+            <p class="next-month" @click.stop="goYearNextList"><i class="icon iconfont el-icon-arrow-right"></i></p>
+          </div>
+
+          <div class="full-jcalendar__body">
+            <ul class="data-list">
+              <li :class="{'select-year':(m + startYear -1)==year,'curr-year':(m + startYear -1)==todayYear}" @click="onYearSelect(m + startYear -1)" v-for="m in 12" :key="m">{{m + startYear -1}}</li>
+            </ul>
+            <p class="clearfix"></p>
+            <p class="close" @click="yearVisible=false">取 消</p>
+          </div>
+        </div>
+
+      </div>
+
+      <!--日期段模式-->
+      <div class="date-range__month leftMonth" v-if="type.toUpperCase() === 'DATERANGE'">
+        <div class="full-jcalendar-header">
+          <span class="title-year">{{year}}年</span>
+          <span style="width:10px;"></span>
+          <span class="title-month">{{month}}月</span>
+          <span style="width:10px;" v-if="showLunarControl"></span>
+          <label v-if="showLunarControl"><input type="checkbox" v-model="isLunar" @change="onLunarChange" />农历</label>
+          <!-- header 切换月份 -->
+          <p class="prev-year" @click.stop="goYearPrev"><i class="icon iconfont el-icon-d-arrow-left"></i></p>
+          <p class="prev-month" @click.stop="goPrev"><i class="icon iconfont el-icon-arrow-left"></i></p>
+        </div>
+        <!-- body  日期和事件 -->
+        <div class="full-jcalendar__body">
+          <div class="weeks">
+            <strong class="week">日</strong>
+            <strong class="week">一</strong>
+            <strong class="week">二</strong>
+            <strong class="week">三</strong>
+            <strong class="week">四</strong>
+            <strong class="week">五</strong>
+            <strong class="week">六</strong>
+          </div>
+          <!--日期 周  行-->
+          <div class="week-row" v-for="(week,index) in calendarDatas" :key="index" @mouseout="onMouseOut">
+            <!--日期 日  单元格-->
+            <div class="day-cell" v-for="(day,index) in week" :key="index"
+                 :class="[{'today': day.isToday,'not-optional':isNotOptional(day),'choose':isChoose(day),'select':isSelect(day),'not-cur-month': !day.isCurMonth }]"
+                 @click="onDateSelect(day)" @mouseover="onMouseOver(day)">
+              <!-- 日期 节气 农历 -->
+              <div class="day-number">
+                <p class="solar">
+                  <!--<span class="is-leap" v-if="day.lDate.isLeap && day.lDate.lMonth>10 &&day.lDate.IDayCn==='初一'">闰</span>-->
+                  <span class="is-leap" v-if="day.lDate.isLeap && day.lDate.IDayCn==='初一'">闰</span>
+                  <span :class="['number',{'is-today':day.isToday,'is-empty':day.isToday && !day.lDate.isFestival && !day.lDate.isTerm}]">{{day.isToday?'今天':day.day}}</span>
+                </p>
+                <p class="lunar" v-show="!day.isToday || day.lDate.isFestival || day.lDate.isTerm">
+                  <span class="festival" v-if="day.lDate.isFestival">{{day.lDate.festival[0]}}</span>
+                  <span class="term" v-else-if="day.lDate.isTerm">{{day.lDate.Term}}</span>
+                  <!--<span v-else-if="day.lDate.IDayCn==='初一'">{{day.lDate.isLeap && day.lDate.lMonth>10?day.lDate.IMonthCn.replace('闰',''):day.lDate.IMonthCn}}</span>-->
+                  <span v-else-if="day.lDate.IDayCn==='初一'">{{day.lDate.IMonthCn.replace('闰','')}}</span>
+                  <span v-else>{{day.lDate.IDayCn}}</span>
+                </p>
+              </div>
+
+            </div>
+
+          </div>
+        </div>
+      </div>
+      <div class="date-range__month" v-if="type.toUpperCase() === 'DATERANGE'">
+
+        <div class="full-jcalendar-header">
+          <span class="title-year">{{year2}}年</span>
+          <span style="width:10px;"></span>
+          <span class="title-month">{{month2}}月</span>
+          <!-- header 切换月份 -->
+          <p class="next-year" @click.stop="goYearNext"><i class="icon iconfont el-icon-d-arrow-right"></i></p>
+          <p class="next-month" @click.stop="goNext"><i class="icon iconfont el-icon-arrow-right"></i></p>
+        </div>
+        <!-- body  日期和事件 -->
+        <div class="full-jcalendar__body">
+          <div class="weeks">
+            <strong class="week">日</strong>
+            <strong class="week">一</strong>
+            <strong class="week">二</strong>
+            <strong class="week">三</strong>
+            <strong class="week">四</strong>
+            <strong class="week">五</strong>
+            <strong class="week">六</strong>
+          </div>
+          <!--日期 周  行-->
+          <div class="week-row" v-for="(week,index) in calendarDatas2" :key="index" @mouseout="onMouseOut">
+            <!--日期 日  单元格-->
+            <div class="day-cell" v-for="(day,index) in week" :key="index"
+                 :class="[{'today': day.isToday,'not-optional':isNotOptional(day),'choose':isChoose(day),'select':isSelect(day),'not-cur-month': !day.isCurMonth }]"
+                 @click="onDateSelect(day)" @mouseover="onMouseOver(day);">
+              <!-- 日期 节气 农历 -->
+              <div class="day-number">
+                <p class="solar">
+                  <!--<span class="is-leap" v-if="day.lDate.isLeap && day.lDate.lMonth>10 &&day.lDate.IDayCn==='初一'">闰</span>-->
+                  <span class="is-leap" v-if="day.lDate.isLeap && day.lDate.IDayCn==='初一'">闰</span>
+                  <span :class="['number',{'is-today':day.isToday,'is-empty':day.isToday && !day.lDate.isFestival && !day.lDate.isTerm}]">{{day.isToday?'今天':day.day}}</span>
+                </p>
+                <p class="lunar" v-show="!day.isToday || day.lDate.isFestival || day.lDate.isTerm">
+                  <span class="festival" v-if="day.lDate.isFestival">{{day.lDate.festival[0]}}</span>
+                  <span class="term" v-else-if="day.lDate.isTerm">{{day.lDate.Term}}</span>
+                  <!--<span v-else-if="day.lDate.IDayCn==='初一'">{{day.lDate.isLeap && day.lDate.lMonth>10?day.lDate.IMonthCn.replace('闰',''):day.lDate.IMonthCn}}</span>-->
+                  <span v-else-if="day.lDate.IDayCn==='初一'">{{day.lDate.IMonthCn.replace('闰','')}}</span>
+                  <span v-else>{{day.lDate.IDayCn}}</span>
+                </p>
+              </div>
+
+            </div>
+
+          </div>
+        </div>
+
+      </div>
+
+      <div class="clearfix"></div>
+    </div>
+
+  </div>
+</template>
+<script>
+  import moment from 'moment';
+  import JDatePickerScript from './jDatePicker.js'
+
+  export default {
+    props: {
+      width: {
+        type: String,
+        default: '200',
+      },
+      value: {
+        type:[String,Date,Array],
+        default: ''
+      },
+      placeholder:{
+        type: String,
+        default: ''
+      },
+      format: {
+        type: String,
+        default: 'YYYY-MM-DD'
+      },
+      showLunarClass: {
+        type: String,
+        default: 'NUMBER',//共四种，FULLLUNAR－全农历格式：丁酉[鸡]年己酉月乙巳日；LUNAR－中文格式：丁酉[鸡]年七月廿三；NUMBER－数字格式：2017-09-13；MIX格式：丁酉(2017)[鸡]年七月廿三；
+      },
+      showLunarIcon:{
+        type: Boolean,
+        default: false,
+      },
+      showBackYears:{
+        type: Number,
+        default: 2,
+      },
+      showLunarControl:{
+        type: Boolean,
+        default: true,
+      },
+      disabled:{
+        type: Boolean,
+        default: false,
+      },
+      editable:{
+        type: Boolean,
+        default: true,
+      },
+      clearable:{
+        type: Boolean,
+        default: true,
+      },
+      type:{
+        type: String,
+        default: "DATE",//DATE - 日期类型；DATERANGE － 时间段；
+      },
+      rangeSeparator:{
+        type: String,
+        default: "-",//时间段分隔符
+      },
+      pickerOptions:{
+        type:Object,
+        default:null
+      },
+    },
+    computed: {
+      handleWidth: function () {
+        let w = this.width.toString();
+        if (w == null || w == '') {
+          return 200;
+        }
+        if (w.indexOf('px') > -1) w = w.replace(/px/, '');
+        let w0 = parseInt(w) || 0;
+        if (w0 == 0) {
+          return 200;
+        }
+        return w0;
+      },
+    },
+    watch: {
+      'value': function (newValue, oldValue) {
+        this.inputText = '';
+        this.isLeap = false;
+        this.isLunar = false;
+
+        this.handleInputText(newValue);
+
+      },
+      'showLunarIcon': function (newValue, oldValue) {
+      },
+    },
+    data () {
+      return {
+        inputText:'',
+        startYear:0,//年份列表的起始年份
+        monthDay: '',//月份日期类型，用来比较日期
+        selectDay:[],//type=daterange,存放点击选中的时间值；
+        chooseDay:[],//type=daterange,存放鼠标移动所选时间段；
+        year: 0,
+        month: 0,
+        year2: 0,
+        month2: 0,
+        isCurrMonth: true,
+        calendarDatas: [],
+        calendarDatas2: [],
+        calendarVisible: false,//日历显示开关
+        yearVisible: false,//年份选择开关
+        monthVisible: false,//月份选择开关
+        clearVisible:false,//清除按钮开关
+        isLunar: false,//是否启用农历
+        isLeap: false,//是否闰月
+      }
+    },
+    created () {
+      let month = moment()
+      this.monthDay = month.toISOString();
+      this.todayYear = month.year();
+      this.loadCalendar();
+
+      document.addEventListener('click', (e) => {
+        let icon = this.$el.querySelector('.input-icon');
+        let input = this.$el.querySelector('.input__inner');
+        let main = this.$el.querySelector('.full-jcalendar__main');
+        if (!icon.contains(e.target) && !input.contains(e.target) && !main.contains(e.target)) {
+          this.calendarVisible = false;
+          if (this.selectDay.length > 0) {
+            this.monthDay = this.selectDay[0];
+          }
+        }
+      });
+
+      this.handleInputText(this.value,true);
+    },
+    methods: {
+      handleInputText(newValue,isNeedEmit){
+        if (newValue == undefined || newValue == null || !newValue.toString().length) return;
+
+        let valueDay = '', valueDay2 = '', result = '';
+
+        if (this.type.toUpperCase() == 'DATE') {
+          //单日期模式
+          newValue = newValue.toString();
+          let isLunar  = newValue.indexOf('L') > -1;
+          this.isLunar = isLunar;
+
+          if (isLunar) {
+            //农历模式
+            let showLunarClass = this.showLunarClass.toUpperCase();
+            let lunarDate      = JDatePickerScript.calendar.getSolar(newValue);
+
+            valueDay = new Date(lunarDate.cYear + '-' + lunarDate.cMonth + '-' + lunarDate.cDay).toISOString();
+
+            if (showLunarClass == 'NUMBER') {
+              result = moment(new Date(lunarDate.lYear + '-' + lunarDate.lMonth + '-' + lunarDate.lDay)).format(this.format.toUpperCase());
+            }
+            else if (showLunarClass == 'MIX') {
+              result = lunarDate.gzYear + '(' + lunarDate.lYear + ')[' + lunarDate.Animal + ']年 ' + lunarDate.IMonthCn + lunarDate.IDayCn;
+            }
+            else if (showLunarClass == 'FULLLUNAR') {
+              result = lunarDate.gzYear + '[' + lunarDate.Animal + ']年 ' + lunarDate.gzMonth + '月 ' + lunarDate.gzDay + '日';
+            }
+            else if (showLunarClass == 'LUNAR') {
+              result = lunarDate.gzYear + '[' + lunarDate.Animal + ']年 ' + lunarDate.IMonthCn + lunarDate.IDayCn;
+            }
+
+          } else {
+            //公历模式
+            let date = new Date(newValue);
+            valueDay = date.toISOString();
+            result   = moment(date).format(this.format.toUpperCase());
+            this.$emit('input',moment(date).format('YYYY-MM-DD'))
+          }
+          this.monthDay  = valueDay;
+          this.selectDay = [valueDay];
+          this.inputText = result;
+          this.loadCalendar();
+          return;
+        }
+        if (this.type.toUpperCase() == 'DATERANGE') {
+          //时间段模式
+          //判断newValue是否为数组；ES2005以上支持isArray
+          if (Array.isArray(newValue) && newValue.length == 2) {
+            let beginDt = newValue[0];
+            let endDt = newValue[1];
+            //判断value是否为日期类型
+            if(beginDt == undefined || beginDt == null || !beginDt.toString().length) return;
+            if(endDt == undefined || endDt == null || !endDt.toString().length) return;
+            beginDt = beginDt.toString();
+            endDt = endDt.toString();
+
+            let isLunar  = beginDt.indexOf('L') > -1;
+            this.isLunar = isLunar;
+            if (isLunar) {
+              //农历模式
+              let beginDateResult = '', endDateResult = '';
+              let showLunarClass  = this.showLunarClass.toUpperCase();
+
+              let beginLunarDate = JDatePickerScript.calendar.getSolar(beginDt);
+              let endLunarDate  = JDatePickerScript.calendar.getSolar(endDt);
+
+              valueDay  = new Date(beginLunarDate.cYear + '-' + beginLunarDate.cMonth + '-' + beginLunarDate.cDay).toISOString();
+              valueDay2 = new Date(endLunarDate.cYear + '-' + endLunarDate.cMonth + '-' + endLunarDate.cDay).toISOString();
+
+              if (showLunarClass == 'NUMBER') {
+                beginDateResult = moment(new Date(beginLunarDate.lYear + '-' + beginLunarDate.lMonth + '-' + beginLunarDate.lDay)).format(this.format.toUpperCase());
+                endDateResult   = moment(new Date(endLunarDate.lYear + '-' + endLunarDate.lMonth + '-' + endLunarDate.lDay)).format(this.format.toUpperCase());
+              }
+              else if (showLunarClass == 'MIX') {
+                beginDateResult = beginLunarDate.gzYear + '(' + beginLunarDate.lYear + ')[' + beginLunarDate.Animal + ']年 ' + beginLunarDate.IMonthCn + beginLunarDate.IDayCn;
+                endDateResult   = endLunarDate.gzYear + '(' + endLunarDate.lYear + ')[' + endLunarDate.Animal + ']年 ' + endLunarDate.IMonthCn + endLunarDate.IDayCn;
+              }
+              else if (showLunarClass == 'FULLLUNAR') {
+                beginDateResult = beginLunarDate.gzYear + '[' + beginLunarDate.Animal + ']年 ' + beginLunarDate.gzMonth + '月 ' + beginLunarDate.gzDay + '日';
+                endDateResult   = endLunarDate.gzYear + '[' + endLunarDate.Animal + ']年 ' + endLunarDate.gzMonth + '月 ' + endLunarDate.gzDay + '日';
+              }
+              else if (showLunarClass == 'LUNAR') {
+                beginDateResult = beginLunarDate.gzYear + '[' + beginLunarDate.Animal + ']年 ' + beginLunarDate.IMonthCn + beginLunarDate.IDayCn;
+                endDateResult   = endLunarDate.gzYear + '[' + endLunarDate.Animal + ']年 ' + endLunarDate.IMonthCn + endLunarDate.IDayCn;
+              }
+
+              result = beginDateResult + ' ' + this.rangeSeparator + ' ' + endDateResult;
+
+            } else {
+              //公历模式
+              if(isNeedEmit){
+                this.$emit('input',[moment(new Date(beginDt)).format('YYYY-MM-DD'),moment(new Date(endDt)).format('YYYY-MM-DD')]);
+                return;
+              }
+
+              let beginDate = new Date(beginDt);
+              let endDate   = new Date(endDt);
+              valueDay      = beginDate.toISOString();
+              valueDay2     = endDate.toISOString();
+              result        = moment(beginDate).format(this.format.toUpperCase()) + ' ' + this.rangeSeparator + ' ' + moment(endDate).format(this.format.toUpperCase());
+            }
+            this.monthDay   = valueDay;
+            this.selectDay  = [valueDay, valueDay2];
+            this.chooseDay  = [valueDay, valueDay2];
+            this.inputText  = result;
+            this.loadCalendar();
+          }
+        }
+      },
+      handleInputChange(e){
+        let result = e.target.value;
+        if(this.type.toUpperCase() == 'DATE'){
+          //单日期
+          if(this.isLunar){
+            //农历 NUMBER 模式
+            if(this.showLunarClass.toUpperCase() == 'NUMBER') {
+              let regex = /\d{4}[-\.\/]\d{1,2}[-\.\/]\d{1,2}/;
+              if (!regex.test(result)) return;
+              result = result.replace(/\./g, '-').replace(/\//g, '-');
+              result = 'L' + moment(new Date(result)).format('YYYY-MM-DD');
+            }
+          }else{
+            let regex = /\d{4}[-\.\/]\d{1,2}[-\.\/]\d{1,2}/;
+            if (!regex.test(result)) return;
+            result = result.replace(/\./g, '-').replace(/\//g, '-');
+            result = moment(new Date(result)).format('YYYY-MM-DD');
+          }
+        }
+        this.$emit('change',result);
+        this.$emit('input',result);
+
+      },
+      onClearInput(){
+        if(this.type.toUpperCase() == 'DATERANGE'){
+          this.$emit('change',[]);
+          this.$emit('input', []);
+        }else {
+          this.$emit('change', '');
+          this.$emit('input',  '');
+        }
+        this.selectDay = [];
+        this.chooseDay = [];
+        this.monthDay = moment().toISOString();
+        this.clearVisible = false;
+      },
+      onInputOver(){
+        if(this.disabled) return;
+        if(this.value ==null || this.value == '')return;
+        this.clearVisible = true;
+      },
+      onInputOut(){
+        this.clearVisible = false;
+      },
+      isNotOptional(day){
+        if (this.pickerOptions != null && this.pickerOptions != undefined && 'disabledDate' in this.pickerOptions) {
+          return this.pickerOptions.disabledDate(new Date(day.date));
+        }
+        return false;
+      },
+      isChoose(day){
+        //是否在选中时间段区域内
+        if(this.type.toUpperCase() == 'DATERANGE') {
+          if(this.chooseDay.length == 2){
+            let currDay = moment(day.date);
+            return currDay.isSameOrAfter(this.chooseDay[0]) & currDay.isSameOrBefore(this.chooseDay[1]) & day.isCurMonth;
+          }
+        }
+        return false;
+      },
+      isSelect(day){
+        return this.chooseDay.length>0 & moment(day.date).isSame(new Date(this.chooseDay[0]),'day') & day.isCurMonth;
+      },
+      onInputFocus(){
+        if(this.disabled) return;
+        this.loadCalendar();
+        this.calendarVisible = true;
+      },
+      onLunarChange(){
+        if (this.value != null && this.value != '' && this.value.length > 0) {
+          if (this.type.toUpperCase() == 'DATERANGE') {
+            //时间段模式
+            if (this.isLunar) {
+              //由公历到农历
+              //判断日期结果集中日期格式是否为农历，若是不作处理直接返回。
+              if(this.value[0].indexOf('L')>-1) return;
+              let beginDay       = JDatePickerScript.calendar.getLunar(this.value[0].replace(/L/,'').replace(/R/,''));
+              let endDay         = JDatePickerScript.calendar.getLunar(this.value[1].replace(/L/,'').replace(/R/,''));
+              let beginDayResult = 'L' + (beginDay.isLeap ? 'R' : '') + moment(new Date(beginDay.lYear + '-' + beginDay.lMonth + '-' + beginDay.lDay)).format('YYYY-MM-DD');
+              let endDayResult   = 'L' + (endDay.isLeap ? 'R' : '') + moment(new Date(endDay.lYear + '-' + endDay.lMonth + '-' + endDay.lDay)).format('YYYY-MM-DD');
+
+              this.$emit('change',[beginDayResult,endDayResult]);
+              this.$emit('input' ,[beginDayResult,endDayResult]);
+            } else {
+              //由农历到公历
+              //判断日期结果集中日期格式是否为农历，若不是不作处理直接返回。
+              if(this.value[0].indexOf('L') == -1) return;
+              let beginDay       = JDatePickerScript.calendar.getSolar(this.value[0]);
+              let endDay         = JDatePickerScript.calendar.getSolar(this.value[1]);
+              let beginDayResult = moment(new Date(beginDay.cYear + '-' + beginDay.cMonth + '-' + beginDay.cDay)).format('YYYY-MM-DD');
+              let endDayResult   = moment(new Date(endDay.cYear + '-' + endDay.cMonth + '-' + endDay.cDay)).format('YYYY-MM-DD');
+
+              this.$emit('change',[beginDayResult,endDayResult]);
+              this.$emit('input' ,[beginDayResult,endDayResult]);
+            }
+          } else {
+            //单日期模式
+            let day,result = '';
+            if (this.isLunar) {
+              //由公历到农历
+              //判断日期结果中日期格式是否为农历，若是不作处理直接返回。
+              if(this.value.indexOf('L')>-1) return;
+              day = JDatePickerScript.calendar.getLunar(this.value.replace(/L/,'').replace(/R/,''));
+              result = 'L' + (day.isLeap ? 'R' : '') + moment(new Date(day.lYear + '-' + day.lMonth + '-' + day.lDay)).format('YYYY-MM-DD');
+              this.$emit('change', result);
+              this.$emit('input' , result);
+            } else {
+              //由农历到公历
+              //判断日期结果中日期格式是否为农历，若不是不作处理直接返回。
+              if(this.value.indexOf('L') == -1) return;
+              day = JDatePickerScript.calendar.getSolar(this.value);
+              result = moment(new Date(day.cYear + '-' + day.cMonth + '-' + day.cDay)).format('YYYY-MM-DD');
+              this.$emit('change', new Date(result));
+              this.$emit('input' , new Date(result));
+            }
+          }
+
+        }
+      },
+      showYearList(){
+        //公式：A ＝ 默认当前年所在页面的起始年；S ＝ 选择日期所在年份；Z(pagesize) = 12; Math.ceil : 向上入，有小数就向上＋1；
+        // result = A - Math.ceil( (A-S) / Z ) * Z;
+        let A = this.todayYear + parseInt(this.showBackYears) - 11;
+        this.startYear = A - Math.ceil((A - this.year )/12) * 12;
+
+        this.yearVisible = true;
+      },
+      goYearPrevList(){
+        if(this.startYear<1912) return;
+        this.startYear -= 12;
+      },
+      goYearNextList(){
+        if(this.startYear>=this.todayYear + parseInt(this.showBackYears) - 11) return;
+        this.startYear += 12;
+      },
+      goYearPrev(){
+        this.monthDay = moment(this.monthDay).subtract(1,'years').toISOString();
+        this.loadCalendar();
+      },
+      goYearNext(){
+        this.monthDay = moment(this.monthDay).add(1,'years').toISOString();
+        this.loadCalendar();
+      },
+      goPrev () {
+        let newMonth = moment(this.monthDay).subtract(1, 'months');
+        this.monthDay = newMonth.toISOString();
+        this.loadCalendar()
+      },
+      goNext () {
+        let newMonth = moment(this.monthDay).add(1, 'months');
+        this.monthDay = newMonth.toISOString();
+        this.loadCalendar()
+      },
+      onMouseOver(day){
+        if (this.selectDay.length == 1) {
+          let currDay = moment(day.date);
+          let beginDt = this.selectDay[0];
+          if (currDay.isAfter(beginDt)) {
+            this.chooseDay = [beginDt, currDay.toISOString()];
+          }
+        }
+      },
+      onMouseOut(){
+        if (this.selectDay.length < 2) {
+          this.chooseDay = [];
+        }
+      },
+      onDateSelect(day){
+        if(this.isNotOptional(day)) return;
+        let dayDate = new Date(day.date).toISOString();
+        if(this.type.toUpperCase() == 'DATERANGE') {
+          if (this.selectDay.length >= 2) {
+            this.selectDay = [];
+            this.chooseDay = [];
+          }
+          //判断日期；1、第一次选中，直接加入结果集为时间段起始日期；
+          // 2、小于起始日期，则重置结果集，所选日期为结果集起始日期；
+          // 3、大于等于起始日期，加入结果集为时间段结束日期；可返回结果。
+          if (this.selectDay.length > 0) {
+            if (moment(dayDate).isSameOrAfter(this.selectDay[0])) {
+              this.selectDay.push(dayDate);
+            }else{
+                this.selectDay = [dayDate];
+            }
+          }else {
+            this.selectDay.push(dayDate);
+          }
+          //校正日历控件展示月份到起始月份或当前月份
+          //this.monthDay = new Date(this.selectDay[0]).toISOString();
+          //判断结果集是否符合条件，数组selectDay.length＝＝2；返回结果；隐藏控件；
+          if (this.selectDay.length == 2) {
+            if(this.isLunar) {
+              let beginLunarDateResult = '', endLunarDateResult = '';
+              let beginLunar = JDatePickerScript.calendar.getLunar(this.selectDay[0]);
+              beginLunarDateResult = 'L' + (beginLunar.isLeap ? 'R' : '') + moment(new Date(beginLunar.lYear + '-' + beginLunar.lMonth + '-' + beginLunar.lDay)).format("YYYY-MM-DD");
+              endLunarDateResult = 'L' + (day.lDate.isLeap ? 'R' : '') + moment(new Date(day.lDate.lYear + '-' + day.lDate.lMonth + '-' + day.lDate.lDay)).format("YYYY-MM-DD");
+              this.$emit('change', [beginLunarDateResult, endLunarDateResult])
+              this.$emit('input' , [beginLunarDateResult, endLunarDateResult])
+            }else{
+              this.$emit('change', [moment(this.selectDay[0]).format('YYYY-MM-DD'), moment(this.selectDay[1]).format('YYYY-MM-DD')])
+              this.$emit('input' , [moment(this.selectDay[0]).format('YYYY-MM-DD'), moment(this.selectDay[1]).format('YYYY-MM-DD')])
+            }
+            this.calendarVisible = false;
+          }
+        }else {
+          let result = day.date;
+          if (this.isLunar) {
+            let tip = 'L' + (day.lDate.isLeap ? 'R' : '');
+            let date = new Date(day.lDate.lYear + '-' + day.lDate.lMonth + '-' + day.lDate.lDay).toISOString();
+            result = tip + moment(date).format("YYYY-MM-DD")
+          }
+          this.monthDay = dayDate;
+          this.calendarVisible = false;
+          this.$emit('change', result);
+          this.$emit('input' , result);
+        }
+      },
+      onMonthSelect(command){
+        let newMonth = moment(this.monthDay).month(command)
+        this.monthDay = newMonth.toISOString();
+        this.loadCalendar();
+        this.monthVisible = false;
+      },
+      onYearSelect(command){
+        let newMonth = moment(this.monthDay).year(command)
+        this.monthDay = newMonth.toISOString();
+        this.yearVisible = false;
+        this.monthVisible = true;
+      },
+      loadCalendar () {
+        if(this.monthDay==null || this.monthDay == ''){
+            this.monthDay = moment().toISOString();
+        }
+
+        let startDate = moment(this.monthDay).startOf('month').format('YYYY-MM-DD');
+        let currentMonth = moment(startDate);
+        this.year = currentMonth.year();
+        this.month = currentMonth.month() + 1;
+        this.calendarDatas = this.handleCalendar(currentMonth);
+
+        if(this.type.toUpperCase() == 'DATERANGE'){
+            //时间段模式
+          let currentMonth2 = currentMonth.clone().add(1,'months');
+          this.year2 = currentMonth2.year();
+          this.month2 = currentMonth2.month() + 1;
+          this.calendarDatas2 = this.handleCalendar(currentMonth2);
+        }
+      },
+      handleCalendar(currentMonth){
+
+        let start = currentMonth.clone()
+        start.subtract(start.day(), 'd')
+        let calendars = [];
+
+        for (let iWeek = 0; iWeek < 6; iWeek++) {
+          let week = []
+          if (iWeek > 0 && !start.isSame(currentMonth, 'month')) {
+            break;
+          }
+          for (let iDay = 0; iDay < 7; iDay++) {
+            week.push({
+              day: start.date(),
+              isToday: start.isSame(new Date(), 'day'),
+              isSelect: this.selectDay.length>0 && start.isSame(new Date(this.selectDay[0]),'day'),
+              isCurMonth: start.isSame(currentMonth, 'month'),
+              weekIndex:iWeek,
+              week: iDay,
+              date: start.clone().format('YYYY-MM-DD'),
+              lDate: JDatePickerScript.calendar.getLunar(start.clone().format('YYYY-MM-DD')),
+            });
+            start.add(1, 'd')
+          }
+          calendars.push(week)
+        }
+
+        return calendars;
+      }
+    },
+
+  }
+</script>
+
+<style src="../theme/public.css" scoped>
+</style>
diff --git a/src/views/group/holidaySetting/components/index.js b/src/views/group/holidaySetting/components/index.js
new file mode 100644
index 00000000..64e1fbbe
--- /dev/null
+++ b/src/views/group/holidaySetting/components/index.js
@@ -0,0 +1,13 @@
+import jDatePicker from './JDatePicker.vue' // 导入组件
+const jLunarDatePicker = {
+  install(Vue, options) {
+    Vue.component(jDatePicker.name, jDatePicker) // vuePayKeyboard.name 组件的name属性
+    // 类似通过 this.$xxx 方式调用插件的 其实只是挂载到原型上而已
+    // Vue.prototype.$xxx  // 最终可以在任何地方通过 this.$xxx 调用
+    // 虽然没有明确规定用$开头  但是大家都默认遵守这个规定
+  }
+}
+if (typeof window !== 'undefined' && window.Vue) {
+  window.Vue.use(jLunarDatePicker);
+}
+export default jLunarDatePicker // 导出..
diff --git a/src/views/group/holidaySetting/components/jDatePicker.js b/src/views/group/holidaySetting/components/jDatePicker.js
new file mode 100644
index 00000000..e4434896
--- /dev/null
+++ b/src/views/group/holidaySetting/components/jDatePicker.js
@@ -0,0 +1,626 @@
+/**
+ * @1900-2100区间内的公历、农历互转
+ * @charset UTF-8
+ * @公历转农历：calendar.solar2lunar(1987,11,01); //[you can ignore params of prefix 0]
+ */
+const calendar = {
+
+  /**
+   * 农历1900-2100的润大小信息表
+   * @Array Of Property
+   * @return Hex
+   */
+  lunarInfo:[0x04bd8,0x04ae0,0x0a570,0x054d5,0x0d260,0x0d950,0x16554,0x056a0,0x09ad0,0x055d2,//1900-1909
+    0x04ae0,0x0a5b6,0x0a4d0,0x0d250,0x1d255,0x0b540,0x0d6a0,0x0ada2,0x095b0,0x14977,//1910-1919
+    0x04970,0x0a4b0,0x0b4b5,0x06a50,0x06d40,0x1ab54,0x02b60,0x09570,0x052f2,0x04970,//1920-1929
+    0x06566,0x0d4a0,0x0ea50,0x06e95,0x05ad0,0x02b60,0x186e3,0x092e0,0x1c8d7,0x0c950,//1930-1939
+    0x0d4a0,0x1d8a6,0x0b550,0x056a0,0x1a5b4,0x025d0,0x092d0,0x0d2b2,0x0a950,0x0b557,//1940-1949
+    0x06ca0,0x0b550,0x15355,0x04da0,0x0a5b0,0x14573,0x052b0,0x0a9a8,0x0e950,0x06aa0,//1950-1959
+    0x0aea6,0x0ab50,0x04b60,0x0aae4,0x0a570,0x05260,0x0f263,0x0d950,0x05b57,0x056a0,//1960-1969
+    0x096d0,0x04dd5,0x04ad0,0x0a4d0,0x0d4d4,0x0d250,0x0d558,0x0b540,0x0b6a0,0x195a6,//1970-1979
+    0x095b0,0x049b0,0x0a974,0x0a4b0,0x0b27a,0x06a50,0x06d40,0x0af46,0x0ab60,0x09570,//1980-1989
+    0x04af5,0x04970,0x064b0,0x074a3,0x0ea50,0x06b58,0x055c0,0x0ab60,0x096d5,0x092e0,//1990-1999
+    0x0c960,0x0d954,0x0d4a0,0x0da50,0x07552,0x056a0,0x0abb7,0x025d0,0x092d0,0x0cab5,//2000-2009
+    0x0a950,0x0b4a0,0x0baa4,0x0ad50,0x055d9,0x04ba0,0x0a5b0,0x15176,0x052b0,0x0a930,//2010-2019
+    0x07954,0x06aa0,0x0ad50,0x05b52,0x04b60,0x0a6e6,0x0a4e0,0x0d260,0x0ea65,0x0d530,//2020-2029
+    0x05aa0,0x076a3,0x096d0,0x04afb,0x04ad0,0x0a4d0,0x1d0b6,0x0d250,0x0d520,0x0dd45,//2030-2039
+    0x0b5a0,0x056d0,0x055b2,0x049b0,0x0a577,0x0a4b0,0x0aa50,0x1b255,0x06d20,0x0ada0,//2040-2049
+    /**Add By JJonline@JJonline.Cn**/
+    0x14b63,0x09370,0x049f8,0x04970,0x064b0,0x168a6,0x0ea50, 0x06b20,0x1a6c4,0x0aae0,//2050-2059
+    0x0a2e0,0x0d2e3,0x0c960,0x0d557,0x0d4a0,0x0da50,0x05d55,0x056a0,0x0a6d0,0x055d4,//2060-2069
+    0x052d0,0x0a9b8,0x0a950,0x0b4a0,0x0b6a6,0x0ad50,0x055a0,0x0aba4,0x0a5b0,0x052b0,//2070-2079
+    0x0b273,0x06930,0x07337,0x06aa0,0x0ad50,0x14b55,0x04b60,0x0a570,0x054e4,0x0d160,//2080-2089
+    0x0e968,0x0d520,0x0daa0,0x16aa6,0x056d0,0x04ae0,0x0a9d4,0x0a2d0,0x0d150,0x0f252,//2090-2099
+    0x0d520],//2100
+
+  /**
+   * 公历每个月份的天数普通表
+   * @Array Of Property
+   * @return Number
+   */
+  solarMonth:[31,28,31,30,31,30,31,31,30,31,30,31],
+
+  /**
+   * 天干地支之天干速查表
+   * @Array Of Property trans["甲","乙","丙","丁","戊","己","庚","辛","壬","癸"]
+   * @return Cn string
+   */
+  Gan:["\u7532","\u4e59","\u4e19","\u4e01","\u620a","\u5df1","\u5e9a","\u8f9b","\u58ec","\u7678"],
+
+  /**
+   * 天干地支之地支速查表
+   * @Array Of Property
+   * @trans["子","丑","寅","卯","辰","巳","午","未","申","酉","戌","亥"]
+   * @return Cn string
+   */
+  Zhi:["\u5b50","\u4e11","\u5bc5","\u536f","\u8fb0","\u5df3","\u5348","\u672a","\u7533","\u9149","\u620c","\u4ea5"],
+
+  /**
+   * 天干地支之地支速查表<=>生肖
+   * @Array Of Property
+   * @trans["鼠","牛","虎","兔","龙","蛇","马","羊","猴","鸡","狗","猪"]
+   * @return Cn string
+   */
+  Animals:["\u9f20","\u725b","\u864e","\u5154","\u9f99","\u86c7","\u9a6c","\u7f8a","\u7334","\u9e21","\u72d7","\u732a"],
+
+  /**
+   * 24节气速查表
+   * @Array Of Property
+   * @trans["小寒","大寒","立春","雨水","惊蛰","春分","清明","谷雨","立夏","小满","芒种","夏至","小暑","大暑","立秋","处暑","白露","秋分","寒露","霜降","立冬","小雪","大雪","冬至"]
+   * @return Cn string
+   */
+  solarTerm:["\u5c0f\u5bd2","\u5927\u5bd2","\u7acb\u6625","\u96e8\u6c34","\u60ca\u86f0","\u6625\u5206","\u6e05\u660e","\u8c37\u96e8","\u7acb\u590f","\u5c0f\u6ee1","\u8292\u79cd","\u590f\u81f3","\u5c0f\u6691","\u5927\u6691","\u7acb\u79cb","\u5904\u6691","\u767d\u9732","\u79cb\u5206","\u5bd2\u9732","\u971c\u964d","\u7acb\u51ac","\u5c0f\u96ea","\u5927\u96ea","\u51ac\u81f3"],
+
+  /**
+   * 1900-2100各年的24节气日期速查表
+   * @Array Of Property
+   * @return 0x string For splice
+   */
+  sTermInfo:['9778397bd097c36b0b6fc9274c91aa','97b6b97bd19801ec9210c965cc920e','97bcf97c3598082c95f8c965cc920f',
+    '97bd0b06bdb0722c965ce1cfcc920f','b027097bd097c36b0b6fc9274c91aa','97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c359801ec95f8c965cc920f','97bd0b06bdb0722c965ce1cfcc920f','b027097bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e','97bcf97c359801ec95f8c965cc920f','97bd0b06bdb0722c965ce1cfcc920f',
+    'b027097bd097c36b0b6fc9274c91aa','9778397bd19801ec9210c965cc920e','97b6b97bd19801ec95f8c965cc920f',
+    '97bd09801d98082c95f8e1cfcc920f','97bd097bd097c36b0b6fc9210c8dc2','9778397bd197c36c9210c9274c91aa',
+    '97b6b97bd19801ec95f8c965cc920e','97bd09801d98082c95f8e1cfcc920f','97bd097bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36c9210c9274c91aa','97b6b97bd19801ec95f8c965cc920e','97bcf97c3598082c95f8e1cfcc920f',
+    '97bd097bd097c36b0b6fc9210c8dc2','9778397bd097c36c9210c9274c91aa','97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c3598082c95f8c965cc920f','97bd097bd097c35b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e','97bcf97c3598082c95f8c965cc920f','97bd097bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa','97b6b97bd19801ec9210c965cc920e','97bcf97c359801ec95f8c965cc920f',
+    '97bd097bd097c35b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa','97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c359801ec95f8c965cc920f','97bd097bd097c35b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e','97bcf97c359801ec95f8c965cc920f','97bd097bd07f595b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9210c8dc2','9778397bd19801ec9210c9274c920e','97b6b97bd19801ec95f8c965cc920f',
+    '97bd07f5307f595b0b0bc920fb0722','7f0e397bd097c36b0b6fc9210c8dc2','9778397bd097c36c9210c9274c920e',
+    '97b6b97bd19801ec95f8c965cc920f','97bd07f5307f595b0b0bc920fb0722','7f0e397bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36c9210c9274c91aa','97b6b97bd19801ec9210c965cc920e','97bd07f1487f595b0b0bc920fb0722',
+    '7f0e397bd097c36b0b6fc9210c8dc2','9778397bd097c36b0b6fc9274c91aa','97b6b97bd19801ec9210c965cc920e',
+    '97bcf7f1487f595b0b0bb0b6fb0722','7f0e397bd097c35b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e','97bcf7f1487f595b0b0bb0b6fb0722','7f0e397bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa','97b6b97bd19801ec9210c965cc920e','97bcf7f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa','97b6b97bd19801ec9210c965cc920e',
+    '97bcf7f1487f531b0b0bb0b6fb0722','7f0e397bd07f595b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c9274c920e','97bcf7f0e47f531b0b0bb0b6fb0722','7f0e397bd07f595b0b0bc920fb0722',
+    '9778397bd097c36b0b6fc9210c91aa','97b6b97bd197c36c9210c9274c920e','97bcf7f0e47f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722','9778397bd097c36b0b6fc9210c8dc2','9778397bd097c36c9210c9274c920e',
+    '97b6b7f0e47f531b0723b0b6fb0722','7f0e37f5307f595b0b0bc920fb0722','7f0e397bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36b0b70c9274c91aa','97b6b7f0e47f531b0723b0b6fb0721','7f0e37f1487f595b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc9210c8dc2','9778397bd097c36b0b6fc9274c91aa','97b6b7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f595b0b0bb0b6fb0722','7f0e397bd097c35b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa',
+    '97b6b7f0e47f531b0723b0b6fb0721','7f0e27f1487f531b0b0bb0b6fb0722','7f0e397bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa','97b6b7f0e47f531b0723b0b6fb0721','7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722','9778397bd097c36b0b6fc9274c91aa','97b6b7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722','7f0e397bd07f595b0b0bc920fb0722','9778397bd097c36b0b6fc9274c91aa',
+    '97b6b7f0e47f531b0723b0787b0721','7f0e27f0e47f531b0b0bb0b6fb0722','7f0e397bd07f595b0b0bc920fb0722',
+    '9778397bd097c36b0b6fc9210c91aa','97b6b7f0e47f149b0723b0787b0721','7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722','9778397bd097c36b0b6fc9210c8dc2','977837f0e37f149b0723b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722','7f0e37f5307f595b0b0bc920fb0722','7f0e397bd097c35b0b6fc9210c8dc2',
+    '977837f0e37f14998082b0787b0721','7f07e7f0e47f531b0723b0b6fb0721','7f0e37f1487f595b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc9210c8dc2','977837f0e37f14998082b0787b06bd','7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722','7f0e397bd097c35b0b6fc920fb0722','977837f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721','7f0e27f1487f531b0b0bb0b6fb0722','7f0e397bd097c35b0b6fc920fb0722',
+    '977837f0e37f14998082b0787b06bd','7f07e7f0e47f531b0723b0b6fb0721','7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722','977837f0e37f14998082b0787b06bd','7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722','7f0e397bd07f595b0b0bc920fb0722','977837f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f149b0723b0787b0721','7f0e27f0e47f531b0b0bb0b6fb0722','7f0e397bd07f595b0b0bc920fb0722',
+    '977837f0e37f14998082b0723b06bd','7f07e7f0e37f149b0723b0787b0721','7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722','977837f0e37f14898082b0723b02d5','7ec967f0e37f14998082b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722','7f0e37f1487f595b0b0bb0b6fb0722','7f0e37f0e37f14898082b0723b02d5',
+    '7ec967f0e37f14998082b0787b0721','7f07e7f0e47f531b0723b0b6fb0722','7f0e37f1487f531b0b0bb0b6fb0722',
+    '7f0e37f0e37f14898082b0723b02d5','7ec967f0e37f14998082b0787b06bd','7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e37f1487f531b0b0bb0b6fb0722','7f0e37f0e37f14898082b072297c35','7ec967f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721','7f0e27f1487f531b0b0bb0b6fb0722','7f0e37f0e37f14898082b072297c35',
+    '7ec967f0e37f14998082b0787b06bd','7f07e7f0e47f531b0723b0b6fb0721','7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e37f0e366aa89801eb072297c35','7ec967f0e37f14998082b0787b06bd','7f07e7f0e47f149b0723b0787b0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722','7f0e37f0e366aa89801eb072297c35','7ec967f0e37f14998082b0723b06bd',
+    '7f07e7f0e47f149b0723b0787b0721','7f0e27f0e47f531b0723b0b6fb0722','7f0e37f0e366aa89801eb072297c35',
+    '7ec967f0e37f14998082b0723b06bd','7f07e7f0e37f14998083b0787b0721','7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e37f0e366aa89801eb072297c35','7ec967f0e37f14898082b0723b02d5','7f07e7f0e37f14998082b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722','7f0e36665b66aa89801e9808297c35','665f67f0e37f14898082b0723b02d5',
+    '7ec967f0e37f14998082b0787b0721','7f07e7f0e47f531b0723b0b6fb0722','7f0e36665b66a449801e9808297c35',
+    '665f67f0e37f14898082b0723b02d5','7ec967f0e37f14998082b0787b06bd','7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e36665b66a449801e9808297c35','665f67f0e37f14898082b072297c35','7ec967f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721','7f0e26665b66a449801e9808297c35','665f67f0e37f1489801eb072297c35',
+    '7ec967f0e37f14998082b0787b06bd','7f07e7f0e47f531b0723b0b6fb0721','7f0e27f1487f531b0b0bb0b6fb0722'],
+
+  /**
+   * 数字转中文速查表
+   * @Array Of Property
+   * @trans ['日','一','二','三','四','五','六','七','八','九','十']
+   * @return Cn string
+   */
+  nStr1:["\u65e5","\u4e00","\u4e8c","\u4e09","\u56db","\u4e94","\u516d","\u4e03","\u516b","\u4e5d","\u5341"],
+
+  /**
+   * 日期转农历称呼速查表
+   * @Array Of Property
+   * @trans ['初','十','廿','卅']
+   * @return Cn string
+   */
+  nStr2:["\u521d","\u5341","\u5eff","\u5345"],
+
+  /**
+   * 月份转农历称呼速查表
+   * @Array Of Property
+   * @trans ['正','一','二','三','四','五','六','七','八','九','十','冬','腊']
+   * @return Cn string
+   */
+  nStr3:["\u6b63","\u4e8c","\u4e09","\u56db","\u4e94","\u516d","\u4e03","\u516b","\u4e5d","\u5341","\u51ac","\u814a"],
+
+  /**
+   * 农历节日
+   */
+  lunarFestival:{"1-1":"春节","1-15":"上元节","2-2":"龙抬头","5-5":"端午","7-7":"七夕","7-15":"中元节","8-15":"中秋","9-9":"重阳","10-15":"下元节","12-8":"腊八","12-23":"小年"},
+  /**
+   * 公历节日
+   */
+  solarFestival:{"1-1":"元旦","2-14":"情人节","3-8":"妇女节","3-12":"植树节","4-1":"愚人节","5-1":"劳动节","5-4":"青年节","6-1":"儿童节","7-1":"建党节","8-1":"建军节","9-10":"教师节","10-1":"国庆节","11-1":"万圣节","12-24":"平安夜","12-25":"圣诞节"},
+
+  /**
+   * 返回农历y年一整年的总天数
+   * @param lunar Year
+   * @return Number
+   * @eg:var count = calendar.lYearDays(1987) ;//count=387
+   */
+  lYearDays:function(y) {
+    var i, sum = 348;
+    for(i=0x8000; i>0x8; i>>=1) { sum += (calendar.lunarInfo[y-1900] & i)? 1: 0; }
+    return(sum+calendar.leapDays(y));
+  },
+
+  /**
+   * 返回农历y年闰月是哪个月；若y年没有闰月 则返回0
+   * @param lunar Year
+   * @return Number (0-12)
+   * @eg:var leapMonth = calendar.leapMonth(1987) ;//leapMonth=6
+   */
+  leapMonth:function(y) { //闰字编码 \u95f0
+    return(calendar.lunarInfo[y-1900] & 0xf);
+  },
+
+  /**
+   * 返回农历y年闰月的天数 若该年没有闰月则返回0
+   * @param lunar Year
+   * @return Number (0、29、30)
+   * @eg:var leapMonthDay = calendar.leapDays(1987) ;//leapMonthDay=29
+   */
+  leapDays:function(y) {
+    if(calendar.leapMonth(y))  {
+      return((calendar.lunarInfo[y-1900] & 0x10000)? 30: 29);
+    }
+    return(0);
+  },
+
+  /**
+   * 返回农历y年m月（非闰月）的总天数，计算m为闰月时的天数请使用leapDays方法
+   * @param lunar Year
+   * @return Number (-1、29、30)
+   * @eg:var MonthDay = calendar.monthDays(1987,9) ;//MonthDay=29
+   */
+  monthDays:function(y,m) {
+    if(m>12 || m<1) {return -1}//月份参数从1至12，参数错误返回-1
+    return( (calendar.lunarInfo[y-1900] & (0x10000>>m))? 30: 29 );
+  },
+
+  /**
+   * 返回公历(!)y年m月的天数
+   * @param solar Year
+   * @return Number (-1、28、29、30、31)
+   * @eg:var solarMonthDay = calendar.leapDays(1987) ;//solarMonthDay=30
+   */
+  solarDays:function(y,m) {
+    if(m>12 || m<1) {return -1} //若参数错误 返回-1
+    var ms = m-1;
+    if(ms==1) { //2月份的闰平规律测算后确认返回28或29
+      return(((y%4 == 0) && (y%100 != 0) || (y%400 == 0))? 29: 28);
+    }else {
+      return(calendar.solarMonth[ms]);
+    }
+  },
+
+  /**
+   * 农历年份转换为干支纪年
+   * @param  lYear 农历年的年份数
+   * @return Cn string
+   */
+  toGanZhiYear:function(lYear) {
+    var ganKey = (lYear - 3) % 10;
+    var zhiKey = (lYear - 3) % 12;
+    if(ganKey == 0) ganKey = 10;//如果余数为0则为最后一个天干
+    if(zhiKey == 0) zhiKey = 12;//如果余数为0则为最后一个地支
+    return calendar.Gan[ganKey-1] + calendar.Zhi[zhiKey-1];
+
+  },
+
+  /**
+   * 公历月、日判断所属星座
+   * @param  cMonth [description]
+   * @param  cDay [description]
+   * @return Cn string
+   */
+  toAstro:function(cMonth,cDay) {
+    var s   = "\u9b54\u7faf\u6c34\u74f6\u53cc\u9c7c\u767d\u7f8a\u91d1\u725b\u53cc\u5b50\u5de8\u87f9\u72ee\u5b50\u5904\u5973\u5929\u79e4\u5929\u874e\u5c04\u624b\u9b54\u7faf";
+    var arr = [20,19,21,21,21,22,23,23,23,23,22,22];
+    return s.substr(cMonth*2 - (cDay < arr[cMonth-1] ? 2 : 0),2) + "\u5ea7";//座
+  },
+
+  /**
+   * 传入offset偏移量返回干支
+   * @param offset 相对甲子的偏移量
+   * @return Cn string
+   */
+  toGanZhi:function(offset) {
+    return calendar.Gan[offset%10] + calendar.Zhi[offset%12];
+  },
+
+  /**
+   * 传入公历(!)y年获得该年第n个节气的公历日期
+   * @param y公历年(1900-2100)；n二十四节气中的第几个节气(1~24)；从n=1(小寒)算起
+   * @return day Number
+   * @eg:var _24 = calendar.getTerm(1987,3) ;//_24=4;意即1987年2月4日立春
+   */
+  getTerm:function(y,n) {
+    if(y<1900 || y>2100) {return -1;}
+    if(n<1 || n>24) {return -1;}
+    var _table = calendar.sTermInfo[y-1900];
+    var _info = [
+      parseInt('0x'+_table.substr(0,5)).toString() ,
+      parseInt('0x'+_table.substr(5,5)).toString(),
+      parseInt('0x'+_table.substr(10,5)).toString(),
+      parseInt('0x'+_table.substr(15,5)).toString(),
+      parseInt('0x'+_table.substr(20,5)).toString(),
+      parseInt('0x'+_table.substr(25,5)).toString()
+    ];
+    var _calday = [
+      _info[0].substr(0,1),
+      _info[0].substr(1,2),
+      _info[0].substr(3,1),
+      _info[0].substr(4,2),
+
+      _info[1].substr(0,1),
+      _info[1].substr(1,2),
+      _info[1].substr(3,1),
+      _info[1].substr(4,2),
+
+      _info[2].substr(0,1),
+      _info[2].substr(1,2),
+      _info[2].substr(3,1),
+      _info[2].substr(4,2),
+
+      _info[3].substr(0,1),
+      _info[3].substr(1,2),
+      _info[3].substr(3,1),
+      _info[3].substr(4,2),
+
+      _info[4].substr(0,1),
+      _info[4].substr(1,2),
+      _info[4].substr(3,1),
+      _info[4].substr(4,2),
+
+      _info[5].substr(0,1),
+      _info[5].substr(1,2),
+      _info[5].substr(3,1),
+      _info[5].substr(4,2),
+    ];
+    return parseInt(_calday[n-1]);
+  },
+
+  /**
+   * 传入农历数字月份返回汉语通俗表示法
+   * @param lunar month
+   * @return Cn string
+   * @eg:var cnMonth = calendar.toChinaMonth(12) ;//cnMonth='腊月'
+   */
+  toChinaMonth:function(m) { // 月 => \u6708
+    if(m>12 || m<1) {return -1} //若参数错误 返回-1
+    var s = calendar.nStr3[m-1];
+    s+= "\u6708";//加上月字
+    return s;
+  },
+
+  /**
+   * 传入年份月份返回第n个星期日的日期数字
+   * @param y 年份
+   * @param m 月份
+   * @param n 第几个星期日 ( 5>n>0的数字 一个月一般就4个星期日，最多5个)
+   * @return 日期数字；3 ＝ getSunday(2017,9,1); 九月的第一个星期日是3号；超出返回-1
+   */
+  getSunday(y,m,n){
+    var d = new Date(y+'-' + m + '-1');
+    var d2= new Date(y+'-'+(m+1)+'-1');
+    d2.setDate(0);
+    var maxDay = d2.getDate();//传入月份的最后一天
+
+    var week = d.getDay();
+    var first = 1;
+    if(week>0) first = d.getDate() + (7 - week);
+    var result = (n-1)*7 + first;
+    if(result>maxDay) return -1;
+    return result;
+  },
+  /**
+   * 传入农历日期数字返回汉字表示法
+   * @param lunar day
+   * @return Cn string
+   * @eg:var cnDay = calendar.toChinaDay(21) ;//cnMonth='廿一'
+   */
+  toChinaDay:function(d){ //日 => \u65e5
+    var s;
+    switch (d) {
+      case 10:
+        s = '\u521d\u5341'; break;
+      case 20:
+        s = '\u4e8c\u5341'; break;
+        break;
+      case 30:
+        s = '\u4e09\u5341'; break;
+        break;
+      default :
+        s = calendar.nStr2[Math.floor(d/10)];
+        s += calendar.nStr1[d%10];
+    }
+    return(s);
+  },
+
+  /**
+   * 年份转生肖[!仅能大致转换] => 精确划分生肖分界线是“立春”
+   * @param y year
+   * @return Cn string
+   * @eg:var animal = calendar.getAnimal(1987) ;//animal='兔'
+   */
+  getAnimal: function(y) {
+    return calendar.Animals[(y - 4) % 12]
+  },
+  /**
+   * 判断 当天为 此年的第几天
+   * @param date
+   * @returns {number}
+   */
+  getCyclical:function(date){
+    var nowDate = new Date(date);
+    var initTime = new Date(date);
+    initTime.setMonth(0); // 本年初始月份
+    initTime.setDate(1); // 本年初始时间
+    var differenceVal = nowDate - initTime ; // 今天的时间减去本年开始时间，获得相差的时间
+    return Math.ceil(differenceVal/(24*60*60*1000));
+  },
+  /**
+   * 传入阳历年月日获得详细的公历、农历object信息 <=>JSON
+   * @param y  solar year
+   * @param m  solar month
+   * @param d  solar day
+   * @return JSON object
+   * @eg:console.log(calendar.solar2lunar(1987,11,01));
+   */
+  solar2lunar:function (y,m,d) { //参数区间1900.1.31~2100.12.31
+    //年份限定、上限
+    if(y<1900 || y>2100) {
+      return -1;// undefined转换为数字变为NaN
+    }
+    //公历传参最下限
+    if(y==1900&&m==1&&d<31) {
+      return -1;
+    }
+    //未传参  获得当天
+    if(!y) {
+      var objDate = new Date();
+    }else {
+      var objDate = new Date(y,parseInt(m)-1,d)
+    }
+    var i, leap=0, temp=0;
+    //修正ymd参数
+    var y = objDate.getFullYear(),
+      m = objDate.getMonth()+1,
+      d = objDate.getDate();
+    var offset = (Date.UTC(objDate.getFullYear(),objDate.getMonth(),objDate.getDate()) - Date.UTC(1900,0,31))/86400000;
+    for(i=1900; i<2101 && offset>0; i++) {
+      temp    = calendar.lYearDays(i);
+      offset -= temp;
+    }
+    if(offset<0) {
+      offset+=temp; i--;
+    }
+
+    //是否今天
+    var isTodayObj = new Date(),
+      isToday    = false;
+    if(isTodayObj.getFullYear()==y && isTodayObj.getMonth()+1==m && isTodayObj.getDate()==d) {
+      isToday = true;
+    }
+    //星期几
+    var nWeek = objDate.getDay(),
+      cWeek  = calendar.nStr1[nWeek];
+    //数字表示周几顺应天朝周一开始的惯例
+    if(nWeek==0) {
+      nWeek = 7;
+    }
+    //农历年
+    var year   = i;
+    var leap   = calendar.leapMonth(i); //闰哪个月
+    var isLeap = false;
+
+    //效验闰月
+    for(i=1; i<13 && offset>0; i++) {
+      //闰月
+      if(leap>0 && i==(leap+1) && isLeap==false){
+        --i;
+        isLeap = true; temp = calendar.leapDays(year); //计算农历闰月天数
+      }
+      else{
+        temp = calendar.monthDays(year, i);//计算农历普通月天数
+      }
+      //解除闰月
+      if(isLeap==true && i==(leap+1)) { isLeap = false; }
+      offset -= temp;
+    }
+    // 闰月导致数组下标重叠取反
+    if(offset==0 && leap>0 && i==leap+1)
+    {
+      if(isLeap){
+        isLeap = false;
+      }else{
+        isLeap = true; --i;
+      }
+    }
+    if(offset<0)
+    {
+      offset += temp;
+      --i;
+    }
+    //农历月
+    var month      = i;
+    //农历日
+    var day        = offset +1;
+    //天干地支处理
+    var sm         = m-1;
+    var gzY        = calendar.toGanZhiYear(year);
+
+    // 当月的两个节气
+    // bugfix-2017-7-24 11:03:38 use lunar Year Param `y` Not `year`
+    var firstNode  = calendar.getTerm(y,(m*2-1));//返回当月「节」为几日开始
+    var secondNode = calendar.getTerm(y,(m*2));//返回当月「节」为几日开始
+
+    // 依据12节气修正干支月
+    var gzM        = calendar.toGanZhi((y-1900)*12+m+11);
+    if(d>=firstNode) {
+      gzM        = calendar.toGanZhi((y-1900)*12+m+12);
+    }
+
+    //传入的日期的节气与否
+    var isTerm = false;
+    var Term   = null;
+    if(firstNode==d) {
+      isTerm  = true;
+      Term    = calendar.solarTerm[m*2-2];
+    }
+    if(secondNode==d) {
+      isTerm  = true;
+      Term    = calendar.solarTerm[m*2-1];
+    }
+    //日柱 当月一日与 1900/1/1 相差天数
+    var dayCyclical = Date.UTC(y,sm,1,0,0,0,0)/86400000+25567+10;
+    var gzD         = calendar.toGanZhi(dayCyclical+d-1);
+    //(年-1900) * 5 + (年-1900+3) / 4 + 9 + 当年年初起累积日数
+    // var dayCyclical = (y-1900)*5 + (y-1900+3)/4 + 9 +(this.getCyclical(y+'-'+m+'-'+d))
+    // var gzD         = calendar.toGanZhi(dayCyclical-1);
+    //该日期所属的星座
+    var astro       = calendar.toAstro(m,d);
+    //该日期所有的节日
+    var festival    = [];
+    //农历传统节日
+    var lf = calendar.lunarFestival[month+'-'+day];
+    if(lf != undefined && lf != null && lf != '') festival.push(lf);
+    if(month==12 && (isLeap?day == calendar.leapDays(year):calendar.monthDays(month-1)==29?day == 30:day == 29)) festival.push('除夕');
+
+    //公历节日
+    var sf = calendar.solarFestival[m+'-'+d];
+    if(sf != undefined && sf != null && sf != '') festival.push(sf);
+    if(m==5 && d==calendar.getSunday(y,m,2)) festival.push('母亲节');
+    if(m==6 && d==calendar.getSunday(y,m,3)) festival.push('父亲节');
+
+    return {'lYear':year,'lMonth':month,'lDay':day,'isFestival':festival.length>0,'festival':festival,'Animal':calendar.getAnimal(year),'IMonthCn':(isLeap?"\u95f0":'')+calendar.toChinaMonth(month),'IDayCn':calendar.toChinaDay(day),'cYear':y,'cMonth':m,'cDay':d,'gzYear':gzY,'gzMonth':gzM,'gzDay':gzD,'isToday':isToday,'isLeap':isLeap,'nWeek':nWeek,'ncWeek':"\u661f\u671f"+cWeek,'isTerm':isTerm,'Term':Term,'astro':astro};
+  },
+
+  getLunar:function (date) {
+    var D;
+    if(date==undefined){
+      D = new Date();
+    }else{
+      D = new Date(date);
+    }
+    D.setHours(D.getHours()+8)//根据国际UTC标准，中国时区应为：UTC+8
+    var cY  =   D.getUTCFullYear();
+    var cM  =   D.getUTCMonth()+1;
+    var cD  =   D.getUTCDate();
+    //console.log('getLunar:月'+cM+'--'+cD+'日')
+    return calendar.solar2lunar(cY,cM,cD);
+  },
+
+  /**
+   * 传入农历年月日以及传入的月份是否闰月获得详细的公历、农历object信息 <=>JSON
+   * @param y  lunar year
+   * @param m  lunar month
+   * @param d  lunar day
+   * @param isLeapMonth  lunar month is leap or not.[如果是农历闰月第四个参数赋值true即可]
+   * @return JSON object
+   * @eg:console.log(calendar.lunar2solar(1987,9,10));
+   */
+  lunar2solar:function(y,m,d,isLeapMonth) {   //参数区间1900.1.31~2100.12.1
+    var isLeapMonth = !!isLeapMonth;
+    var leapOffset  = 0;
+    var leapMonth   = calendar.leapMonth(y);
+    var leapDay     = calendar.leapDays(y);
+    if(isLeapMonth&&(leapMonth!=m)) {return -1;}//传参要求计算该闰月公历 但该年得出的闰月与传参的月份并不同
+    if(y==2100&&m==12&&d>1 || y==1900&&m==1&&d<31) {return -1;}//超出了最大极限值
+    var day  = calendar.monthDays(y,m);
+    var _day = day;
+    //bugFix 2016-9-25
+    //if month is leap, _day use leapDays method
+    if(isLeapMonth) {
+      _day = calendar.leapDays(y,m);
+    }
+    if(y < 1900 || y > 2100 || d > _day) {return -1;}//参数合法性效验
+
+    //计算农历的时间差
+    var offset = 0;
+    for(var i=1900;i<y;i++) {
+      offset+=calendar.lYearDays(i);
+    }
+    var leap = 0,isAdd= false;
+    for(var i=1;i<m;i++) {
+      leap = calendar.leapMonth(y);
+      if(!isAdd) {//处理闰月
+        if(leap<=i && leap>0) {
+          offset+=calendar.leapDays(y);isAdd = true;
+        }
+      }
+      offset+=calendar.monthDays(y,i);
+    }
+    //转换闰月农历 需补充该年闰月的前一个月的时差
+    if(isLeapMonth) {offset+=day;}
+    //1900年农历正月一日的公历时间为1900年1月30日0时0分0秒(该时间也是本农历的最开始起始点)
+    var stmap   =   Date.UTC(1900,1,30,0,0,0);
+    var calObj  =   new Date((offset+d-31)*86400000+stmap);
+    var cY      =   calObj.getUTCFullYear();
+    var cM      =   calObj.getUTCMonth()+1;
+    var cD      =   calObj.getUTCDate();
+
+    return calendar.solar2lunar(cY,cM,cD);
+  },
+  /**
+   * 传入农历日期
+   * @param date 类型String，格式：L2017-01-02；闰月：LR2017-06-03
+   * @returns {*|JSON}
+   */
+  getSolar(date) {
+    if(date == undefined || date == null || date == '' || date.indexOf('L') == -1) return null;
+    var isLeapMonth = date.indexOf('R')>-1;
+    var D = date.replace(/L/,'').replace(/R/,'').split('-');
+    var cY  =   parseInt(D[0]);
+    var cM  =   parseInt(D[1]);
+    var cD  =   parseInt(D[2]);
+    return calendar.lunar2solar(cY,cM,cD,isLeapMonth);
+  },
+};
+export default { calendar }
diff --git a/src/views/group/holidaySetting/holidayLog.vue b/src/views/group/holidaySetting/holidayLog.vue
index 37a39507..c06dc9d1 100644
--- a/src/views/group/holidaySetting/holidayLog.vue
+++ b/src/views/group/holidaySetting/holidayLog.vue
@@ -3,6 +3,7 @@
 		<search-bar
 			:formConfigs="formConfig"
 			ref="searchBarForm"
+      :isFold="true"
 			@headBtnClick="buttonClick" />
 		<base-table
 			:table-props="tableProps"
@@ -32,6 +33,10 @@ const tableProps = [
 		prop: 'opPeopleName',
 		label: '操作人'
 	},
+	{
+		prop: 'deptName',
+		label: '部门'
+	},
 	{
 		prop: 'opType',
 		label: '操作类型',
diff --git a/src/views/group/holidaySetting/index.vue b/src/views/group/holidaySetting/index.vue
index 0d1b58a2..d3bee60a 100644
--- a/src/views/group/holidaySetting/index.vue
+++ b/src/views/group/holidaySetting/index.vue
@@ -2,135 +2,296 @@
  * @Author: zwq
  * @Date: 2024-07-01 14:54:06
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-19 00:35:24
+ * @LastEditTime: 2025-11-24 16:11:20
  * @Description:
 -->
 <template>
-	<el-row :gutter="10" style="background-color: #f2f4f9">
-		<!--部门数据-->
-		<el-col :span="4">
-			<div class="head-container">
-				<el-input
-					v-model="deptName"
-					placeholder="请输入部门名称"
-					clearable
-					size="small"
-					prefix-icon="el-icon-search"
-					style="margin-bottom: 20px" />
-				<el-tree
-					:data="deptOptions"
-					:props="defaultProps"
-					:expand-on-click-node="false"
-					:filter-node-method="filterNode"
-					ref="tree"
-					default-expand-all
-					highlight-current
-					@node-click="handleNodeClick" />
-			</div>
-		</el-col>
-		<el-col :span="20">
-			<div class="groupTeamScheduling">
-				<div class="operationArea">
-					<el-row>
-						<el-col :span="16">
-							<div style="height: 40px; font-size: 16px">
-								<span style="color: #409eff; font-weight: 600">
-									{{ showDeptName }}
-								</span>
-								节假日设置
-							</div>
-						</el-col>
-						<el-col :span="8">
-							<div style="float: right">
-								<el-button
-									size="small"
-									type="primary"
-									style="margin-right: 10px"
-									@click="addHoliday">
-									新增节假日
-								</el-button>
-								<el-button size="small" @click="holidayLog">
-									节假日变更记录
-								</el-button>
-							</div>
-						</el-col>
-					</el-row>
-				</div>
-				<div class="operationArea">
-					<el-form :inline="true" class="demo-form-inline">
-						<span class="blue-block"></span>
-						<el-form-item label="月份选择">
-							<el-date-picker
-								v-model="startDay"
-								type="month"
-								placeholder="选择月"
-								size="small"
-								@change="selectMonth"
-								:clearable="false"
-								style="width: 120px"></el-date-picker>
-						</el-form-item>
-						<el-form-item style="float: right">
+	<div
+		class="app-container"
+		style="
+			background-color: #f2f4f9;
+			padding: 0;
+			display: grid;
+			grid-template-columns: 1fr 5fr;
+			gap: 10px;
+		">
+		<div class="head-container">
+			<el-input
+				v-model="deptName"
+				placeholder="请输入部门名称"
+				clearable
+				size="small"
+				prefix-icon="el-icon-search"
+				style="margin-bottom: 20px" />
+			<el-tree
+				:data="deptOptions"
+				:props="defaultProps"
+				:expand-on-click-node="false"
+				:filter-node-method="filterNode"
+				ref="tree"
+				node-key="id"
+				default-expand-all
+				highlight-current
+				@node-click="handleNodeClick" />
+		</div>
+		<div class="groupTeamScheduling">
+			<div class="operationArea">
+				<el-row>
+					<el-col :span="6">
+						<div style="height: 40px; font-size: 16px">
+							<span style="color: #409eff; font-weight: 600">
+								{{ showDeptName }}
+							</span>
+							节假日设置
+							<span
+								:style="{
+									color: inherited ? '#67c23a' : '#b5b839',
+									fontSize: '12px',
+									fontWeight: 600,
+								}"
+								v-show="ishasParent">
+								{{ inherited ? '继承模式' : '自定义模式' }}
+							</span>
+						</div>
+					</el-col>
+					<el-col :span="18" v-if="!ishasParent">
+						<div style="float: right">
 							<el-button
 								size="small"
 								type="primary"
-								@click="startDay = new Date()">
-								跳转到今天
+								style="margin-right: 10px"
+								v-hasPermi="['base:group-holiday:create']"
+								@click="addHoliday">
+								新增节假日
 							</el-button>
-						</el-form-item>
-					</el-form>
+							<el-button
+								size="small"
+								v-hasPermi="['base:group-holiday-log:query']"
+								@click="holidayLog">
+								节假日变更记录
+							</el-button>
+						</div>
+					</el-col>
+					<el-col :span="18" v-else style="text-align: right">
+						<el-button
+							size="small"
+							type="primary"
+							:disabled="inherited"
+							v-hasPermi="['base:group-holiday:create']"
+							@click="addHoliday">
+							新增节假日
+						</el-button>
+						<el-button
+							size="small"
+							type="success"
+							:disabled="inherited"
+							v-hasPermi="['base:group-holiday:update']"
+							@click="reExtends">
+							恢复继承
+						</el-button>
+						<el-button
+							size="small"
+							type="warning"
+							:disabled="!inherited"
+							v-hasPermi="['base:group-holiday:update']"
+							@click="disExtends">
+							解除继承
+						</el-button>
+						<el-button
+							size="small"
+							:disabled="inherited"
+							v-hasPermi="['base:group-holiday-log:query']"
+							@click="holidayLog">
+							节假日变更记录
+						</el-button>
+					</el-col>
+				</el-row>
+			</div>
+			<div class="operationArea">
+				<el-form :inline="true" class="demo-form-inline">
+					<span class="blue-block"></span>
+					<el-form-item label="月份选择">
+						<el-date-picker
+							v-model="startDay"
+							type="month"
+							placeholder="选择月"
+							size="small"
+							@change="selectMonth"
+							:clearable="false"
+							style="width: 120px"></el-date-picker>
+					</el-form-item>
+					<el-form-item label="继承上一级的节假日" v-show="ishasParent">
+						<div
+							style="
+								width: 36px;
+								height: 36px;
+								background-color: #67c23a;
+								border-radius: 3px;
+							"></div>
+					</el-form-item>
+					<el-form-item label="本级自定义的节假日" v-show="ishasParent">
+						<div
+							style="
+								width: 36px;
+								height: 36px;
+								background-color: #b5b839;
+								border-radius: 3px;
+							"></div>
+					</el-form-item>
+					<el-form-item style="float: right">
+						<el-button
+							size="small"
+							type="primary"
+							@click="(startDay = new Date()), getHolidayPage()">
+							跳转到今天
+						</el-button>
+					</el-form-item>
+				</el-form>
+				<div v-if="!ishasParent">
 					<el-tag
 						type="warning"
 						closable
+						v-if="showTag1"
+						@close="handleClose(1)"
 						style="margin-bottom: 10px; color: black">
 						<i class="el-icon-warning" style="color: #ffbd02"></i>
 						当前节假日设置为组织架构中最高层级配置，默认自动继承至下属部门。子部门可选择
 						<span style="color: red">解除继承</span>
-						设置后进行独立修改，复制后不再继承上级设置
+						设置后进行独立修改，解除后不再继承上级设置
 					</el-tag>
 				</div>
-				<!-- 日历区域 -->
-				<div class="calenderArea">
-					<el-calendar v-model="startDay">
-						<template slot="dateCell" slot-scope="{ data }">
-							<div v-if="data.type === 'current-month'" @click="showDetail">
-								<!-- 日期 -->
-								<div class="dateStyle">
-									<el-row :gutter="20">
-										<el-col :span="18">
-											{{ Number(data.day.split('-')[2]) }}
-											<div class="lunar-date">{{ getLunarDate(data.day) }}</div>
-										</el-col>
-										<el-col :span="6"><div class="work-tip">班</div></el-col>
-									</el-row>
-								</div>
-							</div>
+				<div v-else>
+					<div v-if="inherited">
+						<el-tag
+							type="warning"
+							closable
+							v-if="showTag2"
+							@close="handleClose(2)"
+							style="margin-bottom: 10px; color: black">
+							<i class="el-icon-warning" style="color: #ffbd02"></i>
+							当前部门继承上级节假日设置，默认不可修改。可通过
+							<span style="color: red">解除继承</span>
+							进行自定义，解除后将不再继承。
+						</el-tag>
+					</div>
+					<div v-else>
+						<el-tag
+							type="warning"
+							closable
+							v-if="showTag3"
+							@close="handleClose(3)"
+							style="margin-bottom: 10px; color: black">
+							<i class="el-icon-warning" style="color: #ffbd02"></i>
+							当前部门已解除继承，节假日可自由配置。点击
+							<span style="color: red">恢复继承</span>
+							将清空当前设置并同步上级节假日。
+						</el-tag>
+					</div>
+				</div>
+			</div>
+			<!-- 日历区域 -->
+			<div class="calenderArea">
+				<el-calendar v-model="startDay">
+					<template slot="dateCell" slot-scope="{ data }">
+						<div v-if="data.type === 'current-month'">
+							<!-- 日期 -->
 							<div
-								v-else
-								style="font-size: 20px; font-weight: 500; text-align: left">
+								class="dateStyle"
+								@click="
+									new Date(data.day).getTime() >=
+										new Date().setHours(0, 0, 0, 0) &&
+										(!ishasParent || !inherited) &&
+										HolidayList[Number(data.day.split('-')[2]) - 1]
+											?.isHoliday &&
+										showDetail(HolidayList[Number(data.day.split('-')[2]) - 1])
+								">
 								<el-row :gutter="20">
-									<el-col :span="24">
+									<!-- 公历和农历 -->
+									<el-col :span="18">
 										{{ Number(data.day.split('-')[2]) }}
-										<span style="font-size: 12px">
-											{{ getLunarDate(data.day) }}
-										</span>
+										<div class="lunar-date">{{ getLunarDate(data.day) }}</div>
+									</el-col>
+									<!-- 显示假或班 -->
+									<el-col :span="6">
+										<div
+											class="work-tip"
+											:style="{
+												backgroundColor: HolidayList[
+													Number(data.day.split('-')[2]) - 1
+												]?.isHoliday
+													? '#67C23A'
+													: '#409EFF',
+											}">
+											{{
+												HolidayList[Number(data.day.split('-')[2]) - 1]
+													?.isHoliday
+													? '假'
+													: '班'
+											}}
+										</div>
+									</el-col>
+									<!-- 显示假期名和操作 -->
+									<el-col
+										:span="24"
+										v-if="
+											HolidayList[Number(data.day.split('-')[2]) - 1]?.isHoliday
+										">
+										<div
+											class="holiday-div"
+											:style="{
+												backgroundColor: ishasParent
+													? HolidayList[Number(data.day.split('-')[2]) - 1]
+															.isInherit
+														? '#67c23a'
+														: '#b5b839'
+													: '',
+											}">
+											{{
+												HolidayList[Number(data.day.split('-')[2]) - 1]
+													?.holidayName
+											}}
+											<span
+												class="holiday-div-btn"
+												v-if="
+													(!ishasParent || !inherited) &&
+													new Date(data.day).getTime() >=
+														new Date().setHours(0, 0, 0, 0)
+												">
+												<i class="el-icon-more" style="color: #fff"></i>
+											</span>
+										</div>
 									</el-col>
 								</el-row>
 							</div>
-						</template>
-					</el-calendar>
-				</div>
+						</div>
+						<div
+							v-else
+							style="font-size: 20px; font-weight: 500; text-align: left">
+							<el-row :gutter="20">
+								<el-col :span="24">
+									{{ Number(data.day.split('-')[2]) }}
+									<span style="font-size: 12px">
+										{{ getLunarDate(data.day) }}
+									</span>
+								</el-col>
+							</el-row>
+						</div>
+					</template>
+				</el-calendar>
 			</div>
-		</el-col>
+		</div>
 		<base-dialog
 			:dialogTitle="dialogTitle"
 			:dialogVisible="addOrUpdateVisible"
 			@cancel="cancel"
 			@confirm="handleConfirm"
+			:before-close="cancel"
 			:destroy-on-close="true"
+			class="addDialog"
 			width="40%">
 			<add-or-updata
 				ref="addOrUpdataRef"
-				@refreshPage="getHolidayPage"></add-or-updata>
+				@refreshPage="successSubmit"></add-or-updata>
 			<template #footer>
 				<slot name="footer">
 					<el-row slot="footer" type="flex" justify="end">
@@ -155,6 +316,7 @@
 								size="small"
 								type="primary"
 								class="btnTextStyle"
+								v-hasPermi="['base:group-holiday:update']"
 								@click="editHoliday">
 								修改
 							</el-button>
@@ -162,6 +324,7 @@
 								v-if="detail"
 								class="btnTextStyle"
 								size="small"
+								v-hasPermi="['base:group-holiday:delete']"
 								@click="deleteHoliday">
 								删除
 							</el-button>
@@ -174,6 +337,7 @@
 			dialogTitle="节假日变更记录"
 			:dialogVisible="logVisible"
 			@cancel="cancelLog"
+			:before-close="cancelLog"
 			:destroy-on-close="true"
 			width="70%">
 			<holiday-log ref="holidayLogRef"></holiday-log>
@@ -189,16 +353,22 @@
 				</slot>
 			</template>
 		</base-dialog>
-	</el-row>
+	</div>
 </template>
 
 <script>
 import moment from 'moment';
 import { solarToLunar } from 'chinese-lunar';
 
-import { listSimpleDepts } from '@/api/system/dept';
 import { getUserProfile } from '@/api/system/user';
-import { deptHolidayList } from '@/api/group/holidaySetting';
+import {
+	deptHolidayList,
+	getEnableData,
+	disExtends,
+	reExtends,
+	updateSchedule,
+	getSet,
+} from '@/api/group/holidaySetting';
 
 import addOrUpdata from './add-or-updata.vue';
 import holidayLog from './holidayLog';
@@ -212,13 +382,17 @@ export default {
 	data() {
 		return {
 			startDay: '', // 查询参数
+			HolidayList: [],
 			// 部门树选项
 			deptOptions: undefined,
 			// 查询的部门名称
 			deptName: undefined,
 			// 选择的部门名称
 			showDeptName: undefined,
+			topDeptId: undefined, // 保存当前用户的部门id为最高级部门id
+			parentId: undefined, // 保存部门点击时对象的父id，用于解除和恢复继承
 			deptId: undefined,
+			ishasParent: false, // 判断是否有上级,false,则表示为最高级
 			defaultProps: {
 				children: 'children',
 				label: 'name',
@@ -227,6 +401,10 @@ export default {
 			addOrUpdateVisible: false,
 			detail: false,
 			logVisible: false,
+			inherited: true, //该部门是否为继承状态
+			showTag1: true, //tag标签是否显示的
+			showTag2: true,
+			showTag3: true,
 		};
 	},
 	watch: {
@@ -240,28 +418,86 @@ export default {
 		// 查询用户个人信息
 		getUserProfile().then((response) => {
 			this.showDeptName = response.data.dept.name || '';
+			this.topDeptId = response.data.dept.id || ''; // 保存当前用户的部门id为最高级部门id
 			this.deptId = response.data.dept.id || '';
-			this.getHolidayPage();
+			this.getTreeselect();
+			this.getSet();
 		});
-		this.getTreeselect();
 	},
 	methods: {
 		getHolidayPage() {
-			deptHolidayList({ deptId: this.deptId }).then((response) => {});
+			const now = new Date(this.startDay);
+			const year = now.getFullYear();
+			const month = now.getMonth();
+			const startTime = `${year}-${String(month + 1).padStart(2, '0')}-01`;
+			const lastDate = new Date(year, month + 1, 0).getDate();
+			const endTime = `${year}-${String(month + 1).padStart(2, '0')}-${String(
+				lastDate
+			).padStart(2, '0')}`;
+
+			this.HolidayList = [];
+			deptHolidayList({
+				deptId: this.deptId,
+				startTime: Date.parse(startTime),
+				endTime: Date.parse(endTime),
+			}).then((res) => {
+				this.HolidayList = res.data;
+			});
 		},
 		// 切换月份
 		selectMonth() {
-			console.log(this.startDay);
 			this.getHolidayPage();
 		},
 		/** 查询部门下拉树结构 */
 		getTreeselect() {
-			listSimpleDepts().then((response) => {
+			getEnableData().then((response) => {
+				// 遍历部门，判断当前帐号的部门是否有为最上级
+				const nowDept = response.data.filter((i) => i.id == this.topDeptId);
+				this.ishasParent = nowDept[0].hasParent;
+				this.parentId = nowDept[0].parentId;
+
 				// 处理 deptOptions 参数
 				this.deptOptions = [];
-				this.deptOptions.push(...this.handleTree(response.data, 'id'));
+				this.deptOptions.push(...this.handleTree1(response.data, 'id'));
+				this.$nextTick(() => {
+					this.$refs.tree.setCurrentKey(this.deptId);
+				});
 			});
 		},
+		//大整数精度丢失
+		handleTree1(data, fid) {
+			const id = fid || 'id';
+			const parentId = 'parentId';
+			const children = 'children';
+			const rootId =
+				data
+					.map((item) => item[parentId].toString())
+					.reduce((min, current) => {
+						if (current.length < min.length) return current;
+						if (current.length > min.length) return min;
+						return current < min ? current : min;
+					}) || 0;
+			//对源数据深度克隆
+			const cloneData = JSON.parse(JSON.stringify(data));
+			//循环所有项
+			const treeData = cloneData.filter((father) => {
+				let branchArr = cloneData.filter((child) => {
+					//返回每一项的子级数组
+					return father[id] == child[parentId];
+				});
+				branchArr.length > 0 ? (father.children = branchArr) : '';
+				//返回第一层
+				return father[parentId] == rootId;
+			});
+			return treeData !== '' ? treeData : data;
+		},
+		// 根据部门id查询该部门是否是继承
+		getSet() {
+			getSet({ id: this.deptId }).then((res) => {
+				this.inherited = res.data;
+			});
+			this.getHolidayPage();
+		},
 		// 筛选节点
 		filterNode(value, data) {
 			if (!value) return true;
@@ -271,6 +507,11 @@ export default {
 		handleNodeClick(data) {
 			this.deptId = data.id;
 			this.showDeptName = data.name;
+			this.ishasParent = data.hasParent;
+			this.parentId = data.parentId;
+			this.getSet();
+			this.showTag1 = true;
+			this.showTag2 = true;
 			this.getHolidayPage();
 		},
 		//获取农历
@@ -342,9 +583,109 @@ export default {
 			this.detail = false;
 			this.dialogTitle = '新增节假日';
 			this.$nextTick(() => {
-				this.$refs.addOrUpdataRef.init();
+				this.$refs.addOrUpdataRef.init(this.deptId, {
+					inherited: this.inherited,
+				});
 			});
 		},
+		disExtends() {
+			this.$confirm(
+				'当前节假日设置继承自上级部门，解除继承后将不再自动同步上级设置。<br/>系统将保留当前节假日配置作为初始数据，您可以自定义修改。<br/>是否确认解除继承？',
+				'解除继承',
+				{
+					dangerouslyUseHTMLString: true,
+					confirmButtonText: '确认解除',
+					cancelButtonText: '取消',
+					type: 'warning',
+				}
+			)
+				.then(() => {
+					disExtends({ id: this.deptId, pid: this.parentId }).then((res) => {
+						if (!res.data.updateFlag) {
+							this.$modal.msgSuccess('操作成功');
+							this.getSet();
+						} else {
+							this.$confirm(
+								'新增节假日影响已有排班计划，是否立即更新？',
+								'更新排班',
+								{
+									confirmButtonText: '立即更新',
+									cancelButtonText: '暂不更新',
+									type: 'warning',
+								}
+							)
+								.then(() => {
+									updateSchedule({ logId: res.data.logId }).then((res1) => {
+										this.$modal.msgSuccess('更新成功');
+										this.getSet();
+									});
+								})
+								.catch(() => {
+									this.$message({
+										type: 'info',
+										message: '已取消',
+									});
+								});
+						}
+					});
+				})
+				.catch((res) => {
+					console.log(res);
+					this.$message({
+						type: 'info',
+						message: '已取消',
+					});
+				});
+		},
+		reExtends() {
+			this.$confirm(
+				'恢复继承后，当前部门将重新同步未来时间的上级部门的节假日设置，现有自定义配置将被清空并替换为上级设置，不可恢复。<br/>是否确认继续？',
+				'恢复继承',
+				{
+					dangerouslyUseHTMLString: true,
+					confirmButtonText: '确认恢复继承',
+					cancelButtonText: '取消',
+					type: 'warning',
+				}
+			)
+				.then(() => {
+					reExtends({ id: this.deptId, pid: this.parentId }).then((res) => {
+						if (!res.data.updateFlag) {
+							this.$modal.msgSuccess('操作成功');
+							this.getSet();
+						} else {
+							this.$confirm(
+								'新增节假日影响已有排班计划，是否立即更新？',
+								'更新排班',
+								{
+									confirmButtonText: '立即更新',
+									cancelButtonText: '暂不更新',
+									type: 'warning',
+								}
+							)
+								.then(() => {
+									updateSchedule({ logId: res.data.logId }).then((res1) => {
+										this.$modal.msgSuccess('更新成功');
+										this.getSet();
+									});
+								})
+								.catch(() => {
+									this.$message({
+										type: 'info',
+										message: '已取消',
+									});
+									this.getSet();
+								});
+						}
+					});
+				})
+				.catch(() => {
+					this.$message({
+						type: 'info',
+						message: '已取消',
+					});
+				});
+		},
 		holidayLog() {
 			this.logVisible = true;
 			this.$nextTick(() => {
@@ -352,17 +693,22 @@ export default {
 			});
 		},
 		cancel() {
+			this.getHolidayPage();
 			this.addOrUpdateVisible = false;
 		},
+		successSubmit() {
+			this.cancel();
+			this.getHolidayPage();
+		},
 		handleConfirm() {
 			this.$refs.addOrUpdataRef.dataFormSubmit();
 		},
-		showDetail(id) {
+		showDetail(val) {
 			this.addOrUpdateVisible = true;
 			this.detail = true;
 			this.dialogTitle = '节假日详情';
 			this.$nextTick(() => {
-				this.$refs.addOrUpdataRef.init(id, true);
+				this.$refs.addOrUpdataRef.init(this.deptId, val, true, this.inherited); //编辑的时候，该部门如果是自定义的，但这个val数据是继承的，修改之后，则变成自定义的inherited
 			});
 		},
 		editHoliday() {
@@ -379,6 +725,15 @@ export default {
 		cancelLog() {
 			this.logVisible = false;
 		},
+		handleClose(val) {
+			if (val == 1) {
+				this.showTag1 = false;
+			} else if (val == 2) {
+				this.showTag2 = false;
+			} else {
+				this.showTag3 = false;
+			}
+		},
 	},
 };
 </script>
@@ -386,7 +741,7 @@ export default {
 .head-container {
 	padding: 20px 10px 0;
 	background-color: #fff;
-	min-height: calc(100vh - 120px - 8px);
+	height: 100%;
 	border-radius: 8px;
 }
 .groupTeamScheduling {
@@ -465,9 +820,28 @@ export default {
 						text-align: center;
 						float: right;
 					}
+					.holiday-div {
+						background-color: #67c23a;
+						border-radius: 3px;
+						height: 25px;
+						text-align: center;
+						line-height: 24px;
+						color: #fff;
+						.holiday-div-btn {
+							float: right;
+							transform: rotate(90deg);
+							font-size: 14px;
+							pointer-events: none;
+						}
+					}
 				}
 			}
 		}
 	}
 }
+.addDialog {
+	.el-dialog__body {
+		overflow: visible;
+	}
+}
 </style>
diff --git a/src/views/group/holidaySetting/theme/font/iconfont/element-icons.ttf b/src/views/group/holidaySetting/theme/font/iconfont/element-icons.ttf
new file mode 100644
index 00000000..91b74de3
Binary files /dev/null and b/src/views/group/holidaySetting/theme/font/iconfont/element-icons.ttf differ
diff --git a/src/views/group/holidaySetting/theme/font/iconfont/element-icons.woff b/src/views/group/holidaySetting/theme/font/iconfont/element-icons.woff
new file mode 100644
index 00000000..02b9a253
Binary files /dev/null and b/src/views/group/holidaySetting/theme/font/iconfont/element-icons.woff differ
diff --git a/src/views/group/holidaySetting/theme/font/iconfont/iconfont.eot b/src/views/group/holidaySetting/theme/font/iconfont/iconfont.eot
new file mode 100644
index 00000000..cce7da27
Binary files /dev/null and b/src/views/group/holidaySetting/theme/font/iconfont/iconfont.eot differ
diff --git a/src/views/group/holidaySetting/theme/font/iconfont/iconfont.js b/src/views/group/holidaySetting/theme/font/iconfont/iconfont.js
new file mode 100644
index 00000000..ca0010f2
--- /dev/null
+++ b/src/views/group/holidaySetting/theme/font/iconfont/iconfont.js
@@ -0,0 +1,636 @@
+;(function(window) {
+
+  var svgSprite = '<svg>' +
+    '' +
+    '<symbol id="icon-sousuo" viewBox="0 0 1000 1000">' +
+    '' +
+    '<path d="M808.473 745.747l-73.112-74.382c30.151-48.518 47.633-105.966 47.633-167.497 0-173.28-138.488-314.226-308.694-314.226-170.176 0-308.626 140.946-308.626 314.226 0 173.256 138.45 314.226 308.626 314.226 45.404 0 88.549-10.037 127.412-28.037l22.542 22.93 0.132-0.176 59.12 60.192c34.481 35.107 90.457 35.107 124.968 0C842.945 837.849 842.945 780.939 808.473 745.747zM261.639 503.868c0-119.391 95.393-216.53 212.66-216.53 117.297 0 212.706 97.139 212.706 216.53 0 119.398-95.409 216.515-212.706 216.515C357.032 720.383 261.639 623.266 261.639 503.868z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-tingzhi" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M511.424 3.392c70.336 0 136.448 13.376 198.464 40.256 62.016 26.816 115.904 63.104 161.6 108.864 45.696 45.76 81.984 99.392 108.864 161.024 26.816 61.632 40.256 127.552 40.256 197.888 0 70.4-13.44 136.512-40.256 198.528-26.88 62.016-63.168 115.904-108.864 161.6-45.76 45.76-99.648 81.984-161.6 108.864-62.016 26.752-128.128 40.256-198.464 40.256-70.272 0-136.192-13.504-197.824-40.256-61.632-26.88-115.264-63.104-161.024-108.864s-82.048-99.648-108.864-161.6C16.832 647.872 3.456 581.76 3.456 511.36c0-70.336 13.376-136.256 40.256-197.888 26.816-61.632 63.104-115.264 108.864-161.024 45.76-45.696 99.392-82.048 161.024-108.864C375.168 16.768 441.152 3.392 511.424 3.392L511.424 3.392zM764.288 580.608c22.656 0 43.072-5.888 61.248-17.6 18.112-11.776 27.2-29.248 27.2-52.736 0-22.656-9.088-39.488-27.2-50.496-18.176-10.944-38.592-16.448-61.248-16.448L263.104 443.328c-22.656 0-43.456 5.44-62.336 16.448C181.824 470.72 172.416 487.552 172.416 510.272c0 23.488 9.408 41.024 28.352 52.736 18.88 11.776 39.68 17.6 62.336 17.6L764.288 580.608 764.288 580.608zM764.288 580.608"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-bianji" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M501.710848 482.072576"  ></path>' +
+    '' +
+    '<path d="M380.239872 828.033024 380.239872 828.033024l-191.670272 35.375104 38.668288-188.378112 0.001024-0.003072L380.239872 828.033024zM680.911872 221.355008l-68.65408 68.653056 153.00608 153.001984 68.65408-68.651008L680.911872 221.355008zM261.530624 640.738304l153.00608 152.999936 316.435456-316.429312L577.968128 324.299776 261.530624 640.738304z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-icon01" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M858.126525 769.136382 678.538139 591.761602c11.577137-24.299429 17.986367-51.467185 17.986367-79.979566 0-102.947673-83.135779-186.181353-186.182842-186.181353-17.124708 0-33.962878 2.302439-49.750069 6.698562l79.704492 79.408561c33.006047 33.295314 30.518288 88.971357-5.361321 124.754329-35.689266 35.58752-91.657198 38.080294-124.663246 5.361101l-79.506986-79.985706c-4.403467 15.880689-6.700884 32.533974-6.700884 49.944506 0 103.130845 83.429479 186.746218 186.279036 186.746218 28.323206 0 55.77759-6.502088 79.697329-18.176988l178.815758 177.76159c22.866714 22.3838 60.948568 21.044292 85.439335-3.832282C878.691729 829.987285 880.417094 791.520181 858.126525 769.136382L858.126525 769.136382zM809.900222 841.464687c-17.30891 0-31.946882-14.166651-31.946882-31.760354 0-17.034978 14.637972-31.000038 31.946882-31.000038 17.511533 0 31.577453 13.964036 31.577453 31.000038C841.478698 827.298036 827.412778 841.464687 809.900222 841.464687L809.900222 841.464687zM901.177758 429.118338l-18.184896 0-42.376846-0.38067-0.285514 0c-8.508116-0.76134-16.648851-3.820002-23.729396-8.413624-0.475857 0-0.67234-0.201591-0.957854-0.578168-15.024797-9.763364-25.068959-27.171849-24.783445-46.50415 0-6.121418 1.244391-11.661597 3.160099-17.410532 1.719225-6.121418 4.784152-12.048407 8.901082-17.021675l9.371822-9.573029 21.146466-20.85498 12.441867-12.632715c18.082561-23.334451 18.082561-56.827263-0.67234-80.360236l-36.355466-37.311791c-24.205253-18.551518-57.591986-19.134803-81.226211-1.143033l-13.209378 12.619412-29.466286 30.238698 0 0-0.386826 0c-16.070659 13.006222-38.258893 15.500019-56.634132 7.460925-6.319175-2.866281-11.953729-6.495948-17.50437-11.864212-8.711763-9.371438-14.066943-20.669762-15.595825-32.718169l0-13.202697 0-29.655414L594.830309 121.438816c-3.635956-29.65439-27.17501-53.002145-57.502955-56.44864l-51.85612 0c-29.756917 3.261277-53.771827 26.596751-57.984952 56.06797l0 18.176988 0 30.232558 0 12.054547 0 0 0 0.190335c-0.184203 1.529843-0.761371 3.25002-0.857566 4.594645l0 0.571005c-0.474834 1.529843-0.671316 3.063779-0.856542 4.402263-0.577168 0-0.577168 0.577145-0.577168 0.577145-0.571028 1.338485-0.861659 3.445472-1.62303 4.403287l0 0c-0.48302 1.714038-1.440874 3.058662-2.202245 4.581342l0 0.194428c-3.160099 6.510274-7.557426 12.050454-13.495915 16.839527-9.561142 8.229428-22.384717 13.202697-36.158983 13.202697-12.918747 0-24.973788-4.402263-34.257602-12.054547l-9.471087-9.56689-21.047201-20.665669-12.816412-13.012362c-23.539054-17.98563-56.925786-17.98563-80.370692 0.957815l-37.210985 36.736693c-18.762065 23.347754-19.047579 56.834426-1.15536 80.753185l12.822552 12.620435 30.041408 29.858028 0 0c0.577168 0.957815 1.047908 1.720178 1.625077 2.677992 0.380686 0.184195 0.767511 0.957815 1.535022 1.915629 0.380686 0.572028 0.761371 1.714038 1.332399 2.486634 0 0.184195 0.965017 1.143033 0.965017 1.720178 0.571028 0.76748 1.142057 2.100848 1.813373 3.057639 0 0.577145 0.190343 1.149173 0.480974 1.720178 0.572052 0.768503 0.762394 2.113127 1.625077 3.261277 0 0.37453 0.095171 0.956791 0.285514 1.527796 0.191366 1.720178 1.054049 3.065825 1.054049 4.77884l0 0c0.474834 1.732457 0.761371 3.248997 0.761371 4.981455l0 0c2.396681 16.451694-3.154982 33.675984-15.977534 46.307675l0 0c-9.084261 9.18008-20.760663 14.536065-32.815704 15.881712l-13.101926 0-29.667886 0-17.887102 0c-29.750777 4.206812-53.194659 27.929096-56.545101 57.398268l-0.190343 52.242851c3.064928 30.0412 26.407498 53.574173 56.070267 57.595766l18.266764 0 42.287815 0.572028c1.535022 0.184195 3.635956 0.184195 5.07683 0.76134l1.433711 0c1.338539 0.571005 2.10605 0.957815 3.635956 1.14201 22.865691 7.080256 39.414253 28.328185 39.414253 53.579289l0 0c0 12.815887-4.39835 25.258267-12.145096 34.831296l-9.282791 8.983605 0 0-21.337832 20.86112-12.721241 12.632715c-17.798071 23.918759-17.798071 57.207933 0.665176 80.556711l37.022689 37.305651c23.635248 18.754133 56.741584 18.945491 80.751377 0.76134l12.626069-12.619412 30.334085-29.66667 0 0c0-0.37453 0.284491-0.37453 0.671316-0.571005 1.142057-1.149173 2.387471-1.720178 3.25527-2.868327 1.047908-0.196475 1.243368-0.196475 2.004739-0.76748 0.577168-0.37453 1.536046-1.149173 2.297417-1.720178 1.054049-0.572028 2.392588-0.76748 3.445613-1.344624 0.671316-0.37453 1.148197-0.571005 1.338539-0.957815 1.624053-0.185218 2.678102-0.76134 4.783129-1.333368l0 0 0 0c1.81542-0.572028 3.057764-1.344624 4.397327-1.344624l0.48302 0c1.432687-0.38067 2.962593-0.571005 4.592786-0.957815l0.380686 0c1.338539 0 2.677079 0 3.832439-0.572028 15.500654-0.571005 31.185511 4.790096 42.669524 16.654308 9.567282 9.181103 14.540754 21.044292 16.16583 33.099862l-0.191366 13.006222 0 29.471219 0 17.980513c3.636979 30.0412 27.454384 53.579289 57.2113 56.637951l52.333 0c29.948283-3.057639 53.481196-26.406416 57.598126-55.680137l0-17.980513 0.475857-30.612205 0-12.060687 0 0c1.154337-10.900258 5.075807-19.896142 11.104351-27.935236 0.571028-0.963954 1.142057-1.534959 1.713085-2.106987 0.386826-0.191358 0.869846-1.333368 1.731505-1.720178 3.349418-3.635807 7.080546-6.888897 11.187242-9.757225l0 0c1.249508-0.196475 2.492876-1.14201 3.260387-1.726318 0.946597-0.576121 0.946597-0.576121 1.333423-0.576121l0 0c0.577168-0.185218 0.958877-0.185218 1.059165-0.185218 1.046885-0.76748 1.915708-0.76748 3.159076-1.344624l-50.0407-49.937342c-21.718517 6.318916-44.584208 9.376555-68.219456 9.376555-135.379747-0.190335-244.454331-109.824291-243.97131-244.527203 0-135.475508 110.025274-244.920152 245.214678-244.545622 135.000085 0.571005 243.97131 110.213147 243.774827 245.306962-0.089031 22.954805-3.533621 45.731554-9.657336 66.39006l50.417292 49.557696c2.588047-5.925966 6.69372-11.102872 11.286506-16.266475 5.177118-4.963035 12.061181-8.795317 18.368076-11.287067 4.695121-2.100848 9.574445-3.629667 14.263426-4.206812l13.489775 0 29.846971 0 17.708016 0c29.661745-4.016477 53.094371-27.554566 56.443789-57.208956l0-52.81181C953.89656 457.060737 930.64916 433.139931 901.177758 429.118338L901.177758 429.118338zM901.177758 429.118338"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-shijian" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M511.700671 127.718847c-211.957911 0-383.778061 171.815157-383.778061 383.76336 0 211.95025 171.821174 383.76336 383.778061 383.76336 211.957911 0 383.780108-171.813111 383.780108-383.76336C895.480779 299.534004 723.658581 127.718847 511.700671 127.718847zM511.700671 860.359013c-192.690312 0-348.890077-156.209738-348.890077-348.875782 0-192.699814 156.199765-348.875782 348.890077-348.875782 192.691336 0 348.8911 156.176992 348.8911 348.875782C860.591771 704.147228 704.392006 860.359013 511.700671 860.359013zM703.591748 511.48323 529.145686 511.48323 529.145686 284.71346c0-9.641591-7.819403-17.443277-17.445016-17.443277-9.624589 0-17.443992 7.801686-17.443992 17.443277l0 244.213048c0 9.625218 7.819403 17.443277 17.443992 17.443277l191.891077 0c9.624589 0 17.445016-7.819083 17.445016-17.443277C721.033694 519.28594 713.216337 511.48323 703.591748 511.48323z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-weixin" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M669.029188 317.395814c10.181291 0 20.235686 0.748037 30.23789 1.865487C672.100256 192.728466 536.831031 98.730629 382.414962 98.730629c-172.618362 0-314.03484 117.659747-314.03484 267.066545 0 86.2422 47.044337 157.061129 125.674313 211.988112l-31.406554 94.467535 109.75511-55.05285c39.302708 7.78122 70.80955 15.765055 110.010947 15.765055 9.849726 0 19.624747-0.481977 29.323017-1.243317-6.144182-20.996197-9.69827-42.982954-9.69827-65.792449C402.040732 428.732551 519.845498 317.395814 669.029188 317.395814zM500.167537 232.256738c23.639342 0 39.302708 15.550161 39.302708 39.185464 0 23.536043-15.66439 39.300075-39.302708 39.300075-23.535984 0-47.146672-15.765055-47.146672-39.300075C453.021889 247.806899 476.632577 232.256738 500.167537 232.256738zM280.402504 310.7433c-23.537007 0-47.300174-15.765055-47.300174-39.300075 0-23.635303 23.76419-39.185464 47.300174-39.185464 23.53496 0 39.200373 15.550161 39.200373 39.185464C319.602877 294.978245 303.937464 310.7433 280.402504 310.7433z"  ></path>' +
+    '' +
+    '<path d="M955.617831 562.14712c0-125.543298-125.622123-227.882104-266.733643-227.882104-149.41292 0-267.090791 102.338806-267.090791 227.882104 0 125.770472 117.677871 227.879034 267.090791 227.879034 31.278636 0 62.837668-7.896854 94.243199-15.765055l86.119862 47.170323-23.612735-78.473259C908.675829 695.672206 955.617831 632.965026 955.617831 562.14712zM602.306891 522.858302c-15.638806 0-31.431114-15.549138-31.431114-31.416524 0-15.651468 15.792308-31.405267 31.431114-31.405267 23.73963 0 39.302708 15.754822 39.302708 31.405267C641.609599 507.309164 626.04652 522.858302 602.306891 522.858302zM775.027587 522.858302c-15.538518 0-31.201884-15.549138-31.201884-31.416524 0-15.651468 15.66439-31.405267 31.201884-31.405267 23.535984 0 39.300661 15.754822 39.300661 31.405267C814.329272 507.309164 798.563571 522.858302 775.027587 522.858302z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-fenxiang1" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M769.714 589.547c-51.754 0-97.702 24.851-126.571 63.269L394.479 528.059c3.93-13.798 6.034-28.364 6.034-43.424 0-16.496-2.527-32.399-7.211-47.35l247.724-124.288c28.71 40.052 75.647 66.151 128.687 66.151 87.388 0 158.229-70.84 158.229-158.229 0-87.388-70.841-158.229-158.229-158.229-87.389 0-158.229 70.841-158.229 158.229 0 6.046 0.352 12.009 1.011 17.88L351.22 369.884c-28.371-26.943-66.723-43.479-108.938-43.479-87.388 0-158.229 70.84-158.229 158.229s70.84 158.229 158.229 158.229c43.752 0 83.354-17.758 111.997-46.459l258.676 129.779c-0.964 7.062-1.474 14.266-1.474 21.592 0 87.389 70.84 158.229 158.229 158.229s158.229-70.84 158.229-158.229C927.938 660.388 857.103 589.547 769.714 589.547L769.714 589.547z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-qq" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M855.8592 627.570688c-5.310464-73.131008-54.381568-134.397952-82.747392-166.086656 3.93728-9.219072 13.518848-62.58176-23.48032-98.992128 0.059392-0.873472 0.059392-1.739776 0.059392-2.586624 0-143.633408-102.234112-247.017472-230.51264-247.487488-128.299008 0.47104-230.529024 103.855104-230.529024 247.487488 0 0.846848-0.012288 1.713152 0.049152 2.586624-36.999168 36.410368-27.400192 89.773056-23.48032 98.992128-28.347392 31.688704-77.42464 92.955648-82.745344 166.086656-0.959488 19.224576 2.013184 47.227904 11.404288 59.6736 11.4432 15.176704 42.852352-3.047424 65.313792-51.535872 6.249472 22.463488 20.673536 56.756224 53.311488 100.283392-54.621184 12.465152-70.201344 66.338816-51.825664 95.787008 12.959744 20.75136 42.631168 37.818368 93.765632 37.818368 90.978304 0 131.155968-24.451072 149.087232-41.47712 3.654656-3.714048 8.926208-5.505024 15.648768-5.51936 6.700032 0.014336 11.983872 1.805312 15.62624 5.51936 17.933312 17.026048 58.119168 41.47712 149.076992 41.47712 51.152896 0 80.80384-17.067008 93.763584-37.818368 18.3808-29.448192 2.803712-83.32288-51.803136-95.787008 32.638976-43.528192 47.066112-77.819904 53.311488-100.283392 22.467584 48.488448 53.870592 66.711552 65.324032 51.535872C853.858304 674.798592 856.835072 646.795264 855.8592 627.570688z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-xinzeng" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M739.456 481.984 551.104 481.984 551.104 275.072c0-13.504-10.496-22.912-33.792-24.256S483.52 261.504 483.52 275.072l0 206.912L284.608 481.984c0 0-37.568-3.456-37.568 27.072 0 41.088 16.064 41.024 29.568 41.024l206.912 0-0.064 216.96c0 16.96-3.52 39.424 31.616 39.424 36.992 0 35.264-34.048 35.264-41.984l0.832-214.464 188.352 0c8.64 0 41.984 2.432 42.432-35.584S739.456 481.984 739.456 481.984z"  ></path>' +
+    '' +
+    '<path d="M518.592 42.048c-265.152 0-480 214.848-480 480 0 265.088 214.848 480 480 480s480-214.848 480-480S783.68 42.048 518.592 42.048zM518.592 937.984c-229.76 0-416-186.304-416-416 0-229.76 186.24-416 416-416s416 186.24 416 416C934.528 751.744 748.352 937.984 518.592 937.984z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-tishi" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M512.852414 619.447151c-14.128789 0-25.582655-11.453866-25.582655-25.582655l0-327.457983c0-14.128789 11.453866-25.582655 25.582655-25.582655s25.582655 11.453866 25.582655 25.582655l0 327.457983C538.435069 607.993285 526.980179 619.447151 512.852414 619.447151z"  ></path>' +
+    '' +
+    '<path d="M512.852414 785.222755c-14.128789 0-25.582655-11.453866-25.582655-25.582655l0-2.046612c0-14.128789 11.453866-25.582655 25.582655-25.582655s25.582655 11.453866 25.582655 25.582655l0 2.046612C538.435069 773.768889 526.980179 785.222755 512.852414 785.222755z"  ></path>' +
+    '' +
+    '<path d="M512.852414 946.905134c-58.700937 0-115.659183-11.501962-169.292708-34.187637-51.791573-21.904892-98.299817-53.260018-138.231271-93.192495s-71.287603-86.440721-93.193519-138.232295c-22.684652-53.633524-34.187637-110.591771-34.187637-169.292708 0-58.699913 11.501962-115.65816 34.187637-169.292708 21.905916-51.791573 53.261041-98.299817 93.193519-138.231271 39.932478-39.932478 86.440721-71.287603 138.231271-93.193519 53.633524-22.685675 110.591771-34.187637 169.292708-34.187637 58.699913 0 115.65816 11.501962 169.292708 34.187637 51.791573 21.905916 98.299817 53.260018 138.232295 93.193519 39.932478 39.932478 71.287603 86.440721 93.192495 138.231271 22.685675 53.633524 34.187637 110.591771 34.187637 169.292708 0 58.700937-11.501962 115.659183-34.187637 169.292708-21.904892 51.791573-53.260018 98.299817-93.192495 138.232295s-86.440721 71.287603-138.232295 93.192495C628.510574 935.403173 571.552328 946.905134 512.852414 946.905134zM512.852414 128.260176c-102.500489 0-198.866257 39.916105-271.344988 112.394836S129.11259 409.499511 129.11259 512c0 102.500489 39.916105 198.866257 112.394836 271.344988s168.844499 112.394836 271.344988 112.394836 198.866257-39.916105 271.344988-112.394836 112.394836-168.844499 112.394836-271.344988c0-102.500489-39.916105-198.866257-112.394836-271.344988S615.352903 128.260176 512.852414 128.260176z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-shijian1" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M513 1014.5c-277.25 0-502-224.758-502-502 0-277.243 224.75-502 502-502 277.242 0 502 224.757 502 502C1015 789.742 790.242 1014.5 513 1014.5zM513 67.387c-245.826 0-445.112 199.285-445.112 445.112S267.174 957.612 513 957.612c245.827 0 445.112-199.286 445.112-445.112C958.112 266.673 758.826 67.387 513 67.387zM770.143 638.367c-6.914 14.813-24.562 21.178-39.374 14.234l-235.9-78.865c-11.283-5.266-17.562-16.723-16.925-28.439-0.145-1.186-0.694-2.17-0.694-3.385L477.25 216.037c0-16.375 13.25-29.625 29.625-29.625s29.625 13.25 29.625 29.625l0 309.558 219.381 73.367C770.722 605.906 777.087 623.525 770.143 638.367z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-iconfontweibowukuang" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M726.639616 470.780928c-34.779136-6.721536-17.844224-25.089024-17.844224-25.089024s34.0224-55.405568-6.805504-95.729664c-50.499584-49.878016-173.428736 6.276096-173.428736 6.276096-46.876672 14.332928-34.47808-6.572032-27.824128-42.116096 0-41.965568-14.518272-112.899072-139.563008-71.084032-124.894208 42.262528-232.09984 189.958144-232.09984 189.958144C54.53312 531.113984 64.361472 606.979072 64.361472 606.979072c18.59584 167.56224 198.98368 213.557248 339.3024 224.461824 147.576832 11.348992 346.865664-50.182144 407.1936-176.822272C871.343104 527.827968 761.566208 477.64992 726.639616 470.780928L726.639616 470.780928zM414.550016 784.247808c-146.518016 6.718464-265.061376-65.71008-265.061376-162.184192 0-96.623616 118.54336-173.983744 265.061376-180.70528 146.668544-6.718464 265.36448 53.0176 265.36448 149.341184C679.914496 687.0272 561.21856 777.675776 414.550016 784.247808L414.550016 784.247808zM385.36704 504.830976c-147.42528 17.022976-130.337792 153.224192-130.337792 153.224192s-1.509376 43.159552 39.467008 65.114112c86.182912 46.144512 175.092736 18.215936 219.848704-38.980608C559.25248 627.141632 532.944896 487.954432 385.36704 504.830976L385.36704 504.830976zM348.17024 696.137728c-27.515904 3.135488-49.742848-12.547072-49.742848-35.248128 0-22.550528 19.653632-46.296064 47.172608-49.130496 31.603712-2.989056 52.166656 14.93504 52.166656 37.782528C397.918208 672.09216 375.538688 693.00224 348.17024 696.137728L348.17024 696.137728zM435.116032 623.108096c-9.376768 6.868992-20.866048 5.97504-25.70752-2.387968-5.14048-8.067072-3.1744-20.91008 6.201344-27.628544 10.88512-8.067072 22.226944-5.673984 27.215872 2.387968C447.6672 603.546624 444.186624 615.938048 435.116032 623.108096L435.116032 623.108096zM798.45888 411.789312c11.945984 0 21.926912-8.659968 23.740416-20.007936 0.152576-0.897024 0.300032-1.645568 0.300032-2.542592 17.9968-159.645696-132.604928-132.164608-132.604928-132.164608-13.30688 0-24.040448 10.600448-24.040448 24.041472 0 13.144064 10.733568 23.748608 24.040448 23.748608 108.111872-23.59808 84.374528 83.17952 84.374528 83.17952C774.117376 401.18784 785.002496 411.789312 798.45888 411.789312L798.45888 411.789312zM780.918784 133.117952c-52.013056-12.095488-105.693184-1.640448-120.662016 1.195008-1.209344 0.150528-2.266112 1.19808-3.32288 1.344512-0.456704 0.150528-0.908288 0.596992-0.908288 0.596992-14.81728 4.184064-25.554944 17.62304-25.554944 33.60256 0 18.967552 15.572992 34.646016 35.078144 34.646016 0 0 18.900992-2.538496 31.756288-7.465984 12.698624-5.075968 120.656896-3.73248 174.184448 84.975616 29.186048 64.813056 12.85632 108.123136 10.737664 115.141632 0 0-6.953984 16.876544-6.953984 33.452032 0 19.115008 15.574016 31.214592 35.078144 31.214592 16.1792 0 29.786112-2.24256 33.717248-29.273088l0.152576 0C1001.981952 243.33312 874.0608 154.47552 780.918784 133.117952L780.918784 133.117952zM780.918784 133.117952"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-delete" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M768 928l-96 0L672 256l-96 0 0 672-128 0L448 256 352 256l0 672L256 928 256 256l512 0L768 928zM416 96l192 0 0 64-192 0L416 96zM880 160 704 160 704 64c0-35.2-28.8-64-64-64L384 0C348.8 0 320 28.8 320 64l0 96L144 160C117.44 160 96 181.44 96 208S117.44 256 144 256L160 256l0 704c0 35.2 28.8 64 64 64l576 0c35.2 0 64-28.8 64-64L864 256l16 0C906.56 256 928 234.56 928 208S906.56 160 880 160z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-dizhi" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M512 1024c0 0-384-427.968-384-640 0-212.032 171.968-384 384-384 212.096 0 384 171.968 384 384C896 596.096 512 1024 512 1024zM512 128C370.624 128 256 242.624 256 384c0 141.376 114.624 256 256 256 141.376 0 256-114.624 256-256C768 242.624 653.376 128 512 128z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-guanbi" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M481.457892 63.627133c-264.080537 0-478.159264 214.078727-478.159264 478.162334 0 264.079514 214.078727 478.160287 478.159264 478.160287 264.064164 0 478.142891-214.07975 478.142891-478.160287C959.600783 277.706883 745.522056 63.627133 481.457892 63.627133zM683.378717 743.326553c-0.007163 0.008186-0.01535 0.016373-0.023536 0.023536-13.292748 13.292748-34.844599 13.30605-48.15372 0.021489L481.520313 589.965699 328.113411 743.664244c-0.008186 0.007163-0.016373 0.017396-0.023536 0.022513-13.293771 13.293771-34.843576 13.307074-48.152696 0.023536-13.332656-13.30912-13.355169-34.878368-0.063445-48.194652l153.406902-153.697521L279.581068 388.408147c-13.31526-13.291724-13.33675-34.860972-0.046049-48.177256 0.008186-0.007163 0.016373-0.01535 0.023536-0.023536 13.275351-13.275351 34.827203-13.287631 48.136324-0.004093l153.697521 153.407925 153.392576-153.701614c0.008186-0.007163 0.016373-0.01535 0.022513-0.022513 13.293771-13.293771 34.845623-13.30605 48.171116-0.00614 13.317307 13.291724 13.335726 34.860972 0.046049 48.177256l-153.408949 153.700591L683.316296 695.166693C696.631556 708.458417 696.653045 730.029712 683.378717 743.326553z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-shoucang1" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M512 84.517929c-9.573029 0-19.145036 7.357572-26.40744 22.071691l-94.694709 191.872982c-14.523785 29.42824-52.979632 57.368592-85.456301 62.087057l-211.743542 30.768771c-32.476669 4.719488-39.821961 27.322275-16.320711 50.228985l153.219637 149.352563c23.500227 22.907733 38.188764 68.11433 32.641421 100.460016l-36.170804 210.888058c-4.021593 23.445992 4.971222 37.235043 21.288862 37.235043 6.194072 0 13.447267-1.989307 21.439288-6.191003l189.389418-99.567693c14.523785-7.634888 33.669844-11.453866 52.81488-11.453866s38.291095 3.818979 52.81488 11.453866l189.389418 99.567693c7.994068 4.202719 15.244192 6.191003 21.439288 6.191003 16.314571 0 25.309432-13.791098 21.288862-37.235043L760.761644 691.358971c-5.547343-32.345686 9.141194-77.552284 32.641421-100.460016l153.219637-149.352563c23.50125-22.906709 16.155958-45.51052-16.320711-50.228985l-211.743542-30.768771c-32.476669-4.719488-70.932516-32.658817-85.456301-62.087057L538.40744 106.58962C531.145036 91.8755 521.573029 84.517929 512 84.517929L512 84.517929z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-phone" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M294.595017 112.379487c21.914102 0 43.298132 9.779737 60.131519 27.421536 12.654204 13.381775 25.00858 27.180036 39.626509 43.769876 30.988782 35.180244 28.195156 83.627652-6.581905 115.158786l-12.377912 11.279904c-15.448854 14.132882-30.0412 27.467585-45.421492 39.463804-19.189038 15.089673-40.527019 42.685171-33.067116 88.522126 6.096858 36.808324 21.290909 73.339332 46.414099 111.61303 45.121664 68.953442 97.377818 120.378671 159.956062 157.312862 20.067035 11.763928 41.450041 19.258623 60.569494 25.966395 9.629311 3.335978 19.396769 5.022387 29.02608 5.022387 15.332197 0 38.171368-4.386914 59.900252-25.238824 16.764825-16.083304 34.43016-31.254841 53.134151-47.304376l5.057179-4.340865c17.594727-15.242146 37.338397-23.288402 57.151651-23.288402 22.560832 0 43.989887 10.253528 62.002123 29.650297 15.471366 16.660448 27.733645 30.28577 38.655392 42.951231 30.573319 35.283598 28.195156 80.485079-5.588275 112.179942-1.016143 0.945535-3.140527 3.069919-6.096858 6.429433-27.27111 30.908964-61.886489 56.505945-102.919021 76.110445-12.724813 4.399193-26.186406 6.559393-41.104163 6.559393-18.24248 0-39.001269-3.313465-63.386656-10.079566-83.430154-23.242354-161.825642-69.448722-246.735497-145.421021-107.814518-96.467075-184.2954-199.328791-233.780441-314.475298-28.680203-66.735937-39.279608-119.372761-34.360576-170.671101 3.324722-34.915207 16.417925-60.708664 41.264822-81.237209 13.300934-11.026124 26.024723-22.421662 38.332027-33.437553 8.197706-7.343245 16.395412-14.696724 24.778336-21.925359C255.801479 119.975489 274.968004 112.379487 294.595017 112.379487M294.595017 65.087391c-30.088272 0-60.431348 11.084453-86.36295 33.517371-20.921495 18.057261-41.011043 37.039591-62.348 54.727439-35.815717 29.580712-53.850465 67.844178-58.168818 113.150036-6.535857 68.258617 11.452843 132.084271 37.986149 193.83159 55.604412 129.36023 141.066853 237.428527 245.719354 331.055928 77.726246 69.553099 163.120125 127.20003 265.554098 155.742087 25.146727 6.972808 50.66389 11.799744 76.086909 11.799744 19.859303 0 39.672558-2.933819 59.231009-10.090822 81.144088-38.193881 118.852922-87.760786 122.917494-91.501994 52.809763-49.554626 56.759725-123.170251 9.305947-177.957041-12.954033-15.007809-26.278503-29.650297-39.74112-44.150546-27.594475-29.719882-61.909002-44.763506-96.662527-44.763506-30.43415 0-61.2152 11.533684-88.11792 34.834366-20.274766 17.410532-40.71019 34.776038-59.969836 53.249785-8.451486 8.104585-17.480116 12.076036-27.155477 12.076036-4.386914 0-8.890484-0.807389-13.554714-2.424212-17.780969-6.236028-35.976376-12.607132-52.141544-22.074761-60.014862-35.423791-106.567108-84.748173-144.276964-142.384871-18.773576-28.588105-33.666774-59.160401-39.325657-93.428879-2.839675-17.458627 0.300852-31.589462 15.633049-43.642986 21.013593-16.395412 40.479947-34.915207 60.293201-52.834322 54.126758-49.094138 58.514695-126.820384 10.344602-181.501774-13.394055-15.19405-26.879184-30.342052-40.780799-45.028543C362.347097 79.265298 328.633251 65.087391 294.595017 65.087391L294.595017 65.087391z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-bianji1" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M783.70558 287.073204 657.810223 161.183006l62.973774-62.946634c20.866068-20.837584 54.651907-20.837584 75.516952 0l50.351798 50.350758c20.866068 20.865213 20.866068 54.702879 0 75.56707L783.70558 287.073204zM417.966076 652.797723 292.069696 526.907525l342.253664-339.564719 125.894333 125.891222L417.966076 652.797723zM190.931177 756.041132l76.597607-204.593701 124.841308 124.864846L190.931177 756.041132zM756.299293 799.066041c17.622055 0 31.891621 14.270005 31.891621 31.892361 0 17.594727-14.269566 31.864732-31.891621 31.864732L192.418102 862.823134c-17.595448 0-31.866037-14.268982-31.866037-31.864732 0-17.622356 14.27059-31.892361 31.866037-31.892361L756.299293 799.066041z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-guanbi1" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M512.000512 73.232908c-238.495836 0-431.835216 193.33938-431.835216 431.835216s193.33938 431.835216 431.835216 431.835216 431.835216-193.33938 431.835216-431.835216S750.496347 73.232908 512.000512 73.232908zM720.690508 661.556201l-52.200896 52.200896L512.000512 557.267996 355.510388 713.757097l-52.199872-52.200896 156.4891-156.4891L303.310515 348.579023l52.159964-52.199872 156.518776 156.500357 156.50138-156.500357 52.200896 52.199872L564.191174 505.07631 720.690508 661.556201z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-cuowu" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M563.591299 535.628454l289.170135-287.604938c13.665373-13.635273 13.725573-35.69853 0.1204-49.333804-13.635273-13.755673-35.63833-13.755673-49.303704-0.1806l-289.200235 287.725338L227.645855 198.659612c-13.544974-13.575073-35.66843-13.695473-49.303704-0.0602C164.706878 212.174486 164.676778 234.267842 178.281952 247.903116l286.61164 287.544738L175.904056 822.932393c-13.665373 13.575073-13.725573 35.63833-0.1505 49.333804 6.832687 6.892887 15.742269 10.29418 24.712052 10.29418 8.909583 0 17.819165-3.401293 24.621752-10.17378l289.079835-287.544738 289.290535 290.193533c6.832687 6.892887 15.742269 10.29418 24.712052 10.29418 8.909583 0 17.819165-3.401293 24.591652-10.17378 13.635273-13.635273 13.665373-35.69853 0.0602-49.333804L563.591299 535.628454 563.591299 535.628454zM563.591299 535.628454"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-tupian" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M975.36 97.6 48.64 97.6C21.76 97.6 0 119.359 0 146.24l0 731.52C0 904.64 21.76 926.4 48.64 926.4l926.72 0c26.88 0 48.64-21.761 48.64-48.641L1024 146.24C1024 119.359 1002.24 97.6 975.36 97.6zM926.08 664.64 746.24 484.8c-21.76-21.76-57.601-21.76-79.36 0L455.68 696l-90.239-90.88c-19.841-19.84-52.48-19.84-72.96 0l-192 192c-1.92-5.12-3.2-10.88-3.2-17.28L97.281 243.52c0-26.88 21.76-48.64 48.64-48.64L877.44 194.88c26.88 0 48.64 21.76 48.64 48.64L926.08 664.64z"  ></path>' +
+    '' +
+    '<path d="M316.8 292.8c-53.76 0-97.28 43.52-97.28 97.28 0 53.76 43.52 97.28 97.28 97.28s97.28-43.521 97.28-97.28C414.08 336.319 370.56 292.8 316.8 292.8z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-yonghuming" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M705.497076 1023.999991C701.721212 1023.999991 697.913348 1022.944029 694.521469 1020.704109 662.138628 999.328874 608.796536 993.537081 590.653186 993.089097L567.006032 993.089097 529.247383 993.377087 529.087389 993.377087 52.112455 993.377087C41.07285 993.377087 32.113171 984.385409 32.113171 973.281806L32.113171 949.154669C31.761184 942.402911 31.153205 905.508231 54.576367 864.965682 69.263842 839.622588 90.351087 817.831368 117.294123 800.231998 149.900956 778.92076 191.243477 763.817301 240.105729 755.273607 240.36172 755.209609 240.61771 755.17761 240.873701 755.145611 241.225689 755.113612 278.856342 749.929798 317.062975 739.81816 383.268606 722.282787 389.060399 706.763342 389.124397 706.603348 389.508383 705.067403 390.052363 703.595456 390.788337 702.219505 391.332318 699.307609 392.67627 688.396 390.116361 659.117047 383.588595 584.815706 345.029974 540.913277 314.087082 505.61854 304.295432 494.482938 295.079762 483.987314 287.976016 473.683682 257.353112 429.205274 254.505213 378.647083 254.377218 376.503159 254.377218 376.183171 254.377218 375.831183 254.377218 375.511195 254.377218 355.319917 264.39286 346.040249 273.224544 337.848543L273.672528 337.400559C273.992516 337.144568 274.15251 336.952575 274.280506 336.824579 274.376502 335.352632 273.672528 331.704762 273.192545 329.240851 273.000552 328.312884 272.808559 327.352918 272.648564 326.424951 264.968839 284.506451 264.456857 219.804766 271.400609 178.270252 273.960517 123.648207 320.83884 81.825703 322.854768 80.065766 322.950764 80.001769 323.014762 79.937771 323.07876 79.873773 329.830518 74.113979 336.646274 67.874203 340.998119 60.930451 341.5101 60.066482 341.894087 59.426505 342.118079 58.946522 341.79809 58.082553 341.318107 56.994592 340.96612 56.130623 338.342214 50.082839 334.406355 40.963165 336.646274 29.251585 338.022225 22.147839 343.142042 9.508291 362.46935 4.324476 370.213073 2.244551 378.532776 1.828566 384.612558 1.508577L385.796516 1.444579C409.763658 0.196624 435.298744-0.891337 461.153819 1.092592 648.123129 15.492077 712.504826 85.665566 715.160731 88.641459 715.320725 88.833453 715.44872 88.993447 715.608715 89.153441 730.55218 107.168797 741.655783 129.631993 748.535536 155.871054 750.711459 164.062761 752.087409 170.942515 752.887381 177.438282 759.415147 215.548919 758.327186 254.715517 756.951235 280.922579 756.151264 295.610054 754.519322 311.033502 751.79942 329.464843 751.063446 334.488663 751.863417 335.448628 752.183406 335.832615 752.983377 336.79258 753.975342 337.848543 755.031304 338.968502 759.159156 343.384344 764.822954 349.400129 767.830846 359.095782 769.334792 363.927609 770.038767 369.143423 770.038767 375.511195 770.038767 375.831183 770.038767 376.183171 770.038767 376.503159 769.910772 378.647083 767.062874 429.205274 736.439969 473.683682 729.336223 483.987314 720.120553 494.482938 710.360902 505.61854 679.386011 540.913277 640.82739 584.815706 634.299624 659.149046 631.739716 688.396 633.083667 699.307609 633.627648 702.219505 634.363622 703.595456 634.907602 705.067403 635.323587 706.603348 635.355586 706.763342 641.179378 722.314786 707.704997 739.882157 745.879631 749.993795 783.190296 755.113612 783.542284 755.145611 783.894271 755.209609 784.21426 755.241608 784.534248 755.305605 833.844484 764.489277 875.442996 780.008721 908.113827 801.447954 935.152859 819.143321 956.176107 840.902543 970.703587 866.053643 993.710764 905.956215 992.750798 942.050923 992.302814 949.282665L992.302814 973.313805C992.302814 984.385409 983.343135 993.409086 972.30353 993.409086L783.030302 993.409086C771.990697 993.409086 763.031018 984.385409 763.031018 973.313805 763.031018 962.210202 771.990697 953.218524 783.030302 953.218524L952.304245 953.218524 952.304245 948.57869C952.304245 947.842716 952.304245 947.362733 952.368243 946.658759 952.496238 945.058816 954.12818 916.227847 934.896868 884.196993 923.313283 864.901684 906.449886 848.070286 884.754662 834.118785 856.819662 816.167428 820.788951 802.983899 777.686493 794.920188 772.726671 794.216213 735.959986 788.936402 697.369367 778.728767 621.660076 758.697484 603.228736 736.426281 597.660935 720.23486 593.373088 711.915158 590.973174 695.339751 594.461049 655.597173 602.140775 568.144302 647.323158 516.626146 680.345976 479.027491 689.689642 468.371872 697.785352 459.156202 703.545146 450.804501 726.136338 418.005674 729.688211 379.543051 730.040198 374.903217 730.008199 372.471304 729.752209 371.44734 729.656212 371.095353 729.400221 370.231384 727.640284 368.343451 725.912346 366.519517 724.568394 365.111567 723.064448 363.479625 721.496504 361.591693 712.984809 351.384058 709.944917 338.936504 712.216836 323.577053 714.776744 306.425667 716.280691 292.186176 716.984665 278.746657 719.064591 239.516061 717.97663 210.237109 713.400794 183.806054 713.336796 183.454067 713.272798 183.10208 713.240799 182.750092 712.66482 177.982263 711.608858 172.702452 709.88092 166.142686 704.537111 145.823413 696.249407 128.768024 685.241801 115.360503 683.417866 113.472571 668.79439 99.105085 636.155558 83.457645 577.437659 55.330651 506.912182 44.931023 458.113928 41.187157 434.626769 39.363223 410.56363 40.387186 387.90844 41.571144L386.628486 41.635141C384.740554 41.731138 381.572667 41.891132 378.564774 42.211121 381.156682 48.482896 384.388566 57.922559 380.996687 69.218154 379.748732 73.474002 377.796802 77.601854 374.884906 82.273687 367.685164 93.793275 357.829516 102.944948 349.157827 110.368682 347.429889 111.904627 312.519138 144.063476 311.33518 181.022154 311.303181 181.950121 311.207185 182.878088 311.04719 183.806054 304.647419 220.668735 305.063404 281.402562 312.007156 319.129212 312.135151 319.961183 312.295146 320.761154 312.45514 321.593124 314.567064 332.536733 318.118937 350.904075 300.807557 366.935502L300.359573 367.383486C298.119653 369.431412 295.079762 372.279311 294.56778 373.271275L294.56778 373.271275C294.56778 373.271275 294.407786 373.719259 294.375787 374.967214 294.727774 379.57505 298.279647 418.005674 320.870839 450.804501 326.662632 459.156202 334.726343 468.371872 344.102008 479.027491 377.092827 516.626146 422.27521 568.144302 429.954936 655.597173 433.442811 695.339751 431.042897 711.915158 426.787049 720.23486 421.187249 736.426281 402.787908 758.697484 327.078617 778.728767 288.168009 789.0004 251.081336 794.31221 246.601496 794.920188 203.979021 802.40792 168.300298 815.207462 140.525292 833.030824 118.926065 846.85433 102.030669 863.749725 90.319088 883.237028 70.767788 915.779863 71.983744 945.442802 72.079741 947.010746 72.11174 947.618724 72.11174 947.970712 72.11174 948.57869L72.11174 953.186525 529.023391 953.186525 566.750041 952.898535 566.910035 952.898535 590.909177 952.898535C591.069171 952.898535 591.197166 952.898535 591.357161 952.898535 594.461049 952.962533 667.802425 955.01046 716.472684 987.105311 725.720353 993.185094 728.31226 1005.632648 722.232478 1014.912316 718.392615 1020.800106 711.992844 1023.999991 705.497076 1023.999991L705.497076 1023.999991ZM628.507831 695.947729C629.019813 696.363714 629.467797 696.7797 629.915781 697.227683 629.499796 696.7797 629.051812 696.363714 628.507831 695.947729L628.507831 695.947729ZM395.908154 695.947729C395.396172 696.363714 394.916189 696.7797 394.500204 697.195685 394.948188 696.7797 395.428171 696.363714 395.908154 695.947729L395.908154 695.947729Z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-mima" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M510.8672 526.813381c-29.501918 0-53.407374 23.903409-53.407374 53.408397 0 15.816221 6.875594 30.021757 17.802458 39.800471l0 49.206702c0 19.665899 15.940041 35.606962 35.605939 35.606962 19.661805 0 35.605939-15.941064 35.605939-35.606962l0-49.206702c10.926864-9.778714 17.803481-23.984251 17.803481-39.800471C564.27662 550.71679 540.370141 526.813381 510.8672 526.813381L510.8672 526.813381zM760.108774 366.596376l-35.606962 0 0-89.010243c0-117.993345-95.637174-213.626425-213.634612-213.626425s-213.634612 95.633081-213.634612 213.626425l0 89.010243-35.605939 0c-49.167816 0-89.014336 39.84652-89.014336 89.010243l0 338.243631c0 49.15963 39.84652 89.00615 89.014336 89.00615l498.481102 0c49.148373 0 89.014336-39.84345 89.014336-89.00615l0-338.243631C849.123111 406.441872 809.256124 366.596376 760.108774 366.596376L760.108774 366.596376zM510.8672 99.564623c98.31619 0 178.028673 79.70839 178.028673 178.020486l0 89.010243L332.862064 366.595352l0-89.010243-0.023536 0C332.838527 179.273013 412.552034 99.564623 510.8672 99.564623L510.8672 99.564623zM813.516148 793.846156c0 29.501918-23.906479 53.404304-53.407374 53.404304L261.627672 847.25046c-29.502941 0-53.408397-23.902386-53.408397-53.404304L208.219275 455.606619c0-29.502941 23.906479-53.408397 53.408397-53.408397l498.481102 0c29.501918 0 53.407374 23.906479 53.407374 53.408397L813.516148 793.846156 813.516148 793.846156zM813.516148 793.846156"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-shoucang" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M752.165872 939.39509c-10.357905 0-20.766976-2.583848-30.15581-7.470135L514.397606 828.65494 304.962643 932.152129c-20.253276 10.809183-48.247864 8.91402-67.816548-5.51869-19.74674-14.204513-29.930683-39.446407-25.832342-64.055898l43.181475-224.130663L89.783863 484.698191c-18.092054-17.828041-24.520463-44.276413-16.841573-67.795059 7.452739-23.687492 27.481911-40.937364 52.176336-44.675502l228.604558-41.915645 102.468766-208.436216c11.150968-22.596647 33.511231-36.625152 58.262962-36.625152 24.63405 0 47.51006 14.432711 58.205657 36.801161l102.412484 208.144574 229.233891 40.709167c24.121374 3.619434 44.149523 20.754696 51.716872 44.676525 7.621585 23.397896 1.193175 49.851385-16.386202 67.156516L774.411525 638.446877l41.763173 223.728504c4.267187 24.842805-5.92085 50.083675-26.001187 64.687278C779.304975 934.854681 765.704213 939.39509 752.165872 939.39509L752.165872 939.39509zM514.454912 777.421069 742.494605 890.811582c7.452739 3.965312 15.019065 3.104711 20.934798-1.207501 6.090718-4.487198 9.159614-11.962449 7.910157-19.261693l-46.369074-248.28069 183.203532-172.669618c4.836145-4.7727 6.77224-12.594853 4.492314-19.609617-2.330068-7.299243-8.303106-12.419867-15.755846-13.510712l-252.392334-44.732807L531.75288 142.345985c-6.54609-13.625322-28.107151-13.568017-34.822087 0.061398L384.334365 371.425358l-251.763001 46.227858c-8.082072 1.207501-14.055111 6.383384-16.272615 13.511735-2.39249 7.184633-0.400113 15.006785 4.835122 20.239973l182.865841 170.713057-47.90915 248.741177c-1.137916 6.838755 1.87879 14.371312 7.740288 18.626219 6.203282 4.600785 14.223956 5.118578 20.652366 1.671059L514.454912 777.421069 514.454912 777.421069zM514.454912 777.421069"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-zhengque" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M512 937.196c-234.832 0-425.198-190.368-425.198-425.198S277.168 86.802 512 86.802c234.83 0 425.198 190.368 425.198 425.198S746.83 937.196 512 937.196zM512 139.952C306.53 139.952 139.954 306.528 139.954 512S306.53 884.046 512 884.046 884.046 717.47 884.046 512 717.47 139.952 512 139.952zM681.88 364.092c7.336-12.716 2.994-28.962-9.722-36.298s-28.962-2.994-36.298 9.722L465.892 631.88l-95.088-87.684c-10.018-10.708-26.834-11.262-37.56-1.228-10.71 10.036-11.246 26.852-1.21 37.562l121.49 112.06c10.036 10.708 26.852 11.246 37.562 1.21C494.318 690.774 681.88 364.092 681.88 364.092z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-tuichu" viewBox="0 0 1274 1024">' +
+    '' +
+    '<path d="M851.406 1024l-716.804 0c-35.25 0-70.32-14.032-93.798-37.508C14.876 960.618 0 927.618 0 896l0-768c0-31.594 14.876-64.586 40.782-90.524C64.282 14 99.328 0 134.578 0l716.804 0c32.968 0 62.304 12.618 87.188 37.476 22.734 22.712 34.226 53.148 34.226 90.524l0 76.796c0 14.134-11.438 25.602-25.594 25.602s-25.602-11.468-25.602-25.602L921.6 128c0-23.624-6.274-41.398-19.204-54.32-15.36-15.336-31.54-22.476-50.992-22.476l-716.804 0c-21.656 0-43.72 8.624-57.594 22.5-16.414 16.382-25.804 36.172-25.804 54.296l0 768c0 18.148 9.39 37.914 25.772 54.274 13.906 13.898 35.97 22.524 57.602 22.524l716.804 0c19.454 0 35.656-7.14 50.992-22.5 12.954-12.898 19.226-30.674 19.226-54.296l0-76.796c0-14.156 11.446-25.602 25.602-25.602s25.594 11.446 25.594 25.602L972.794 896c0 37.398-11.492 67.844-34.196 90.524C913.718 1011.382 884.376 1024 851.406 1024L851.406 1024zM1203.204 537.602l-640 0c-14.134 0-25.602-11.468-25.602-25.602 0-14.132 11.468-25.602 25.602-25.602l640 0c14.156 0 25.594 11.47 25.594 25.602C1228.796 526.132 1217.36 537.602 1203.204 537.602L1203.204 537.602zM1030.602 754.812c-6.546 0-13.102-2.508-18.094-7.5-10.016-10.008-10.016-26.19 0-36.196L1211.594 512l-199.086-199.118c-10.016-10.006-10.016-26.186 0-36.194 10.008-10.016 26.188-10.016 36.196 0L1265.89 493.898c10.016 10.016 10.016 26.188 0 36.204L1048.704 747.312C1043.71 752.336 1037.156 754.812 1030.602 754.812L1030.602 754.812zM1030.602 754.812"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-wodedingdan30" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M178.848 664.48l203.904 212.496 500.672-521.504L679.536 142.992 178.848 664.48 178.848 664.48zM16 1008l320.544-77.808L130.08 714.992 16 1008 16 1008zM938.56 87.12c-58.528-61.008-110.752-102.064-169.28-41.056l-38.816 44.56 206.64 216.08 42.48-41.456C1038.128 204.272 997.088 148.128 938.56 87.12L938.56 87.12z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-chenggong" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M510.645654 959.349561c-247.25636 0-447.691345-200.446241-447.691345-447.700555 0-247.24715 200.436008-447.692369 447.691345-447.692369 247.25636 0 447.693392 200.445218 447.693392 447.692369C958.339046 758.90332 757.902014 959.349561 510.645654 959.349561zM784.191774 354.236883l-14.387685-14.387685c-7.949043-7.949043-20.826328-7.949043-28.77537 0L442.600909 632.086006 333.044724 517.430686c-3.597945-3.596921-12.958126-0.060375-20.908192 7.888667l-14.387685 14.389732c-7.949043 7.949043-11.465123 17.309224-7.869225 20.895913L436.064029 713.574948c3.576455 3.597945 12.936637 0.049119 20.886703-7.888667l14.368242-14.388708c2.542916-2.523473 4.411473-5.136997 5.960759-7.710612l306.913065-300.56345C792.142863 375.083677 792.142863 362.185926 784.191774 354.236883z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-time" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M512 64C264.96 64 64 264.96 64 512s200.96 448 448 448 448-200.96 448-448S759.04 64 512 64zM512 895.712c-211.584 0-383.712-172.16-383.712-383.712C128.288 300.416 300.416 128.288 512 128.288c211.552 0 383.712 172.128 383.712 383.712C895.712 723.552 723.552 895.712 512 895.712zM671.968 512 512 512 512 288.064c0-17.76-14.24-32.128-32-32.128s-32 14.4-32 32.128L448 544c0 17.76 14.272 32 32 32l191.968 0c17.76 0 32.128-14.24 32.128-32S689.728 512 671.968 512z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-jingshu" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M269.608949 205.858508l0-40.302915c0-10.869558-8.815783-19.685341-19.679202-19.685341-10.869558 0-19.668968 8.815783-19.668968 19.685341l0 399.728984c0 1.588171 0.23843 3.120061 0.588401 4.607948-0.022513 32.775474-0.033769 65.573461-0.044002 96.783277L216.831932 666.675802c-29.561269 0-53.743018 23.205515-55.458079 52.355415 0.021489 1.775436 0.044002 3.108804 0.066515 3.997034 0.011256 0.533143-0.077771 1.043772-0.110517 1.554402 1.194198 29.621645 25.603121 53.360302 55.503105 53.360302l14.005992 0c0.011256 14.744819 0.033769 28.024264 0.055259 39.34817l-17.042141 0c-1.022283 0-1.998517-0.13303-2.998287-0.288572-49.596582-3.108804-89.022523-44.322461-89.022523-94.684476 0-1.154289 0.13303-2.264577 0.166799-3.396353-0.599657-58.45125 0-502.935554 0.072655-551.310308-0.083911-0.682545-0.216941-1.354857-0.216941-2.043542 0-52.383044 42.612517-94.995561 94.990444-94.995561l31.448246 0 477.203496 0 4.807493 0c10.869558 0 19.685341 8.815783 19.685341 19.685341l0 75.444273L365.243053 165.701926C327.854515 165.67839 293.985126 181.093475 269.608949 205.858508z"  ></path>' +
+    '' +
+    '<path d="M883.644857 841.33882c-10.858302 0-19.674085 8.815783-19.674085 19.696598l0 54.381561L370.15083 915.416979c-29.910217 0-54.315046-23.736611-55.508221-53.337789 0.021489-0.533143 0.110517-1.043772 0.110517-1.575892-0.021489-0.86674-0.044002-2.220574-0.066515-3.997034 1.715061-29.134551 25.897833-52.338019 55.464219-52.338019l508.652765 0c1.554402 0 3.052522-0.222057 4.497431-0.577145 0.110517 0 0.233314 0.045025 0.343831 0.045025 10.858302 0 19.675108-8.815783 19.675108-19.675108l0-556.228317c0-10.869558-8.815783-19.679202-19.675108-19.679202l-4.818749 0L401.616472 208.0535l-31.44313 0c-52.383044 0-94.995561 42.612517-94.995561 94.978165 0 0.705058 0.138146 1.36509 0.215918 2.059915-0.066515 48.374754-0.671289 492.859058-0.066515 551.305191-0.033769 1.131777-0.171915 2.264577-0.171915 3.397377 0 50.362015 39.432081 91.575672 89.022523 94.684476 0.98749 0.154519 1.964748 0.311085 2.997264 0.311085l516.469801 0c10.880815 0 19.685341-8.815783 19.685341-19.675108l0-74.078159C903.330198 850.154603 894.524648 841.33882 883.644857 841.33882zM766.143723 657.505955c-6.375198 1.105171-13.365402 2.124384-20.951171 3.039219-7.592932 0.924045-18.146289 1.571798-31.654954 1.935072-13.513782 0.370437-21.028942 0.552585-22.544459 0.552585l-25.505907 0c-15.485693 0-29.228695 0.465604-41.218774 1.381463-11.999288 0.924045-23.911596 2.858094-35.753295 5.802146-1.216711 0.743944-3.345188 1.105171-6.376221 1.105171-4.859681 0-9.564843-1.657756-14.118556-4.972245-4.554736-3.315512-6.832615-6.994298-6.832615-11.05273 0-4.049223 2.733251-7.91732 8.198729-11.604292 1.210571-1.105171 4.247744-4.420683 9.108448-9.94756 6.980995-8.098445 13.052271-11.413957 18.218944-9.946536 3.032056 2.580778 6.604418 4.420683 10.703783 5.525853 4.098341 1.104147 7.969509 1.656733 11.614525 1.656733 1.821485 0 5.010107-0.181125 9.564843-0.552585 4.553713-0.36225 8.04114-0.551562 10.474562-0.551562 3.032056 0 5.308913 0.190335 6.832615 0.551562 2.12029-2.572592 3.643993-5.888104 4.554736-9.946536 0.910743-4.049223 1.366114-8.289804 1.366114-12.709463 0-2.573615-0.156566-6.716982-0.455371-12.43317-0.305969-5.706979-0.455371-10.033517-0.455371-12.985756 0-3.678786 0.149403-6.440689 0.455371-8.28878l-5.465478-6.631024c-6.077416 0-12.981662 0.370437-20.723997 1.105171-7.742335 0.74292-17.235546 2.580778-28.465309 5.525853-0.611937-1.839905-1.067308-3.678786-1.366114-5.525853-0.306992-1.838881-0.455371-3.678786-0.455371-5.525853 0-9.946536 4.099365-17.768689 12.298094-23.484877 8.197706-5.706979 17.45658-8.565073 27.78174-8.565073 6.376221 0 11.841699 1.105171 16.396435 3.315512l101.111862 3.314489c1.821485 4.420683 2.733251 8.842389 2.733251 13.263072 0 11.051707-4.554736 16.57756-13.664208 16.57756l-43.724851 0c-0.910743 4.058432-1.52268 7.55507-1.821485 10.499122-1.216711 8.842389-1.821485 17.682731-1.821485 26.52512 0 2.580778 0.149403 5.438872 0.455371 8.565073 0.298805 3.134387 0.455371 5.621021 0.455371 7.459902l2.732228 3.315512c30.060643 3.315512 60.121286 6.630001 90.180905 9.946536C788.006659 646.644583 780.718673 654.562926 766.143723 657.505955zM590.793042 375.129726c4.554736-5.525853 9.258874-8.841366 14.119579-9.946536 2.12029-2.210341 3.942799-3.868097 5.465478-4.973268 4.853541-3.315512 9.863648-4.973268 15.030321-4.973268 3.643993 0 7.742335 1.105171 12.298094 3.315512 1.210571 0 2.12029 0 2.733251 0 2.426259 0 4.852518-0.181125 7.286963-0.552585 6.980995 0 13.43601 0.466628 19.35686 1.381463 5.92085 0.924045 12.525268 2.857071 19.812231 5.802146 6.675026-6.259564 14.573927-9.393951 23.684422-9.393951 8.497535 0 13.358239 4.239558 14.573927 12.709463 3.943822 6.26775 5.92085 12.156878 5.92085 17.682731 0 9.584286-6.226818 19.340487-18.673292 29.288047-5.77247 4.420683-11.542894 8.66024-17.307178 12.709463 0 1.105171 0 1.848091 0 2.210341 0.604774 3.315512 2.426259 5.897314 5.465478 7.737218 15.784498 7.002484 29.148877 12.347213 40.079834 16.024975 33.398668 11.794627 64.674998 19.711947 93.824899 23.762193-4.553713 10.317996-8.809643 18.054191-12.752442 23.208585-12.147668 15.84385-26.116821 23.762193-41.902342 23.762193-3.643993 0-6.375198-0.181125-8.197706-0.552585-8.504698-2.944052-18.069541-8.469905-28.694529-16.57756-28.545126-21.361517-43.574425-32.413224-45.089941-33.156144-0.611937-0.36225-5.771447-4.782933-15.485693-13.262048-6.376221-5.525853-12.147668-7.736195-17.307178-6.631024-15.485693 14.367219-30.971385 28.735461-46.456055 43.10268-19.128663 15.47239-37.347606 23.208585-54.654784 23.208585-6.376221-3.677762-10.93198-6.631024-13.664208-8.841366-5.465478-4.049223-8.198729-8.841366-8.198729-14.367219 29.148877-11.786441 52.071959-23.390733 68.774363-34.8139 22.772656-15.47239 41.745776-34.8139 56.932664-58.022485 0.910743-5.154393 0.070608-8.652054-2.505054-10.499122-2.582825-1.838881-6.305613-2.762927-11.158131-2.762927-3.949962 0-6.682189 0-8.198729 0-6.682189 0.37146-12.147668 0.924045-16.396435 1.657756-13.664208 2.210341-25.505907 6.078439-35.526121 11.604292-6.682189-2.944052-10.019191-7.546883-10.019191-13.814634C583.96145 386.000308 586.238306 380.65558 590.793042 375.129726zM421.81756 462.439234c5.465478-4.782933 10.930957-9.575076 16.396435-14.367219 9.109472-10.30981 16.545838-18.97005 22.317285-25.972535 17.607006-21.731954 32.031531-42.912345 43.269479-63.548338 2.12029-2.210341 4.326539-3.678786 6.603395-4.420683 2.27788-0.733711 4.475941-1.105171 6.604418-1.105171 6.070252 0 11.386328 3.134387 15.941064 9.393951 4.553713 6.268774 6.831592 13.262048 6.831592 20.999266 0 9.584286-3.800559 16.767895-11.386328 21.551852-8.809643 6.631024-16.09763 12.347213-21.861914 17.130146-16.395412 13.633508-31.882128 27.820626-46.456055 42.550095 1.209548 3.686972 3.25923 6.26775 6.149047 7.736195 2.88163 1.476631 6.148024 2.210341 9.792017 2.210341 6.375198-0.36225 11.08036-0.552585 14.119579-0.552585 2.426259 0 4.247744 0.190335 5.465478 0.552585 3.942799-2.944052 7.130398-5.525853 9.564843-7.736195 14.872732-13.625322 27.170826-28.735461 36.892235-45.313022 5.465478-1.467421 10.396791-0.085958 14.802124 4.14439 4.39817 4.239558 8.576329 8.383948 12.525268 12.43317 0 9.584286-4.099365 18.054191-12.298094 25.418926-6.988158 5.897314-13.81975 11.794627-20.494777 17.682731-16.09763 16.949021-25.662473 27.076682-28.694529 30.393217-10.930957 12.528338-18.673292 24.505114-23.228027 35.919071 6.376221 0 18.823718-3.868097 37.347606-11.604292 8.803503-3.678786 16.239869-5.525853 22.318308-5.525853 2.732228 0.370437 4.704139 0.552585 5.92085 0.552585l8.198729 16.57756c-10.93198 9.584286-25.207102 17.320481-42.814108 23.209608-17.613146 5.897314-34.31555 11.423167-50.100048 16.57756-8.504698 1.105171-14.731516-2.762927-18.674315-11.604292-2.127454-4.420683-3.187599-9.757225-3.187599-16.025998 0-13.624299 4.554736-23.208585 13.664208-28.734438 1.515516-1.839905 2.732228-3.316535 3.643993-4.420683 5.465478-7.365758 9.714246-14.730493 12.752442-22.104437l-49.189306 3.315512-10.930957-23.209608C412.403143 476.444203 415.13537 469.070258 421.81756 462.439234zM389.024689 633.744785c4.248767-8.098445 11.229762-12.985756 20.951171-14.643512 9.714246-1.657756 19.128663-3.402493 28.238135-5.250584l122.973776-33.155121c1.210571-0.36225 2.733251-0.552585 4.554736-0.552585 5.764284 0 8.653077 3.686972 8.653077 11.05273 0 5.16258-1.594311 10.221806-4.78191 15.196097-3.188622 4.973268-6.910387 7.459902-11.158131 7.459902-6.989181 2.953262-13.970176 5.898337-20.952194 8.842389-20.039405 8.479115-37.503149 15.291265-52.377928 20.445658-25.207102 8.841366-48.12916 15.662725-68.774363 20.445658-3.643993 4.420683-7.443529 6.630001-11.386328 6.630001-4.554736 0-8.504698-2.944052-11.841699-8.841366-3.345188-5.889127-5.010107-12.339026-5.010107-19.340487C388.113947 638.355803 388.412752 635.591853 389.024689 633.744785z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-huiyuan1" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M614.029 1023.992 409.943 1023.992c-193.563 0-346.506 0-346.506-100.408l0-20.082c0-188.158 155.447-341.242 346.506-341.242l204.086 0c191.059 0 346.533 153.113 346.533 341.242l0 20.082C960.533 1023.992 799.938 1023.992 614.029 1023.992L614.029 1023.992 614.029 1023.992zM408.094 618.893c-160.709 0-291.466 128.34-291.466 286.176l0 20.451c0 40.902 168.446 40.902 291.466 40.902l207.814 0c101.828 0 291.463 0 291.463-40.902l0-20.451c0-157.834-130.756-286.176-291.463-286.176L408.094 618.893 408.094 618.893zM501.789 542.094c-151.692 0-274.998-121.597-274.998-271.042 0-149.445 123.306-271.043 274.998-271.043 151.721 0 275.053 121.569 275.053 271.015 0 149.445-123.391 271.072-275.053 271.072l0 0 0 0L501.789 542.094zM283.423 270.225c0 118.156 97.961 214.327 218.366 214.327 120.43 0 218.393-96.113 218.393-214.327 0-118.213-97.963-214.297-218.393-214.297C381.356 55.928 283.423 152.041 283.423 270.225L283.423 270.225 283.423 270.225 283.423 270.225z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-xiazai" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M356.43 516.404c-0.019 0.045-0.058 0.083-0.083 0.134-0.211 0.512-0.269 1.069-0.365 1.632-0.096 0.512-0.218 1.005-0.198 1.542 0 0.115-0.051 0.211-0.045 0.333 0.026 0.314 0.198 0.576 0.262 0.877 0.128 0.672 0.282 1.325 0.589 1.984 0.147 0.314 0.339 0.576 0.525 0.87 0.288 0.474 0.48 0.986 0.87 1.434l140.307 156.8c0.301 0.346 0.691 0.531 1.024 0.819 0.186 0.179 0.269 0.422 0.48 0.589 0.186 0.141 0.422 0.166 0.627 0.294 0.557 0.352 1.126 0.589 1.728 0.806 0.205 0.064 0.39 0.154 0.595 0.198 2.445 0.717 5.03 0.499 6.95-1.05 0.454-0.371 0.704-0.877 1.037-1.331 0.237-0.205 0.518-0.326 0.736-0.563L657.536 525.12c0.448-0.486 0.678-1.043 0.998-1.574 0.16-0.237 0.326-0.454 0.454-0.71 0.314-0.646 0.467-1.293 0.595-1.958 0.058-0.294 0.224-0.531 0.25-0.838l0-0.512c0-0.102 0-0.186 0-0.282 0.301-4.435-3.142-8.032-7.757-8.045l-92.915 0.026L559.161 409.312c0-9.37-7.597-16.979-16.979-16.979l-67.93 0c-9.389 0-16.979 7.61-16.979 16.979L457.273 511.36l0.001 0-93.734 0.474C360.238 511.84 357.607 513.735 356.43 516.404z"  ></path>' +
+    '' +
+    '<path d="M849.367 365.514c-5.251-13.75-18.558-23.52-34.153-23.52-20.189 0-36.555 16.366-36.555 36.555 0 5.634 1.277 10.969 3.554 15.736l-0.001 0c12.77 33.678 31.676 78.762 31.676 116.915 0 168.826-136.845 305.677-305.67 305.677S202.547 680.026 202.547 511.2c0-168.806 136.845-305.67 305.67-305.67 40.01 0 84.398 16.721 119.42 30.699l0.004-0.006c5.37 3.099 11.595 4.881 18.24 4.881 20.189 0 36.555-16.366 36.555-36.555 0-13.135-6.931-24.646-17.332-31.091l0.002-0.003c-0.01-0.005-0.019-0.009-0.029-0.014-1.987-1.229-4.1-2.271-6.316-3.106-48.027-23.161-92.705-32.734-150.544-32.734-206.336 0-373.6 167.264-373.6 373.6s167.264 373.6 373.6 373.6 373.6-167.264 373.6-373.6C881.817 456.858 870.229 411.702 849.367 365.514z"  ></path>' +
+    '' +
+    '<path d="M474.252 375.347l67.93 0c9.389 0 16.979-7.61 16.979-16.979l0-16.986c0-9.37-7.597-16.979-16.979-16.979l-67.93 0c-9.389 0-16.979 7.61-16.979 16.979l0 16.986C457.273 367.731 464.863 375.347 474.252 375.347z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-zhengque1" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M448.961268 795.631826c-9.165754 0-18.332531-3.496637-25.325805-10.489912l-256.990049-256.990049c-13.986549-13.987572-13.986549-36.664038 0-50.65161 13.988596-13.986549 36.665061-13.986549 50.65161 0l231.664244 231.665267 391.917064-391.917064c13.988596-13.986549 36.663014-13.986549 50.65161 0 13.986549 13.987572 13.986549 36.664038 0 50.65161l-417.242869 417.241846C467.293799 792.135188 458.127022 795.631826 448.961268 795.631826z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-richeng" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M874.368 1006.464 124.16 1006.464c-37.632 0-68.224-30.528-68.224-68.224L55.936 188.032c0-37.696 30.528-68.224 68.224-68.224l68.224 0 0 34.112c0 56.512 45.824 102.272 102.272 102.272 56.448 0 102.272-45.824 102.272-102.272L396.928 119.872l204.608 0 0 34.112c0 56.512 45.824 102.272 102.272 102.272 56.448 0 102.272-45.824 102.272-102.272L806.08 119.872l68.224 0c37.632 0 68.224 30.528 68.224 68.224L942.528 938.24C942.528 975.872 912 1006.464 874.368 1006.464L874.368 1006.464zM878.912 304 119.616 304l0 638.016 759.296 0L878.912 304 878.912 304zM294.656 498.304 192.384 498.304 192.384 396.032l102.272 0L294.656 498.304 294.656 498.304zM294.656 668.8 192.384 668.8 192.384 566.464l102.272 0L294.656 668.8 294.656 668.8zM294.656 839.296 192.384 839.296l0-102.272 102.272 0L294.656 839.296 294.656 839.296zM465.152 498.304 362.88 498.304 362.88 396.032l102.272 0L465.152 498.304 465.152 498.304zM465.152 668.8 362.88 668.8 362.88 566.464l102.272 0L465.152 668.8 465.152 668.8zM465.152 839.296 362.88 839.296l0-102.272 102.272 0L465.152 839.296 465.152 839.296zM635.648 498.304 533.376 498.304 533.376 396.032l102.272 0L635.648 498.304 635.648 498.304zM635.648 668.8 533.376 668.8 533.376 566.464l102.272 0L635.648 668.8 635.648 668.8zM635.648 839.296 533.376 839.296l0-102.272 102.272 0L635.648 839.296 635.648 839.296zM806.144 498.304l-102.272 0L703.872 396.032l102.272 0L806.144 498.304 806.144 498.304zM806.144 668.8l-102.272 0L703.872 566.464l102.272 0L806.144 668.8 806.144 668.8zM806.144 839.296l-102.272 0 0-102.272 102.272 0L806.144 839.296 806.144 839.296zM702.784 222.144c-37.12 0-67.136-30.08-67.136-67.136L635.648 84.736c0-37.12 30.016-67.136 67.136-67.136 37.12 0 67.136 30.016 67.136 67.136l0 70.336C769.92 192.064 739.904 222.144 702.784 222.144L702.784 222.144zM293.632 222.144c-37.12 0-67.136-30.08-67.136-67.136L226.496 84.736c0-37.12 30.016-67.136 67.136-67.136 37.12 0 67.136 30.016 67.136 67.136l0 70.336C360.768 192.064 330.688 222.144 293.632 222.144L293.632 222.144zM293.632 222.144"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-fo" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M843.576279 511.485277c0-18.479887-11.652388-34.252105-28.006867-40.362266 8.393157-7.858992 13.646811-19.042705 13.646811-31.449269 0-23.781636-19.278065-43.067888-43.073005-43.067888-1.461281 0-2.905166 0.070608-4.324492 0.210801 2.342348-5.308913 3.63683-11.18883 3.63683-17.358343 0-23.801079-19.279089-43.077098-43.069935-43.077098-1.654686 0-3.279696 0.095167-4.88424 0.26913 1.502213-4.38896 2.328022-9.095145 2.328022-14.001899 0-23.781636-19.281135-43.064818-43.074028-43.064818-1.379417 0-2.744507 0.066515-4.093225 0.191358 1.678222-4.589528 2.596128-9.55461 2.596128-14.733563 0-23.783683-19.287275-43.064818-43.067888-43.064818-1.134847 0-2.257413 0.045025-3.363607 0.128937 1.664919-4.579295 2.566452-9.516748 2.566452-14.666024 0-23.790846-19.282159-43.074028-43.077098-43.074028-1.74269 0-3.474125 0.103354-5.16872 0.306992 0.784876-3.240811 1.192152-6.624884 1.192152-10.102079 0-21.270443-15.404852-38.933731-35.666314-42.440601l0.103354-3.025916c0-23.787776-19.283182-43.067888-43.068911-43.067888-23.786753 0-43.067888 19.280112-43.067888 43.067888 0 1.187035 0.047072 2.364861 0.130983 3.524267-19.034519 4.457522-33.214473 21.542642-33.214473 41.942251 0 3.477194 0.416486 6.862291 1.186012 10.102079-1.687432-0.203638-3.408633-0.306992-5.16565-0.306992-23.780613 0-43.067888 19.284205-43.067888 43.074028 0 5.149277 0.907673 10.085706 2.563382 14.666024-1.108241-0.083911-2.223644-0.128937-3.352351-0.128937-23.787776 0-43.067888 19.281135-43.067888 43.064818 0 5.179976 0.906649 10.144034 2.572592 14.733563-1.343601-0.124843-2.705622-0.191358-4.082992-0.191358-23.779589 0-43.065841 19.283182-43.065841 43.064818 0 4.906753 0.818645 9.612938 2.330068 14.001899-1.606591-0.173962-3.236718-0.26913-4.891404-0.26913-23.788799 0-43.069935 19.276019-43.069935 43.077098 0 6.169513 1.301645 12.04943 3.645017 17.358343-1.427512-0.140193-2.867304-0.210801-4.334725-0.210801-23.779589 0-43.067888 19.286252-43.067888 43.067888 0 12.406564 5.249561 23.591301 13.648858 31.449269-16.358573 6.110161-27.997658 21.88238-27.997658 40.362266 0 10.691503 3.91517 20.445658 10.360975 27.977191-0.509606 10.79281 2.402723 25.932626 13.494339 46.542013 27.983331 51.991118 49.297776 149.300374 38.645159 223.940328-3.924379 27.487028-13.688767 67.479881-13.688767 74.68498 0 22.538319 18.275225 40.806381 40.806381 40.806381 20.438495 0 37.362956-15.018042 40.346917-34.618449 0.468674-0.033769 50.355875 66.112744 186.854689 67.146283 136.507-1.033539 186.391131-67.180052 186.860828-67.146283 2.983961 19.600407 19.908422 34.618449 40.349987 34.618449 22.531156 0 40.803311-18.268062 40.803311-40.806381 0-7.205099-9.764388-47.197952-13.684674-74.68498-10.659781-74.638931 10.659781-171.94921 38.641065-223.940328 11.234879-20.8734 14.081717-36.149315 13.470803-46.967708C839.819722 531.566638 843.576279 521.969049 843.576279 511.485277z"  ></path>' +
+    '' +
+    '<path d="M767.309268 516.036943c-0.010233 12.628622-0.414439 21.174252-0.414439 21.174252s-9.370415 67.48602-16.869203 97.478102c-7.494695 29.990035-14.818497 98.610902-18.48705 129.3326-13.635555 114.15083-112.00291 175.348634-208.316489 181.443445-96.29823-6.093788-192.57804-67.292616-206.222805-181.443445-3.670599-30.720675-10.992355-99.342566-18.49012-129.3326-7.498788-29.992081-16.868179-97.478102-16.868179-97.478102s0.051165-3.084245 0.36225-8.170077c-0.320295 0-21.25407-122.114199 81.259722-109.805872 150.449547 18.065448 201.404056 18.065448 319.850725 0C765.710864 406.64244 769.046842 485.494323 767.309268 516.036943z"  ></path>' +
+    '' +
+    '<path d="M689.209516 573.117986l-99.197256 0.239454c41.690518 26.847461 85.081771 29.122271 145.270595-20.615527C717.349413 563.564399 701.89442 570.103326 689.209516 573.117986z"  ></path>' +
+    '' +
+    '<path d="M576.471872 745.589083c8.815783-13.093203 4.091178-26.068725-6.791683-38.695301-29.642111-34.32476-67.333548-192.426591 82.030271-209.012338 60.916395-6.766101 101.449553 40.319288 101.449553 40.319288s-19.679202-59.984163-99.343589-59.984163c-79.662341 0-144.100956 73.484641-113.375164 196.405205 8.856715 35.404348 29.613458 74.547857-16.97051 76.607772C523.470751 751.228523 564.257689 763.704672 576.471872 745.589083z"  ></path>' +
+    '' +
+    '<path d="M509.411547 487.592101c0-8.280594 6.714935-15.002692 14.993482-15.002692 8.28571 0 14.996552 6.722098 14.996552 15.002692 0 8.284687-6.711865 14.987343-14.996552 14.987343C516.125459 502.579443 509.411547 495.876788 509.411547 487.592101z"  ></path>' +
+    '' +
+    '<path d="M524.405029 487.592101"  ></path>' +
+    '' +
+    '<path d="M471.84086 745.589083c-8.81783-13.093203-4.098341-26.068725 6.79373-38.695301 29.643134-34.32476 64.228837-193.874569-82.041528-209.012338-60.957327-6.309706-101.437274 40.319288-101.437274 40.319288s19.679202-59.984163 99.344612-59.984163c79.664388 0 144.097886 73.484641 113.373117 196.405205-8.859785 35.404348-29.608342 74.547857 16.978696 76.607772C524.850168 751.228523 484.056066 763.704672 471.84086 745.589083z"  ></path>' +
+    '' +
+    '<path d="M358.722546 573.117986l99.200326 0.239454c-41.690518 26.847461-85.078701 29.122271-145.269571-20.615527C330.576509 563.564399 346.034573 570.103326 358.722546 573.117986z"  ></path>' +
+    '' +
+    '<path d="M449.882755 828.194452c49.272193 50.725288 98.333586 50.725288 147.20669 0C515.686461 839.243089 449.882755 828.194452 449.882755 828.194452z"  ></path>' +
+    '' +
+    '<path d="M591.956541 819.936371l5.722328-1.023306c0 0-8.892531-9.209756-18.584264-16.228613-11.018961-7.993045-13.346983-9.375531-26.083052-10.143011-17.768689-1.075495-29.53978 13.701047-29.53978 13.701047s-14.601556-14.230096-29.132504-13.701047c-10.749832 0.398066-18.430768 3.631714-26.492374 10.143011-8.097422 6.53995-16.655332 14.364149-18.759249 16.303314l-0.405229 0c0 0 0.24457 0.035816 0.345877 0.054235-0.284479 0.25992-0.438998 0.407276-0.438998 0.407276l2.843768 0.488117C465.126948 821.850977 524.162506 829.27404 591.956541 819.936371z"  ></path>' +
+    '' +
+    '<path d="M737.111502 887.8706c0-10.742668 8.709359-19.453051 19.456121-19.453051 10.745738 0 19.456121 8.710382 19.456121 19.453051 0 10.748808-8.710382 19.461237-19.456121 19.461237C745.820861 907.330814 737.111502 898.619408 737.111502 887.8706z"  ></path>' +
+    '' +
+    '<path d="M280.956392 887.8706c0-10.742668 8.716522-19.453051 19.460214-19.453051 10.747785 0 19.458167 8.710382 19.458167 19.453051 0 10.748808-8.710382 19.461237-19.458167 19.461237C289.672914 907.330814 280.956392 898.619408 280.956392 887.8706z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-fo3" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M482.739071 70.083172c-8.661264 22.683628-14.366196 46.181809-22.239514 69.069075-3.366677 9.792017-6.630001 20.030196-12.124132 29.145807-4.668323 7.755638-14.948457 12.653181-22.239514 18.497283-10.242272 8.206916-18.536168 18.040888-20.009729 30.286794-0.941442 7.813966 0.720408 15.697517 3.52529 23.12058-11.205203 4.77884-11.822257 6.728238-10.169617 17.419741 4.839215 31.29782 27.246551 57.505715 18.142196 90.323145 16.85283 0 12.520151-19.383466 17.276479-29.485545 7.077186 4.02057 11.086499 15.037485 12.577456 22.231327 2.196015 10.584056-0.475837 16.529465-10.828626 22.1116-16.712637 9.014304-36.72032 11.908214-54.78986 18.293645-45.762253 16.176424-47.877427 61.582567-51.119261 98.460476-1.865487 21.194718-2.935865 42.549072-7.392364 63.501266-4.487198 21.103644-9.030677 33.504068 2.047636 53.874001 8.002254 14.710027 13.582343 22.582321 5.852288 37.953404-18.6078 2.13564-37.041638 7.319709-53.850465 14.388708-15.680121 6.591115-31.597649 15.529695-40.97318 28.466332-13.389962 18.485003-2.122337 35.431977 6.011924 53.735855 3.756557 8.455579-8.782014 12.808724-12.727882 21.572318-3.586688 7.965415-3.791349 16.738219-3.042289 25.14161 0.868787 9.773598 3.040243 19.426445 4.916986 29.082362-9.562796 5.555529-18.781762 11.597129-27.129894 18.448164-13.775748 11.311627-24.702612 24.89397-30.930453 40.378639-3.464915 8.613168-5.502317 17.609053-6.435573 26.668383-0.529049 5.135974-0.709151 10.292414-0.61296 15.441691 4.739954 2.417049 9.594519 4.665253 14.532995 6.771217 35.746132 15.230889 75.369571 23.460318 114.608248 28.953426 93.6581 13.102413 190.532451 11.378142 284.695041 3.308349 44.804439-3.837398 88.938612-10.159384 133.162836-17.249873 44.663222-7.160073 94.242408-13.325493 128.535445-41.216727 15.711843-12.771885 1.89107-36.054147-8.592702-49.425689-12.715603-16.225543-30.80868-29.504988-50.741661-38.935778-4.140297-1.958608-8.396227-3.750417-12.761652-5.330402-7.099698-2.569522-3.777023-8.221242-3.469008-14.176884 0.664126-12.761652 1.329275-25.51921 1.995447-38.279838-4.431939-4.535293-8.862855-9.073656-13.290701-13.608949 2.726088-4.879124 5.119601-9.905604 6.947226-15.084557 3.2623-9.241478 4.711302-19.152199 2.198062-28.662807-3.810792-14.436804-16.387225-25.143657-30.451546-33.004695-8.026814-4.483104-16.60212-8.212032-25.305339-11.629875-8.908904-3.495614-13.908778-9.249665-21.88545-12.903891-7.547907-3.459798-10.04989 1.723248-10.413164-7.77815-0.196475-5.190209 0.330528-10.373255 1.546216-15.46011 2.224668-9.343809 6.689353-18.114566 10.222829-27.118638 6.01704-15.331173 6.834662-30.185486 5.087878-46.162366-4.730745-43.35339-17.140379-95.789647-43.357484-133.806495-20.500916-29.728068-144.706753-22.534226-102.493326-76.261894 6.642281-8.457626 6.031367 0.782829 7.640004 5.638417 1.978051 5.967922 5.931083 12.287861 13.075807 14.68956 14.775518 4.963035 7.175423-7.216355 5.618974-13.995759-1.851161-8.055466-1.599428-16.303314-0.154519-24.384363 2.52552-14.102183 8.449439-27.601638 10.531867-41.772382 1.133823-7.754614 2.883677-16.724917-4.65809-21.87317-10.402931-7.103792-7.338129-9.334599-8.098445-20.018939-0.837064-11.863189-6.597255-22.441105-16.07614-31.070646-5.617951-5.117554-12.107759-9.493212-18.777669-13.558807-6.971785-4.247744-4.355191-12.21009-8.719592-18.828834-3.414773-5.17179-8.414647-9.387811-12.028964-14.44192-5.054109-7.076162-3.62762-14.688537-3.62762-22.677489-4.15053-10.160407-8.300037-20.320814-12.45466-30.481222-1.664919-4.066619-3.321652-8.129144-4.986571-12.19167C491.289818 68.24429 491.335866 70.083172 482.739071 70.083172"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-muyu2" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M752.345462 486.736617c94.731548 43.026956 196.888206 23.163559 196.888206 265.181615 0 221.62254-58.57814 205.523887-173.446307 205.523887-114.852818 0-267.192412 0-346.879312 0-90.112344 0-122.477472-93.870947-110.154819-178.99365 12.401448-85.700871 103.078657-108.22384 180.462095-55.387471 58.06137 39.639812 64.105017 55.896054 114.837468 52.083216 65.545832-4.912893 96.109941-56.397475 96.109941-119.358435 0-62.954821-18.758226-155.763576-100.790544-155.763576-72.640414 0-86.715991 69.578682-182.812629 69.578682-107.806331 0-117.279077-261.859963 2.348488-261.859963C533.616832 307.739896 562.489416 400.548652 752.345462 486.736617z"  ></path>' +
+    '' +
+    '<path d="M460.63668 75.012438c-42.236963-21.956058-99.346659 4.146437-127.492696 58.276265-25.542746 49.182143-17.129122 103.032608 16.011672 129.334647-48.728818 93.41353-258.667248 496.393557-275.296997 536.476461-18.84316 45.423539 39.065737 91.609441 78.652338-2.114151C188.066795 712.86682 339.894735 365.31622 378.1889 277.525758c38.907125 7.02602 83.97046-18.485003 108.005876-64.641229C514.280438 158.692279 502.89411 96.941889 460.63668 75.012438z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-xiaoxizhongxin" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M47.793 226.897v394.758c0 76.758 62.138 138.896 138.896 138.896h208.346l7.311 175.449 204.69-175.449h233.931c76.758 0 138.896-62.138 138.896-138.896v-394.758c0-76.758-62.138-138.896-138.896-138.896h-654.274c-76.758 0-138.896 62.138-138.896 138.896zM647.241 446.207c0-36.553 29.241-65.793 65.793-65.793s65.793 29.241 65.793 65.793c0 36.553-29.241 65.793-65.793 65.793-36.553 0-65.793-29.241-65.793-65.793zM446.207 446.207c0-36.553 29.241-65.793 65.793-65.793s65.793 29.241 65.793 65.793c0 36.553-29.241 65.793-65.793 65.793-36.553 0-65.793-29.241-65.793-65.793zM248.829 446.207c0-36.553 29.241-65.793 65.793-65.793s65.793 29.241 65.793 65.793c0 36.553-29.241 65.793-65.793 65.793-36.553 0-65.793-29.241-65.793-65.793z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-shouqi" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M832.501 928.498l0-832c0-8.837-7.163-16-16-16l-32.004 0c-8.835 0-15.998 7.163-15.998 16l0 832c0 8.837 7.163 16 15.998 16l32.004 0C825.337 944.498 832.501 937.335 832.501 928.498z"  ></path>' +
+    '' +
+    '<path d="M544.501 928.498l0-832c0-8.837-7.163-16-16-16l-32.004 0c-8.835 0-15.998 7.163-15.998 16l0 832c0 8.837 7.163 16 15.998 16l32.004 0C537.337 944.498 544.501 937.335 544.501 928.498z"  ></path>' +
+    '' +
+    '<path d="M255.501 928.498l0-832c0-8.837-7.163-16-16-16l-32.004 0c-8.835 0-15.998 7.163-15.998 16l0 832c0 8.837 7.163 16 15.998 16l32.004 0C248.337 944.498 255.501 937.335 255.501 928.498z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-mima1" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M847.36 1024l-675.84 0c-58.368 0-105.984-44.544-105.984-99.84L65.536 500.224c0-55.296 47.104-99.84 105.984-99.84l26.112 0L197.632 301.568C197.632 130.048 337.408 0 509.44 0s311.808 130.048 311.808 301.568l0 99.328 26.112 0c58.368 0 105.984 44.544 105.984 99.84l0 423.936C953.344 979.456 905.728 1024 847.36 1024zM464.896 709.12l0 111.104c0 23.04 19.968 41.984 44.544 41.984s44.544-18.944 44.544-41.984l0-111.104c26.624-14.336 44.544-41.472 44.544-72.704 0-46.592-39.936-84.48-89.088-84.48-49.152 0-89.088 37.888-89.088 84.48C420.352 667.648 438.272 694.784 464.896 709.12zM732.16 298.496c0-116.224-99.84-210.944-222.72-210.944S286.72 182.272 286.72 298.496l0 101.888 445.44 0L732.16 298.496z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-xiangshangjiantou" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M966.4 668.8l-435.2-432c-9.6-9.6-25.6-9.6-35.2 0l-441.6 432c-9.6 9.6-9.6 25.6 0 35.2 9.6 9.6 25.6 9.6 35.2 0l425.6-416 416 416c9.6 9.6 25.6 9.6 35.2 0S976 678.4 966.4 668.8z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-xiangxiajiantou" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M966.4 323.2c-9.6-9.6-25.6-9.6-35.2 0l-416 416-425.6-416c-9.6-9.6-25.6-9.6-35.2 0-9.6 9.6-9.6 25.6 0 35.2l441.6 432c9.6 9.6 25.6 9.6 35.2 0l435.2-432C976 345.6 976 332.8 966.4 323.2z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-xiangyoujiantou" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M761.6 489.6l-432-435.2c-9.6-9.6-25.6-9.6-35.2 0-9.6 9.6-9.6 25.6 0 35.2l416 416-416 425.6c-9.6 9.6-9.6 25.6 0 35.2s25.6 9.6 35.2 0l432-441.6C771.2 515.2 771.2 499.2 761.6 489.6z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-xiangzuojiantou" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M729.6 931.2l-416-425.6 416-416c9.6-9.6 9.6-25.6 0-35.2-9.6-9.6-25.6-9.6-35.2 0l-432 435.2c-9.6 9.6-9.6 25.6 0 35.2l432 441.6c9.6 9.6 25.6 9.6 35.2 0C739.2 956.8 739.2 940.8 729.6 931.2z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-zhankai1" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M928 191.997 96 191.997c-8.837 0-16 7.163-16 16l0 32.004c0 8.835 7.163 15.998 16 15.998l832 0c8.837 0 16-7.163 16-15.998l0-32.004C944 199.161 936.837 191.997 928 191.997z"  ></path>' +
+    '' +
+    '<path d="M928 479.997 96 479.997c-8.837 0-16 7.163-16 16l0 32.004c0 8.835 7.163 15.998 16 15.998l832 0c8.837 0 16-7.163 16-15.998l0-32.004C944 487.161 936.837 479.997 928 479.997z"  ></path>' +
+    '' +
+    '<path d="M928 768.997 96 768.997c-8.837 0-16 7.163-16 16l0 32.004c0 8.835 7.163 15.998 16 15.998l832 0c8.837 0 16-7.163 16-15.998l0-32.004C944 776.161 936.837 768.997 928 768.997z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-location" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M512.705881 990.405297l-0.704522 0c-16.619732 0-32.696832-6.894326-44.108494-18.916175-9.012889-9.441599-90.88558-95.91477-172.292186-205.435315-109.919674-147.879338-165.653287-265.773605-165.653287-350.407424 0-210.665569 171.388399-382.054567 382.053967-382.054567 210.661571 0 382.047971 171.388399 382.047971 382.053568 0 51.208681-19.694647 113.913567-58.537112 186.373239-37.454606 69.86743-93.787212 151.036197-167.436078 241.249833l-0.611585 0.725508-109.622476 125.579657C546.225155 982.828434 529.7873 990.405297 512.705881 990.405297zM512.001559 91.09483c-178.957667 0-324.551154 145.593488-324.551154 324.551554 0 70.992267 53.356624 180.299357 154.300384 316.103882 80.718073 108.593174 164.275621 196.407236 167.793436 200.091738 0.667547 0.704522 1.520969 1.060281 2.457334 1.060281l0.704522 0c0.254827 0 1.075271-0.298797 1.853743-1.188194l109.274712-125.180727c71.169547-87.209672 125.334623-165.156624 160.996444-231.682319 34.315734-64.014998 51.715737-117.578882 51.715737-159.205659C836.546517 236.687718 690.956627 91.09483 512.001559 91.09483zM512.001559 594.489728c-98.614939 0-178.843344-80.228405-178.843344-178.843344 0-98.614339 80.228405-178.843344 178.843344-178.843344s178.843344 80.228805 178.843344 178.843344C690.844703 514.261323 610.616298 594.489728 512.001559 594.489728zM512.001559 294.306452c-66.907037 0-121.340531 54.432495-121.340531 121.339932 0 66.907037 54.433494 121.340331 121.340531 121.340331 66.907437 0 121.340331-54.433494 121.340331-121.340331C633.34189 348.738947 578.908996 294.306452 512.001559 294.306452z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-suoxiaotuichuquanpingshouhui" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M410.112 513.664 97.664 513.664c-17.664 0-32 14.336-32 32s14.336 32 32 32l242.752 0-267.456 267.456c-12.032 12.032-12.032 31.36 0 43.392 11.968 11.968 31.36 11.968 43.328 0l269.376-269.376 0 246.592c0 17.664 14.336 32 32 32s32-14.336 32-32l0-320C449.664 521.6 435.84 513.664 410.112 513.664zM553.216 449.664l312.512 0c17.664 0 32-14.336 32-32s-14.336-32-32-32L622.912 385.664l267.456-267.456c12.032-12.032 12.032-31.36 0-43.392-11.968-11.968-31.36-11.968-43.328 0L577.664 344.256 577.664 97.664c0-17.664-14.336-32-32-32s-32 14.336-32 32l0 320C513.664 438.144 529.664 449.664 553.216 449.664z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-xitong1" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M512.227677 688.065567C415.489473 688.065567 336.786682 609.490177 336.786682 512.908141 336.786682 416.307611 415.489473 337.71681 512.227677 337.71681 559.014545 337.71681 603.050998 355.956681 636.225516 389.074691 669.411335 422.204001 687.677919 466.183945 687.662508 512.908141 687.662508 609.490177 608.9628 688.065567 512.227677 688.065567M923.417445 434.818723 923.193467 434.777626 840.699479 416.481246 838.707302 410.106075C833.320515 392.855613 826.196352 375.667825 816.931035 357.561519L814.013149 351.858284 858.411255 277.88062C871.983535 256.195793 877.746361 226.369653 860.031503 208.622944L818.26977 166.835526C807.799284 156.344491 794.284539 154.141693 784.792161 154.141693 771.768526 154.141693 757.853085 158.410642 747.568563 165.559464L747.380545 165.688919 675.186489 211.731932 669.287016 208.668152C652.216354 199.807641 634.650473 192.435868 617.075345 186.756264L610.793671 184.7271 592.315436 101.338225 592.27434 101.112192C588.017719 77.485532 567.338741 51.986905 541.352087 51.986905L482.331672 51.986905C457.270728 51.986905 440.27404 77.150592 434.547174 102.091327L414.02231 184.344898 407.894749 186.297005C389.004517 192.320797 370.295113 200.192925 352.286412 209.696603L346.364335 212.822029 272.41133 165.690974 272.222284 165.559464C261.936734 158.410642 248.025403 154.141693 235.009987 154.141693 225.519664 154.141693 212.003891 156.345519 201.513885 166.84169L159.786056 208.591095C142.066061 226.325473 147.830941 256.156751 161.406304 277.854934L207.879808 355.353583 205.074939 361.006474C196.475394 378.339129 189.888573 394.407025 184.940496 410.129706L182.942155 416.484328 100.492346 434.777626 100.26734 434.818723C76.669449 439.079453 51.199589 459.759458 51.199589 485.739948L51.199589 544.796323C51.199589 569.869597 76.350947 586.879641 101.276271 592.614726L184.369248 613.407747 186.348068 619.467498C191.208815 634.346664 197.35487 649.230966 205.140694 664.970085L207.935289 670.61784 161.401168 748.176079C147.830941 769.841384 142.070171 799.646977 159.781946 817.394712L201.5519 859.157473C212.01622 869.641315 225.531993 871.841032 235.027453 871.841032 248.048006 871.841032 261.968585 867.583384 272.26338 860.452028L272.44318 860.32771 346.503038 813.081583 352.428197 816.205982C370.672177 825.82987 389.48638 833.738984 408.348871 839.718597L414.489788 841.66454 434.98794 923.723927C440.714805 948.663635 457.710465 973.827322 482.773465 973.827322L541.797989 973.827322C567.791835 973.827322 588.452319 948.347188 592.688392 924.742105L592.729488 924.510934 611.232381 840.940205 617.515084 838.910013C634.873425 833.297192 652.232793 826.013778 669.111327 817.264229L675.007717 814.206612 747.37438 860.328738 747.561371 860.456138C757.843838 867.593657 771.752087 871.853361 784.764421 871.853361 794.260908 871.853361 807.783873 869.650562 818.279016 859.149254L860.027394 817.402931C877.751498 799.645949 871.9897 769.841384 858.415364 748.178134L813.999792 674.094645 816.887884 668.406822C825.103172 652.226937 831.983835 635.746016 837.340828 619.421265L839.324785 613.37076 922.409543 592.614726C947.334867 586.880668 972.48417 569.870624 972.48417 544.796323L972.48417 485.739948C972.48417 459.759458 947.015338 439.079453 923.417445 434.818723"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-ai-edit" viewBox="0 0 1025 1024">' +
+    '' +
+    '<path d="M201.675742 124.830489c-54.615298 0-99.270649 44.376353-99.270649 99.269226l0 598.22598c0 54.613875 44.655351 98.991651 99.270649 98.991651l598.503555 0c54.613875 0 98.991651-44.377777 98.991651-98.991651L899.170948 429.194622l102.699764-99.269226 0 528.803855c0 91.312087-77.377841 165.270777-168.691351 165.270777L165.270763 1024.000028C73.96437 1024.000028-1.4e-05 950.041338-1.4e-05 858.729251L-1.4e-05 197.932257c0-91.306393 73.964384-175.508299 165.270777-175.508299l528.805279 0-98.991651 102.412225L201.675742 124.836183 201.675742 124.830489zM567.776741 610.96899l-221.870378 62.859976 63.432207-220.452612L567.776741 610.96899 567.776741 610.96899zM589.974171 588.782948 431.241343 431.473581l348.741909-346.461527L938.71608 242.310034 589.974171 588.782948 589.974171 588.782948zM1010.400082 171.198262l-47.507964 47.224696L804.166408 60.830322l47.50227-47.224696c17.642358-17.349126 45.227582-18.210319 61.447904-1.985726l99.269226 98.41942C1028.604707 126.248255 1027.743514 153.849137 1010.400082 171.198262L1010.400082 171.198262zM1010.400082 171.198262"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-sanjiao" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M290.30634 78.167291 941.309184 518.375198 290.30634 958.585151Z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-error-circle" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M510.976182 956.884416c-118.997208 0-230.871181-46.356794-315.01458-130.48689C111.819227 742.249011 65.474712 630.375038 65.474712 511.376807c0-118.997208 46.344514-230.871181 130.48689-315.013557 84.143399-84.143399 196.017372-130.48689 315.01458-130.48689s230.871181 46.344514 315.01458 130.48689c84.143399 84.142375 130.48689 196.016349 130.48689 315.013557 0 118.998231-46.343491 230.872205-130.48689 315.02072C741.847363 910.527622 629.97339 956.884416 510.976182 956.884416zM510.976182 116.973108c-105.349373 0-204.400297 41.023322-278.887778 115.516944-74.499761 74.493621-115.516944 173.537382-115.516944 278.886755 0 105.350396 41.017182 204.394157 115.516944 278.893918 74.487481 74.474179 173.537382 115.516944 278.887778 115.516944S715.376479 864.744903 789.862937 790.270724c74.499761-74.499761 115.516944-173.543521 115.516944-278.893918 0-105.349373-41.017182-204.393133-115.516944-278.886755C715.376479 157.99643 616.325555 116.973108 510.976182 116.973108z"  ></path>' +
+    '' +
+    '<path d="M362.662275 683.691337c-6.53688 0-13.072737-2.494821-18.063401-7.484462-9.979282-9.979282-9.979282-26.15366 0-36.126802l296.602232-296.608372c9.980305-9.979282 26.14752-9.979282 36.126802 0 9.980305 9.974166 9.980305 26.15366 0 36.126802L380.726699 676.206876C375.737058 681.19754 369.199155 683.691337 362.662275 683.691337z"  ></path>' +
+    '' +
+    '<path d="M659.276786 683.691337c-6.53688 0-13.072737-2.494821-18.063401-7.484462L344.598874 379.599528c-9.979282-9.974166-9.979282-26.15366 0-36.126802 9.980305-9.979282 26.14752-9.979282 36.127825 0L677.340187 640.080074c9.980305 9.973142 9.980305 26.14752 0 36.126802C672.350546 681.19754 665.812643 683.691337 659.276786 683.691337z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-shouqi1" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M509.672727 128l418.909091 418.909091c18.618182 18.618182 46.545455 18.618182 65.163636 0 18.618182-18.618182 18.618182-46.545455 0-65.163636L512 0 30.254545 481.745455c-18.618182 18.618182-18.618182 46.545455 0 65.163636 18.618182 18.618182 46.545455 18.618182 65.163636 0L509.672727 128 509.672727 128zM512 591.127273l418.909091 418.909091c18.618182 18.618182 46.545455 18.618182 65.163636 0 18.618182-18.618182 18.618182-46.545455 0-65.163636L512 463.127273 30.254545 944.872727c-18.618182 18.618182-18.618182 46.545455 0 65.163636 18.618182 18.618182 46.545455 18.618182 65.163636 0L512 591.127273 512 591.127273zM512 591.127273"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-jian" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M797.465079 379.937219l-91.105974 0 0-139.415236c0-62.315254-50.51551-112.831788-112.831788-112.831788L242.054383 127.690194c-62.315254 0-112.831788 50.516534-112.831788 112.831788l0 351.472933c0 62.315254 50.516534 112.830765 112.831788 112.830765l142.984528 0 0 87.538729c0 55.352679 44.871977 100.223632 100.225679 100.223632l312.200488 0c55.353702 0 100.224656-44.871977 100.224656-100.223632L897.689734 480.162898C897.689734 424.810219 852.818781 379.937219 797.465079 379.937219zM242.054383 641.009236c-27.027563 0-49.015344-21.98778-49.015344-49.01432L193.03904 240.521982c0-27.027563 21.98778-49.016367 49.015344-49.016367l351.472933 0c27.027563 0 49.015344 21.988804 49.015344 49.016367l0 139.415236L485.264591 379.937219c-55.353702 0-100.225679 44.871977-100.225679 100.224656l0 160.847361L242.054383 641.009236zM642.54266 443.753663l0 148.241252c0 27.02654-21.98778 49.01432-49.015344 49.01432L448.854333 641.009236 448.854333 480.162898c0-20.076244 16.33299-36.409235 36.410258-36.409235L642.54266 443.753663zM833.874313 792.364409c0 20.075221-16.33299 36.408211-36.409235 36.408211l-312.200488 0c-20.076244 0-36.410258-16.33299-36.410258-36.408211L448.854333 704.82568l144.67196 0c62.315254 0 112.831788-50.51551 112.831788-112.830765L706.358081 443.753663l91.105974 0c20.076244 0 36.409235 16.33299 36.409235 36.409235L833.87329 792.364409z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-daiban1" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M510.854409 65.089437c-245.955738 0-445.337741 199.38405-445.337741 445.337741 0 245.950621 199.383026 445.338764 445.337741 445.338764 245.950621 0 445.336718-199.389166 445.336718-445.338764C956.191126 264.472464 756.804007 65.089437 510.854409 65.089437L510.854409 65.089437zM494.980883 168.149675c1.803066-0.575098 4.077875-0.447185 5.087878-2.628874l20.213367 0c8.154727 3.798513 16.950044 6.039553 24.12342 12.125155 16.08228 13.636578 23.240307 35.431977 17.433044 55.107085-6.284123 21.289885-23.12365 35.681664-44.682665 38.178531-27.826765 3.227508-52.744271-14.759145-58.367339-42.140773C453.438745 202.775286 469.248825 176.337147 494.980883 168.149675L494.980883 168.149675zM273.433044 263.131933c52.593845 35.58752 102.631472 74.637907 152.742776 113.570615 38.785352 30.131251 77.472466 60.394509 116.02962 90.816378 17.102516 13.492292 24.727171 31.537274 20.465101 52.924373-4.349051 21.864984-18.165732 36.376489-40.156582 41.368176s-40.60479-2.220574-54.295604-19.809161c-60.335157-77.501118-121.482819-154.393369-179.11747-233.964636-10.769274-14.876826-21.442358-29.855982-30.728862-45.741787-1.351787-2.313695-2.819209-4.579295-3.344165-8.752338C262.522554 255.588119 267.984962 259.442914 273.433044 263.131933L273.433044 263.131933zM855.757716 523.899004c-1.092891 1.099031-0.552585 2.49789-0.695848 3.77293 0.059352 1.030469-0.214894 2.133593 0.695848 2.967588l0 8.083096c-1.62808 10.578939-1.603521 21.309328-3.465938 31.899524-8.766664 49.897434-27.77867 95.589079-56.559157 137.111774-29.576619 42.674938-66.877153 77.264735-111.995747 103.092983-38.788421 22.204721-80.247672 36.951587-124.666324 42.856064-7.483438 0.9967-15.124466 0.436952-22.61916 1.6465l-5.389754 0c-0.831948-0.907673-1.939165-0.636496-2.968611-0.695848-1.274016 0.138146-2.667759-0.398066-3.76679 0.695848l-26.943652 0c-1.098008-1.092891-2.49789-0.552585-3.771907-0.695848-1.030469 0.059352-2.137687-0.211824-2.968611 0.695848l-8.082072 0c-10.341532-1.721201-20.862143-1.502213-31.234375-3.367701-61.949934-11.144828-116.930129-36.886095-164.916027-77.646428-43.073005-36.595476-75.144444-81.157391-96.693226-133.308145-11.027148-26.684756-18.443048-54.394864-22.195511-83.031065-0.835018-6.371104-0.329505-12.888542-1.568728-19.253506l0-8.083096c0.903579-0.831948 0.630357-1.938142 0.694825-2.972705-0.141216-1.27504 0.393973-2.668783-0.694825-3.767813l0-26.943652c1.282203-1.485841 0.447185-3.270487 0.694825-4.90266-0.086981-1.093914 0.282433-2.284019-0.694825-3.184529l0-5.389754c3.046383-7.051603 2.488681-14.716166 3.557012-22.078855 4.324492-29.887704 12.464893-58.648748 24.313755-86.393649 6.070252-14.226003 22.545482-21.776979 37.352723-17.07898 20.971637 6.649444 30.943756 26.501584 23.172769 46.943149-6.060019 15.933901-11.513218 32.017204-14.953573 48.733934-10.021238 48.696072-7.80578 96.703459 8.048303 143.959739 13.626345 40.635489 35.418674 76.30999 65.325821 106.924241 26.326599 26.941606 57.021691 47.65537 91.793636 62.181201 37.373189 15.615653 76.364225 22.754237 116.827799 21.12718 54.970986-2.216481 104.950284-19.47454 149.816121-51.225685 42.383296-29.994128 73.870428-69.058842 94.492094-116.63644 19.769252-45.608757 26.875091-93.27129 20.537755-142.677537-10.045797-78.311577-47.359634-140.887774-109.732194-188.856275-12.116969-9.321296-25.602098-16.518209-38.378076-24.809035-5.924943-3.844561-10.92584-8.645914-14.526855-14.721283-8.013511-13.525038-5.612834-30.102598 5.919826-41.940205 8.892531-9.133008 24.066115-10.507308 37.445844-3.567245 70.715575 36.7019 123.256208 91.00569 157.13583 163.084309 16.824177 35.787064 26.579355 73.630974 30.228465 113.035426 0.130983 1.381463-0.714268 3.270487 1.424442 3.994987 0 1.798972 0 3.592828 0.005117 5.393847-1.328251 1.647523-0.432859 3.587712-0.700965 5.371334l0 3.712555c0.204661 1.463328-0.509606 3.080152 0.700965 4.387937C855.757716 509.529739 855.757716 516.711302 855.757716 523.899004L855.757716 523.899004zM855.757716 523.899004"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-laba" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M867.2 284.8c-12.8-12.8-32-12.8-44.8 0-12.8 12.8-12.8 32 0 44.8 44.8 44.8 73.6 108.8 73.6 182.4s-28.8 134.4-73.6 182.4c-12.8 12.8-12.8 32 0 44.8 12.8 12.8 32 12.8 44.8 0 57.6-57.6 92.8-137.6 92.8-227.2S924.8 342.4 867.2 284.8z"  ></path>' +
+    '' +
+    '<path d="M774.4 377.6c-12.8-12.8-32-12.8-44.8 0-12.8 12.8-12.8 32 0 44.8 22.4 22.4 38.4 54.4 38.4 89.6s-12.8 67.2-38.4 89.6c-12.8 12.8-12.8 32 0 44.8 12.8 12.8 32 12.8 44.8 0 35.2-35.2 57.6-83.2 57.6-134.4S809.6 409.6 774.4 377.6z"  ></path>' +
+    '' +
+    '<path d="M556.8 144 320 288l0 448 236.8 144c44.8 28.8 83.2 6.4 83.2-44.8L640 192C640 137.6 601.6 118.4 556.8 144z"  ></path>' +
+    '' +
+    '<path d="M64 384l0 256c0 54.4 41.6 96 96 96l96 0L256 288 160 288C105.6 288 64 329.6 64 384z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-shenfenxinxi" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M511.412622 189.218526c108.009969-0.008186 216.000496-0.057305 324.009442 0.063445 12.196787 0.010233 24.520463 0.107447 36.585243 1.689479 58.205657 7.636934 86.941118 39.373753 87.109963 98.095155 0.448208 146.036028 0.487094 292.076148 0.005117 438.107059-0.209778 63.597457-42.36283 107.060341-105.809861 107.24556-228.220818 0.668219-456.44573 0.730641-684.665525-0.048095C105.388259 834.157257 65.313541 793.648658 64.953338 730.62016c-0.826831-145.344273-0.842181-290.707988-0.019443-436.0584 0.400113-70.624501 35.364439-104.786555 106.189508-105.176434C284.554848 188.771341 397.986293 189.223642 511.412622 189.218526L511.412622 189.218526 511.412622 189.218526zM412.932704 685.85256c0-28.884864 1.338485-55.361889-0.339738-81.644485-2.097778-32.804127-27.421536-62.615083-60.006675-65.154929-42.396599-3.300162-85.396949-3.344165-127.827317-0.379647-29.343305 2.049682-51.640124 22.097274-56.759725 50.913577-5.578042 31.350009-3.883447 63.99757-5.364171 96.265484L412.932704 685.85256 412.932704 685.85256 412.932704 685.85256zM364.627535 409.964092c-0.12689-41.85527-32.936133-74.251098-75.43097-74.464969-43.062771-0.218988-76.635401 32.964786-76.558653 75.677587 0.078795 42.444694 34.167171 76.16468 76.578096 75.760474C331.906296 486.532979 364.758518 452.998211 364.627535 409.964092L364.627535 409.964092 364.627535 409.964092zM660.567687 588.409251c39.408545 0 78.797647 0.213871 118.201076-0.086981 22.700001-0.165776 33.475416-8.774851 34.317597-26.101471 0.915859-18.898419-9.17394-30.024827-32.497135-30.239721-79.468936-0.74906-158.957315-0.759293-238.416018 0.092098-23.089881 0.249687-33.076326 11.637038-32.205493 30.648021 0.798179 17.516956 11.081383 25.483394 34.44858 25.624611C583.128991 588.585259 621.850897 588.409251 660.567687 588.409251L660.567687 588.409251 660.567687 588.409251zM660.948357 690.715311l0 0.146333c39.350217 0 78.695317 0.271176 118.045533-0.102331 22.606881-0.218988 33.830503-9.369392 34.112935-26.243711 0.273223-16.708544-11.336186-28.67611-32.341592-28.836769-80.034824-0.618077-160.082952-0.394996-240.11573 0.24764-7.402597 0.063445-17.769712 3.294023-21.419845 8.673543-5.085832 7.490601-9.831926 21.307282-6.220678 27.15343 5.39794 8.721639 17.96414 17.618263 27.90863 18.124799C580.840878 691.893136 620.925828 690.715311 660.948357 690.715311L660.948357 690.715311 660.948357 690.715311zM703.855586 487.087611c25.041326 0 50.082652 0.291642 75.117838-0.086981 21.142529-0.326435 34.391275-10.697643 33.996279-26.701129-0.515746-20.845771-16.353456-25.800619-32.326243-26.072819-52.091402-0.904603-104.21248-0.904603-156.299789 0.024559-20.111037 0.360204-33.081443 12.873192-31.023574 27.455305 2.657526 18.766412 15.686261 25.458835 33.383318 25.405623C652.420123 487.034399 678.138878 487.092727 703.855586 487.087611L703.855586 487.087611 703.855586 487.087611zM703.855586 487.087611"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-zhankai" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M203.566 504.931l326.149 289.4 288.198-288.199 41.441 41.441-327.236 327.237-367.474-326.035z"  ></path>' +
+    '' +
+    '<path d="M203.567 149.191l326.149 289.4 288.198-288.199 41.441 41.442-327.235 327.236-367.474-326.034z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-icon-yxj-record" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M773.632 419.84 254.464 419.84c-12.8 0-23.552-10.24-23.552-23.04s10.752-23.04 23.552-23.04l519.168 0c12.8 0 23.552 10.24 23.552 23.04S786.432 419.84 773.632 419.84z"  ></path>' +
+    '' +
+    '<path d="M622.592 599.04 254.464 599.04c-12.8 0-23.552-12.8-23.552-25.6s10.752-25.6 23.552-25.6l368.128 0c12.8 0 23.552 12.8 23.552 25.6S635.392 599.04 622.592 599.04z"  ></path>' +
+    '' +
+    '<path d="M688.64 778.24 254.464 778.24c-12.8 0-23.552-12.8-23.552-25.6s10.752-25.6 23.552-25.6l434.176 0c12.8 0 23.552 12.8 23.552 25.6S701.44 778.24 688.64 778.24z"  ></path>' +
+    '' +
+    '<path d="M660.48 235.52 363.52 235.52c-50.176 0-89.6-38.4-89.6-87.04 0-41.472 28.672-74.752 68.608-83.968C352.256 27.136 387.072 0 429.568 0l164.864 0c42.496 0 77.312 26.624 87.04 64.512 39.936 8.704 68.608 43.008 68.608 84.48C750.08 197.632 710.656 235.52 660.48 235.52zM429.568 46.08c-24.064 0-42.496 16.896-42.496 39.424 0 12.8-10.752 23.552-23.552 23.552-24.064 0-42.496 15.36-42.496 37.888S339.456 184.32 363.52 184.32l296.96 0c24.064 0 42.496-15.36 42.496-37.888s-18.432-38.4-42.496-38.4c-12.8 0-23.552-10.24-23.552-23.04 0-22.528-18.432-38.912-42.496-38.912L429.568 46.08z"  ></path>' +
+    '' +
+    '<path d="M842.24 1022.976l-660.48 0c-65.024 0-117.76-52.736-117.76-117.76l0-660.48c0-65.024 52.736-117.76 117.76-117.76l115.712 0c12.8 0 23.552 10.752 23.552 23.552s-10.752 23.552-23.552 23.552L181.76 174.08c-38.912 0-70.656 31.744-70.656 70.656l0 660.48c0 38.912 31.744 70.656 70.656 70.656l660.48 0c38.912 0 70.656-31.744 70.656-70.656l0-660.48c0-38.912-31.744-70.656-70.656-70.656l-115.712 0c-12.8 0-23.552-10.752-23.552-23.552s10.752-23.552 23.552-23.552l115.712 0c65.024 0 117.76 52.736 117.76 117.76l0 660.48C960 969.728 907.264 1022.976 842.24 1022.976z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-huiyuan" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M573.446144 434.374656c-26.929152 11.085824-51.612672 25.868288-74.054656 44.346368-22.441984 18.480128-41.842688 39.601152-58.211328 63.361024-16.365568 23.7568-29.039616 49.763328-38.014976 78.012416-8.976384 28.24704-13.464576 57.94816-13.464576 89.09824 0 27.456512 3.565568 53.721088 10.692608 78.799872 7.124992 25.080832 17.027072 48.712704 29.70112 70.885376L408.70912 858.877952c-15.309824 0-33.127424-0.524288-53.45792-1.58208-20.325376-1.056768-41.312256-2.510848-62.96064-4.359168-21.646336-1.844224-43.165696-3.959808-64.546816-6.330368-21.387264-2.376704-40.788992-4.888576-58.211328-7.5264-17.427456-2.6368-32.210944-5.279744-44.352512-7.921664-12.145664-2.633728-19.801088-5.276672-22.965248-7.916544-5.809152-4.226048-10.162176-17.292288-13.070336-39.200768-2.900992-21.914624-1.716224-50.033664 3.56352-84.34688 2.108416-13.201408 6.470656-24.030208 13.065216-32.474112 6.603776-8.449024 14.654464-15.706112 24.160256-21.776384 9.500672-6.075392 20.064256-10.958848 31.681536-14.654464 11.613184-3.69664 23.493632-7.26016 35.64032-10.694656 12.140544-3.433472 23.888896-7.129088 35.236864-11.08992 11.355136-3.958784 21.781504-8.841216 31.287296-14.649344 11.085824-6.866944 19.668992-13.597696 25.739264-20.196352 6.070272-6.59968 10.433536-13.06624 13.069312-19.405824 2.640896-6.330368 3.95776-12.93312 3.95776-19.798016 0-6.86592-0.26112-14.517248-0.7936-22.966272-1.055744-12.143616-5.276672-21.777408-12.669952-28.905472-7.39328-7.126016-15.572992-14.393344-24.551424-21.78048-4.224-3.69664-8.04864-8.844288-11.48416-15.449088-3.4304-6.59456-6.465536-13.32736-9.106432-20.192256-2.640896-7.921664-5.276672-16.099328-7.917568-24.554496-3.697664-1.051648-7.39328-2.902016-11.08992-5.542912-3.168256-2.635776-6.59968-6.332416-10.295296-11.085824-3.697664-4.753408-6.8608-11.618304-9.501696-20.595712-2.640896-8.973312-3.70176-17.156096-3.16928-24.546304 0.528384-7.39328 2.108416-13.996032 4.749312-19.801088 2.116608-5.809152 5.542912-11.35616 10.299392-16.631808 0-20.064256 1.051648-40.127488 3.16416-60.19072 2.112512-16.899072 5.809152-35.111936 11.090944-54.647808 5.279744-19.539968 13.463552-36.963328 24.5504-52.274176 10.561536-14.78656 21.912576-26.795008 34.055168-36.03456 12.145664-9.239552 24.81664-16.498688 38.018048-21.77536 13.198336-5.285888 26.262528-8.845312 39.199744-10.696704C384.029696 65.434624 396.567552 64.512 408.70912 64.512c15.315968 0 30.492672 1.716224 45.5424 5.147648 15.04768 3.434496 29.17376 8.050688 42.372096 13.85984 13.202432 5.808128 24.943616 12.408832 35.245056 19.801088 10.2912 7.392256 18.347008 14.782464 24.15104 22.17472 13.729792 16.894976 23.759872 35.5072 30.097408 55.832576 6.336512 20.330496 10.8288 39.733248 13.461504 58.215424 2.643968 21.115904 3.961856 42.50112 3.961856 64.149504 3.69664 2.640896 6.598656 6.071296 8.712192 10.295296 2.112512 3.697664 3.82976 8.450048 5.147648 14.255104 1.321984 5.808128 1.455104 12.937216 0.39936 21.385216-1.056768 11.619328-3.3024 20.72576-6.7328 27.32544-3.434496 6.598656-7.259136 11.746304-11.488256 15.44192-4.749312 4.221952-9.764864 7.129088-15.044608 8.712192-1.056768 3.165184-2.112512 6.603776-3.165184 10.2912l-3.96288 11.09504C576.34816 426.186752 575.025152 430.145536 573.446144 434.374656L573.446144 434.374656 573.446144 434.374656zM686.696448 459.711488c34.322432 0 66.660352 6.602752 97.019904 19.800064 30.358528 13.203456 56.763392 31.154176 79.197184 53.856256 22.443008 22.704128 40.264704 49.232896 53.458944 79.592448 13.202432 30.363648 19.801088 62.698496 19.801088 97.022976 0 34.320384-6.593536 66.658304-19.801088 97.017856-13.19936 30.358528-31.015936 56.884224-53.458944 79.5904-22.433792 22.709248-48.837632 40.52992-79.197184 53.46304-30.359552 12.936192-62.698496 19.39968-97.019904 19.39968-34.84672 0-67.45088-6.468608-97.810432-19.39968-30.35648-12.937216-56.76032-30.753792-79.198208-53.46304-22.438912-22.706176-40.259584-49.23392-53.45792-79.5904-13.202432-30.359552-19.801088-62.698496-19.801088-97.017856 0-34.32448 6.59968-66.659328 19.801088-97.022976 13.198336-30.358528 31.019008-56.88832 53.45792-79.592448 22.437888-22.70208 48.841728-40.6528 79.198208-53.856256C619.244544 466.313216 651.848704 459.711488 686.696448 459.711488L686.696448 459.711488 686.696448 459.711488zM832.420864 660.878336c3.173376-10.556416 1.717248-20.192256-4.354048-28.909568-6.071296-8.711168-14.12096-14.913536-24.155136-18.610176-10.03008-3.693568-20.063232-3.958784-30.098432-0.790528-10.029056 3.16928-17.41824 11.353088-22.170624 24.5504-2.640896 8.978432-5.146624 17.292288-7.527424 24.953856-2.373632 7.652352-4.753408 15.702016-7.12704 24.15104-2.373632 8.451072-5.275648 17.554432-8.712192 27.328512-3.4304 9.764864-7.78752 20.985856-13.068288 33.656832-5.277696 13.724672-12.804096 20.196352-22.571008 19.39968-9.767936-0.791552-17.291264-6.463488-22.571008-17.026048-5.809152-10.560512-11.224064-21.909504-16.234496-34.052096-5.018624-12.145664-9.901056-24.032256-14.654464-35.639296-4.75648-11.619328-8.977408-22.182912-12.674048-31.681536-3.692544-9.506816-6.8608-17.164288-9.505792-22.976512-4.219904-8.44288-11.213824-13.19424-20.98176-14.247936-9.767936-1.055744-19.277824 0.396288-28.51328 4.352-9.239552 3.959808-16.894976 10.167296-22.967296 18.614272-6.070272 8.450048-6.996992 17.688576-2.771968 27.718656 3.69664 10.561536 7.916544 22.441984 12.668928 35.64032 4.749312 13.201408 9.773056 26.66496 15.048704 40.392704 5.280768 13.725696 10.292224 27.191296 15.048704 40.392704 4.753408 13.197312 8.973312 24.5504 12.670976 34.052096 7.919616 20.063232 19.934208 35.115008 36.033536 45.144064 16.109568 10.036224 33.000448 15.31392 50.690048 15.839232 17.68448 0.530432 34.582528-3.434496 50.688-11.8784 16.106496-8.448 27.8528-21.12 35.24096-38.014976 5.809152-13.725696 11.752448-28.112896 17.8176-43.164672 6.075392-15.040512 11.884544-29.699072 17.430528-43.9552 5.538816-14.256128 10.691584-27.98592 15.439872-41.18528C825.293824 681.731072 829.252608 670.381056 832.420864 660.878336L832.420864 660.878336 832.420864 660.878336zM832.420864 660.878336"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-renshiguanli" viewBox="0 0 1029 1024">' +
+    '' +
+    '<path d="M838.674288 813.545655c0-2.672805 0.116209-5.461819 0.116209-8.483251l-16.03683 8.483251L838.674288 813.545655z"  ></path>' +
+    '' +
+    '<path d="M701.31535 792.74426l14.409905-84.251463c0.116209-2.440387-1.626925-7.785997-3.137641-9.761549l-61.00968-59.498964c-14.177488-13.712652-19.406889-31.841243-14.061279-48.459117 0.929671-2.905223 2.09176-5.578028 3.602476-8.134624-11.504683-4.880774-23.009365-9.64534-34.049212-14.177488-11.969518-3.25385-24.055245-6.507699-36.024764-9.761549-14.409905-9.761549-28.471184-42.532463-36.140972-58.801711-7.669788-1.162089-15.339577-2.207969-23.009365-3.25385 1.162089-25.101126 16.850293-26.495633 23.009365-45.670103 5.461819-16.966502 0.581045-39.046195 9.180504-54.734399 5.926655-10.923638 19.406889-11.039847 26.147006-20.33656 6.042864-8.483251 10.110176-23.241783 11.969518-33.700585 3.486267-18.942053 6.507699-44.97285-2.556596-63.682485-5.229401-10.807429-8.483251-11.853309-9.877758-24.984917-1.743134-15.920621 4.764566-67.749797 4.996983-79.022062 0.697253-29.052229 0-55.431652-7.088744-83.786628 0 0-8.59946-25.68217-22.079694-33.351959l-26.844259-4.532148L502.017062 37.618732c-66.936335-41.021747-138.637235-12.201936-176.986177 3.25385C269.715441 58.768754 234.736558 136.628727 259.14043 251.791761c4.183521 19.639307-10.807429 28.471184-9.877758 39.278613 2.207969 23.474201 2.556596 79.951733 24.868708 93.780594 2.09176 1.278298 17.896173 5.229401 17.779964 4.183521 2.207969 22.893156 4.415939 45.786312 6.507699 68.56326 5.578028 15.223368 18.942053 16.850293 22.776947 38.348942l-17.08271 4.183521c-7.669788 16.269248-21.731067 48.923953-36.140972 58.801711-11.969518 3.25385-24.055245 6.507699-36.024764 9.761549-42.183836 17.198919-89.016029 37.884106-131.316074 55.547861-38.465151 16.153039-86.459433 23.939036-100.404502 64.031112 0 27.309095-0.581045 89.713282 0.116209 125.389419l418.584511 0 282.620081 0C700.26947 807.037956 700.037052 800.065421 701.31535 792.74426z"  ></path>' +
+    '' +
+    '<path d="M761.743986 547.427241c2.440387-0.697253 6.972535-3.951103 8.367042-6.159072l0.697253-1.394507c-11.272265-4.764566-22.428321-9.412922-33.23575-13.828861-11.504683-3.137641-23.009365-6.275281-34.514048-9.296713-13.712652-9.412922-27.192886-40.67312-34.514048-56.128906-7.321162-1.04588-14.642323-2.09176-21.963485-3.137641 1.162089-24.055245 16.03683-25.333543 21.963485-43.694552 5.113192-16.269248 0.581045-37.303062 8.715669-52.294012 5.694237-10.458802 18.593426-10.458802 24.984917-19.406889 5.810446-8.134624 9.64534-22.195903 11.504683-32.189869 3.370059-18.128591 6.275281-42.997298-2.440387-60.893471-4.996983-10.342593-8.134624-11.272265-9.529131-23.822828-1.626925-15.223368 4.532148-64.844574 4.764566-75.535795 0.581045-27.773931 0-52.991265-6.856326-80.067942 0 0-8.250833-24.520081-21.150022-31.957452L653.088651 33.202793l-15.804412-14.642323c-37.535479-23.009365-81.694867-21.614858-118.533093-11.969518 0.581045 0.348627 1.162089 0.697253 1.626925 0.929671l2.905223 1.859343 11.504683 10.575011 22.776947 3.834894 5.461819 3.137641c23.241783 13.364025 34.862674 43.694552 37.884106 52.642638l0.464836 1.278298 0.348627 1.394507c7.785997 31.260198 8.948086 59.847591 8.134624 93.083341-0.116209 4.764566-0.813462 11.853309-1.859343 24.055245-1.162089 12.782981-4.067312 42.88109-3.25385 50.31846 0.116209 0.813462 0.232418 1.394507 0.232418 1.743134 0.232418 0.464836 0.581045 1.04588 0.929671 1.510716 1.394507 2.440387 3.370059 5.694237 5.578028 10.226384 13.712652 28.471184 9.64534 62.287978 5.461819 85.297343-2.09176 11.272265-7.088744 32.654705-18.012382 47.878073-8.018415 11.039847-18.2448 16.385457-24.520081 19.639307-0.581045 3.486267-0.813462 8.715669-1.04588 12.666772-0.464836 9.877758-1.04588 21.150022-4.764566 32.887123-1.743134 5.34561-3.834894 9.993967-6.159072 13.94507l4.415939 9.296713c0.813462 1.743134 1.626925 3.602476 2.556596 5.578028 3.370059 7.321162 12.89919 27.773931 19.523098 36.605808 9.180504 2.440387 18.2448 4.996983 27.425304 7.437371l2.09176 0.581045 2.09176 0.813462c18.2448 7.437371 37.419271 15.571995 56.593741 23.706619 0.116209 0 0.348627 0 0.464836-0.116209L761.743986 547.427241z"  ></path>' +
+    '' +
+    '<path d="M701.31535 792.74426l14.409905-84.251463c0.116209-2.440387-1.626925-7.785997-3.137641-9.761549l-61.00968-59.498964c-14.177488-13.712652-19.406889-31.841243-14.061279-48.459117 0.929671-2.905223 2.09176-5.578028 3.602476-8.134624-11.504683-4.880774-23.009365-9.64534-34.049212-14.177488-11.969518-3.25385-24.055245-6.507699-36.024764-9.761549-14.409905-9.761549-28.471184-42.532463-36.140972-58.801711-7.669788-1.162089-15.339577-2.207969-23.009365-3.25385 1.162089-25.101126 16.850293-26.495633 23.009365-45.670103 5.461819-16.966502 0.581045-39.046195 9.180504-54.734399 5.926655-10.923638 19.406889-11.039847 26.147006-20.33656 6.042864-8.483251 10.110176-23.241783 11.969518-33.700585 3.486267-18.942053 6.507699-44.97285-2.556596-63.682485-5.229401-10.807429-8.483251-11.853309-9.877758-24.984917-1.743134-15.920621 4.764566-67.749797 4.996983-79.022062 0.697253-29.052229 0-55.431652-7.088744-83.786628 0 0-8.59946-25.68217-22.079694-33.351959l-26.844259-4.532148L502.017062 37.618732c-66.936335-41.021747-138.637235-12.201936-176.986177 3.25385C269.715441 58.768754 234.736558 136.628727 259.14043 251.791761c4.183521 19.639307-10.807429 28.471184-9.877758 39.278613 2.207969 23.474201 2.556596 79.951733 24.868708 93.780594 2.09176 1.278298 17.896173 5.229401 17.779964 4.183521 2.207969 22.893156 4.415939 45.786312 6.507699 68.56326 5.578028 15.223368 18.942053 16.850293 22.776947 38.348942l-17.08271 4.183521c-7.669788 16.269248-21.731067 48.923953-36.140972 58.801711-11.969518 3.25385-24.055245 6.507699-36.024764 9.761549-42.183836 17.198919-89.016029 37.884106-131.316074 55.547861-38.465151 16.153039-86.459433 23.939036-100.404502 64.031112 0 27.309095-0.581045 89.713282 0.116209 125.389419l418.584511 0 282.620081 0C700.26947 807.037956 700.037052 800.065421 701.31535 792.74426z"  ></path>' +
+    '' +
+    '<path d="M838.674288 813.545655c0-2.672805 0.116209-5.461819 0.116209-8.483251l-16.03683 8.483251L838.674288 813.545655z"  ></path>' +
+    '' +
+    '<path d="M1023.214044 614.247367c9.64534-9.180504 6.856326-18.2448-6.159072-20.104142l-84.716299-12.318145c-13.015398-1.859343-28.354975-13.015398-34.165421-24.868708l-37.884106-76.814093c-2.905223-5.810446-6.856326-8.831878-10.575011-8.831878-3.834894 0-7.553579 3.021432-10.575011 8.831878L801.255017 556.956372c-5.810446 11.7371-21.266231 23.009365-34.165421 24.868708L682.373297 594.143224c-13.015398 1.859343-16.03683 10.923638-6.507699 20.104142l61.242098 59.731382c9.296713 9.180504 15.223368 27.192886 13.015398 40.208285L735.713189 798.670914c-1.626925 9.296713 2.09176 14.874741 8.59946 14.874741 2.556596 0 5.34561-0.813462 8.59946-2.556596l75.652004-39.859658c5.810446-3.021432 13.480234-4.532148 21.033814-4.532148 7.553579 0 15.339577 1.626925 21.033814 4.532148l75.652004 39.859658c3.137641 1.743134 6.159072 2.556596 8.59946 2.556596 6.507699 0 10.110176-5.578028 8.59946-14.874741l-14.409905-84.367672c-2.207969-13.015398 3.602476-31.02778 13.015398-40.208285L1023.214044 614.247367z"  ></path>' +
+    '' +
+    '<path d="M1023.214044 614.247367c9.64534-9.180504 6.856326-18.2448-6.159072-20.104142l-84.716299-12.318145c-13.015398-1.859343-28.354975-13.015398-34.165421-24.868708l-37.884106-76.814093c-2.905223-5.810446-6.856326-8.831878-10.575011-8.831878-3.834894 0-7.553579 3.021432-10.575011 8.831878L801.255017 556.956372c-5.810446 11.7371-21.266231 23.009365-34.165421 24.868708L682.373297 594.143224c-13.015398 1.859343-16.03683 10.923638-6.507699 20.104142l61.242098 59.731382c9.296713 9.180504 15.223368 27.192886 13.015398 40.208285L735.713189 798.670914c-1.626925 9.296713 2.09176 14.874741 8.59946 14.874741 2.556596 0 5.34561-0.813462 8.59946-2.556596l75.652004-39.859658c5.810446-3.021432 13.480234-4.532148 21.033814-4.532148 7.553579 0 15.339577 1.626925 21.033814 4.532148l75.652004 39.859658c3.137641 1.743134 6.159072 2.556596 8.59946 2.556596 6.507699 0 10.110176-5.578028 8.59946-14.874741l-14.409905-84.367672c-2.207969-13.015398 3.602476-31.02778 13.015398-40.208285L1023.214044 614.247367z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-xinzenghuiyuan" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M728.683217 891.666944c-112.142535 0-203.121511-90.978976-203.121511-203.121511 0-80.518826 46.827414-150.090985 114.818387-182.930989 2.189334-2.919112 4.257038-6.324742 6.203112-10.095261 3.648889-7.297779 6.93289-14.717187 9.730372-22.136596 2.797482-8.757335 5.716593-18.001188 8.514075-27.853189 5.594964-1.824445 10.946668-4.986816 15.933484-9.608742 4.500297-4.135408 8.635705-9.852001 12.284594-16.906521 3.648889-7.297779 6.081482-17.028151 7.176149-29.191115 1.216296-9.365483 0.973037-17.028151-0.364889-23.474522-1.459556-6.446371-3.284-11.676446-5.473334-15.811854-2.310963-4.621927-5.473334-8.392446-9.365483-11.311557 0-23.717781-1.459556-47.192303-4.257038-70.423566-2.797482-20.312151-7.662668-41.597339-14.230669-63.977194-6.81126-22.379855-17.39304-42.692006-32.110227-61.422972-6.203112-8.149186-14.717187-16.176743-25.663856-24.325929-11.068298-8.149186-23.474522-15.325336-37.583561-21.771707-14.109039-6.324742-29.191115-11.433187-45.124599-15.082076-15.933484-3.770519-32.231857-5.716593-48.4086-5.716593-12.892743 0-26.272004 0.973037-40.137784 3.040741-13.86578 2.067704-27.60993 5.959853-41.35408 11.798076-13.74415 5.838223-27.245041 13.86578-40.502673 23.961041-13.257632 10.21689-25.055707 23.352892-35.880746 39.651265-11.798076 16.784891-20.55541 36.002376-26.515263 57.409193-5.959853 21.406818-9.973631 41.35408-12.284594 60.085046-2.797482 22.014966-3.892149 44.029932-3.40563 66.166528-5.108445 5.838223-8.757335 11.919705-10.946668 18.244447-2.310963 5.838223-3.892149 12.771113-4.743556 20.79867-0.851408 8.149186 0.486519 17.14978 3.892149 27.001782 2.797482 9.852001 6.203112 17.39304 10.095261 22.623114 4.013778 5.230075 7.662668 9.243853 11.068298 12.162965 3.892149 2.919112 7.905927 4.986816 11.798076 6.203112 2.919112 9.852001 5.716593 19.095855 8.514075 27.853189 2.797482 7.541038 5.959853 14.838817 9.365483 22.136596 3.284 7.297779 7.297779 12.892743 11.798076 16.906521 9.608742 8.149186 18.244447 16.055113 26.150374 23.961041 7.905927 7.784297 12.406224 18.366077 13.500891 31.745338 0.608148 9.365483 0.851408 17.636299 0.851408 25.177337 0 7.662668-1.337926 14.717187-4.257038 21.771707-2.797482 6.93289-7.297779 13.987409-13.500891 20.79867-6.203112 7.05452-15.082076 14.230669-27.001782 21.771707-15.082076 9.852001-32.596745 17.39304-52.300748 22.623114-19.582373 5.230075-38.678228 11.189928-56.922675 17.757928-18.244447 6.689631-34.299561 15.568595-48.043711 27.001782C153.253356 736.467514 144.86091 752.887516 142.063428 774.294334c-5.594964 37.705191-6.93289 68.477491-3.770519 92.316902 3.040741 23.717781 7.419408 37.94845 13.014372 42.692006 3.40563 2.919112 11.676446 5.838223 24.447559 8.757335 12.892743 2.797482 28.704597 5.716593 47.192303 8.635705 18.609336 2.919112 39.286376 5.716593 62.03112 8.392446 22.744744 2.554223 45.732747 4.865186 68.720751 6.93289s45.367858 3.648889 67.139565 4.865186c21.528448 1.094667 40.624302 1.702815 56.922675 1.702815 16.176743 0 35.515857-0.608148 57.774082-1.702815 22.136596-1.216296 45.367858-2.797482 69.450529-4.865186 24.2043-2.067704 48.16534-4.500297 72.126381-7.419408 23.839411-2.919112 45.489488-6.203112 64.950232-10.095261 19.339114-3.770519 35.759116-7.662668 48.895118-11.798076 13.257632-4.013778 21.163559-8.149186 23.961041-12.162965 4.013778-6.446371 6.93289-15.690224 9.000594-27.853189 0.243259-1.581185 0.486519-3.284 0.729778-4.986816C795.822782 883.031239 763.347666 891.666944 728.683217 891.666944z"  ></path>' +
+    '' +
+    '<path d="M726.128994 512.547333c-98.520014 0-178.430692 79.789049-178.430692 178.430692 0 98.520014 79.789049 178.430692 178.430692 178.430692S904.681316 789.376411 904.681316 690.856396 824.770638 512.547333 726.128994 512.547333L726.128994 512.547333M825.622045 688.910322l0 5.473334 0 0c-0.851408 11.919705-10.703409 21.406818-22.744744 21.406818l-51.81423 0 0 74.680603-28.339708 0 0 0c-11.919705-0.851408-21.406818-10.703409-21.406818-22.744744l0-51.81423-74.680603 0 0-28.339708 0 0c0.851408-11.919705 10.703409-21.406818 22.744744-21.406818l51.81423 0L701.194916 614.229718l0-22.866374 28.339708 0 0 0.12163c11.919705 0.851408 21.406818 10.703409 21.406818 22.744744l0 51.81423 74.680603 0L825.622045 688.910322 825.622045 688.910322M825.622045 688.910322 825.622045 688.910322z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-fozhu" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M96.416 485.536c-0.4 7.44-0.624 14.928-0.624 22.464 0 8.096 0.288 16.112 0.752 24.096-43.216 19.344-66.512 67.952-52.864 114.624 12.48 41.76 50.72 68.8 92.176 68.8 4.864 0 9.776-0.448 14.704-1.2 7.696 13.472 16.096 26.496 25.2 38.992-25.904 39.536-19.344 93.232 17.536 125.104 18.08 15.68 40.464 23.36 62.72 23.36 22.848 0 45.552-8.176 63.552-24.08 13.664 7.2 27.792 13.632 42.288 19.296-0.416 47.36 34.304 88.912 82.464 95.664 4.48 0.64 9.12 0.96 13.44 0.96 42.848 0 80.256-28.608 92-69.744 15.68-1.36 31.136-3.52 46.272-6.576 17.904 28.24 48.896 44.64 81.088 44.64 13.456 0 27.04-2.72 40-8.64 44.224-20.272 65.536-70.048 51.664-115.344 12.224-9.488 23.92-19.632 35.008-30.4 13.024 6.064 26.816 9.104 40.528 9.104 31.68 0 62.56-15.52 80.976-44 26.288-40.976 17.44-94.272-18.544-124.912 5.184-14.544 9.536-29.472 13.088-44.704 46.848-6.352 83.056-46.464 83.056-95.024 0-0.16 0-0.48 0-0.64 0-0.48 0-0.8 0-1.28-0.288-48.672-36.496-88.528-83.44-94.736-3.616-15.216-8.016-30.144-13.248-44.688 35.888-30.896 44.512-84.128 17.968-124.896-26.448-40.848-78.768-54.736-121.584-34.448-11.136-10.72-22.832-20.816-35.104-30.256 13.712-45.376-7.776-95.008-52.256-115.136-44.192-19.968-95.696-3.616-120.848 36.512-15.056-2.976-30.432-5.072-46.016-6.384-13.104-45.44-58-75.424-105.952-68.528-48.16 7.056-82.624 48.768-82.16 96.16-14.464 5.728-28.56 12.192-42.192 19.44-35.616-31.28-89.648-32.24-126.192-0.224-36.72 32.016-43.152 85.712-17.104 125.248-9.024 12.496-17.376 25.52-25.008 38.992C102.8 296.064 56.864 324.464 43.2 371.2 29.552 417.84 53.088 466.416 96.416 485.536zM144.176 493.2c38.08-3.552 72.064-29.472 83.344-68.4 11.376-38.928-3.152-79.216-33.36-102.672 5.152-8.816 10.672-17.408 16.512-25.744 13.808 7.104 28.976 10.816 44.208 10.816 22.4 0 44.8-7.68 63.04-23.52 30.64-26.72 40.16-68.512 27.312-104.608 9.024-4.624 18.224-8.928 27.664-12.816 16.816 29.28 48.288 48.288 83.104 48.288 4.64 0 9.28-0.32 13.92-0.96 40.272-5.888 70.944-35.952 79.68-73.328 10.208 0.992 20.272 2.496 30.224 4.304-1.888 38.208 19.168 75.44 56.176 92.224 12.96 5.92 26.384 8.64 39.664 8.64 24.8 0 48.704-9.872 66.592-27.184 8.032 6.352 15.792 13.024 23.264 20.016-22.224 31.184-24.512 73.92-2.336 107.968l-0.176 0c18.56 28.32 49.28 43.84 80.64 43.84 6.352 0 12.72-0.88 19.04-2.176 3.312 9.584 6.304 19.328 8.816 29.264-35.664 14.112-60.896 48.96-60.656 89.712 0 0 0 0.16 0 0.32 0 0.32 0 0.48 0 0.8 0 40.624 25.264 75.328 61.008 89.328-2.48 9.92-5.392 19.664-8.656 29.248-37.552-7.488-77.504 8-99.552 42.064-21.936 34.176-19.392 76.944 2.944 108.064-7.424 6.992-15.12 13.696-23.088 20.064-27.584-26.464-69.536-34.944-106.416-18.048-36.864 16.896-57.904 54.256-55.856 92.448-9.936 1.856-19.968 3.408-30.144 4.448-8.832-37.392-39.6-67.408-79.888-73.056-40.176-5.632-78.032 14.48-96.912 47.728-9.456-3.856-18.688-8.096-27.744-12.688 12.672-36.144 2.944-77.904-27.68-104.48-30.736-26.448-73.44-30.048-107.376-12.304-5.872-8.304-11.408-16.832-16.592-25.616 30.128-23.584 44.432-63.952 32.928-102.88-11.408-38.864-45.456-64.96-83.648-68.32-0.224-5.312-0.4-10.64-0.4-16C143.792 503.04 143.984 498.112 144.176 493.2z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-iconfontquanping" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M143.948687 911.614206l304.074118 0c17.14978 0 31.13719-13.987409 31.13719-31.13719s-13.987409-31.13719-31.13719-31.13719L211.818031 849.339827l260.287445-260.287445c11.676446-11.676446 11.676446-30.529041 0-42.205488-11.676446-11.676446-30.529041-11.676446-42.205488 0L167.788098 809.080413 167.788098 569.105119c0-17.14978-13.987409-31.13719-31.13719-31.13719-17.14978 0-31.13719 13.987409-31.13719 31.13719l0 311.371897C105.513719 903.951538 119.01461 911.614206 143.948687 911.614206L143.948687 911.614206z"  ></path>' +
+    '' +
+    '<path d="M879.929683 102.047274l-304.074118 0c-17.14978 0-31.13719 13.987409-31.13719 31.13719 0 17.14978 13.987409 31.13719 31.13719 31.13719L812.181969 164.321653l-260.287445 260.287445c-11.676446 11.676446-11.676446 30.529041 0 42.205488 11.676446 11.676446 30.529041 11.676446 42.205488 0l262.11189-262.233519 0 239.975294c0 17.14978 13.987409 31.13719 31.13719 31.13719 17.14978 0 31.13719-13.987409 31.13719-31.13719l0-311.371897C918.486281 113.237202 902.917686 102.047274 879.929683 102.047274L879.929683 102.047274z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-iconfontshuangjiantou" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M534.689672 843.993282l335.097307-341.136291c14.110423-14.425448 14.110423-37.754291 0-52.184604-14.166373-14.435178-37.189923-14.435178-51.362378 0L506.710872 768.123456 194.876727 450.667522c-14.171239-14.430313-37.076806-14.430313-51.245612 0-14.172455 14.435178-14.172455 37.764021 0 52.189469L478.609224 843.998147c7.734521 7.940078 18.001402 11.121947 28.101647 10.465139 10.0297 0.661673 20.246712-2.523845 27.977584-10.465139l0 0L534.689672 843.993282 534.689672 843.993282 534.689672 843.993282zM506.712088 587.147338c10.034565 0.729787 20.246712-2.520196 27.977584-10.338643l335.097307-341.144805c14.105558-14.425448 14.105558-37.754291 0-52.307451-14.166373-14.424231-37.194788-14.303816-51.366026 0l-311.708865 317.578781-311.834145-317.578781c-14.171239-14.303816-37.076806-14.424231-51.245612 0-14.172455 14.55316-14.172455 37.882004 0 52.307451l334.976892 341.144805C486.33888 584.627141 496.60941 587.872259 506.712088 587.147338L506.712088 587.147338 506.712088 587.147338 506.712088 587.147338z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-temple" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M625.836883 146.817662h-239.376623c41.491948-44.683636 95.750649-82.983896 118.092467-124.475844 0-6.383377 0-15.958442 3.191689-22.341818-15.958442 47.875325 76.600519 92.558961 118.092467 146.817662z m89.367273 22.341819v22.341818c22.341818 12.766753 63.833766 38.30026 73.408831 38.300259 9.575065 0 19.15013-3.191688 28.725195-15.958441-3.191688 6.383377-6.383377 15.958442-12.766753 25.533506s-25.533506 22.341818-35.108572 22.341819H239.642597c-19.15013 0-47.875325-35.108571-44.683636-47.875325 9.575065 12.766753 19.15013 15.958442 28.725195 15.958441 9.575065 0 67.025455-38.30026 73.408831-44.683636v-15.958441h418.111169zM290.70961 303.21039h430.877922v-12.766754h-430.877922v12.766754z m19.15013 79.792207h392.577663v-57.450389H309.85974v57.450389z m459.603117 54.258702c9.575065 6.383377 73.408831 51.067013 95.750649 51.067013 9.575065 0 25.533506-9.575065 35.108572-22.341818-3.191688 19.15013-22.341818 31.916883-22.341818 51.067012 0 3.191688-6.383377 9.575065-9.575065 12.766754H140.70026l6.383376-6.383377c-12.766753-19.15013-28.725195-25.533506-35.108571-47.875325v-9.575064c6.383377 12.766753 22.341818 22.341818 35.108571 22.341818 19.15013 0 86.175584-47.875325 92.558961-51.067013 3.191688-6.383377 3.191688-15.958442 3.191689-28.725195h526.628571v28.725195z m-548.970389 130.85922h609.612467v-12.766753H220.492468v12.766753z m542.587013 25.533507v54.258701H249.217662c0-12.766753 3.191688-31.916883 3.191689-38.300259 0-9.575065-9.575065-9.575065-9.575065-15.958442h520.245195z m79.792207 82.983896v38.30026c3.191688 0 95.750649 60.642078 118.092468 60.642078 12.766753 0 31.916883-6.383377 44.683636-28.725195 9.575065 19.15013-41.491948 79.792208-70.217143 79.792208H73.674805c-9.575065-3.191688-25.533506-9.575065-35.108571-19.15013-15.958442-12.766753-31.916883-38.30026-31.916883-44.683637v-15.958441c9.575065 22.341818 28.725195 28.725195 44.683636 28.725195 28.725195 0 95.750649-51.067013 114.900779-60.642078 3.191688 0 3.191688-6.383377 3.191689-9.575065v-28.725195h673.446233z m-686.212987 194.692987h698.979741v-15.958441H156.658701v15.958441z m31.916883 76.60052h635.145974v-57.45039H188.575584v57.45039z m-92.558961 67.025454H916.280519v-35.108571H96.016623v35.108571z" fill="#B28500" ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-huiyuan2" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M516.096 75.264c-238.592-2.048-438.784 193.024-441.344 430.592-2.56 244.224 190.976 440.832 435.2 443.904 236.544 2.56 436.224-193.024 438.784-430.08 3.072-242.176-192-442.368-432.64-444.416z m293.376 687.104c-49.664-61.952-111.616-105.984-187.904-130.048 92.672-116.736 95.744-215.552 10.24-289.28-73.216-63.488-184.832-57.856-250.88 11.264-57.856 60.416-85.504 179.712 24.576 277.504-77.312 25.088-140.288 68.096-189.44 131.072-119.808-132.096-132.096-367.104 17.92-521.216 145.408-149.504 390.656-156.16 540.16-17.408 164.864 152.576 160.256 395.264 35.328 538.112z" fill="#333333" ></path>' +
+    '' +
+    '<path d="M249.344 797.184c3.072 4.096 4.608 6.656 7.168 9.216 130.56 124.928 372.224 126.976 506.368 5.12 13.824-12.8 9.728-19.968 0-30.72-92.672-102.912-205.824-138.752-339.456-104.448-72.192 18.432-130.048 59.904-174.08 120.832zM512.512 615.424c73.216 0 133.632-59.904 135.168-133.632 1.536-73.216-60.928-136.192-134.656-137.216-73.216-0.512-136.192 61.952-136.192 135.68-1.024 74.24 60.416 135.168 135.68 135.168z" fill="#333333" ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-shangchuan1" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M512 0C230.4 0 0 230.4 0 512s230.4 512 512 512 512-230.4 512-512S793.6 0 512 0z m46.933333 768h-55.466666c-17.066667 0-34.133333-17.066667-34.133334-34.133333s17.066667-34.133333 34.133334-34.133334h55.466666c17.066667 0 34.133333 17.066667 34.133334 34.133334s-17.066667 34.133333-34.133334 34.133333z m128-273.066667h-93.866666v106.666667c0 17.066667-12.8 29.866667-29.866667 29.866667h-59.733333c-17.066667 0-29.866667-12.8-29.866667-29.866667v-106.666667H371.2c-17.066667 0-29.866667-12.8-29.866667-25.6s0-29.866667 12.8-38.4l145.066667-162.133333c17.066667-17.066667 42.666667-17.066667 59.733333 0l145.066667 162.133333c8.533333 8.533333 12.8 25.6 12.8 38.4-4.266667 12.8-17.066667 25.6-29.866667 25.6z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-sousuo-sousuo" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M691.881 249.91c-122.036-122.092-319.94-122.092-442.033 0s-122.093 319.997 0 442.033c56.558 56.574 134.7 91.567 221.017 91.567 86.316 0 164.458-34.994 221.016-91.567 56.575-56.558 91.568-134.701 91.568-221.017 0-86.316-34.994-164.458-91.567-221.016zM181.8 759.992c-74.010-73.991-119.787-176.22-119.787-289.14 0-225.802 183.050-408.852 408.852-408.852 225.803 0 408.852 183.050 408.852 408.852 0 112.92-45.778 215.149-119.787 289.139-73.985 73.966-176.183 119.713-289.065 119.713-112.883 0-215.080-45.747-289.065-119.713zM945.517 945.579c-10.099 10.115-24.058 16.372-39.48 16.372s-29.381-6.257-39.479-16.371l-78.903-78.959c-10.097-10.097-16.342-24.045-16.342-39.452 0-30.814 24.98-55.792 55.792-55.792 15.406 0 29.355 6.245 39.452 16.341l78.958 78.903c10.142 10.087 16.418 24.050 16.418 39.479s-6.277 29.393-16.416 39.477z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-shangchuan" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M542.035 752.316h-60.073c-16.597 0-30.045 13.448-30.045 30.037 0 16.587 13.449 30.035 30.045 30.035h60.073c16.597 0 30.045-13.448 30.045-30.035 0-16.588-13.448-30.037-30.045-30.037zM511.998 31.375C246.559 31.375 31.373 246.559 31.373 512c0 265.438 215.186 480.625 480.625 480.625 265.435 0 480.629-215.188 480.629-480.625 0-265.441-215.194-480.625-480.629-480.625z m0.001 919.168C269.802 950.543 73.445 754.205 73.445 512c0-242.196 196.357-438.553 438.553-438.553 242.201 0 438.538 196.357 438.538 438.553 0 242.205-196.337 438.543-438.537 438.543z m28.716-664.093c-15.469-17.789-40.555-17.789-56.033 0l-140.08 161.082c-9.209 10.582-12.939 25.086-11.183 38.853 1.866 14.631 14.377 25.569 29.126 25.569h89.372v150.245c0 16.587 13.449 30.035 30.045 30.035h60.073c16.597 0 30.045-13.448 30.045-30.035V511.954h90.776c14.741 0 27.262-10.938 29.117-25.569 1.767-13.767-1.965-28.262-11.173-38.853L540.715 286.45z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-shoukuan" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M985.6 627.2c-57.6-32-300.8 147.2-345.6 147.2 0 0-83.2 25.6-198.4-44.8-115.2-64-198.4-128-198.4-128s-76.8-44.8-166.4 12.8c-38.4 25.6-76.8 44.8-76.8 44.8v326.4s70.4-83.2 166.4-83.2 313.6 102.4 313.6 102.4 83.2 38.4 147.2 0l377.6-281.6c25.6-12.8 32-70.4-19.2-96z m-403.2 57.6c185.6 0 339.2-153.6 339.2-339.2S768 6.4 582.4 6.4 243.2 153.6 243.2 339.2s153.6 345.6 339.2 345.6zM473.6 147.2l115.2 153.6L704 147.2h64l-140.8 192h102.4c6.4 0 6.4 6.4 6.4 6.4v19.2c0 6.4-6.4 6.4-6.4 6.4H608v44.8h115.2c6.4 0 6.4 6.4 6.4 6.4V448c0 6.4-6.4 6.4-6.4 6.4H608v70.4c0 6.4-6.4 6.4-12.8 6.4h-25.6c-6.4 0-12.8-6.4-12.8-6.4V454.4H448c-6.4 0-6.4 0-6.4-6.4v-19.2c0-6.4 6.4-6.4 6.4-6.4h115.2v-51.2H448c-6.4 0-6.4-6.4-6.4-6.4v-19.2c0-6.4 6.4-6.4 6.4-6.4h102.4l-140.8-192h64z" fill="#333333" ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-men" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M501.221 474.492c-25.353 0-45.979 16.826-45.979 37.509 0 20.691 20.626 37.525 45.979 37.525 25.197 0 45.697-16.834 45.697-37.525 0-20.683-20.5-37.509-45.697-37.509z"  ></path>' +
+    '' +
+    '<path d="M760.316 111.782H263.261c-42.608 0-73.887 24.428-77.837 60.813l-0.074 0.76v671.389c0 39.729 32.038 67.475 77.911 67.475h497.055c43.193 0 78.334-27.976 78.334-62.361V174.117c0-34.372-35.14-62.335-78.334-62.335zM578.428 838.998c40.658-6.832 71.318-36.787 71.318-69.679V254.682c0-32.933-30.637-62.875-71.334-69.658L334.69 151.791h425.625c6.949 0 22.697 2.667 32.564 12.761 5.426 5.551 8.082 12.487 7.896 20.674v653.598c0.186 7.93-2.477 14.772-7.91 20.336-9.355 9.576-24.59 13.052-32.549 13.052H334.709l243.719-33.214z m34.633-68.287c0 6.662-18.752 28.81-32.354 31.174l-353.179 51.252V172.636l353.041 49.451c13.699 2.408 32.492 24.567 32.492 31.218v517.406z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '</svg>'
+  var script = function() {
+    var scripts = document.getElementsByTagName('script')
+    return scripts[scripts.length - 1]
+  }()
+  var shouldInjectCss = script.getAttribute("data-injectcss")
+
+  /**
+   * document ready
+   */
+  var ready = function(fn) {
+    if (document.addEventListener) {
+      if (~["complete", "loaded", "interactive"].indexOf(document.readyState)) {
+        setTimeout(fn, 0)
+      } else {
+        var loadFn = function() {
+          document.removeEventListener("DOMContentLoaded", loadFn, false)
+          fn()
+        }
+        document.addEventListener("DOMContentLoaded", loadFn, false)
+      }
+    } else if (document.attachEvent) {
+      IEContentLoaded(window, fn)
+    }
+
+    function IEContentLoaded(w, fn) {
+      var d = w.document,
+        done = false,
+        // only fire once
+        init = function() {
+          if (!done) {
+            done = true
+            fn()
+          }
+        }
+        // polling for no errors
+      var polling = function() {
+        try {
+          // throws errors until after ondocumentready
+          d.documentElement.doScroll('left')
+        } catch (e) {
+          setTimeout(polling, 50)
+          return
+        }
+        // no errors, fire
+
+        init()
+      };
+
+      polling()
+        // trying to always fire before onload
+      d.onreadystatechange = function() {
+        if (d.readyState == 'complete') {
+          d.onreadystatechange = null
+          init()
+        }
+      }
+    }
+  }
+
+  /**
+   * Insert el before target
+   *
+   * @param {Element} el
+   * @param {Element} target
+   */
+
+  var before = function(el, target) {
+    target.parentNode.insertBefore(el, target)
+  }
+
+  /**
+   * Prepend el to target
+   *
+   * @param {Element} el
+   * @param {Element} target
+   */
+
+  var prepend = function(el, target) {
+    if (target.firstChild) {
+      before(el, target.firstChild)
+    } else {
+      target.appendChild(el)
+    }
+  }
+
+  function appendSvg() {
+    var div, svg
+
+    div = document.createElement('div')
+    div.innerHTML = svgSprite
+    svgSprite = null
+    svg = div.getElementsByTagName('svg')[0]
+    if (svg) {
+      svg.setAttribute('aria-hidden', 'true')
+      svg.style.position = 'absolute'
+      svg.style.width = 0
+      svg.style.height = 0
+      svg.style.overflow = 'hidden'
+      prepend(svg, document.body)
+    }
+  }
+
+  if (shouldInjectCss && !window.__iconfont__svg__cssinject__) {
+    window.__iconfont__svg__cssinject__ = true
+    try {
+      document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>");
+    } catch (e) {
+      console && console.log(e)
+    }
+  }
+
+  ready(appendSvg)
+
+
+})(window)
\ No newline at end of file
diff --git a/src/views/group/holidaySetting/theme/font/iconfont/iconfont.svg b/src/views/group/holidaySetting/theme/font/iconfont/iconfont.svg
new file mode 100644
index 00000000..b0ae7f6c
--- /dev/null
+++ b/src/views/group/holidaySetting/theme/font/iconfont/iconfont.svg
@@ -0,0 +1,319 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>
+Created by FontForge 20120731 at Sat Apr 15 15:55:39 2017
+ By admin
+</metadata>
+<defs>
+<font id="iconfont" horiz-adv-x="1024" >
+  <font-face 
+    font-family="iconfont"
+    font-weight="500"
+    font-stretch="normal"
+    units-per-em="1024"
+    panose-1="2 0 6 3 0 0 0 0 0 0"
+    ascent="896"
+    descent="-128"
+    x-height="792"
+    bbox="0 -224 1273 896.22"
+    underline-thickness="0"
+    underline-position="0"
+    unicode-range="U+0078-E810"
+  />
+<missing-glyph 
+ />
+    <glyph glyph-name=".notdef" 
+ />
+    <glyph glyph-name=".notdef" 
+ />
+    <glyph glyph-name=".null" horiz-adv-x="0" 
+ />
+    <glyph glyph-name="nonmarkingreturn" horiz-adv-x="341" 
+ />
+    <glyph glyph-name="x" unicode="x" horiz-adv-x="1001" 
+d="M281 543q-27 -1 -53 -1h-83q-18 0 -36.5 -6t-32.5 -18.5t-23 -32t-9 -45.5v-76h912v41q0 16 -0.5 30t-0.5 18q0 13 -5 29t-17 29.5t-31.5 22.5t-49.5 9h-133v-97h-438v97zM955 310v-52q0 -23 0.5 -52t0.5 -58t-10.5 -47.5t-26 -30t-33 -16t-31.5 -4.5q-14 -1 -29.5 -0.5
+t-29.5 0.5h-32l-45 128h-439l-44 -128h-29h-34q-20 0 -45 1q-25 0 -41 9.5t-25.5 23t-13.5 29.5t-4 30v167h911zM163 247q-12 0 -21 -8.5t-9 -21.5t9 -21.5t21 -8.5q13 0 22 8.5t9 21.5t-9 21.5t-22 8.5zM316 123q-8 -26 -14 -48q-5 -19 -10.5 -37t-7.5 -25t-3 -15t1 -14.5
+t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-5 19 -11 39h-368zM336 498v228q0 11 2.5 23t10 21.5t20.5 15.5t34 6h188q31 0 51.5 -14.5t20.5 -52.5v-227h-327z" />
+    <glyph glyph-name="sousuo" unicode="&#xe602;" horiz-adv-x="1000" 
+d="M808 54l-73 75q48 76 48 167q0 130 -90.5 222t-218 92t-218 -92t-90.5 -222t90.5 -222t217.5 -92q67 0 128 28l22 -23v0l60 -60q25 -26 62 -26t62.5 26t25.5 63.5t-26 63.5zM262 296.5q0 89.5 62 153t150 63.5t150.5 -63.5t62.5 -153t-62.5 -153t-150.5 -63.5t-150 63.5
+t-62 153z" />
+    <glyph glyph-name="tingzhi" unicode="&#xe61d;" 
+d="M511 809q106 0 199 -41q93 -40 161.5 -108.5t109 -161t40.5 -198t-40.5 -198.5t-109 -161.5t-161.5 -109t-198.5 -40.5t-197.5 41q-93 40 -161.5 108.5t-109 161.5t-40.5 198.5t40.5 198t109 161t161 109t197.5 40.5v0zM764 231q34 0 61.5 18t27.5 53q0 34 -27.5 50.5
+t-61.5 16.5h-501q-34 0 -62.5 -16.5t-28.5 -50.5q0 -35 28.5 -53t62.5 -18h501v0zM764 231z" />
+    <glyph glyph-name="bianji" unicode="&#xe69e;" 
+d="M502 330zM380 -16v0l-191 -35l38 188v0zM681 591l-69 -69l153 -153l69 69zM262 171l153 -153l316 317l-153 153z" />
+    <glyph glyph-name="icon01" unicode="&#xe600;" 
+d="M858 43l-179 177q18 38 18 80q0 77 -54.5 131.5t-132.5 54.5q-25 0 -49 -6l79 -80q25 -25 23.5 -61.5t-28.5 -63t-63.5 -28t-61.5 22.5l-79 80q-7 -24 -7 -50q0 -77 54.5 -132t131.5 -55q43 0 80 19l179 -178q17 -17 42 -16t43 20q19 18 20 43t-16 42v0zM810 -29
+q-13 0 -22.5 9t-9.5 22t9.5 22t22.5 9t22 -9t9 -22t-9 -22t-22 -9v0zM901 383h-18h-42h-1q-12 1 -23 9h-1q-26 17 -25 47q0 8 3 17q3 10 9 17l9 10l21 21l13 12q13 18 13 40.5t-14 40.5l-36 37q-18 14 -41 14.5t-40 -13.5l-14 -13l-29 -30v0v0q-26 -21 -57 -7q-10 4 -18 12
+q-13 14 -15 32v14v29v19q-3 22 -19 37.5t-39 18.5h-52q-22 -2 -38 -18t-20 -38v-18v-30v-13v0v0v-2v-2v-1q-1 -1 -1 -4l-1 -1l-0.5 -2l-0.5 -2v0q-1 -1 -3 -5v0q-4 -10 -13 -17q-15 -13 -36 -13q-20 0 -35 12l-9 10l-21 20l-13 13q-17 14 -40 13.5t-40 -14.5l-37 -36
+q-14 -18 -14.5 -40.5t12.5 -40.5l13 -13l30 -30v0q1 0 1.5 -1l0.5 -1l0.5 -1t1 -1.5t0.5 -1t1 -1.5l0.5 -0.5t0.5 -1.5l0.5 -1t1.5 -2v-1t0.5 -2t1.5 -2v-1t0.5 -2.5t0.5 -2.5v0q1 -3 1 -5v0q4 -27 -16 -46v0q-14 -14 -33 -16h-13h-30h-18q-22 -3 -38 -19t-18 -38v-53
+q2 -22 17.5 -38t38.5 -19h18l42 -1q5 0 5 -1h2q2 -1 3 -1q18 -5 29 -20t11 -33v0q0 -20 -12 -35l-10 -9v0l-21 -21l-13 -13q-13 -18 -13 -40.5t14 -39.5l37 -37q18 -15 40.5 -15t40.5 14l12 12l31 30v0v1q1 0 2 1t2 1q1 1 2 1l2 2l1.5 0.5l1.5 0.5l2 1q1 0 2 1q2 0 2 1v0v0
+l5 1v0q1 0 2.5 0.5t2.5 0.5v0h4q26 1 43 -16q13 -13 16 -33v-13v-30v-18q2 -22 18.5 -38t38.5 -18h52q23 2 39 17.5t19 37.5v18v31v12v0q2 15 11 28l2 2l0.5 1t1.5 1q5 5 11 9v0q1 1 3 2q1 1 2 1v0h1l1.5 0.5l1.5 0.5l-50 50q-32 -9 -68 -9q-102 0 -173.5 71.5t-70.5 172.5
+q0 102 71.5 173.5t173 71.5t173 -72t71.5 -173q0 -35 -10 -67l50 -49q4 7 12 16q7 7 18 11q8 4 14 4h14h30h17q23 3 38.5 19t18.5 39v52q-2 23 -18 39t-38 19v0zM901 383z" />
+    <glyph glyph-name="shijian" unicode="&#xe620;" 
+d="M511.5 684q-104.5 0 -192.5 -51t-139.5 -139.5t-51.5 -193t51.5 -193t139.5 -139.5t192.5 -51t193 51t139.5 139.5t51 193t-51 193t-139.5 139.5t-193 51zM511.5 -48q-94.5 0 -175 46.5t-127 127t-46.5 175t46.5 175t127 127t175 46.5t175 -46.5t127.5 -127t47 -175
+t-47 -175t-127.5 -127t-175 -46.5zM704 301h-175v226q0 8 -5 13t-12.5 5t-12.5 -5t-5 -13v-244q0 -7 5 -12t13 -5h192q7 0 12 5t5 12t-5 12.5t-12 5.5z" />
+    <glyph glyph-name="weixin" unicode="&#xe60f;" 
+d="M669 495q14 0 30 -2q-20 95 -110.5 157.5t-206.5 62.5q-130 0 -222 -77.5t-92 -189.5q0 -124 126 -212l-31 -94l109 55q80 -16 110 -16q14 0 30 1q-10 33 -10 66q0 103 77.5 176t189.5 73zM500 580q18 0 28.5 -11t10.5 -28.5t-10.5 -28.5t-28.5 -11t-32.5 11.5
+t-14.5 28.5t14.5 28t32.5 11zM280 501q-18 0 -32.5 11.5t-14.5 28.5t14.5 28t32.5 11t29 -11t11 -28.5t-11 -28.5t-29 -11zM956 250q0 93 -80 160.5t-187 67.5q-112 0 -189.5 -67t-77.5 -161.5t77.5 -161t189.5 -66.5q31 0 94 16l86 -47l-23 78q110 83 110 181zM602 289
+q-11 0 -21 10t-10 21.5t10 21.5t21 10q17 0 28.5 -9.5t11.5 -22t-11.5 -22t-28.5 -9.5zM775 289q-12 0 -21.5 10t-9.5 21.5t9.5 21.5t21.5 10q17 0 28 -9.5t11 -22t-11 -22t-28 -9.5z" />
+    <glyph glyph-name="fenxiang1" unicode="&#xe655;" 
+d="M770 222q-38 0 -71.5 -16.5t-55.5 -46.5l-249 125q7 21 7 43q0 25 -8 48l248 124q22 -31 56 -48.5t73 -17.5q65 0 111.5 46.5t46.5 112t-46.5 111.5t-112 46t-112 -46t-46.5 -112q0 -9 1 -18l-261 -131q-46 44 -109 44q-65 0 -111.5 -46.5t-46.5 -112t46.5 -112
+t112 -46.5t111.5 47l259 -130q-2 -11 -2 -22q0 -65 46.5 -111.5t112 -46.5t112 46.5t46.5 112t-46.5 111.5t-111.5 46v0z" />
+    <glyph glyph-name="qq" unicode="&#xe649;" 
+d="M856 184q-6 81 -83 167q3 7 4.5 21.5t-5 37.5t-22.5 40v2q0 107 -67 177t-164 71q-97 -1 -163.5 -71t-66.5 -177v-2q-17 -17 -23 -40t-5 -37.5t4 -21.5q-77 -86 -83 -167q-2 -41 12 -59q7 -7 17 -4.5t23.5 17.5t24.5 38q13 -46 54 -100q-26 -6 -42 -24t-17 -36.5t7 -35.5
+q23 -38 93 -38q106 0 150 42q5 5 15 5t16 -5q43 -42 149 -42q70 0 94 38q7 17 6.5 35.5t-16.5 36.5t-42 24q40 54 53 100q11 -23 24.5 -38t24 -17.5t16.5 4.5q14 18 12 59z" />
+    <glyph glyph-name="xinzeng" unicode="&#xe642;" 
+d="M739 330h-188v207q0 22 -34 24q-16 1 -24.5 -6t-8.5 -18v-207h-199q-1 0 -4.5 0.5t-9 -1t-11 -4t-9.5 -8.5t-4 -14q0 -15 2.5 -24t7.5 -12.5t9 -4t11 -0.5h207l-1 -217v-6t0.5 -6t0.5 -5.5t1 -6t2.5 -5t4 -5t5.5 -3t7.5 -2t10.5 -0.5q35 0 35 42l1 214h189q42 0 42 36
+q0 16 -10.5 24.5t-21.5 7.5h-11zM518.5 770q-97.5 0 -186.5 -38t-153 -102.5t-102 -153t-38 -186.5t38 -186.5t102 -153t153 -102.5t186.5 -38t186.5 38t153.5 102t102.5 153t38 187t-38 186.5t-102.5 153t-153.5 102.5t-186.5 38zM519 -126q-113 0 -209 55.5t-151.5 151.5
+t-55.5 209t55.5 209t151.5 151.5t209 55.5t208.5 -55.5t151.5 -151.5t56 -209t-56 -209t-151.5 -151.5t-208.5 -55.5z" />
+    <glyph glyph-name="tishi" unicode="&#xe64d;" 
+d="M512.5 193q-10.5 0 -18 7.5t-7.5 17.5v328q0 10 7.5 17.5t18 7.5t18 -7.5t7.5 -17.5v-328q0 -10 -7.5 -17.5t-18 -7.5zM512.5 27q-10.5 0 -18 7.5t-7.5 17.5v2q0 11 7.5 18.5t18 7.5t18 -7.5t7.5 -18.5v-2q0 -10 -7.5 -17.5t-18 -7.5zM512.5 -135q-88.5 0 -168.5 34
+q-78 33 -138.5 93.5t-93.5 138.5q-34 81 -34 169t34 169q33 78 93.5 138.5t138.5 93.5q80 34 168.5 34t169.5 -34q78 -33 138.5 -93.5t93.5 -138.5q34 -81 34 -169t-34 -169q-33 -78 -93.5 -138.5t-138.5 -93.5q-81 -34 -169.5 -34zM513 684q-77 0 -147 -29t-124.5 -83.5
+t-83.5 -124.5t-29 -147t29 -147t83.5 -124.5t124.5 -83.5t147 -29t147 29t124.5 83.5t83.5 124.5t29 147t-29 147t-83.5 124.5t-124.5 83.5t-147 29z" />
+    <glyph glyph-name="shijian1" unicode="&#xe6fb;" 
+d="M513 -202q-102 0 -195 39.5t-160 106.5t-107 160t-40 195.5t40 195.5t107 160t160 107t195 40t195 -40t160 -107t107 -160t40 -195.5t-40 -195.5t-107 -160t-160 -106.5t-195 -39.5zM513 745q-91 0 -173 -35.5t-142 -95t-95 -142t-35 -173t35 -173t95 -142t142 -95
+t173 -35.5t173 35.5t142 95t95 142t35 173t-35 173t-95 142t-142 95t-173 35.5zM770 174q-5 -11 -16.5 -15.5t-22.5 0.5l-236 79q-18 9 -17 29l-0.5 1t-0.5 2v326q0 12 9 21t21 9t20.5 -9t8.5 -21v-310l220 -73q11 -5 15 -16.5t-1 -22.5z" />
+    <glyph glyph-name="iconfontweibowukuang" unicode="&#xe661;" 
+d="M727 341q-16 3 -20.5 9.5t-0.5 11.5l3 4q1 3 3 7t6 15.5t4.5 22.5t-4.5 25.5t-16 25.5q-14 14 -37 18.5t-46 1t-44 -9t-33 -11.5l-13 -5q-10 -3 -17 -4.5t-10.5 0t-5.5 3.5t-2 7.5t1 9t3 12.5t3 14q0 15 -2.5 27.5t-11 27t-23 22t-41 7t-62.5 -12.5q-35 -12 -71.5 -36
+t-64 -49.5t-50 -49.5t-34.5 -40l-12 -15q-33 -44 -48.5 -87.5t-16.5 -65t0 -21.5q6 -48 30 -86.5t57 -62t78.5 -40t86.5 -24.5t88 -11q76 -6 157 11.5t151 61t99 103.5q17 36 17.5 67t-10.5 51t-29.5 35t-34 22t-27.5 9v0zM415 28q-110 -5 -188 42.5t-78 119.5t77.5 124
+t188.5 57q112 5 188.5 -37t76.5 -113q0 -73 -78 -130.5t-187 -62.5v0zM385 307q-30 -3 -53.5 -13.5t-37 -23.5t-22.5 -30t-12.5 -30.5t-4.5 -28t-0.5 -19.5t0.5 -8v0v-5t2 -11.5t5.5 -16.5t12 -17t19.5 -15q67 -32 126 -19.5t94 58.5q14 17 18.5 42t-2 50.5t-22.5 47
+t-48.5 33t-74.5 6.5v0zM348 116q-20 -2 -35 8t-15 27q0 18 14 32.5t34 16.5q23 2 37.5 -9t14.5 -29q0 -16 -14.5 -30t-35.5 -16v0zM435 189q-7 -5 -14.5 -4.5t-11.5 6.5t-2 14.5t9 13.5q8 6 15.5 5t11.5 -7q3 -7 1 -15t-9 -13v0zM798 400q9 0 16 6t8 14v3q4 32 -1 57
+t-16.5 39t-26.5 23t-30.5 11.5t-28.5 3t-21 -0.5l-8 -1q-10 0 -17 -7t-7 -17t7 -17t17 -7q32 6 50.5 0.5t26 -19.5t9 -28t0.5 -25l-2 -11q0 -10 7 -17t17 -7v0zM781 679q-51 12 -121 -1l-1.5 -1l-1.5 -1h-1q-11 -3 -18.5 -12.5t-7.5 -21.5q0 -14 10.5 -24.5t25.5 -10.5
+q18 3 31 8q6 0 18.5 1.5t33.5 -3.5t42 -13t43 -26.5t37 -43.5q28 -60 11 -115q-7 -17 -7 -34q0 -14 10 -22.5t25 -8.5t23 5.5t11 23.5v0q19 57 14.5 102.5t-20 79t-43.5 58t-56 39t-58 21.5v0zM781 679z" />
+    <glyph glyph-name="delete" unicode="&#xe616;" 
+d="M768 -128h-96v672h-96v-672h-128v672h-96v-672h-96v672h512v-672zM416 704h192v-64h-192v64zM880 640h-176v96q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45v-96h-176q-20 0 -34 -14t-14 -34t14 -34t34 -14h16v-704q0 -26 19 -45t45 -19h576q26 0 45 19t19 45v704h16
+q20 0 34 14t14 34t-14 34t-34 14z" />
+    <glyph glyph-name="dizhi" unicode="&#xe685;" 
+d="M512 -212q-16 17 -41.5 47.5t-92 115.5t-117 161.5t-92 166.5t-41.5 149q0 159 112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5q0 -59 -41.5 -149t-92 -166.5t-116.5 -161.5t-92.5 -115.5t-41.5 -47.5v0zM512 684q-106 0 -181 -75t-75 -181t75 -181t181 -75t181 75
+t75 181t-75 181t-181 75z" />
+    <glyph glyph-name="guanbi" unicode="&#xe637;" 
+d="M481.5 748q-97.5 0 -186 -37.5t-152.5 -101.5t-102 -153t-38 -186t38 -185.5t102 -152.5t152.5 -102t186 -38t186 38t152.5 102t102 152.5t38 185.5t-38 186t-102 153t-152.5 101.5t-186 37.5zM683 69v0q-10 -10 -24 -10t-24 10l-153 153l-154 -154v0q-10 -10 -24 -10
+t-24 10t-10 24t10 24l153 154l-153 154q-10 10 -10 24t10 24v0q10 10 24 10t24 -10l153 -154l154 154v0q10 10 24 10t24 -10t10 -24t-10 -24l-153 -154l153 -153q10 -10 10 -24t-10 -24z" />
+    <glyph glyph-name="shoucang1" unicode="&#xe604;" 
+d="M512 727q-16 0 -26 -22l-95 -191q-11 -23 -36 -41t-50 -22l-211 -30q-25 -4 -29.5 -18.5t12.5 -32.5l154 -149q17 -17 26.5 -46.5t5.5 -53.5l-36 -211q-3 -18 3 -27.5t18 -9.5q10 0 22 6l189 99q22 12 53 12t53 -12l189 -99q12 -6 22 -6q12 0 18 9.5t3 27.5l-36 211
+q-4 24 5.5 53.5t26.5 46.5l154 149q17 18 12.5 32.5t-29.5 18.5l-211 30q-25 4 -50 22t-36 41l-95 191q-10 22 -26 22v0z" />
+    <glyph glyph-name="phone" unicode="&#xe622;" 
+d="M295 688q34 0 60 -28q15 -16 39 -44q24 -26 22 -58.5t-28 -56.5l-13 -11q-30 -27 -45 -39q-42 -34 -33 -89t46 -112q67 -102 160 -157q20 -12 61 -26q14 -5 29 -5q33 0 60 25q17 17 53 48l5 4q27 23 57 23q35 0 62 -29q23 -25 39 -43q23 -27 21.5 -58t-27.5 -55l-6 -6
+q-41 -47 -103 -76q-19 -7 -41 -7q-27 0 -63 10q-123 35 -247 146q-160 143 -234 314q-41 97 -34 171q5 51 41 81q13 11 38 34q17 15 25 22q26 22 56 22zM295 735q-48 0 -87 -34q-7 -6 -28.5 -25t-33.5 -29q-52 -43 -58 -113q-9 -87 38 -194q77 -181 245 -331
+q133 -119 266 -156q43 -12 76 -12q32 0 59 10q19 9 37 20t30.5 20t23.5 18.5t17 16t10.5 11.5t4.5 6q40 37 42.5 87t-32.5 91q-17 19 -40 44q-42 45 -97 45q-48 0 -88 -35q-43 -37 -60 -54q-13 -12 -27 -12q-7 0 -14 3q-36 12 -52 22q-83 49 -144 142q-32 49 -39 94
+q-5 28 15 43q14 11 60 53q41 37 44 89t-33 93q-25 28 -41 45q-40 42 -94 42v0z" />
+    <glyph glyph-name="bianji1" unicode="&#xe64a;" 
+d="M784 525l-126 126l63 63q15 15 37.5 15t37.5 -15l51 -51q15 -15 15 -37.5t-15 -37.5zM418 159l-126 126l342 340l126 -126zM191 56l77 205l124 -125zM756 13q14 0 23 -9.5t9 -22.5t-9 -22.5t-23 -9.5h-564q-13 0 -22 9.5t-9 22.5t9 22.5t22 9.5h564z" />
+    <glyph glyph-name="guanbi1" unicode="&#xe609;" 
+d="M512 739q-117 0 -216.5 -58t-157.5 -157.5t-58 -216.5t58 -216.5t157.5 -157.5t216.5 -58t216.5 58t157.5 157.5t58 216.5t-58 216.5t-157.5 157.5t-216.5 58zM721 150l-53 -52l-156 157l-156 -157l-53 52l157 157l-157 156l52 53l157 -157l156 157l53 -53l-157 -156z
+" />
+    <glyph glyph-name="cuowu" unicode="&#xe617;" 
+d="M564 276l289 288q10 10 10 24.5t-10 25t-24.5 10.5t-24.5 -11l-290 -287l-286 287q-11 11 -25 11t-24.5 -10.5t-10.5 -25t10 -24.5l287 -287l-289 -288q-10 -10 -10 -24.5t10 -25t24.5 -10.5t24.5 11l289 287l289 -290q11 -10 25.5 -10t24.5 10t10 24.5t-10 24.5
+l-289 290v0zM564 276z" />
+    <glyph glyph-name="tupian" unicode="&#xe6a0;" 
+d="M975 714h-926q-21 0 -35 -14t-14 -34v-732q0 -20 14 -34t35 -14h926q21 0 35 14t14 34v732q0 20 -14 34t-35 14zM926 147l-180 180q-16 17 -39.5 17t-39.5 -17l-211 -211l-91 91q-14 15 -35.5 15t-37.5 -15l-192 -192q-3 8 -3 17v536q0 21 14.5 35t34.5 14h731
+q21 0 35 -14t14 -35v-421zM316.5 519q-40.5 0 -68.5 -28.5t-28 -68.5t28 -68.5t68.5 -28.5t69 28.5t28.5 68.5t-28.5 68.5t-69 28.5z" />
+    <glyph glyph-name="yonghuming" unicode="&#xe618;" 
+d="M705 -212q-5 0 -10 3q-22 14 -52.5 20.5t-51.5 7.5h-24h-38v0h-477q-8 0 -14 5.5t-6 14.5v24q-2 41 23 84q22 38 62 65q49 32 123 45h1q28 2 76 15q66 18 72 33q1 3 2 5q2 11 -1 43q-3 34 -17 66t-25.5 47.5t-33.5 39.5q-19 22 -26 32q-30 45 -34 97v1q0 21 19 38l1 1v0
+q0 2 -1 8v3q-6 31 -6.5 74t4.5 74q2 24 15.5 49.5t22 34.5t14.5 14v0q13 11 18 19l1 2q0 1 -0.5 2l-0.5 1q-7 15 -4 27q3 19 25 25q8 2 23 2l1 1q47 2 75 0q53 -4 98 -14.5t71.5 -21.5t48 -24t27.5 -18.5t9 -9.5h1q22 -27 33 -67q3 -12 4 -21q7 -43 4 -104q-1 -22 -5 -48
+q-1 -5 0 -7l3 -3q10 -10 13 -20q2 -7 2 -17v-1q-3 -52 -34 -97q-7 -10 -26 -32q-21 -24 -33 -39.5t-26 -47.5t-17 -66q-2 -32 0 -43q1 -2 1 -5q1 -1 4 -4.5t21 -12t48 -16.5q48 -13 76 -15v0h1q74 -14 123 -46q41 -27 63 -65q24 -42 21 -83v-24q0 -9 -5.5 -14.5t-14.5 -5.5
+h-189q-8 0 -14 5.5t-6 14t6 14.5t14 6h169v4v2q3 30 -17 63q-18 29 -50 50q-42 27 -107 39q-42 6 -81 16q-87 23 -99 59q-8 14 -4 64q4 41 20 78t29.5 54.5t36.5 44.5q18 20 24 28q23 34 26 76v4l-4 4l-5 5q-12 16 -9 38q4 25 5 45q3 57 -4 95v1q-1 7 -3 17q-8 30 -25 51
+q-15 15 -49 32q-71 34 -178 42q-25 2 -70 -1h-1h-8q6 -15 2 -27q-2 -6 -6 -13q-8 -13 -26 -28q-4 -4 -10.5 -11t-16.5 -25.5t-11 -34.5v-3q-5 -27 -4.5 -67t5.5 -68v-3q6 -29 -11 -45h-1q-5 -5 -5 -6v0q-1 -1 -1 -2q4 -42 27 -76q6 -8 23 -28q23 -27 36.5 -44.5t29.5 -54.5
+t20 -78q4 -49 -3 -64q-12 -36 -100 -59q-41 -11 -80 -16q-65 -11 -106 -38q-33 -21 -51 -50q-20 -34 -18 -64v-2v-4h457h38v0h24v0q10 0 24.5 -1.5t47 -10t53.5 -22.5q7 -5 9 -13t-3 -15q-6 -9 -17 -9v0zM629 116q0 -1 1 -1q-1 0 -1 1v0zM396 116l-1 -1l1 1v0z" />
+    <glyph glyph-name="mima" unicode="&#xe61e;" 
+d="M511 285q-22 0 -38 -15.5t-16 -37.5q0 -24 18 -40v-49q0 -15 10.5 -25.5t25.5 -10.5t25 10.5t10 25.5v49q18 16 18 40q0 22 -15.5 37.5t-37.5 15.5v0zM760 445h-35v89q0 89 -63 151.5t-151.5 62.5t-151 -62.5t-62.5 -151.5v-89h-35q-37 0 -63 -26t-26 -63v-338
+q0 -37 26 -63t63 -26h498q37 0 63 26t26 63v338q0 37 -26 63t-63 26v0zM511 712q74 0 126 -52t52 -126v-89h-356v89v0q0 74 52 126t126 52v0zM814 18q0 -22 -16 -37.5t-38 -15.5h-498q-22 0 -38 15.5t-16 37.5v338q0 23 16 38.5t38 15.5h498q22 0 38 -15.5t16 -38.5v-338v0z
+M814 18z" />
+    <glyph glyph-name="shoucang" unicode="&#xe60b;" 
+d="M752 -127q-16 0 -30 7l-208 103l-209 -103q-15 -8 -34 -6.5t-34 11.5q-15 11 -22 28.5t-4 35.5l43 225l-164 153q-30 29 -17 68q6 18 20 30t32 15l229 42l102 208q18 37 58 37q19 0 35 -10t24 -27l102 -208l229 -41q18 -3 32 -15t20 -30q6 -17 1.5 -35.5t-17.5 -31.5
+l-166 -155l42 -224q3 -19 -4 -36.5t-22 -28.5q-17 -12 -38 -12v0zM514 35l228 -114q12 -6 21.5 1.5t7.5 19.5l-46 248l183 173q8 8 5 19q-4 12 -16 14l-252 44l-113 230q-5 10 -17.5 10t-17.5 -10l-113 -229l-251 -47q-13 -2 -17 -13q-4 -12 5 -20l183 -171l-48 -249
+q-2 -11 8 -18q10 -8 20 -2l230 114v0zM514 35z" />
+    <glyph glyph-name="zhengque" unicode="&#xe60e;" 
+d="M512 -125q-116 0 -213.5 57t-154.5 154.5t-57 213.5t57 213.5t154.5 154.5t213.5 57t213.5 -57t154.5 -154.5t57 -213.5t-57 -213.5t-154.5 -154.5t-213.5 -57zM512 672q-101 0 -186.5 -50t-135.5 -135.5t-50 -186.5t50 -186.5t135.5 -135.5t186.5 -50t186.5 50
+t135.5 135.5t50 186.5t-50 186.5t-135.5 135.5t-186.5 50zM682 448q5 9 2.5 20t-12 16.5t-20.5 2.5t-16 -13l-170 -294l-95 88q-8 8 -19 8.5t-19 -7t-8 -18.5t7 -20l122 -112q7 -8 18 -8t19 7q2 2 49.5 84t94.5 164z" />
+    <glyph glyph-name="tuichu" unicode="&#xe7c8;" horiz-adv-x="1274" 
+d="M851 -212h-716q-57 0 -94 38q-41 40 -41 90v768q0 50 41 91q37 37 94 37h716q50 0 88 -37q34 -35 34 -91v-77q0 -10 -7.5 -17.5t-18 -7.5t-18 7.5t-7.5 17.5v77q0 35 -20 54q-22 23 -51 23h-716q-35 0 -58 -23q-26 -25 -26 -54v-768q0 -29 26 -54q23 -23 58 -23h716
+q29 0 51 23q20 19 20 54v77q0 10 7.5 17.5t18 7.5t18 -7.5t7.5 -17.5v-77q0 -56 -34 -91q-38 -37 -88 -37v0zM1203 274h-640q-10 0 -17.5 7.5t-7.5 18.5t7.5 18.5t17.5 7.5h640q11 0 18.5 -7.5t7.5 -18.5t-7.5 -18.5t-18.5 -7.5v0zM1031 57q-11 0 -18.5 7.5t-7.5 18t8 18.5
+l199 199l-199 199q-8 8 -8 18.5t7.5 18t18 7.5t18.5 -8l217 -217q7 -7 7 -18t-7 -18l-217 -217q-8 -8 -18 -8v0zM1031 57z" />
+    <glyph glyph-name="wodedingdan30" unicode="&#xe638;" 
+d="M179 148l204 -213l500 522l-203 212l-501 -521v0zM16 -196l321 78l-207 215l-114 -293v0zM939 725q-26 26 -44 41t-40 25t-43.5 3.5t-42.5 -28.5l-39 -45l207 -216l43 42q21 22 26.5 44t-4 45.5t-24 43t-39.5 45.5v0z" />
+    <glyph glyph-name="chenggong" unicode="&#xe62a;" 
+d="M511 -147q-91 0 -174 35.5t-143 95t-95.5 142.5t-35.5 174t35.5 174t95.5 143t143 95.5t174 35.5t174 -35.5t142.5 -95.5t95 -143t35.5 -174t-35.5 -174t-95 -142.5t-142.5 -95t-174 -35.5zM784 458l-14 14q-6 6 -14.5 6t-14.5 -6l-298 -292l-110 115q-6 6 -21 -8
+l-14 -15q-15 -14 -8 -21l146 -153q7 -6 21 8l14 15q4 3 6 7l307 301q6 6 6 14.5t-6 14.5z" />
+    <glyph glyph-name="time" unicode="&#xe62f;" 
+d="M512 736q-185 0 -316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5zM512 -96q-104 0 -192.5 51.5t-140 140t-51.5 192.5t51.5 192.5t140 140t192.5 51.5t192.5 -51.5t140 -140t51.5 -192.5t-51.5 -192.5
+t-140 -140t-192.5 -51.5zM672 288h-160v224q0 13 -9.5 22.5t-22.5 9.5t-22.5 -9.5t-9.5 -22.5v-256q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5t-9.5 22.5t-22.5 9.5z" />
+    <glyph glyph-name="jingshu" unicode="&#xe611;" 
+d="M270 606v40q0 9 -6 14.5t-14 5.5t-14 -5.5t-6 -14.5v-399q0 -2 1 -5v-97h-14q-22 0 -38 -15t-18 -37v-4v-1v-1q1 -22 17 -37.5t39 -15.5h14v-39h-17h-3q-37 2 -63 29.5t-26 65.5v1.5v1.5q-1 64 0 551v2q0 40 28 67.5t67 27.5h31h477h5q8 0 14 -5.5t6 -13.5v-76h-385
+q-56 0 -95 -40zM883.5 -29q-8.5 0 -14 -6t-5.5 -14v-54h-494q-22 0 -38 15.5t-17 37.5v0.5v0.5v4q1 22 17 37.5t38 15.5h509h4h1q8 0 13.5 6t5.5 14v556q0 8 -5.5 14t-13.5 6h-5h-477h-32q-39 0 -67 -28t-28 -67v-2v-551v-2v-2q0 -37 26 -64.5t63 -29.5q2 -1 3 -1h517
+q8 0 13.5 6t5.5 14v74q0 8 -5.5 14t-14 6zM766 154q-10 -1 -21 -2.5t-31.5 -2t-22.5 -0.5h-26q-23 0 -41 -1.5t-35 -5.5q-2 -1 -7 -1q-7 0 -14 5t-7 11t8 11q2 2 9 10q11 12 19 10q4 -4 10.5 -5.5t11.5 -1.5q3 0 10 0.5t10 0.5h7q3 3 4.5 9.5t1.5 12.5q0 4 -1 13v13v8l-5 7
+q-9 0 -20.5 -1.5t-28.5 -5.5q-1 3 -1.5 5.5t-0.5 5.5q0 15 12 23.5t28 8.5q10 0 16 -3l101 -4q3 -6 3 -13q0 -16 -13 -16h-44q-2 -7 -2 -11q-2 -13 -2 -26q0 -4 0.5 -9t0.5 -7l3 -4q88 -10 90 -10q0 -19 -22 -24zM591 437q7 8 14 10l5 5q8 5 15 5q6 0 13 -4h2q4 0 8 1
+q10 0 19 -1.5t20 -5.5q10 9 24 9q12 0 14 -12q6 -10 6 -18q0 -15 -19 -29q-8 -7 -17 -13v-2q1 -5 6 -8q23 -11 40 -16q50 -18 93 -24q-6 -15 -12 -23q-19 -24 -42 -24q-6 0 -8 1q-13 4 -29 16q-43 32 -45 33q-1 1 -16 14q-9 8 -17 6q-6 -6 -14.5 -13.5t-17 -16t-14.5 -13.5
+q-29 -23 -55 -23q-10 5 -14 9q-8 6 -8 14q44 18 69 35q34 23 57 58q1 8 -3 10.5t-11 2.5h-8q-10 0 -16 -1q-21 -4 -36 -12q-10 4 -10 14q0 8 7 16zM422 350q5 4 16 14q14 15 23 26q26 33 43 63q3 4 6.5 5t6.5 1q9 0 16 -9.5t7 -20.5q0 -15 -12 -22q-13 -10 -21 -17
+q-25 -21 -47 -43q2 -5 6.5 -7.5t9.5 -2.5q10 1 14 1t6 -1q5 5 9 8q22 21 37 45q8 3 15 -3.5t12 -12.5q0 -14 -12 -26q-10 -8 -20 -17q-25 -26 -29 -31q-16 -18 -23 -36q9 0 37 12q13 6 22 6q4 -1 6 -1l8 -17q-16 -14 -42.5 -23t-49.5 -16q-13 -2 -19 11q-3 7 -3 16
+q0 21 13 29l4 4q8 12 13 23l-49 -4l-11 23q-2 13 8 23zM389 178q6 12 21 15q15 2 28 5l123 33q2 1 5 1q8 0 8 -11q0 -8 -4.5 -15.5t-11.5 -7.5q-8 -4 -20 -9q-30 -12 -53 -20q-38 -13 -69 -21q-5 -6 -11 -6q-7 0 -12 8.5t-5 19.5q0 6 1 8z" />
+    <glyph glyph-name="huiyuan1" unicode="&#xe610;" 
+d="M614 -212h-204q-63 0 -94 0.5t-80 3t-73 9t-51 17t-38 28.5t-11 42v20q0 93 46.5 171.5t126.5 124.5t174 46h204q94 0 174 -46t126.5 -124.5t46.5 -171.5v-20q0 -18 -6.5 -32.5t-22.5 -25t-31 -18t-44.5 -12t-50 -7t-60.5 -4t-63 -1.5h-69v0v0zM408 193
+q-120 0 -205.5 -84t-85.5 -202v-21q0 -14 25 -23t77 -12.5t88.5 -4t100.5 -0.5h208q56 0 91.5 0.5t89.5 4t82 12.5t28 23v21q0 118 -85.5 202t-205.5 84h-208v0zM502 270q-114 0 -194.5 79.5t-80.5 191.5t80.5 191.5t194.5 79.5t194.5 -79.5t80.5 -191.5t-80.5 -191.5
+t-194.5 -79.5v0v0v0zM283 542q0 -89 64 -152t154.5 -63t154.5 63t64 151.5t-64 151.5t-154.5 63t-154.5 -63t-64 -151v0v0v0z" />
+    <glyph glyph-name="xiazai" unicode="&#xe6d2;" 
+d="M356 296v-1v-1v-2v0v-0.5v-0.5q0 -1 1 -2v-1l0.5 -0.5l0.5 -0.5l140 -157l0.5 -0.5l0.5 -0.5h0.5h0.5v-0.5v-0.5q1 0 2 -1h0.5h0.5q4 -1 7 1l1 2v0v0l147 157l1 1v1q0 1 1 2v0.5v0.5v0v1q0 8 -8 8h-93v102q0 7 -5 12t-12 5h-68q-7 0 -12 -5t-5 -12v-102v0l-93 -1
+q-6 0 -8 -4zM849 446q-9 24 -34 24q-15 0 -25.5 -10.5t-10.5 -26.5q0 -8 3 -15v0q0 -1 5.5 -15t6.5 -17.5t5.5 -15.5t6 -18.5t4 -16.5t3.5 -18t1 -16q0 -127 -89.5 -216.5t-216 -89.5t-216 89.5t-89.5 216t89.5 216t215.5 89.5q43 0 120 -30v0q8 -5 18 -5q15 0 25.5 10.5
+t10.5 25.5q0 21 -17 32v0v0q-3 1 -6 3q-68 32 -151 32q-101 0 -187 -50t-136 -136t-50 -187.5t50 -187.5t136 -136t187.5 -50t187.5 50t136 136t50 188q0 74 -33 145zM474 437h68q7 0 12 5t5 12v17q0 7 -5 12t-12 5h-68q-7 0 -12 -5t-5 -12v-17q0 -7 5 -12t12 -5z" />
+    <glyph glyph-name="zhengque1" unicode="&#xe6e0;" 
+d="M449 100q-15 0 -25 11l-257 257q-11 10 -11 25t10.5 25.5t25.5 10.5t25 -11l232 -231l392 392q10 10 25 10t25.5 -10.5t10.5 -25t-10 -25.5l-418 -417q-10 -11 -25 -11z" />
+    <glyph glyph-name="richeng" unicode="&#xe641;" 
+d="M874 -110h-750q-28 0 -48 19.5t-20 48.5v750q0 28 20 48t48 20h68v-34q0 -42 30 -72t72.5 -30t72.5 30t30 72v34h205v-34q0 -42 29.5 -72t72 -30t72.5 30t30 72v34h68q29 0 49 -20t20 -48v-750q0 -28 -20 -48t-49 -20v0zM879 592h-759v-638h759v638v0zM295 398h-103v102
+h103v-102v0zM295 227h-103v103h103v-103v0zM295 57h-103v102h103v-102v0zM465 398h-102v102h102v-102v0zM465 227h-102v103h102v-103v0zM465 57h-102v102h102v-102v0zM636 398h-103v102h103v-102v0zM636 227h-103v103h103v-103v0zM636 57h-103v102h103v-102v0zM806 398h-102
+v102h102v-102v0zM806 227h-102v103h102v-103v0zM806 57h-102v102h102v-102v0zM703 674q-28 0 -47.5 19.5t-19.5 47.5v70q0 28 19.5 47.5t47.5 19.5t47.5 -19.5t19.5 -47.5v-70q0 -28 -19.5 -47.5t-47.5 -19.5v0zM294 674q-28 0 -48 19.5t-20 47.5v70q0 28 20 47.5t47.5 19.5
+t47.5 -19.5t20 -47.5v-70q0 -28 -20 -47.5t-47 -19.5v0zM294 674z" />
+    <glyph glyph-name="fo" unicode="&#xe606;" 
+d="M844 385q0 13 -8 24t-20 16q13 13 13 31t-12.5 30.5t-30.5 12.5h-4q3 8 3 18q0 17 -12.5 30t-30.5 13q-2 0 -4 -1q2 7 2 14q0 18 -12.5 30.5t-30.5 12.5h-4q2 7 2 15q0 18 -12.5 30.5t-30.5 12.5h-3q2 7 2 15q0 17 -12.5 30t-30.5 13q-2 0 -5 -1q1 5 1 10q0 16 -10 28
+t-25 15v3q0 18 -12.5 30.5t-30.5 12.5t-30.5 -12.5t-12.5 -30.5v-4q-15 -3 -24 -14.5t-9 -27.5q0 -5 1 -10q-3 1 -5 1q-18 0 -30.5 -13t-12.5 -30q0 -8 2 -15h-3q-18 0 -30.5 -12.5t-12.5 -30.5q0 -8 2 -15h-4q-18 0 -30.5 -12.5t-12.5 -30.5q0 -7 2 -14q-2 1 -4 1
+q-18 0 -31 -13t-13 -30q0 -10 4 -18h-4q-18 0 -30.5 -12.5t-12.5 -30.5t13 -31q-12 -5 -20 -16t-8 -24q0 -16 11 -28q-1 -20 13 -47q22 -41 34 -105.5t5 -118.5q-2 -11 -5.5 -29t-6 -30.5t-2.5 -15.5q0 -17 12 -28.5t29 -11.5q15 0 26.5 9.5t13.5 24.5h1q4 -5 9 -10t22 -16
+t36 -19t51 -15t68 -7t68 7t51.5 15t36 19t21.5 16t9 10h1q2 -15 13.5 -24.5t26.5 -9.5q17 0 29 11.5t12 28.5q0 3 -2.5 15.5t-6 30.5t-5.5 29q-7 54 5 118.5t34 105.5q15 27 14 47q10 12 10 28zM767 380v-21q-9 -68 -17 -98q-6 -23 -18 -129q-10 -81 -70.5 -129t-138.5 -52
+q-77 4 -136.5 52t-69.5 129q-13 106 -18 129q-4 14 -8 38l-7 42l-2 18v8q-1 0 -2 12.5t1 30t9 34t26 26.5t47 7q113 -14 172 -14t148 14q24 3 41 -3t25.5 -17t13 -26.5t5 -27t-0.5 -23.5zM689 323h-99q29 -22 65.5 -18.5t79.5 38.5q-25 -15 -46 -20zM576 150q12 18 -6 39
+q-10 11 -18 33.5t-9 50.5t6.5 54t33.5 46t69 25q27 3 52.5 -7t36.5 -22l12 -11q-1 2 -2.5 6t-9.5 14.5t-18 18.5t-28.5 14.5t-40.5 6.5q-64 0 -100 -54.5t-14 -142.5q2 -5 5.5 -17t5 -18t2 -15t-2 -13.5t-9 -8.5t-18.5 -4v0q41 -13 53 5zM509 408.5q0 6.5 4.5 10.5t11 4
+t10.5 -4t4 -10.5t-4 -11t-10.5 -4.5t-11 4.5t-4.5 11zM524 408zM472 150q-12 18 7 39q9 11 16.5 33.5t8.5 51t-6.5 54.5t-33.5 46t-67 24q-27 3 -52.5 -7t-37.5 -22l-12 -11l3 6t9.5 14.5t17.5 18.5t28.5 14.5t41.5 6.5q63 0 99 -54.5t14 -142.5q-2 -5 -5.5 -17t-5 -18
+t-2 -15t2 -13.5t9.5 -8.5t18 -4v0q-5 -2 -12 -3.5t-21.5 -0.5t-19.5 9zM359 323h99q-29 -22 -65.5 -18.5t-79.5 38.5q25 -15 46 -20zM450 68q74 -76 147 0q-36 -5 -73 -5t-55 2zM592 76l6 1q-9 9 -19 16q-13 10 -26 10q-8 1 -15.5 -2.5t-10.5 -7.5l-4 -3q-1 1 -4 3.5
+t-10.5 6.5t-14.5 3q-14 0 -26 -10q-9 -7 -19 -16v0v0v0l2 -1q70 -10 141 0zM737 8q0 8 6 14t14 6t13.5 -6t5.5 -14t-5.5 -13.5t-13.5 -5.5t-14 5.5t-6 13.5zM281 8q0 8 5.5 14t13.5 6t14 -6t6 -14t-6 -13.5t-14 -5.5t-13.5 5.5t-5.5 13.5z" />
+    <glyph glyph-name="fo3" unicode="&#xe60c;" 
+d="M483 826q-5 -13 -12 -36.5t-11 -32.5q-7 -21 -12 -29q-2 -4 -5.5 -7t-9 -6.5t-7.5 -5.5q-18 -14 -20 -30q-1 -11 4 -23q-9 -4 -10.5 -6.5t-0.5 -11.5q1 -6 12.5 -38.5t6.5 -51.5q7 0 10 5t4 13.5t3 11.5q9 -6 12 -23q4 -14 -10 -22q-10 -5 -30.5 -11t-24.5 -7
+q-13 -5 -22.5 -14t-14.5 -16.5t-8 -23t-4 -21.5t-2 -24q-5 -49 -8 -63q0 -2 -1 -7.5t-1.5 -7t-1.5 -6t-0.5 -6.5t0.5 -6t1 -7t2 -6.5t3 -7.5q1 -1 2 -3q6 -12 7.5 -17t-3.5 -18q-27 -3 -54 -14q-29 -13 -41 -29q-3 -4 -4.5 -9t-1.5 -8.5t1.5 -9.5t2.5 -8.5t4.5 -9.5t3.5 -8
+q2 -4 0 -7.5t-6.5 -7.5t-5.5 -7q-5 -10 -3 -25q0 -7 5 -29q-16 -10 -28 -19q-21 -18 -30 -40q-5 -12 -7 -27q-1 -7 -1 -15q7 -4 15 -7q45 -19 115 -29q122 -17 284 -3q55 4 133 17q4 0 10 1q28 5 43.5 8t38 11.5t37.5 20.5q18 15 -9 50q-18 23 -50 39q-7 3 -13 5
+q-3 1 -4 2.5t-1 3t0.5 4.5t0.5 4q1 18 2 38q0 1 -13 14q5 8 7 15q6 16 2 29q-5 18 -30 33q-10 5 -25 11q-5 2 -12 7t-10 6t-6 1.5t-4 1.5t-1 5q0 8 2 16q0 2 10 27q8 20 5 46q-9 84 -43 134q-6 7 -23 13.5t-34.5 10.5t-33.5 10.5t-19.5 15.5t7.5 26q5 6 7 -2q1 -3 1 -4
+q4 -11 13 -14q8 -3 9 0.5t-2 8.5q-1 3 -1 5q-3 11 -1 24q2 6 6 20t5 22q2 17 -5 22q-3 2 -5 4t-2.5 4t-0.5 5v7q-1 17 -16 31q-7 6 -19 13q-4 3 -5.5 10t-2.5 9q-2 3 -6.5 7.5t-5.5 6.5q-4 6 -4 23q-9 23 -12 31q-1 1 -3 5.5t-2 6.5q-3 6 -8 6h-4v0z" />
+    <glyph glyph-name="muyu2" unicode="&#xe612;" 
+d="M752 409q17 -7 47 -17t47 -16.5t39.5 -24t34.5 -41t20.5 -66t8.5 -100.5q0 -34 -2 -61.5t-5.5 -48t-9 -36t-13 -26t-17 -17t-21 -10t-24.5 -5t-28 -2t-31 -0.5q-15 1 -22 1h-347q-43 0 -71 27t-37 67t-2 85q9 63 65.5 79t114.5 -24q13 -9 29 -21t22.5 -16t17.5 -9.5
+t21 -6t25 0.5q47 3 71.5 36t24.5 83q0 27 -4.5 51.5t-15 49.5t-31.5 40t-50 15q-24 0 -45.5 -11t-36.5 -24t-41.5 -24t-58.5 -11q-31 0 -53 27t-27.5 65.5t-1 77t27 65.5t56.5 27q36 0 69 -16.5t59.5 -40t79.5 -59t115 -63.5zM460.5 821q-31.5 16 -69 -1t-58.5 -57
+q-19 -37 -14 -73.5t30 -56.5q-257 -493 -275 -536q-12 -28 7 -45q22 -20 48 8q13 14 24 39q28 67 225 519q30 -5 60 13t48 52q21 41 13.5 81.5t-39 56.5z" />
+    <glyph glyph-name="xiaoxizhongxin" unicode="&#xe605;" 
+d="M48 669v-395q0 -57 40.5 -98t98.5 -41h208l7 -175l205 175h234q58 0 98.5 41t40.5 98v395q0 58 -40.5 98.5t-98.5 40.5h-654q-58 0 -98.5 -40.5t-40.5 -98.5v0zM647 449.5q0 27.5 19.5 47t46.5 19.5t46.5 -19.5t19.5 -47t-19.5 -46.5t-46.5 -19t-46.5 19t-19.5 46.5z
+M446 449.5q0 27.5 19.5 47t46.5 19.5t46.5 -19.5t19.5 -47t-19.5 -46.5t-46.5 -19t-46.5 19t-19.5 46.5zM249 449.5q0 27.5 19 47t46.5 19.5t46.5 -19.5t19 -47t-19 -46.5t-46.5 -19t-46.5 19t-19 46.5z" />
+    <glyph glyph-name="shouqi" unicode="&#xe677;" 
+d="M833 -32v832q0 6 -5 11t-11 5h-33q-6 0 -11 -5t-5 -11v-832q0 -7 5 -11.5t11 -4.5h33q6 0 11 4.5t5 11.5zM545 -32v832q0 6 -5 11t-11 5h-33q-6 0 -11 -5t-5 -11v-832q0 -7 5 -11.5t11 -4.5h33q6 0 11 4.5t5 11.5zM256 -32v832q0 6 -5 11t-11 5h-33q-6 0 -11 -5t-5 -11
+v-832q0 -7 5 -11.5t11 -4.5h33q6 0 11 4.5t5 11.5z" />
+    <glyph glyph-name="mima1" unicode="&#xe654;" 
+d="M847 -128h-675q-44 0 -75 29t-31 71v424q0 41 30.5 70.5t75.5 29.5h26v98q0 128 90.5 215t220.5 87t221 -87t91 -215v-99h26q44 0 75 -29t31 -71v-424q0 -41 -31 -70t-75 -29zM465 187v-111q0 -18 13 -30t31.5 -12t31.5 12t13 30v111q20 11 32.5 30.5t12.5 42.5
+q0 35 -26.5 59.5t-63 24.5t-63 -24.5t-26.5 -59.5q0 -23 12.5 -42.5t32.5 -30.5zM732 598q0 87 -65 148.5t-157.5 61.5t-157.5 -61.5t-65 -148.5v-102h445v102z" />
+    <glyph glyph-name="xiangshangjiantou" unicode="&#xe65d;" 
+d="M966 227l-435 432q-7 7 -17.5 7t-17.5 -7l-442 -432q-7 -7 -7 -17.5t7.5 -17.5t17.5 -7t18 7l425 416l416 -416q7 -7 17.5 -7t18 7t7.5 17.5t-8 17.5z" />
+    <glyph glyph-name="xiangxiajiantou" unicode="&#xe65e;" 
+d="M966 573q-7 7 -17.5 7t-17.5 -7l-416 -416l-425 416q-8 7 -18 7t-17.5 -7t-7.5 -17.5t7 -17.5l442 -432q7 -8 17.5 -8t17.5 8l435 432q15 20 0 35z" />
+    <glyph glyph-name="xiangyoujiantou" unicode="&#xe65f;" 
+d="M762 406l-432 436q-8 7 -18 7t-17.5 -7.5t-7.5 -17.5t7 -18l416 -416l-416 -425q-7 -7 -7 -17.5t7.5 -18t17.5 -7.5t18 8l432 441q7 7 7 17.5t-7 17.5z" />
+    <glyph glyph-name="xiangzuojiantou" unicode="&#xe660;" 
+d="M730 -35l-416 425l416 416q7 8 7 18t-7.5 17.5t-17.5 7.5t-18 -7l-432 -436q-7 -7 -7 -17.5t7 -17.5l432 -441q8 -8 18 -8t17.5 7.5t7.5 18t-7 17.5z" />
+    <glyph glyph-name="zhankai1" unicode="&#xe69c;" 
+d="M928 704h-832q-7 0 -11.5 -4.5t-4.5 -11.5v-32q0 -7 4.5 -11.5t11.5 -4.5h832q7 0 11.5 4.5t4.5 11.5v32q0 7 -4.5 11.5t-11.5 4.5zM928 416h-832q-7 0 -11.5 -4.5t-4.5 -11.5v-32q0 -7 4.5 -11.5t11.5 -4.5h832q7 0 11.5 4.5t4.5 11.5v32q0 7 -4.5 11.5t-11.5 4.5z
+M928 127h-832q-7 0 -11.5 -4.5t-4.5 -11.5v-32q0 -7 4.5 -11.5t11.5 -4.5h832q7 0 11.5 4.5t4.5 11.5v32q0 7 -4.5 11.5t-11.5 4.5z" />
+    <glyph glyph-name="location" unicode="&#xe6c2;" 
+d="M513 -94h-1q-26 0 -44 19q-89 92 -172 205q-166 223 -166 350q0 104 51 192t139 139t192 51t192 -51t139 -139t51 -192q0 -77 -58 -186q-57 -105 -168 -241l-1 -1l-109 -126q-18 -20 -45 -20v0zM512 805q-88 0 -163 -43.5t-118.5 -118.5t-43.5 -163q0 -108 155 -316
+q81 -110 168 -200q1 -1 2 -1h1q1 0 2 1l109 125q107 132 161 232q52 97 52 159q0 88 -43.5 163t-118.5 118.5t-163 43.5zM512 302q-74 0 -126.5 52t-52.5 126t52.5 126.5t126.5 52.5t126.5 -52.5t52.5 -126.5t-52.5 -126t-126.5 -52zM512 602q-50 0 -85.5 -35.5t-35.5 -86
+t35.5 -86t85.5 -35.5t85.5 35.5t35.5 86t-35.5 86t-85.5 35.5z" />
+    <glyph glyph-name="suoxiaotuichuquanpingshouhui" unicode="&#xe794;" 
+d="M410 382h-312q-14 0 -23 -9t-9 -22.5t9 -23t23 -9.5h242l-267 -267q-9 -9 -9 -21.5t9 -21.5t21.5 -9t21.5 8l270 270v-247q0 -13 9 -22.5t22.5 -9.5t23 9.5t9.5 22.5v320q0 32 -40 32zM553 446h313q13 0 22.5 9.5t9.5 23t-9.5 22.5t-22.5 9h-243l267 268q9 9 9 21.5
+t-9 21.5t-21.5 9t-21.5 -9l-269 -269v246q0 14 -9.5 23t-23 9t-22.5 -9t-9 -23v-320q0 -15 10.5 -23.5t28.5 -8.5z" />
+    <glyph glyph-name="xitong1" unicode="&#xe61b;" 
+d="M512.5 208q-72.5 0 -124 51.5t-51.5 124t51.5 123.5t124 51t124 -51t51.5 -123.5t-51.5 -124t-124 -51.5zM923 461v0l-82 19l-2 6q-8 26 -22 52l-3 6l44 74q12 18 13 36t-11 33l-42 42q-12 13 -33 13t-37 -12h-1l-72 -46l-6 3q-25 14 -52 22l-6 2l-19 84v0
+q-3 19 -17.5 34t-33.5 15h-59q-17 0 -30 -15t-17 -35l-21 -82l-6 -2q-29 -9 -56 -24l-6 -3l-74 47v0q-16 12 -37 12t-33 -13l-42 -42q-12 -14 -11 -32.5t12 -36.5l47 -77l-3 -6q-13 -26 -20 -49l-2 -6l-83 -19v0q-19 -3 -34 -17.5t-15 -33.5v-59q0 -17 15 -30t35 -18l83 -20
+l2 -6q8 -23 19 -46l3 -6l-47 -77q-11 -18 -12 -36t11 -33l42 -42q12 -13 33 -13t37 12v0l75 47l5 -3q28 -15 56 -24l6 -2l21 -82q5 -20 17.5 -35t30.5 -15h59q18 0 32.5 15t18.5 34v0l18 84l7 2q26 9 51 22l6 3l72 -46h1q16 -12 37 -12t33 13l42 42q12 15 11 33t-13 36
+l-44 74l3 6q12 24 20 49l2 6l83 20q21 5 35.5 18t14.5 30v59q0 19 -15 33.5t-34 17.5v0z" />
+    <glyph glyph-name="ai-edit" unicode="&#xe613;" horiz-adv-x="1025" 
+d="M202 771q-41 0 -70.5 -29t-29.5 -70v-598q0 -41 29.5 -70t70.5 -29h598q41 0 70 29t29 70v393l103 99v-529q0 -68 -50 -116.5t-119 -48.5h-668q-68 0 -116.5 48.5t-48.5 116.5v661q0 70 49 123t116 53h529l-99 -103h-393zM568 285l-222 -63l63 221zM590 307l-159 158
+l349 346l159 -157zM1010 725l-47 -47l-159 157l48 47q13 13 31 14t30 -12l99 -98q13 -12 12 -30t-14 -31v0zM1010 725z" />
+    <glyph glyph-name="sanjiao" unicode="&#xe6a2;" 
+d="M290 818l651 -440l-651 -441v881z" />
+    <glyph glyph-name="error-circle" unicode="&#xe615;" 
+d="M511 -61q-89 0 -170.5 34t-144.5 97t-97 144t-34 170.5t34 171t97 144.5t144.5 96.5t170.5 33.5t170.5 -33.5t144.5 -96.5t96.5 -144.5t33.5 -171t-33.5 -170.5t-96.5 -144t-144.5 -97t-170.5 -34zM511 779q-79 0 -151 -30t-128 -85.5t-85.5 -127.5t-29.5 -151t29.5 -151
+t85.5 -128t128 -86t151 -30t151 30t128 86t85.5 128t29.5 151t-29.5 151t-85.5 127.5t-128 85.5t-151 30zM362.5 212q-10.5 0 -18 7.5t-7.5 18t8 18.5l296 297q8 7 18.5 7t18 -7.5t7.5 -18t-8 -18.5l-296 -296q-8 -8 -18.5 -8zM659.5 212q-10.5 0 -18.5 8l-296 296
+q-8 8 -8 18.5t7.5 18t18 7.5t18.5 -7l296 -297q8 -8 8 -18.5t-7.5 -18t-18 -7.5z" />
+    <glyph glyph-name="shouqi1" unicode="&#xe65b;" 
+d="M510 768l419 -419q14 -14 32.5 -14t32.5 14t14 32.5t-14 32.5l-482 482l-482 -482q-14 -14 -14 -32.5t14 -32.5t32.5 -14t32.5 14l415 419v0zM512 305l419 -419q14 -14 32.5 -14t32.5 14t14 32.5t-14 32.5l-484 482l-482 -482q-14 -14 -14 -32.5t14 -32.5t32.5 -14
+t32.5 14l417 419v0zM512 305z" />
+    <glyph glyph-name="jian" unicode="&#xe648;" 
+d="M797 516h-91v139q0 47 -33 80t-79 33h-352q-47 0 -80 -33t-33 -80v-351q0 -47 33 -80t80 -33h143v-87q0 -42 29.5 -71.5t70.5 -29.5h312q42 0 71.5 29.5t29.5 71.5v312q0 41 -29.5 70.5t-71.5 29.5zM242 255q-20 0 -34.5 14.5t-14.5 34.5v351q0 21 14.5 35t34.5 14h352
+q20 0 34.5 -14t14.5 -35v-139h-158q-41 0 -70.5 -29.5t-29.5 -70.5v-161h-143zM643 452v-148q0 -20 -14.5 -34.5t-34.5 -14.5h-145v161q0 15 10.5 25.5t25.5 10.5h158zM834 104q0 -15 -10.5 -26t-26.5 -11h-312q-15 0 -25.5 11t-10.5 26v87h145q46 0 79 33t33 80v148h91
+q16 0 26.5 -10.5t10.5 -25.5v-312z" />
+    <glyph glyph-name="daiban1" unicode="&#xe679;" 
+d="M511 831q-91 0 -173.5 -35.5t-142 -95t-94.5 -142t-35 -173t35 -173t94.5 -142t142 -95t173 -35.5t173 35.5t142.5 95t95 142t35 173t-35 173t-95 142t-142.5 95t-172.5 35.5v0zM495 728q5 1 5 2h20q22 -10 24 -12q27 -22 18 -55q-10 -34 -45 -38q-21 -2 -37.5 10
+t-20.5 32t6.5 37.5t29.5 23.5v0zM273 633q51 -35 153 -114q60 -47 116 -91q27 -21 21 -52q-7 -34 -40 -42q-34 -7 -55 20q-138 178 -179 234q-21 29 -31 46q-2 5 -3 8q7 -1 18 -9v0zM856 372q-1 0 -1 -4q0 -2 1 -3v-8q-1 -5 -2 -15.5t-2 -16.5q-13 -74 -56 -137
+q-45 -64 -112 -103q-60 -34 -125 -43q-3 0 -11 -0.5t-12 -0.5h-5h-3h-4h-27h-3h-3h-8q-5 0 -15.5 1t-16.5 2q-93 17 -165 78q-64 54 -96 133q-17 40 -22 83q-1 3 -1 9.5t-1 9.5v8q0 1 1 3l-1 4v27q1 0 1 2.5v2.5l-1 3v6q0 1 4 22q6 44 24 86q4 11 15 16t22 1
+q16 -5 22.5 -18.5t0.5 -28.5q-10 -28 -15 -49q-15 -74 8 -144q21 -61 66 -106q39 -41 92 -63q56 -23 116 -21q83 4 150 51q64 45 95 117q30 69 20 143q-15 116 -109 189q-6 4 -12.5 8t-14.5 9t-12 7q-9 7 -14 15q-14 22 6 42q14 15 37 4q106 -56 157 -163q25 -53 30 -113
+q1 -4 2 -4v-6q-1 0 -1 -2.5v-2.5v-4l1 -4v-22v0zM856 372z" />
+    <glyph glyph-name="laba" unicode="&#xe647;" 
+d="M867 611q-9 10 -22 10t-22.5 -9.5t-9.5 -22.5t9 -23q74 -73 74 -182q0 -104 -74 -182q-9 -10 -9 -23t9.5 -22.5t22.5 -9.5t22 10q93 93 93 227t-93 227zM774 518q-9 10 -22 10t-22.5 -9.5t-9.5 -22.5t10 -22q38 -39 38 -90q0 -56 -38 -90q-10 -9 -10 -22t9.5 -22.5
+t22.5 -9.5t22 10q58 57 58 134q0 38 -15.5 74t-42.5 60zM557 752l-237 -144v-448l237 -144q33 -21 58 -7.5t25 52.5v643q0 40 -25 54t-58 -6zM64 512v-256q0 -41 27.5 -68.5t68.5 -27.5h96v448h-96q-41 0 -68.5 -27.5t-27.5 -68.5z" />
+    <glyph glyph-name="shenfenxinxi" unicode="&#xe810;" 
+d="M511 707h324q24 0 37 -2q87 -11 87 -98q1 -228 0 -438q0 -48 -29 -77.5t-77 -29.5q-361 -1 -684 0q-48 0 -76 28t-28 75q-1 220 0 436q1 105 106 106h340v0v0zM413 210v82q-2 25 -19 44t-41 21q-63 5 -128 0q-22 -1 -37.5 -15t-19.5 -36q-2 -14 -3 -29.5t-1.5 -36
+t-0.5 -30.5h250v0v0zM365 486q0 31 -22 52.5t-54 22.5q-32 0 -54 -22t-22 -54t22 -54t54 -22t54 22.5t22 54.5v0v0zM661 308h118q33 0 34 26q2 30 -32 30q-123 1 -239 0q-33 0 -32 -31q1 -25 34 -25h117v0v0zM661 205v0h118q34 1 34 26q0 13 -8.5 21t-23.5 8q-107 1 -240 0
+q-16 0 -22 -9q-12 -17 -6 -27q11 -17 28 -18t120 -1v0v0zM704 409h75q16 0 25 7.5t9 19.5q-1 25 -32 26q-79 1 -157 0q-15 -1 -23.5 -9t-7.5 -19q4 -25 34 -25h77v0v0zM704 409z" />
+    <glyph glyph-name="zhankai" unicode="&#xe63c;" 
+d="M204 391l326 -289l288 288l41 -42l-327 -327l-367 326zM204 747l326 -290l288 289l41 -42l-327 -327l-367 326z" />
+    <glyph glyph-name="icon-yxj-record" unicode="&#xe639;" 
+d="M774 476h-520q-9 0 -16 7t-7 16.5t7 16t16 6.5h520q9 0 16 -6.5t7 -16t-7 -16.5t-16 -7zM623 297h-369q-9 0 -16 8t-7 17.5t7 17.5t16 8h369q9 0 16 -8t7 -17.5t-7 -17.5t-16 -8zM689 118h-435q-9 0 -16 8t-7 17.5t7 17.5t16 8h435q9 0 16 -8t7 -17.5t-7 -17.5t-16 -8z
+M660 660h-296q-38 0 -64 25.5t-26 62.5q0 30 19 53.5t50 29.5q7 29 31 47t56 18h164q32 0 56 -18t31 -47q31 -6 50 -29.5t19 -54.5q0 -36 -26 -61.5t-64 -25.5zM430 850q-19 0 -31 -11.5t-12 -28.5q0 -9 -7 -16t-16 -7q-19 0 -31 -10.5t-12 -27.5t12 -27t31 -10h296
+q19 0 31 10.5t12 27t-12 27.5t-31 11q-9 0 -16 6.5t-7 16.5q0 17 -12 28t-31 11h-164zM842 -127h-660q-49 0 -83.5 34.5t-34.5 83.5v660q0 49 34.5 83.5t83.5 34.5h115q10 0 17 -7t7 -16.5t-7 -16.5t-17 -7h-115q-29 0 -50 -21t-21 -50v-660q0 -29 21 -50t50 -21h660
+q29 0 50 21t21 50v660q0 29 -21 50t-50 21h-115q-10 0 -17 7t-7 16.5t7 16.5t17 7h115q49 0 83.5 -34.5t34.5 -83.5v-660q0 -49 -34.5 -83.5t-83.5 -34.5z" />
+    <glyph glyph-name="huiyuan" unicode="&#xe62c;" 
+d="M573 462q-40 -17 -73.5 -44.5t-58 -63.5t-38 -78t-13.5 -89q0 -41 10.5 -79t29.5 -71h-21q-23 0 -53.5 1.5t-63.5 4.5l-64 6q-32 4 -58.5 8t-44.5 8t-23 8q-8 6 -12.5 39t3.5 84q3 20 13 32.5t24 22t31.5 15t36 10.5t35.5 11t31 15q16 10 25.5 20t13.5 19.5t4 19.5t-1 23
+q-2 18 -13 29t-24 22q-7 5 -12 15t-9 20q-4 12 -8 25q-6 1 -11 5t-10.5 11.5t-9.5 21t-3 24.5t5 19q3 9 10 17q0 30 3 60q3 26 11 55t25 52q16 22 34 36t38 22t39 10.5t38 2.5q23 0 45.5 -5t42 -13.5t35 -19.5t24.5 -22q21 -26 30.5 -56.5t13.5 -58.5q4 -31 4 -64
+q5 -4 8 -10t5 -14.5t1 -21.5q-2 -17 -7 -27t-11 -15q-8 -7 -15 -9l-4 -10l-4 -11q-1 -6 -4 -12v0v0zM687 436q51 0 96.5 -19.5t79.5 -53.5t53.5 -79.5t19.5 -97t-19.5 -97.5t-53.5 -80t-79.5 -53t-96.5 -19q-53 0 -98.5 19t-79 53t-53.5 80t-20 97t20 97t53.5 80t79 53.5
+t98.5 19.5v0v0zM832 235q5 16 -4 29t-24 18.5t-30 1t-22 -24.5q-4 -14 -8 -25q-4 -12 -7 -24q-4 -13 -9 -27.5t-13 -33.5q-8 -21 -22.5 -19.5t-22.5 16.5q-9 16 -16 34q-7 17 -15 36q-7 17 -12 32q-6 14 -10 23q-6 12 -21 14t-28.5 -4t-23 -19t-2.5 -28q5 -16 12 -35.5
+t15 -40.5q8 -20 15.5 -40t12.5 -34q12 -30 36 -45t50.5 -16t51 11.5t35.5 38.5q9 21 18 43t17.5 44t15.5 41q7 20 11 34v0v0zM832 235z" />
+    <glyph glyph-name="renshiguanli" unicode="&#xe60d;" horiz-adv-x="1029" 
+d="M839 82v4.5v4.5l-16 -9h16zM701 103l15 85q0 5 -3 9l-61 60q-23 22 -14 48q1 5 3 8q-14 7 -34 15q-6 1 -18 4.5t-18 4.5q-12 9 -36 59q-8 1 -23 3q1 14 11 26.5t12 19.5t3 26.5t6 28.5q3 6 13 11t13 9q8 11 12 34q8 42 -2 63q-2 4 -4.5 8.5t-4 7.5t-1.5 9q-1 10 2 44
+t3 35q1 51 -7 84q-9 26 -22 34l-27 4l-17 15q-24 15 -49.5 20t-51.5 0t-40.5 -9.5t-35.5 -13.5q-44 -14 -63.5 -71t-2.5 -140q3 -11 -3.5 -23t-6.5 -16q0 -2 1 -17t2.5 -23t4 -21t7 -21t10.5 -12q1 0 5.5 -1.5t8.5 -2.5t4 0l6 -69q3 -5 12 -15.5t11 -22.5l-17 -4
+q-24 -50 -36 -59q-6 -2 -18 -5t-18 -5q-24 -9 -69.5 -29t-61.5 -26q-8 -3 -29.5 -11t-31.5 -12.5t-22.5 -15.5t-17.5 -25v-126h419h283q-2 11 -1 21zM762 349q5 1 8 6l1 1q-18 8 -33 14q-23 6 -35 9q-12 8 -34 56l-22 4q0 13 9.5 24.5t12 18.5t3.5 25.5t5 27.5q3 5 12.5 10
+t12.5 9q8 10 12 32q7 41 -3 61q-1 3 -3.5 7.5t-4 7.5t-1.5 9q-1 9 2 41.5t3 33.5q1 49 -7 80q-9 25 -21 32l-26 5l-16 14q-49 31 -118 12q1 0 1 -1l3 -1l12 -11l23 -4l5 -3q25 -14 38 -53v-1l1 -1q9 -38 8 -93q0 -4 -2 -24q-4 -44 -3 -51v-1q0 -1 1 -2q4 -7 5 -10
+q16 -32 6 -85q-6 -31 -18 -48q-8 -11 -25 -20q0 -3 -1 -13q-1 -21 -4 -33q-3 -7 -7 -13l5 -10q0 -1 1 -2.5t1 -2.5q13 -28 20 -37q5 -1 14 -3.5t13 -3.5l2 -1l3 -1q18 -7 56 -24l1 1zM701 103l15 85q0 5 -3 9l-61 60q-23 22 -14 48q1 5 3 8q-14 7 -34 15q-6 1 -18 4.5
+t-18 4.5q-12 9 -36 59q-8 1 -23 3q1 14 11 26.5t12 19.5t3 26.5t6 28.5q3 6 13 11t13 9q8 11 12 34q8 42 -2 63q-2 4 -4.5 8.5t-4 7.5t-1.5 9q-1 10 2 44t3 35q1 51 -7 84q-9 26 -22 34l-27 4l-17 15q-24 15 -49.5 20t-51.5 0t-40.5 -9.5t-35.5 -13.5q-44 -14 -63.5 -71
+t-2.5 -140q3 -11 -3.5 -23t-6.5 -16q0 -2 1 -17t2.5 -23t4 -21t7 -21t10.5 -12q1 0 5.5 -1.5t8.5 -2.5t4 0l6 -69q3 -5 12 -15.5t11 -22.5l-17 -4q-24 -50 -36 -59q-6 -2 -18 -5t-18 -5q-24 -9 -69.5 -29t-61.5 -26q-8 -3 -29.5 -11t-31.5 -12.5t-22.5 -15.5t-17.5 -25v-126
+h419h283q-2 11 -1 21zM839 82v4.5v4.5l-16 -9h16zM1023 282q7 7 5.5 12.5t-11.5 7.5l-85 12q-9 2 -19 9t-15 16l-38 77q-4 9 -10 9t-11 -9l-38 -77q-4 -9 -14 -16t-20 -9l-85 -12q-9 -2 -11 -7.5t5 -12.5l61 -60q7 -7 11 -18.5t2 -21.5l-14 -85q-3 -15 8 -15q4 0 9 3l76 40
+q8 4 20.5 4t21.5 -4l75 -40q5 -3 9 -3q11 0 8 15l-14 85q-2 9 2 21t11 19zM1023 282q7 7 5.5 12.5t-11.5 7.5l-85 12q-9 2 -19 9t-15 16l-38 77q-4 9 -10 9t-11 -9l-38 -77q-4 -9 -14 -16t-20 -9l-85 -12q-9 -2 -11 -7.5t5 -12.5l61 -60q7 -7 11 -18.5t2 -21.5l-14 -85
+q-3 -15 8 -15q4 0 9 3l76 40q8 4 20.5 4t21.5 -4l75 -40q5 -3 9 -3q11 0 8 15l-14 85q-2 9 2 21t11 19z" />
+    <glyph glyph-name="xinzenghuiyuan" unicode="&#xe61f;" 
+d="M729 4q-84 0 -143.5 59.5t-59.5 143.5q0 60 31.5 109t82.5 74q4 5 7 10q5 12 9 23q6 17 9 27q8 3 16 10q7 6 12 17q6 11 7 29q2 14 0 24q-2 9 -6 15q-3 7 -9 12q0 35 -4 70q-4 29 -14 64q-11 34 -33 62q-9 12 -25.5 24t-37.5 22q-21 9 -45 15q-24 5 -48 5q-20 0 -40 -3
+q-21 -3 -41.5 -11.5t-40.5 -23.5t-36 -40q-18 -25 -27 -57q-8 -32 -12 -60q-4 -33 -3 -67q-8 -8 -11 -18q-4 -9 -5 -21t4 -27q4 -14 10 -22t11 -12q6 -5 12 -7q5 -16 8 -28q4 -10 10 -22q4 -10 11 -17q15 -12 26.5 -23.5t13.5 -31.5q1 -13 1 -25t-4 -22q-5 -11 -14 -21
+q-9 -11 -27 -22q-22 -14 -52 -22t-57 -18q-28 -10 -48 -27q-21 -17 -25 -49q-8 -57 -3.5 -92.5t12.5 -42.5q5 -5 25 -9t47 -9q28 -4 62 -8t69 -7q32 -3 67 -5q33 -2 57 -2q23 0 58 2t69 5q38 3 72 7q37 5 65 10q30 6 49 12q20 6 24 12q6 10 9 28q0 2 1 5q-45 -24 -96 -24z
+M726 383q-74 0 -126 -52t-52 -126t52 -126t126 -52t126.5 52t52.5 126t-52.5 126t-126.5 52v0zM826 207v-5v0q-1 -9 -7.5 -15.5t-15.5 -6.5h-52v-74h-28v0q-9 0 -15.5 6.5t-6.5 15.5v52h-74v28v0q0 9 6.5 15.5t15.5 6.5h52v52v23h29v0q9 -1 15 -7.5t6 -15.5v-52h75v-23v0z
+M826 207z" />
+    <glyph glyph-name="fozhu" unicode="&#xe601;" 
+d="M96 410v-22t1 -24q-33 -15 -48 -47.5t-5 -67.5q9 -31 34.5 -50t57.5 -19q7 0 15 2q11 -21 25 -39q-20 -30 -15 -66t32 -59q27 -24 63 -24t64 24q20 -10 42 -19q0 -36 23 -63.5t59 -32.5q7 -1 14 -1q32 0 57.5 19.5t34.5 50.5q24 2 46 7q28 -45 81 -45q21 0 40 9
+q33 15 47.5 48t4.5 67q18 14 35 30q19 -9 40 -9q53 0 81 44q20 31 14.5 66.5t-32.5 58.5q7 22 13 45q35 5 59 32t24 63v1v1q0 36 -24 63t-60 32q-5 23 -13 44q27 24 32.5 59t-14.5 66t-54.5 40.5t-66.5 -5.5q-17 16 -36 30q11 34 -4 67t-48 48t-67.5 4.5t-53.5 -40.5
+q-22 4 -46 6q-10 34 -40 54t-65.5 14.5t-59 -33t-23.5 -63.5q-22 -8 -42 -19q-27 23 -63 23.5t-63 -23.5t-32 -60t15 -65q-14 -19 -25 -39q-36 5 -66.5 -14t-40.5 -54t5.5 -67.5t47.5 -47.5zM144 403q29 3 52 21t31.5 47t-1 57t-32.5 46q8 13 17 26q21 -11 44 -11
+q36 0 63 23q23 20 30 49t-3 56q14 7 28 13q13 -22 35 -35.5t48 -13.5q7 0 14 1q30 5 51.5 25t28.5 49q14 -2 30 -5q-2 -29 13.5 -54t42.5 -38q19 -8 40 -8q38 0 66 27l24 -20q-17 -24 -18 -53t15 -55v0q29 -44 81 -44q8 0 19 2q5 -15 9 -29q-28 -11 -44.5 -35.5t-16.5 -54.5
+v0v-1q0 -30 17 -54.5t44 -34.5q-4 -15 -9 -30q-28 6 -55.5 -5t-43.5 -37q-17 -26 -15.5 -55t18.5 -53q-12 -10 -23 -20q-21 20 -50 25.5t-57 -7.5q-27 -12 -42 -37.5t-14 -54.5q-16 -3 -30 -5q-7 29 -28.5 49t-51.5 24.5t-56 -9t-41 -38.5q-14 5 -27 12q9 27 2 56t-30 48.5
+t-52.5 23t-55.5 -10.5l-16 26q23 18 32 46t0.5 56.5t-31.5 47t-52 21.5v16v15z" />
+    <glyph glyph-name="iconfontquanping" unicode="&#xe60a;" 
+d="M144 -16h304q13 0 22 9.5t9 22t-9 22t-22 9.5h-236l260 260q9 9 9 21t-9 21t-21 9t-21 -9l-262 -262v240q0 13 -9 22t-22 9t-22 -9t-9 -22v-311q0 -32 38 -32v0zM880 794h-304q-13 0 -22 -9t-9 -22t9 -22t22 -9h236l-260 -261q-9 -8 -9 -20.5t9 -21.5t21 -9t21 9l262 262
+v-240q0 -12 9 -21.5t22 -9.5t22 9.5t9 21.5v312q0 15 -10.5 23t-27.5 8v0z" />
+    <glyph glyph-name="iconfontshuangjiantou" unicode="&#xe608;" 
+d="M535 52l335 341q10 11 10 26.5t-10.5 26t-25.5 10.5t-26 -11l-311 -317l-312 317q-11 11 -26 11t-25.5 -10.5t-10.5 -26t11 -26.5l335 -341q11 -12 28 -10q16 -2 28 10v0v0v0v0zM507 309q16 -1 28 10l335 341q10 11 10 26.5t-10.5 26t-25.5 10.5t-26 -10l-311 -318
+l-312 318q-11 10 -26 10t-25.5 -10.5t-10.5 -26t11 -26.5l335 -341q11 -11 28 -10v0v0v0z" />
+    <glyph glyph-name="temple" unicode="&#xe607;" 
+d="M626 749h-240q15 16 42.5 41t47 45t29.5 39q0 16 3 22q-7 -21 12 -44.5t55 -53.5t51 -49zM715 727v-23q67 -38 74 -38q16 0 28 16q-1 -2 -3 -7t-4.5 -9.5t-4.5 -8.5q-5 -8 -17 -15.5t-19 -7.5h-529q-14 0 -31 19t-14 29q12 -16 29 -16q6 0 36.5 19.5t36.5 25.5v16h418z
+M291 593h431v13h-431v-13zM310 513h392v57h-392v-57zM769 459q77 -51 96 -51q8 0 18 6.5t17 15.5q-1 -9 -11.5 -25t-10.5 -26q0 -3 -10 -13h-727l6 7q-3 5 -17 19.5t-18 27.5v10q5 -9 15 -15.5t20 -6.5q9 0 30 11.5t41.5 25t21.5 14.5q3 6 3 28h526v-28zM220 328h610v13
+h-610v-13zM763 302v-54h-514q0 7 1.5 21.5t1.5 16.5q0 6 -4.5 10t-4.5 6h520zM843 219v-38q1 0 26 -15t53.5 -30.5t38.5 -15.5q28 0 45 29q7 -14 -21 -47t-50 -33h-861q-24 8 -35 20q-12 8 -22 23.5t-10 20.5v16q12 -29 44 -29q13 0 36.5 13t48.5 29.5t30 18.5q3 0 3 10v28
+h674zM157 25h699v16h-699v-16zM189 -52h635v58h-635v-58zM96 -119h820v35h-820v-35z" />
+    <glyph glyph-name="huiyuan2" unicode="&#xe631;" 
+d="M516 821q-88 0 -169 -34t-140.5 -91.5t-95 -137.5t-36.5 -168q-2 -120 56 -221.5t158.5 -161t220.5 -61.5q87 -1 167.5 33t139.5 92t95 138t37 167q1 89 -33 171t-92 141.5t-138.5 95.5t-169.5 37zM809 134q-75 94 -187 130q140 177 10 289q-55 47 -128 44t-123 -55
+q-23 -24 -36 -56t-15 -68.5t17 -77.5t59 -76q-117 -38 -190 -131q-60 66 -82.5 158t3 190.5t97.5 172.5q71 74 169.5 102t198 6t172.5 -90q80 -74 110 -174.5t9 -196.5t-84 -167zM249 99q6 -8 8 -9q63 -62 157 -84.5t188.5 -1.5t160.5 80q9 11 8.5 16.5t-8.5 14.5
+q-140 156 -340 105q-106 -28 -174 -121zM513 281q54 0 94 39t41 94t-39.5 96t-95.5 41q-55 1 -95.5 -39.5t-40.5 -95.5q-1 -56 39 -95.5t97 -39.5z" />
+    <glyph glyph-name="shangchuan1" unicode="&#xe672;" 
+d="M512 896q-138 0 -256 -69t-187 -187t-69 -256t69 -256t187 -187t256 -69t256 69t187 187t69 256t-69 256t-187 187t-256 69zM559 128h-56q-12 0 -23 10.5t-11 23.5t11 23.5t23 10.5h56q13 0 23.5 -10.5t10.5 -23.5t-10.5 -23.5t-23.5 -10.5zM687 401h-94v-107
+q0 -12 -8.5 -20.5t-21.5 -8.5h-60q-12 0 -20.5 8.5t-8.5 20.5v107h-103q-12 0 -21 8t-9 18q0 30 13 38l145 162q13 13 30 13t30 -13l145 -162q13 -13 13 -38q-4 -10 -12.5 -18t-17.5 -8z" />
+    <glyph glyph-name="sousuo-sousuo" unicode="&#xe603;" 
+d="M691.5 646.5q-91.5 91.5 -221 91.5t-221 -91.5t-91.5 -221t91.5 -221.5t221 -92t221 92t91.5 221.5t-91.5 221zM181.5 136q-56.5 57 -88 131.5t-31.5 157.5q0 111 54.5 205.5t149 149t205.5 54.5t205 -54.5t149 -149t55 -205.5q0 -83 -31.5 -157.5t-88.5 -131.5
+t-131.5 -88.5t-157.5 -31.5t-158 31.5t-131.5 88.5zM946 -50q-17 -16 -40 -16t-39 16l-79 79q-17 17 -17 40t16.5 39.5t39.5 16.5t40 -17l79 -79q16 -16 16 -39t-16 -40v0z" />
+    <glyph glyph-name="shangchuan" unicode="&#xe63a;" 
+d="M542 144h-60q-12 0 -21 -9t-9 -21.5t9 -21t21 -8.5h60q12 0 21 8.5t9 21t-9 21.5t-21 9zM512 865q-98 0 -187 -38.5t-153.5 -102.5t-102.5 -153t-38 -187t38 -187t102.5 -153t153.5 -102.5t187 -38.5t187 38.5t153 102.5t102.5 153t38.5 187t-38.5 187t-102.5 153
+t-153 102.5t-187 38.5zM512 -55q-89 0 -170.5 35t-140 93.5t-93.5 140t-35 170.5t35 170.5t93.5 140t140 93.5t170.5 35t170.5 -35t140 -93.5t93.5 -140t35 -170.5t-35 -170.5t-93.5 -140t-140 -93.5t-170.5 -35zM541 610q-12 13 -28.5 13t-27.5 -13l-140 -162
+q-14 -16 -12 -38q2 -11 10 -18.5t20 -7.5h89v-150q0 -13 9 -21.5t21 -8.5h60q12 0 21 8.5t9 21.5v150h91q11 0 19.5 7.5t9.5 18.5q3 22 -11 38z" />
+    <glyph glyph-name="shoukuan" unicode="&#xe6fd;" 
+d="M986 269q-20 11 -72.5 -9.5t-105.5 -52t-103.5 -58.5t-64.5 -27q-3 -1 -9.5 -2.5t-27 -2t-42.5 2.5t-54.5 15t-64.5 31q-52 29 -101.5 61t-73.5 50l-24 17q-3 2 -8.5 5t-24 7.5t-37 5t-45 -6.5t-51.5 -23q-17 -12 -36.5 -23t-30 -16.5l-10.5 -5.5v-327q3 4 8.5 9.5
+t22.5 20t35.5 25.5t46 20t53.5 9q43 0 121 -26t137 -51.5t56 -25.5q3 -1 9 -3.5t24 -7t35 -6t39 2t40 14.5l378 282q13 6 18 24t-4.5 39t-32.5 33zM582 211q92 0 170 46t124 124t46 169.5t-46 169.5t-124 124t-170 46q-91 0 -169 -44.5t-124 -121t-46 -167.5
+q0 -92 46 -171.5t124 -127t169 -47.5zM474 749l115 -154l115 154h64l-141 -192h103q2 0 4 -1.5t2 -3.5v-2v-19q0 -3 -1.5 -4.5t-3.5 -1.5h-1h-122v-45h115q3 0 4.5 -1.5t1.5 -3.5l1 -1v-26q0 -3 -2 -4.5t-3 -1.5h-2h-115v-71q0 -6 -13 -6h-25q-3 0 -6.5 1.5t-4.5 3.5l-2 1
+v71h-109q-5 0 -5.5 0.5t-0.5 5.5v19q0 3 1.5 4.5t2.5 1.5l2 1h115v51h-115q-3 0 -4.5 1.5t-1.5 3.5v1v19q0 3 1.5 4.5l2.5 2.5h2h102l-140 192h64z" />
+    <glyph glyph-name="men" unicode="&#xe6cf;" 
+d="M501 422q-19 0 -32.5 -11t-13.5 -27t13.5 -27t32.5 -11t32.5 11t13.5 27t-13.5 27t-32.5 11zM760 784h-497q-32 0 -53.5 -16.5t-24.5 -44.5v0v-672q0 -30 22 -48.5t56 -18.5h497q33 0 56 18t23 44v676q0 26 -23 44t-56 18zM578 57q31 5 51.5 25t20.5 45v514
+q0 25 -20.5 45t-51.5 25l-243 33h425q20 0 33 -13q8 -8 8 -20v-654q0 -12 -8 -20q-13 -13 -33 -13h-425zM613 125q0 -5 -11.5 -17t-20.5 -14l-353 -51v680l353 -49q9 -2 20.5 -14t11.5 -17v-518z" />
+  </font>
+</defs></svg>
diff --git a/src/views/group/holidaySetting/theme/font/iconfont/iconfont.ttf b/src/views/group/holidaySetting/theme/font/iconfont/iconfont.ttf
new file mode 100644
index 00000000..df7bc168
Binary files /dev/null and b/src/views/group/holidaySetting/theme/font/iconfont/iconfont.ttf differ
diff --git a/src/views/group/holidaySetting/theme/font/iconfont/iconfont.woff b/src/views/group/holidaySetting/theme/font/iconfont/iconfont.woff
new file mode 100644
index 00000000..8fbd24fe
Binary files /dev/null and b/src/views/group/holidaySetting/theme/font/iconfont/iconfont.woff differ
diff --git a/src/views/group/holidaySetting/theme/public.css b/src/views/group/holidaySetting/theme/public.css
new file mode 100644
index 00000000..d0f7099b
--- /dev/null
+++ b/src/views/group/holidaySetting/theme/public.css
@@ -0,0 +1,411 @@
+@charset "UTF-8";
+@font-face {
+  font-family: 'iconfont';
+  src: url('font/iconfont/iconfont.eot?t=1492242939353'); /* IE9*/
+  src: url('font/iconfont/iconfont.eot?t=1492242939353#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('font/iconfont/element-icons.woff?t=1492242939353') format('woff'), /* chrome, firefox */
+  url('font/iconfont/element-icons.ttf?t=1492242939353') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
+  url('font/iconfont/iconfont.svg?t=1492242939353#iconfont') format('svg'); /* iOS 4.1- */
+}
+
+.iconfont {
+  font-family:"iconfont" !important;
+  font-size:16px;
+  font-style:normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-time:before { content: "\e62f"; }
+.icon-richeng:before { content: "\e641"; }
+.icon-guanbi:before { content: "\e617"; }
+
+.icon-xiangzuojiantou:before { content: "\e660"; }
+.icon-xiangyoujiantou:before { content: "\e65f"; }
+
+
+body {
+  margin: 0px;
+  padding: 0px;
+  /*background: url(assets/bg1.jpg) center !important;
+  background-size: cover;*/
+  background: #ffffff;
+  font-size: 12px;
+  -webkit-font-smoothing: antialiased;
+}
+body, button, input, select, textarea {
+  font: 400 1em/1.5 PingFang SC,/*Lantinghei SC,Helvetica Neue,*/Microsoft Yahei,Hiragino Sans GB,Microsoft Sans Serif,WenQuanYi Micro Hei,sans;
+}
+ul,li,dl,dt,dd{ margin:0; padding:0; list-style:none;}
+em,i{ font-style:normal; margin:0; padding:0;}
+h1,h2,h3,h4,h5,p{ margin:0; padding:0;}
+a{ cursor: pointer;}
+
+
+.full-jcalendar{
+  position: relative;
+  font-size: 14px;
+  display: inline-block;
+}
+.full-jcalendar .input-icon{
+  position: absolute;
+  width: 28px;
+  height: 100%;
+  right: 0;
+  top: 5px;
+  text-align: center;
+  color: #e8a400;
+  transition: all .3s;
+}
+.full-jcalendar .input-icon .iconfont{
+  font-size: 18px;
+}
+.full-jcalendar .input-icon .iconfont.is-clear{
+  color:#999;
+  font-weight: bolder;
+}
+.full-jcalendar .input-icon__tip{
+  position: absolute;
+  right:28px;
+  top:10px;
+  width:16px;
+  cursor: default;
+  text-align: center;
+}
+.full-jcalendar .input-icon__tip i{
+  display: block;
+  margin:0;
+  padding:0;
+  width:16px;
+  height:16px;
+  background-color: #ff5a00;
+  border-radius: 8px;
+  font-size: 12px;
+  color:#fff;
+  line-height: 16px;
+  text-align: center;
+  overflow: hidden;
+}
+
+.full-jcalendar .input__inner{
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  background-color: #fff;
+  background-image: none;
+  border-radius: 5px;
+  border: 1px solid #bfcbd9;
+  box-sizing: border-box;
+  color: #1f2d3d;
+  display: inline-block;
+  font-size: inherit;
+  height: 36px;
+  line-height: 1;
+  outline: none;
+  padding: 3px 10px;
+  transition: border-color .2s cubic-bezier(.645,.045,.355,1);
+  min-width:193px;
+  width: 100%;
+}
+.full-jcalendar .input__inner:focus{
+  outline: none;
+  border-color:#20a0ff;
+}
+.full-jcalendar .input__inner:hover{
+  border-color:#8391a5;
+}
+.input-icon+.input__inner{
+  padding-right:28px;
+}
+.input-icon__tip+.input__inner{
+  padding-right:35px;
+}
+.full-jcalendar input.input__inner::placeholder, .full-jcalendar input.input__inner:-moz-placeholder{
+  color:#97A8BE;
+}
+.full-jcalendar input.is-disabled{
+  background-color: #eef1f6;
+  border-color: #d1dbe5;
+  color: #bbb;
+  cursor: not-allowed;
+}
+.full-jcalendar .is-disabled i{
+   color: #bbb;
+ }
+.full-jcalendar .is-disabled *{
+  cursor: not-allowed;
+}
+
+.full-jcalendar__main{
+  cursor: pointer;
+  position: absolute;
+  z-index: 1670;
+  left:2px;
+  top:38px;
+  width:296px;
+  background-color: #ffffff;
+  border-radius: 5px;
+  -moz-box-shadow:2px 2px 5px #C9C9C9;
+  -webkit-box-shadow:2px 2px 5px #C9C9C9;
+  box-shadow:2px 2px 5px #C9C9C9;
+  overflow: hidden;
+}
+.full-jcalendar__main.is-daterange{
+  width:593px;
+}
+.full-jcalendar__main .date-range__month{
+  float: left;
+  width:296px;
+  overflow: hidden;
+}
+.full-jcalendar__main .date-range__month.leftMonth{
+  border-right:1px solid #F8F8F8;
+}
+.full-jcalendar-header{
+  position: relative;
+  width:100%;
+  padding:5px 0;
+  height:24px;
+  font-size: 14px;
+  text-align: center;
+  line-height: 24px;
+  color:#333;
+}
+.full-jcalendar-header span{ display: inline-block;}
+.full-jcalendar-header .title-year:hover,.full-jcalendar-header .title-month:hover{
+  color:#50bfff;
+}
+.date-range__month .full-jcalendar-header .title-year:hover,.date-range__month .full-jcalendar-header .title-month:hover{
+  color:#333;
+}
+.full-jcalendar-header .prev-month,.full-jcalendar-header .next-month {
+  cursor: pointer;
+  line-height: 20px;
+  text-align: center;
+  color: #E1CEB7;
+  font-size: 20px;
+}
+.full-jcalendar-header p.prev-month{
+  position: absolute;
+  z-index: 1676;
+  left:5px;
+  top:5px;
+}
+.full-jcalendar-header p.next-month {
+  position: absolute;
+  z-index: 1676;
+  right: 5px;
+  top: 5px;
+}
+
+.date-range__month .full-jcalendar-header .prev-year{
+  position: absolute;
+  z-index: 1676;
+  left: 5px;
+  top: 5px;
+}
+
+.date-range__month .full-jcalendar-header .prev-month{
+  left:35px;
+}
+.date-range__month .full-jcalendar-header .next-year{
+  position: absolute;
+  z-index: 1676;
+  right: 5px;
+  top: 5px;
+}
+.date-range__month .full-jcalendar-header .next-month{
+  right:35px;
+}
+
+.full-jcalendar__body {
+  margin: 0;
+  padding: 0;
+  width: 100%;
+  height: 280px;
+  position: relative;
+}
+.full-jcalendar__body ul,.full-jcalendar__body p {
+  margin: 0;
+  padding: 0;
+}
+.full-jcalendar__body .weeks {
+  width: 100%;
+  height: 30px;
+  display: flex;
+  border-top: 1px solid #F8F8F8;
+}
+.full-jcalendar__body .weeks .week {
+  flex: 1;
+  text-align: center;
+  font-size: 14px;
+  color: #8391A5;
+  line-height: 30px;
+  border: none;
+}
+.full-jcalendar__body .weeks .week strong {
+  font-weight: normal;
+}
+.full-jcalendar__body .week-row {
+  display: flex;
+  width:100%;
+}
+.full-jcalendar__body .week-row .day-cell {
+  position: relative;
+  flex: 1;
+  padding: 2px;
+  border: 1px solid #F8F8F8;
+  margin-right: -1px;
+  margin-bottom: -1px;
+  text-align: center;
+}
+.full-jcalendar__body .day-cell .day-number .lunar {
+  font-size: 12px;
+  color: #ACACAC;
+}
+.full-jcalendar__body .day-cell .day-number .solar {
+  font-size: 12px;
+  color: #483a32;
+  /*text-shadow: 1px 1px 1px #ddd;*/
+}
+/*.full-jcalendar__body .day-cell.not-cur-month .solar {*/
+  /*text-shadow: none;*/
+/*}*/
+.full-jcalendar__body .day-cell .day-number .solar .is-leap {
+  display: inline-block;
+  width:14px;
+  height:14px;
+  border-radius: 7px;
+  background-color: #f00;
+  font-size: 12px;
+  color: #fff;
+  text-align: center;
+  line-height: 14px;
+}
+.full-jcalendar__body .day-cell .day-number .term {
+  font－size:12px;
+  color: #FFC200;
+}
+.full-jcalendar__body .day-cell .day-number .festival {
+  font－size:12px;
+  color: #ff8610;
+}
+.full-jcalendar__body .day-cell .day-number .is-today {
+  font-size: 12px;
+  color: #20a0ff;
+}
+.full-jcalendar__body .day-cell .day-number .is-empty {
+  line-height: 34px;
+}
+.full-jcalendar__body .day-cell.today {
+  background-color: #FBF9F6;
+}
+.full-jcalendar__body .day-cell.today:before {
+  content: " ";
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 0;
+  height: 0;
+  border-top: .5em solid #20a0ff;
+  border-left: .5em solid transparent;
+}
+.full-jcalendar__body .day-cell.choose {
+  background-color: #d2ecff;
+}
+.full-jcalendar__body .day-cell.select {
+  background-color: #009bfe;
+}
+.full-jcalendar__body .day-cell.select .lunar,
+.full-jcalendar__body .day-cell.select .solar,
+.full-jcalendar__body .day-cell.select .term ,
+.full-jcalendar__body .day-cell.select .festival ,
+.full-jcalendar__body .day-cell.select .is-today{
+  color: #fff;
+}
+.full-jcalendar__body .day-cell.select .solar .is-leap {
+  background: none;
+}
+.full-jcalendar__body .day-cell.not-cur-month .lunar
+,.full-jcalendar__body .day-cell.not-cur-month .solar
+,.full-jcalendar__body .day-cell.not-cur-month .term
+,.full-jcalendar__body .day-cell.not-cur-month .festival{
+  color: #ddd;
+}
+.full-jcalendar__body .day-cell:hover {
+  background-color: #ECF1F4;
+}
+.full-jcalendar__body .day-cell.choose:hover {
+  background-color: #009bfe;
+}
+.full-jcalendar__body .day-cell.choose:hover .lunar,
+.full-jcalendar__body .day-cell.choose:hover .solar,
+.full-jcalendar__body .day-cell.choose:hover .term ,
+.full-jcalendar__body .day-cell.choose:hover .festival ,
+.full-jcalendar__body .day-cell.choose:hover .is-today{
+  color: #fff;
+}
+.full-jcalendar__body .select:hover{
+  background-color: #009bfe;
+}
+.full-jcalendar__body .day-cell.not-optional{
+  background-color: #ECF1F4;
+}
+.full-jcalendar__month,.full-jcalendar__year{
+  position: absolute;
+  z-index: 1677;
+  top:0;
+  left:0;
+  width:100%;
+  height:100%;
+  background-color: #fff;
+}
+.full-jcalendar__body .close{
+  position: absolute;
+  bottom:10px;
+  right:10px;
+  padding:3px 5px;
+  font-size:12px;
+  background-color: #FBF8FF;
+  border:1px solid #F8F8F8;
+  border-radius: 3px;
+}
+.full-jcalendar__body .data-list{
+  list-style: none;
+  margin:auto;
+  padding:20px 0 0 0;
+  width:85%;
+}
+.full-jcalendar__body .data-list li{
+  position: relative;
+  list-style: none;
+  line-height: normal;
+  float: left;
+  width:25%;
+  text-align: center;
+  padding:5px 0;
+  margin:10px 0;
+  font-size:14px;
+  color:#333;
+}
+.full-jcalendar__body .data-list li:hover ,.full-jcalendar__body .data-list li.select-year {
+  background-color: #50bfff;
+  color: #fff;
+}
+.full-jcalendar__body .data-list li.curr-year:before {
+  content: " ";
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 0;
+  height: 0;
+  border-top: .5em solid #20a0ff;
+  border-left: .5em solid transparent;
+}
+.full-jcalendar__body .clearfix{
+  float: none;
+  width:100%;
+  clear: both;
+  height:0px;
+  line-height: 0px;
+}