Merge branch 'yanyan_dev' into shenzhen-dev
This commit is contained in:
于晏彭
commit
cb3a4c81dc
222
package.json
222
package.json
@ -1,111 +1,111 @@
|
||||
{
|
||||
"name": "geeker-admin",
|
||||
"private": true,
|
||||
"version": "0.0.7",
|
||||
"description": "Geeker-Admin后台管理系统",
|
||||
"author": "SpicyBoy <848130454@qq.com>",
|
||||
"license": "MIT",
|
||||
"scripts": {
|
||||
"dev": "vite --mode development",
|
||||
"serve": "vite",
|
||||
"build:dev": "vue-tsc --noEmit && vite build --mode development",
|
||||
"build:test": "vue-tsc --noEmit && vite build --mode test",
|
||||
"build:pro": "vite build --mode production",
|
||||
"preview": "vite preview",
|
||||
"lint:eslint": "eslint --fix --ext .js,.ts,.vue ./src",
|
||||
"lint:prettier": "prettier --write --loglevel warn \"src/**/*.{js,ts,json,tsx,css,less,scss,vue,html,md}\"",
|
||||
"lint:stylelint": "stylelint --cache --fix \"**/*.{vue,less,postcss,css,scss}\" --cache --cache-location node_modules/.cache/stylelint/",
|
||||
"lint:lint-staged": "lint-staged",
|
||||
"prepare": "husky install",
|
||||
"release": "standard-version",
|
||||
"commit": "git pull && git add -A && git-cz && git push"
|
||||
},
|
||||
"dependencies": {
|
||||
"@amap/amap-jsapi-loader": "^1.0.1",
|
||||
"@amap/amap-jsapi-types": "^0.0.13",
|
||||
"@element-plus/icons-vue": "^2.0.10",
|
||||
"@vueup/vue-quill": "^1.0.0-alpha.40",
|
||||
"@vueuse/core": "^9.12.0",
|
||||
"@wangeditor/editor": "^5.1.12",
|
||||
"@wangeditor/editor-for-vue": "^5.1.12",
|
||||
"amfe-flexible": "^2.2.1",
|
||||
"axios": "^1.2.1",
|
||||
"base-64": "^1.0.0",
|
||||
"date-fns": "^2.29.3",
|
||||
"driver.js": "^0.9.8",
|
||||
"echarts": "^5.3.0",
|
||||
"echarts-gl": "^2.0.9",
|
||||
"echarts-liquidfill": "^3.1.0",
|
||||
"element-china-area-data": "^5.0.2",
|
||||
"element-plus": "^2.2.30",
|
||||
"js-base64": "^3.7.5",
|
||||
"js-md5": "^0.7.3",
|
||||
"mars3d": "^3.5.6",
|
||||
"mars3d-cesium": "^1.105.0",
|
||||
"mitt": "^3.0.0",
|
||||
"moment": "^2.29.4",
|
||||
"nprogress": "^0.2.0",
|
||||
"pinia": "^2.0.28",
|
||||
"pinia-plugin-persistedstate": "^3.0.1",
|
||||
"postcss-pxtorem": "^6.0.0",
|
||||
"print-js": "^1.6.0",
|
||||
"qs": "^6.11.0",
|
||||
"sortablejs": "^1.15.0",
|
||||
"vue": "^3.2.47",
|
||||
"vue-i18n": "^9.1.9",
|
||||
"vue-router": "^4.1.6",
|
||||
"vue3-seamless-scroll": "^1.2.0",
|
||||
"vuedraggable": "^4.1.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@commitlint/cli": "^17.0.1",
|
||||
"@commitlint/config-conventional": "^17.0.0",
|
||||
"@types/node": "^17.0.31",
|
||||
"@types/sortablejs": "^1.15.0",
|
||||
"@typescript-eslint/eslint-plugin": "^5.22.0",
|
||||
"@typescript-eslint/parser": "^5.22.0",
|
||||
"@vitejs/plugin-vue": "^3.1.0",
|
||||
"@vitejs/plugin-vue-jsx": "^1.3.10",
|
||||
"autoprefixer": "^10.4.14",
|
||||
"commitizen": "^4.2.4",
|
||||
"cz-git": "^1.3.2",
|
||||
"eslint": "^8.14.0",
|
||||
"eslint-config-prettier": "^8.5.0",
|
||||
"eslint-plugin-prettier": "^4.0.0",
|
||||
"eslint-plugin-vue": "^8.7.1",
|
||||
"husky": "^8.0.1",
|
||||
"lib-flexible": "^0.3.2",
|
||||
"lint-staged": "^12.4.2",
|
||||
"postcss-html": "^1.4.1",
|
||||
"prettier": "^2.6.2",
|
||||
"rollup-plugin-visualizer": "^5.5.4",
|
||||
"rxjs": "^7.8.1",
|
||||
"sass": "^1.49.7",
|
||||
"standard-version": "^9.5.0",
|
||||
"stylelint": "^14.8.5",
|
||||
"stylelint-config-html": "^1.0.0",
|
||||
"stylelint-config-prettier": "^9.0.3",
|
||||
"stylelint-config-recess-order": "^3.0.0",
|
||||
"stylelint-config-recommended-scss": "^6.0.0",
|
||||
"stylelint-config-recommended-vue": "^1.4.0",
|
||||
"stylelint-config-standard": "^25.0.0",
|
||||
"stylelint-config-standard-scss": "^3.0.0",
|
||||
"typescript": "^4.5.4",
|
||||
"unplugin-auto-import": "^0.6.0",
|
||||
"unplugin-vue-components": "^0.17.18",
|
||||
"vite": "^3.2.5",
|
||||
"vite-plugin-cdn-import": "^0.3.5",
|
||||
"vite-plugin-compression": "^0.5.1",
|
||||
"vite-plugin-eslint": "^1.6.0",
|
||||
"vite-plugin-html": "^3.2.0",
|
||||
"vite-plugin-mars3d": "^2.1.0",
|
||||
"vite-plugin-svg-icons": "^2.0.1",
|
||||
"vite-plugin-vue-setup-extend-plus": "^0.1.0",
|
||||
"vue-tsc": "^1.0.24"
|
||||
},
|
||||
"config": {
|
||||
"commitizen": {
|
||||
"path": "node_modules/cz-git"
|
||||
}
|
||||
}
|
||||
}
|
||||
{
|
||||
"name": "geeker-admin",
|
||||
"private": true,
|
||||
"version": "0.0.7",
|
||||
"description": "Geeker-Admin后台管理系统",
|
||||
"author": "SpicyBoy <848130454@qq.com>",
|
||||
"license": "MIT",
|
||||
"scripts": {
|
||||
"dev": "vite --mode development",
|
||||
"serve": "vite",
|
||||
"build:dev": "vue-tsc --noEmit && vite build --mode development",
|
||||
"build:test": "vue-tsc --noEmit && vite build --mode test",
|
||||
"build:pro": "vite build --mode production",
|
||||
"preview": "vite preview",
|
||||
"lint:eslint": "eslint --fix --ext .js,.ts,.vue ./src",
|
||||
"lint:prettier": "prettier --write --loglevel warn \"src/**/*.{js,ts,json,tsx,css,less,scss,vue,html,md}\"",
|
||||
"lint:stylelint": "stylelint --cache --fix \"**/*.{vue,less,postcss,css,scss}\" --cache --cache-location node_modules/.cache/stylelint/",
|
||||
"lint:lint-staged": "lint-staged",
|
||||
"prepare": "husky install",
|
||||
"release": "standard-version",
|
||||
"commit": "git pull && git add -A && git-cz && git push"
|
||||
},
|
||||
"dependencies": {
|
||||
"@amap/amap-jsapi-loader": "^1.0.1",
|
||||
"@amap/amap-jsapi-types": "^0.0.13",
|
||||
"@element-plus/icons-vue": "^2.0.10",
|
||||
"@vueup/vue-quill": "^1.0.0-alpha.40",
|
||||
"@vueuse/core": "^9.12.0",
|
||||
"@wangeditor/editor": "^5.1.12",
|
||||
"@wangeditor/editor-for-vue": "^5.1.12",
|
||||
"amfe-flexible": "^2.2.1",
|
||||
"axios": "^1.2.1",
|
||||
"base-64": "^1.0.0",
|
||||
"date-fns": "^2.29.3",
|
||||
"driver.js": "^0.9.8",
|
||||
"echarts": "^5.3.0",
|
||||
"echarts-gl": "^2.0.9",
|
||||
"echarts-liquidfill": "^3.1.0",
|
||||
"element-china-area-data": "^5.0.2",
|
||||
"element-plus": "^2.2.30",
|
||||
"js-base64": "^3.7.5",
|
||||
"js-md5": "^0.7.3",
|
||||
"mars3d": "^3.5.6",
|
||||
"mars3d-cesium": "^1.105.0",
|
||||
"mitt": "^3.0.0",
|
||||
"moment": "^2.29.4",
|
||||
"nprogress": "^0.2.0",
|
||||
"pinia": "^2.0.28",
|
||||
"pinia-plugin-persistedstate": "^3.0.1",
|
||||
"postcss-pxtorem": "^6.0.0",
|
||||
"print-js": "^1.6.0",
|
||||
"qs": "^6.11.0",
|
||||
"sortablejs": "^1.15.0",
|
||||
"vue": "^3.2.47",
|
||||
"vue-i18n": "^9.1.9",
|
||||
"vue-router": "^4.1.6",
|
||||
"vue3-seamless-scroll": "^1.2.0",
|
||||
"vuedraggable": "^4.1.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@commitlint/cli": "^17.0.1",
|
||||
"@commitlint/config-conventional": "^17.0.0",
|
||||
"@types/node": "^17.0.31",
|
||||
"@types/sortablejs": "^1.15.0",
|
||||
"@typescript-eslint/eslint-plugin": "^5.22.0",
|
||||
"@typescript-eslint/parser": "^5.22.0",
|
||||
"@vitejs/plugin-vue": "^3.1.0",
|
||||
"@vitejs/plugin-vue-jsx": "^1.3.10",
|
||||
"autoprefixer": "^10.4.14",
|
||||
"commitizen": "^4.2.4",
|
||||
"cz-git": "^1.3.2",
|
||||
"eslint": "^8.14.0",
|
||||
"eslint-config-prettier": "^8.5.0",
|
||||
"eslint-plugin-prettier": "^4.0.0",
|
||||
"eslint-plugin-vue": "^8.7.1",
|
||||
"husky": "^8.0.1",
|
||||
"lib-flexible": "^0.3.2",
|
||||
"lint-staged": "^12.4.2",
|
||||
"postcss-html": "^1.4.1",
|
||||
"prettier": "^2.6.2",
|
||||
"rollup-plugin-visualizer": "^5.5.4",
|
||||
"rxjs": "^7.8.1",
|
||||
"sass": "^1.49.7",
|
||||
"standard-version": "^9.5.0",
|
||||
"stylelint": "^14.8.5",
|
||||
"stylelint-config-html": "^1.0.0",
|
||||
"stylelint-config-prettier": "^9.0.3",
|
||||
"stylelint-config-recess-order": "^3.0.0",
|
||||
"stylelint-config-recommended-scss": "^6.0.0",
|
||||
"stylelint-config-recommended-vue": "^1.4.0",
|
||||
"stylelint-config-standard": "^25.0.0",
|
||||
"stylelint-config-standard-scss": "^3.0.0",
|
||||
"typescript": "^4.5.4",
|
||||
"unplugin-auto-import": "^0.6.0",
|
||||
"unplugin-vue-components": "^0.17.18",
|
||||
"vite": "^3.2.5",
|
||||
"vite-plugin-cdn-import": "^0.3.5",
|
||||
"vite-plugin-compression": "^0.5.1",
|
||||
"vite-plugin-eslint": "^1.6.0",
|
||||
"vite-plugin-html": "^3.2.0",
|
||||
"vite-plugin-mars3d": "^2.1.0",
|
||||
"vite-plugin-svg-icons": "^2.0.1",
|
||||
"vite-plugin-vue-setup-extend-plus": "^0.1.0",
|
||||
"vue-tsc": "^1.0.24"
|
||||
},
|
||||
"config": {
|
||||
"commitizen": {
|
||||
"path": "node_modules/cz-git"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -43,7 +43,7 @@ const projectNumber = async () => {
|
||||
.bgImgOne {
|
||||
width: 232px;
|
||||
height: 82px;
|
||||
background: url("/src/assets/images/screenImg/add.png") no-repeat center center;
|
||||
background: url("@/assets/images/screenImg/add.png") no-repeat center center;
|
||||
background-size: 100%;
|
||||
.listItem {
|
||||
padding: 15px 0 0 85px;
|
||||
@ -61,7 +61,7 @@ const projectNumber = async () => {
|
||||
.bgImgTwo {
|
||||
width: 232px;
|
||||
height: 82px;
|
||||
background: url("/src/assets/images/screenImg/completed.png") no-repeat center center;
|
||||
background: url("@/assets/images/screenImg/completed.png") no-repeat center center;
|
||||
background-size: 100%;
|
||||
.listItem {
|
||||
padding: 15px 0 0 85px;
|
||||
@ -79,7 +79,7 @@ const projectNumber = async () => {
|
||||
.bgImgThree {
|
||||
width: 232px;
|
||||
height: 82px;
|
||||
background: url("/src/assets/images/screenImg/importent.png") no-repeat center center;
|
||||
background: url("@/assets/images/screenImg/importent.png") no-repeat center center;
|
||||
background-size: 100%;
|
||||
.listItem {
|
||||
padding: 15px 0 0 85px;
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
</div>
|
||||
<div class="realNameSystem">
|
||||
<div :class="realNameBlue.bgimg">
|
||||
<img :src="realNameBlue.img" alt="" />
|
||||
<img :src="getImageUrlGit(realNameBlue.img)" alt="" />
|
||||
<div class="centerTitle">
|
||||
<div class="titleNumber">{{ realNameBlue.number }}</div>
|
||||
<div class="titleName">{{ realNameBlue.name }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div :class="realNameGreen.bgimg">
|
||||
<img :src="realNameGreen.img" alt="" />
|
||||
<img :src="getImageUrlGit(realNameGreen.img)" alt="" />
|
||||
<div class="centerTitle">
|
||||
<div class="titleNumber">{{ realNameGreen.number }}</div>
|
||||
<div class="titleName">{{ realNameGreen.name }}</div>
|
||||
@ -28,7 +28,7 @@
|
||||
<div class="percent">{{ realNameGreen.percent }}</div>
|
||||
</div>
|
||||
<div :class="realNameRed.bgimg">
|
||||
<img :src="realNameRed.img" alt="" />
|
||||
<img :src="getImageUrlGit(realNameRed.img)" alt="" />
|
||||
<div class="centerTitle">
|
||||
<div class="titleNumber">{{ realNameRed.number }}</div>
|
||||
<div class="titleName">{{ realNameRed.name }}</div>
|
||||
@ -44,7 +44,7 @@
|
||||
<div v-for="(item, index) in companyLeft" :key="index" class="companyItemLeft">
|
||||
<div class="flex">
|
||||
<div class="leftIcon">
|
||||
<img :src="item.img" />
|
||||
<img :src="getImageUrlPng(item.img)" />
|
||||
</div>
|
||||
<div class="rightMessage">
|
||||
<div class="unitName">{{ item.name }}</div>
|
||||
@ -57,7 +57,7 @@
|
||||
<div v-for="(item, index) in companyRight" :key="index" class="companyItemRight">
|
||||
<div class="flex">
|
||||
<div class="leftIcon">
|
||||
<img :src="item.img" />
|
||||
<img :src="getImageUrlPng(item.img)" />
|
||||
</div>
|
||||
<div class="rightMessage">
|
||||
<div class="unitName">{{ item.name }}</div>
|
||||
@ -98,23 +98,25 @@ const projectNumber = async () => {
|
||||
}
|
||||
projectNum.newNum = projectNum.num.split("");
|
||||
};
|
||||
|
||||
function getImageUrlGit(name: string) {
|
||||
return new URL(`../../../../assets/images/screenImg/${name}` + ".gif", import.meta.url).href;
|
||||
}
|
||||
//实名制统计
|
||||
const realNameBlue = ref({
|
||||
img: "/src/assets/images/screenImg/blueCircle.gif",
|
||||
img: "blueCircle",
|
||||
bgimg: "bluebg",
|
||||
name: "实名制人员",
|
||||
number: "0"
|
||||
});
|
||||
const realNameGreen = ref({
|
||||
img: "/src/assets/images/screenImg/greenCircle.gif",
|
||||
img: "greenCircle",
|
||||
bgimg: "greenbg",
|
||||
name: "建筑工人",
|
||||
number: "0",
|
||||
percent: "92%"
|
||||
});
|
||||
const realNameRed = ref({
|
||||
img: "/src/assets/images/screenImg/redCircle.gif",
|
||||
img: "redCircle",
|
||||
bgimg: "redbg",
|
||||
name: "管理人员",
|
||||
number: "0",
|
||||
@ -128,36 +130,39 @@ const realName = async () => {
|
||||
realNameGreen.value.percent = result.workerRatio + "%";
|
||||
realNameRed.value.percent = result.managerRatio + "%";
|
||||
};
|
||||
function getImageUrlPng(name: string) {
|
||||
return new URL(`../../../../assets/images/screenImg/${name}` + ".png", import.meta.url).href;
|
||||
}
|
||||
//企业统计
|
||||
const companyLeft = ref([
|
||||
{
|
||||
name: "施工",
|
||||
img: "/src/assets/images/screenImg/shigong.png",
|
||||
img: "shigong",
|
||||
number: "0",
|
||||
bgImg: "blue"
|
||||
},
|
||||
{
|
||||
name: "监理",
|
||||
img: "/src/assets/images/screenImg/jianli.png",
|
||||
img: "jianli",
|
||||
number: "0",
|
||||
bgImg: "blue"
|
||||
},
|
||||
{ name: "设计", img: "/src/assets/images/screenImg/sheji.png", number: "0", bgImg: "blue" }
|
||||
{ name: "设计", img: "sheji", number: "0", bgImg: "blue" }
|
||||
]);
|
||||
const companyRight = ref([
|
||||
{
|
||||
name: "建设",
|
||||
img: "/src/assets/images/screenImg/jianshe.png",
|
||||
img: "jianshe",
|
||||
number: "0",
|
||||
bgImg: "green"
|
||||
},
|
||||
{
|
||||
name: "勘察",
|
||||
img: "/src/assets/images/screenImg/kancha.png",
|
||||
img: "kancha",
|
||||
number: "0",
|
||||
bgImg: "green"
|
||||
},
|
||||
{ name: "其他", img: "/src/assets/images/screenImg/qita.png", number: "0", bgImg: "green" }
|
||||
{ name: "其他", img: "qita", number: "0", bgImg: "green" }
|
||||
]);
|
||||
const conmpanyList = async () => {
|
||||
const { result } = await getCompanyAll();
|
||||
|
||||
@ -35,7 +35,9 @@ const getProjectList = async () => {
|
||||
console.log(mapProjectList.value, "aaa");
|
||||
initMap();
|
||||
};
|
||||
|
||||
function getImageUrl(name: string) {
|
||||
return new URL(`../../../../assets/images/screenImg/mapImg/${name}` + ".png", import.meta.url).href;
|
||||
}
|
||||
const initMap = () => {
|
||||
window._AMapSecurityConfig = {
|
||||
securityJsCode: "6caf6429e4b98cf7f39db9bf7014a78b"
|
||||
@ -95,7 +97,7 @@ const initMap = () => {
|
||||
// 第二种 直接写死 position 的经纬度值
|
||||
mapProjectList.value.forEach((item, index, array) => {
|
||||
const marker = new AMap.Marker({
|
||||
icon: "/src/assets/images/screenImg/mapImg/dian.png",
|
||||
icon: getImageUrl("dian"),
|
||||
position: [`${item.longitude}`, `${item.latitude}`],
|
||||
// 通过设置 offset 来添加偏移量
|
||||
offset: new AMap.Pixel(-26, -24)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user