Skip to content

Administrator / project_progress

Go to a project
Commit b198fa97 by liangzhen
Options

暂存下

1 parent 3df5149f
Inline Side-by-side
Showing with 181 additions and 13 deletions
package-lock.json
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
"@vue/cli-service": "~5.0.0", "@vue/cli-service": "~5.0.0",
"node-sass": "^6.0.1", "node-sass": "^6.0.1",
"sass-loader": "^10.0.1", "sass-loader": "^10.0.1",
"url-loader": "^4.1.1",
"vue-template-compiler": "^2.6.14" "vue-template-compiler": "^2.6.14"
} }
}, },
...@@ -11696,6 +11697,96 @@ ...@@ -11696,6 +11697,96 @@
"punycode": "^2.1.0" "punycode": "^2.1.0"
} }
}, },
"node_modules/url-loader": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz",
"integrity": "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==",
"dev": true,
"dependencies": {
"loader-utils": "^2.0.0",
"mime-types": "^2.1.27",
"schema-utils": "^3.0.0"
},
"engines": {
"node": ">= 10.13.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/webpack"
},
"peerDependencies": {
"file-loader": "*",
"webpack": "^4.0.0 || ^5.0.0"
},
"peerDependenciesMeta": {
"file-loader": {
"optional": true
}
}
},
"node_modules/url-loader/node_modules/ajv": {
"version": "6.12.6",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
"dev": true,
"dependencies": {
"fast-deep-equal": "^3.1.1",
"fast-json-stable-stringify": "^2.0.0",
"json-schema-traverse": "^0.4.1",
"uri-js": "^4.2.2"
},
"funding": {
"type": "github",
"url": "https://github.com/sponsors/epoberezkin"
}
},
"node_modules/url-loader/node_modules/ajv-keywords": {
"version": "3.5.2",
"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
"dev": true,
"peerDependencies": {
"ajv": "^6.9.1"
}
},
"node_modules/url-loader/node_modules/json-schema-traverse": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
"dev": true
},
"node_modules/url-loader/node_modules/loader-utils": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
"integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
"dev": true,
"dependencies": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
},
"engines": {
"node": ">=8.9.0"
}
},
"node_modules/url-loader/node_modules/schema-utils": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
"dev": true,
"dependencies": {
"@types/json-schema": "^7.0.8",
"ajv": "^6.12.5",
"ajv-keywords": "^3.5.2"
},
"engines": {
"node": ">= 10.13.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/webpack"
}
},
"node_modules/url-parse-lax": { "node_modules/url-parse-lax": {
"version": "1.0.0", "version": "1.0.0",
"license": "MIT", "license": "MIT",
...@@ -20181,6 +20272,65 @@ ...@@ -20181,6 +20272,65 @@
"punycode": "^2.1.0" "punycode": "^2.1.0"
} }
}, },
"url-loader": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz",
"integrity": "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==",
"dev": true,
"requires": {
"loader-utils": "^2.0.0",
"mime-types": "^2.1.27",
"schema-utils": "^3.0.0"
},
"dependencies": {
"ajv": {
"version": "6.12.6",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
"dev": true,
"requires": {
"fast-deep-equal": "^3.1.1",
"fast-json-stable-stringify": "^2.0.0",
"json-schema-traverse": "^0.4.1",
"uri-js": "^4.2.2"
}
},
"ajv-keywords": {
"version": "3.5.2",
"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
"dev": true
},
"json-schema-traverse": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
"dev": true
},
"loader-utils": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
"integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"schema-utils": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
"dev": true,
"requires": {
"@types/json-schema": "^7.0.8",
"ajv": "^6.12.5",
"ajv-keywords": "^3.5.2"
}
}
}
},
"url-parse-lax": { "url-parse-lax": {
"version": "1.0.0", "version": "1.0.0",
"requires": { "requires": {
......
package.json
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
"@vue/cli-service": "~5.0.0", "@vue/cli-service": "~5.0.0",
"node-sass": "^6.0.1", "node-sass": "^6.0.1",
"sass-loader": "^10.0.1", "sass-loader": "^10.0.1",
"url-loader": "^4.1.1",
"vue-template-compiler": "^2.6.14" "vue-template-compiler": "^2.6.14"
}, },
"browserslist": [ "browserslist": [
......
src/views/assessChecks/assistedViewing.vue
...@@ -654,7 +654,7 @@ export default { ...@@ -654,7 +654,7 @@ export default {
} }
let response = await downloadObjectAll({ let response = await downloadObjectAll({
prjId:this.checkedList[0].projectCode, prjId:this.checkedList[0].projectCode,
bathId: this.checkedList[0].batchId, bathId: this.checkedList[0].contractNumber,
}); });
let blob = new Blob([response], { type: 'application/zip' }) let blob = new Blob([response], { type: 'application/zip' })
let url = window.URL.createObjectURL(blob) let url = window.URL.createObjectURL(blob)
......
src/views/assessZC/assistedViewing.vue
...@@ -654,7 +654,7 @@ export default { ...@@ -654,7 +654,7 @@ export default {
} }
let response = await downloadObjectAll({ let response = await downloadObjectAll({
prjId:this.checkedList[0].projectCode, prjId:this.checkedList[0].projectCode,
bathId: this.checkedList[0].batchId, bathId: this.checkedList[0].contractNumber,
}); });
let blob = new Blob([response], { type: 'application/zip' }) let blob = new Blob([response], { type: 'application/zip' })
let url = window.URL.createObjectURL(blob) let url = window.URL.createObjectURL(blob)
......
src/views/assessZC/projectView.vue
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
v-model="ruleForm.projectCode" v-model="ruleForm.projectCode"
placeholder="请输入" placeholder="请输入"
clearable clearable
@input="numberVal"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目名称:" prop="projectName" class="fromItem"> <el-form-item label="项目名称:" prop="projectName" class="fromItem">
...@@ -466,13 +467,20 @@ export default { ...@@ -466,13 +467,20 @@ export default {
}, },
}, },
mounted() { mounted() {
this.ruleForm.projectCode = this.$route.query.projectId; if(this.$route.query.projectId){
this.ruleForm.projectCode = this.$route.query.projectId;
}
this.submitForm(); this.submitForm();
this.processenv = process.env.VUE_APP_BASE_URL; this.processenv = process.env.VUE_APP_BASE_URL;
}, },
methods: { methods: {
noFullScreen() {
numberVal(val) {
this.$forceUpdate()
},
noFullScreen() {
console.log("关闭了"); console.log("关闭了");
this.dialogFullScreen = false; this.dialogFullScreen = false;
}, },
......
vue.config.js
...@@ -40,15 +40,24 @@ module.exports = defineConfig({ ...@@ -40,15 +40,24 @@ module.exports = defineConfig({
chainWebpack: (config) => { chainWebpack: (config) => {
// // 更改字体的输出路径 // // 更改字体的输出路径
// config.module const filename='arch/fonts/[name].[hash:8].[ext]'
// .rule('fonts') const imgname='arch/img/[name].[hash:8].[ext]'
// .test(/\.(woff2?|eot|ttf|otf)(\?.*)?$/i) config.module
// .use('url-loader') .rule("fonts")
// .loader('url-loader') .test(/\.(woff2?|eot|ttf|otf)(\?.*)?$/i)
// .tap(options => { .set("type", "asset")
// name = 'custom-fonts/[name].[hash:8].[ext]'; .set("generator", {
filename,
// }); });
// config.module
// .rule("images")
// .test(/\.(png|jpe?g|gif)(\?.*)?$/)
// .set("type", "asset")
// .set("generator", {
// imgname,
// });
config.plugin('html').tap((args) => { config.plugin('html').tap((args) => {
args[0].title = '数字化项目全过程管控平台' args[0].title = '数字化项目全过程管控平台'
return args return args
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!