diff --git a/package-lock.json b/package-lock.json index 2cac6a6..aaf80fd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3312,7 +3312,7 @@ }, "node_modules/@wangeditor/editor-for-vue": { "version": "5.1.12", - "resolved": "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz", + "resolved": "https://registry.npmjs.org/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz", "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==", "peerDependencies": { "@wangeditor/editor": ">=5.1.0", @@ -22847,7 +22847,7 @@ }, "@wangeditor/editor-for-vue": { "version": "5.1.12", - "resolved": "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz", + "resolved": "https://registry.npmjs.org/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz", "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==", "requires": {} }, diff --git a/src/components/export/index.vue b/src/components/export/index.vue index 15b13a5..b3a5245 100644 --- a/src/components/export/index.vue +++ b/src/components/export/index.vue @@ -60,8 +60,6 @@ const filesList = ref({}); const baseUrl = ref('')//上传地址 const modelUrl = ref('')//下载模板地址 watch(()=>props.lx,(val)=>{ - let url = '' - let moyRL = '' switch (val) { case 'policeF': baseUrl.value = '/mosty-api/mosty-jcgl/tbJcglXfll/importData' @@ -79,6 +77,10 @@ watch(()=>props.lx,(val)=>{ baseUrl.value = '/mosty-api/mosty-jcgl/tpjcglZnzb/importData' modelUrl.value = '/mosty-api/mosty-jcgl/tpjcglZnzb/importTemplate' break; + case 'fjnr': + baseUrl.value = '/mosty-api/mosty-gsxt/tbGsxtRqfjNr/importFxnr' + // modelUrl.value = '/mosty-api/mosty-jcgl/tpjcglZnzb/importTemplate' + break; default: break; } @@ -126,8 +128,8 @@ function onComfirm() { let formData = new FormData(); formData.append("file", file); formData.append("updateSupport", isSelect.value); - axios.post(baseUrl.value, formData, {"Content-type": "multipart/form-data"}) - .then((res) => { + let token = localStorage.getItem('token') + axios.post(baseUrl.value, formData, {"Content-type": "multipart/form-data",headers:{"Authorization": `${token}`}}).then((res) => { if (res.status == 200) { let { data, message, code } = res.data; if (code == -1) ElMessage({ type:'warning', message:message, dangerouslyUseHTMLString:true }); @@ -174,6 +176,6 @@ function onComfirm() { \ No newline at end of file diff --git a/src/store/modules/user.js b/src/store/modules/user.js index e80e0f4..f443811 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -101,6 +101,7 @@ export default { this.commit("user/setUserName", data.userName); setItem('isOatuh', 0) setItem("USERNAME", data.userName); + setItem("roleList", data.roleList); setItem("SFRH", data.sfrh); setItem("USERID", data.userId); setItem("PermissionsInfo", data.permissionsInfo); diff --git a/src/views/backOfficeSystem/ExcavationResearch/LandingAudit/components/detailForm.vue b/src/views/backOfficeSystem/ExcavationResearch/LandingAudit/components/detailForm.vue deleted file mode 100644 index 2682cfa..0000000 --- a/src/views/backOfficeSystem/ExcavationResearch/LandingAudit/components/detailForm.vue +++ /dev/null @@ -1,188 +0,0 @@ - - - - - diff --git a/src/views/backOfficeSystem/ExcavationResearch/LandingAudit/index.vue b/src/views/backOfficeSystem/ExcavationResearch/LandingAudit/index.vue index 35d4532..e9f01ec 100644 --- a/src/views/backOfficeSystem/ExcavationResearch/LandingAudit/index.vue +++ b/src/views/backOfficeSystem/ExcavationResearch/LandingAudit/index.vue @@ -1,28 +1,11 @@ + + \ No newline at end of file diff --git a/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/components/IntelligentParsing.vue b/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/components/IntelligentParsing.vue index cd0ab8a..d21f805 100644 --- a/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/components/IntelligentParsing.vue +++ b/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/components/IntelligentParsing.vue @@ -93,10 +93,6 @@ const pageData = reactive({ tableColumn: [ { label: "管辖单位", prop: "gxDwDm", showSolt: true, width: 200 }, { label: "姓名", prop: "ryXm", showSolt: true, width: 130 }, - { label: "英文姓名", prop: "ryXmYw", showSolt: true, width: 130 }, - { label: "别名", prop: "ryBm", showSolt: true, width: 130 }, - { label: "网名", prop: "ryWm", showSolt: true, width: 130 }, - { label: "绰号", prop: "ryCh", showSolt: true, width: 130 }, { label: "手机号码", prop: "rySjhm", showSolt: true, width: 130 }, { label: "身份证号码", prop: "rySfzh", showSolt: true, width: 130 }, { label: "户籍地址", prop: "ryHjdz", showSolt: true, width: 130 }, diff --git a/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/index.vue b/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/index.vue index e0308cf..3729b33 100644 --- a/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/index.vue +++ b/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/index.vue @@ -13,7 +13,7 @@ 新增 - + 导入内容 @@ -59,6 +59,11 @@ :controlsWidth="pageData.controlsWidth" @chooseData="chooseDataBottom" > + + + \ No newline at end of file diff --git a/vue.config.js b/vue.config.js index 075373d..2c33534 100644 --- a/vue.config.js +++ b/vue.config.js @@ -4,7 +4,7 @@ function resolve(dir) { return path.join(__dirname, dir); } -const serverHost = "http://192.168.31.233:8006" +const serverHost = "http://192.168.1.98:8006" module.exports = { publicPath: "./", outputDir: "ylth",