diff --git a/yanzhu-bigscreen/src/components/module/module-one-3-2.vue b/yanzhu-bigscreen/src/components/module/module-one-3-2.vue new file mode 100644 index 00000000..1665e511 --- /dev/null +++ b/yanzhu-bigscreen/src/components/module/module-one-3-2.vue @@ -0,0 +1,24 @@ + + + diff --git a/yanzhu-bigscreen/src/components/module/module-one-3-3.vue b/yanzhu-bigscreen/src/components/module/module-one-3-3.vue new file mode 100644 index 00000000..3f4fef53 --- /dev/null +++ b/yanzhu-bigscreen/src/components/module/module-one-3-3.vue @@ -0,0 +1,27 @@ + + + diff --git a/yanzhu-bigscreen/src/views/init.js b/yanzhu-bigscreen/src/views/init.js index ed385199..b3fcd77d 100644 --- a/yanzhu-bigscreen/src/views/init.js +++ b/yanzhu-bigscreen/src/views/init.js @@ -13,6 +13,8 @@ import moduleOne21 from "../components/module/module-one-2-1.vue"; import moduleOne22 from "../components/module/module-one-2-2.vue"; import moduleOne23 from "../components/module/module-one-2-3.vue"; import moduleOne31 from "../components/module/module-one-3-1.vue"; +import moduleOne32 from "../components/module/module-one-3-2.vue"; +import moduleOne33 from "../components/module/module-one-3-3.vue"; import staffSurveyChart from "../components/staffSurveyChart.vue"; import trendChartLine from "../components/trend-chart-line.vue"; import trendLineChart from "../components/trend-line-chart.vue"; @@ -36,6 +38,8 @@ Vue.component("module-one-2-1", moduleOne21); Vue.component("module-one-2-2", moduleOne22); Vue.component("module-one-2-3", moduleOne23); Vue.component("module-one-3-1", moduleOne31); +Vue.component("module-one-3-2", moduleOne32); +Vue.component("module-one-3-3", moduleOne33); Vue.component("people-number", peopleNumber); Vue.component("staff-survey-chart", staffSurveyChart); Vue.component("trend-chart-line", trendChartLine); diff --git a/yanzhu-bigscreen/src/views/projectDetail.vue b/yanzhu-bigscreen/src/views/projectDetail.vue index e7bf5aea..a550feab 100644 --- a/yanzhu-bigscreen/src/views/projectDetail.vue +++ b/yanzhu-bigscreen/src/views/projectDetail.vue @@ -1,1701 +1,1618 @@ diff --git a/yanzhu-bigscreen/src/views/schedule/photography.vue b/yanzhu-bigscreen/src/views/schedule/photography.vue index 68511130..cb8b0bcf 100644 --- a/yanzhu-bigscreen/src/views/schedule/photography.vue +++ b/yanzhu-bigscreen/src/views/schedule/photography.vue @@ -1,183 +1,208 @@