diff --git a/package-lock.json b/package-lock.json index 9317d11..934ca93 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2076,6 +2076,31 @@ "webpack-chain": "^6.4.0", "webpack-dev-server": "^3.11.0", "webpack-merge": "^4.2.2" + }, + "dependencies": { + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.8.3", + "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz", + "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + } + } } }, "@vue/cli-shared-utils": { @@ -14985,6 +15010,7 @@ } } }, +<<<<<<< HEAD "vue-loader-v16": { "version": "npm:vue-loader@16.8.3", "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz", @@ -15010,6 +15036,8 @@ } } }, +======= +>>>>>>> ac9e27d045b841a3a3a2a3dca10cce199d7f3c77 "vue-router": { "version": "4.5.1", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.5.1.tgz", diff --git a/src/assets/images/largeScreen2/bigBox-bg.png b/src/assets/images/largeScreen2/bigBox-bg.png new file mode 100644 index 0000000..3ae5e90 Binary files /dev/null and b/src/assets/images/largeScreen2/bigBox-bg.png differ diff --git a/src/assets/images/largeScreen2/vertical-line.png b/src/assets/images/largeScreen2/vertical-line.png new file mode 100644 index 0000000..82ad090 Binary files /dev/null and b/src/assets/images/largeScreen2/vertical-line.png differ diff --git a/src/assets/recruitment/first.svg b/src/assets/recruitment/first.svg new file mode 100644 index 0000000..50da1d1 --- /dev/null +++ b/src/assets/recruitment/first.svg @@ -0,0 +1,406 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/recruitment/jy.png b/src/assets/recruitment/jy.png new file mode 100644 index 0000000..1e8e040 Binary files /dev/null and b/src/assets/recruitment/jy.png differ diff --git a/src/assets/recruitment/jy.svg b/src/assets/recruitment/jy.svg new file mode 100644 index 0000000..1a6fb07 --- /dev/null +++ b/src/assets/recruitment/jy.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src/assets/recruitment/left-one.svg b/src/assets/recruitment/left-one.svg new file mode 100644 index 0000000..db94860 --- /dev/null +++ b/src/assets/recruitment/left-one.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/recruitment/left-two.svg b/src/assets/recruitment/left-two.svg new file mode 100644 index 0000000..3d5a7d1 --- /dev/null +++ b/src/assets/recruitment/left-two.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/recruitment/right-one.svg b/src/assets/recruitment/right-one.svg new file mode 100644 index 0000000..19940ab --- /dev/null +++ b/src/assets/recruitment/right-one.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/recruitment/right-two.svg b/src/assets/recruitment/right-two.svg new file mode 100644 index 0000000..69c9672 --- /dev/null +++ b/src/assets/recruitment/right-two.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/recruitment/seconed.svg b/src/assets/recruitment/seconed.svg new file mode 100644 index 0000000..1598175 --- /dev/null +++ b/src/assets/recruitment/seconed.svg @@ -0,0 +1,408 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/recruitment/third.svg b/src/assets/recruitment/third.svg new file mode 100644 index 0000000..1319c05 --- /dev/null +++ b/src/assets/recruitment/third.svg @@ -0,0 +1,406 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/mapCount/components/jnpx.vue b/src/views/mapCount/components/jnpx.vue index d168c20..6cb5536 100644 --- a/src/views/mapCount/components/jnpx.vue +++ b/src/views/mapCount/components/jnpx.vue @@ -30,43 +30,49 @@ + + diff --git a/src/views/portraitScreen/components/qyzpq.vue b/src/views/portraitScreen/components/qyzpq.vue new file mode 100644 index 0000000..b4eaff6 --- /dev/null +++ b/src/views/portraitScreen/components/qyzpq.vue @@ -0,0 +1,582 @@ + + + + + diff --git a/src/views/portraitScreen/components/top10.vue b/src/views/portraitScreen/components/top10.vue new file mode 100644 index 0000000..64905c9 --- /dev/null +++ b/src/views/portraitScreen/components/top10.vue @@ -0,0 +1,124 @@ + + + + + diff --git a/src/views/portraitScreen/index copy.vue b/src/views/portraitScreen/index copy.vue new file mode 100644 index 0000000..17959c2 --- /dev/null +++ b/src/views/portraitScreen/index copy.vue @@ -0,0 +1,343 @@ + + + + + diff --git a/src/views/portraitScreen/index.vue b/src/views/portraitScreen/index.vue index 663f0e0..ab2df4a 100644 --- a/src/views/portraitScreen/index.vue +++ b/src/views/portraitScreen/index.vue @@ -4,10 +4,10 @@
- -
+ +
- -
\ No newline at end of file + diff --git a/src/views/recruitment/components/costomCaed.vue b/src/views/recruitment/components/costomCaed.vue index 2ed2e0b..370e55a 100644 --- a/src/views/recruitment/components/costomCaed.vue +++ b/src/views/recruitment/components/costomCaed.vue @@ -13,7 +13,7 @@ -
+ @@ -35,13 +35,15 @@ +
- + + + diff --git a/src/views/recruitment/components/enterpriseEmploymentCard.vue b/src/views/recruitment/components/enterpriseEmploymentCard.vue index 9a7a2cc..4afcb91 100644 --- a/src/views/recruitment/components/enterpriseEmploymentCard.vue +++ b/src/views/recruitment/components/enterpriseEmploymentCard.vue @@ -33,6 +33,14 @@ const props = defineProps({ count: "", class: "" }) + }, + type3: { + type: Object, + default: () => ({ + title: "", + count: "", + class: "" + }) } }); @@ -43,7 +51,7 @@ const props = defineProps({
{{ title }}
{{ description }}
- +
{{ type1.title }}
@@ -53,6 +61,10 @@ const props = defineProps({
{{ type2.title }}
{{ type2.count }}
+
+
{{ type3.title }}
+
{{ type3.count }}
+
@@ -79,6 +91,7 @@ const props = defineProps({ .row { display: flex; + justify-content:space-between; margin: 0.521vw 0.573vw 0; .count { @@ -111,6 +124,25 @@ const props = defineProps({ width: 9.823vw; height: 4.167vw; } + .modelItem3 { + padding-top: 0.8vw; + padding-left: 3.2vw; + text-align: left; + width: 7vw; + height: 4.167vw; + } + .first{ + background: url("~@/assets/recruitment/first.svg") no-repeat; + background-size: auto 100%; + } + .seconed{ + background: url("~@/assets/recruitment/seconed.svg") no-repeat; + background-size: auto 100%; + } + .third{ + background: url("~@/assets/recruitment/third.svg") no-repeat; + background-size: auto 100%; + } } .titleWrapper { diff --git a/src/views/recruitment/index.vue b/src/views/recruitment/index.vue index 9f94bce..16d6e5c 100644 --- a/src/views/recruitment/index.vue +++ b/src/views/recruitment/index.vue @@ -26,13 +26,19 @@ + + +
就业生态数据
@@ -143,18 +149,22 @@ const cardOneInfo = { } }; const cardTwoInfo = { - title: "服务网络覆盖情况", - description: "17家人力资源机构", + title: "兴蜀就业生态数据", type1: { - title: "公共服务站点", - count: "40", - class: "modelItem1" + title: "第一产业", + count: "1.2", + class: "modelItem3 first" + }, + type2: { + title: "第二产业", + count: "1.6", + class: "modelItem3 seconed" + }, + type3: { + title: "第三产业", + count: "1.4", + class: "modelItem3 third" } - // type2: { - // title: "其他服务机构", - // count: "200", - // class: "modelItem1" - // } }; const cardThreeInfo = { title: "重点企业保供案例(比亚迪)", @@ -236,4 +246,16 @@ function getWebSocketData() { :deep(.el-carousel__mask) { display: none; } +.header_bg { + height: 17px; + font-family: PingFang SC, PingFang SC; + font-weight: 600; + font-size: 0.729vw;; + color: #c4f3fe; + line-height: 19px; + letter-spacing: 1px; + text-align: center; + font-style: normal; + text-transform: none; +}