diff --git a/index.html b/index.html
index 20efad2..d80bdc0 100644
--- a/index.html
+++ b/index.html
@@ -23,18 +23,11 @@
-
-
-
-
-
-
-
diff --git a/src/api/jj/gctzgl.js b/src/api/jj/gctzgl.js
index 779d470..cb1208a 100644
--- a/src/api/jj/gctzgl.js
+++ b/src/api/jj/gctzgl.js
@@ -40,7 +40,11 @@ export const historyList=(payload)=>{
//图纸下拉
export const prjInfoDrawingUploadList=(payload)=>{
- return $post(`/zhTEconomy/prjInfo2List` )
+ return $post(`/zhTEconomy/prjInfo2List`,payload )
+}
+//获取2.0项目图纸类型和出图内容
+export const getDrawingTypeAndContent=(payload)=>{
+ return $post(`/zhTEconomy/getDrawingTypeAndContent`,payload )
}
//施工图下拉
export const prjInfoBudgetUploadList=(payload)=>{
diff --git a/src/api/zx/index.js b/src/api/zx/index.js
index c331a68..9d361f5 100644
--- a/src/api/zx/index.js
+++ b/src/api/zx/index.js
@@ -1161,3 +1161,7 @@ export const uploadFile=(payload)=>{
export const extractFirstPage=()=>{
return $postBlob(`/extractFirstPage/extractFirstPage`)
}
+
+export const checkMerge=(pay)=>{
+ return $post(`/zhUploadSlice/checkMerge`,pay)
+}
diff --git a/src/permission.js b/src/permission.js
index 0ab672d..f7b3bff 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -37,7 +37,7 @@ router.beforeEach((to, from, next) => {
})
}).catch(err => {
useUserStore().logOut().then(() => {
- ElMessage.error(err)
+ // ElMessage.error(err)
next({ path: '/' })
})
})
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 04b1882..154175d 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -23,7 +23,7 @@ const useUserStore = defineStore(
login(username, password, code, uuid).then(res => {
setToken(res.token)
this.token = res.token
- resolve()
+ resolve(res)
}).catch(error => {
reject(error)
})
diff --git a/src/utils/request.js b/src/utils/request.js
index 27aa57c..d067576 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -32,7 +32,7 @@ const service = axios.create({
// axios中请求配置有baseURL选项，表示请求URL公共部分
baseURL: import.meta.env.VITE_APP_BASE_API,
// 超时
- timeout: 120000
+ timeout: 600000
})
let whitePage=['uploadPic',
"zhDataMaintain/simpleRead",
diff --git a/src/views/login.vue b/src/views/login.vue
index 6e5e31e..26c6f4d 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -158,6 +158,7 @@ const submit =()=> {
}
import {getOne} from "@/api/zx";
+import {ElMessage} from "element-plus";
function handleLogin() {
proxy.$refs.loginRef.validate(valid => {
@@ -183,10 +184,19 @@ function handleLogin() {
// url.value = window.URL.createObjectURL(blob);
// filePreviewModel.value.open();
// })
- router.push({ path: redirect.value , state: {
- where: "login",
- }});
- }).catch(() => {
+ console.log(res, 'res')
+ if(res.code!=200){
+ ElMessage.error(res.msg)
+ loading.value = false;
+ }else {
+ ElMessage.success(res.msg)
+ router.push({ path: redirect.value , state: {
+ where: "login",
+ }});
+ }
+
+ }).catch((err) => {
+ ElMessage.error(err)
loading.value = false;
// 重新获取验证码
if (captchaEnabled.value) {
diff --git a/src/views/pages/anquan/qzxscxkyxh.vue b/src/views/pages/anquan/qzxscxkyxh.vue
index 4a84402..3a97875 100644
--- a/src/views/pages/anquan/qzxscxkyxh.vue
+++ b/src/views/pages/anquan/qzxscxkyxh.vue
@@ -46,6 +46,7 @@
{
+ console.log(file,'校验')
+ if(file.name.split('.').pop()=='xlsx'||file.name.split('.').pop()=='xls'){
+ return
+ }else {
+ ElMessage.error('请上传xlsx或xls格式的文件')
+ return false
+ }
+}
const submitUpload1 = () => {
const formData = new FormData();
formData.append('file', file2.value);
// 使用 fetch 发送请求
importSafetyWeekly(formData).then(response => response)
- .then(data => {
+ .then(res => {
// 清空文件输入框
upload1.value.clearFiles();
- ElMessage.success(data.msg)
+ if(res.code==200){
+ ElMessage.success(res.msg)
+ }else{
+ ElMessage.error(res.msg)
+ }
file2.value=null
resetQuery()
- }).then(res=>{
- if(res.code==200){
- ElMessage.success(res.msg)
- }
- })
+ })
return
};
let file2=ref(null)
diff --git a/src/views/pages/dw/jbxx.vue b/src/views/pages/dw/jbxx.vue
index d3bf7d1..ef6fd98 100644
--- a/src/views/pages/dw/jbxx.vue
+++ b/src/views/pages/dw/jbxx.vue
@@ -44,6 +44,7 @@
ref="upload1"
action="#"
:http-request="submitUpload1"
+ :before-upload="handleBeforeUpload"
:on-change="handleFileChange1"
accept=".xls,.xlsx"
:show-file-list="false"
@@ -470,24 +471,33 @@ const submitUpload = () => {
})
};
let upload1 = ref(null)
+const handleBeforeUpload=(file)=>{
+ console.log(file,'校验')
+ if(file.name.split('.').pop()=='xlsx'||file.name.split('.').pop()=='xls'){
+ return
+ }else {
+ ElMessage.error('请上传xlsx或xls格式的文件')
+ return false
+ }
+}
const submitUpload1 = () => {
console.log(1111)
const formData = new FormData();
formData.append('file', file1.value);
// 使用 fetch 发送请求
importCm1(formData).then(response => response)
- .then(data => {
+ .then(res => {
// 清空文件输入框
+
+ if (res.code == 200) {
+ ElMessage.success(res.msg)
+ }else {
+ ElMessage.error(res.msg)
+ }
upload1.value.clearFiles();
- ElMessage.success('上传成功')
file1.value = null
handleQuery()
- }).then(res => {
- if (res.code == 200) {
- ElMessage.success(res.msg)
- }
- })
- return
+ })
};
onMounted(() => {
getPrjListFun()
diff --git a/src/views/pages/dw/jjgjzj.vue b/src/views/pages/dw/jjgjzj.vue
index d2485b6..3ea31f9 100644
--- a/src/views/pages/dw/jjgjzj.vue
+++ b/src/views/pages/dw/jjgjzj.vue
@@ -38,7 +38,7 @@
- 新增
+ 新增
@@ -96,7 +96,7 @@
-
+
-
+
{{currentOne.annualTrainingPlanName}}
-
-
- ![]()
{{photoName}}
+
+ ![]()
@@ -201,7 +200,7 @@
修改
{
+ isOpenDialog.value=true
+ currentStatus.value='新增'
+}
const rules = reactive({
name: [{ required: true , message: '必填',}],
dept: [{required: true, message: '必填',}],
@@ -298,6 +301,7 @@ let upLoadname=ref ('')
let isOpenDialog =ref(false)
const closeDialog=()=>{
disabledP.value=false
+ currentStatus.value=''
upLoadname.value=''
selectItemUpload.value={
value:'',
@@ -318,7 +322,7 @@ const route=useRoute()
// 编辑
let fileList=ref([])
let fileList1=ref([])
-let currentStatus=ref('编辑')
+let currentStatus=ref('')
let currentOne=ref({})
const dFile=()=>{
console.log(currentOne.value,'..44')
@@ -335,8 +339,8 @@ const dFile=()=>{
}
let annualTrainingPlanName=ref('')
let editFun = (rowData,pay) => {
- if(pay=='编辑'){
- currentStatus.value='编辑'
+ if(pay=='修改'){
+ currentStatus.value='修改'
}else if(pay=='详情'){
disabledP.value=true
currentStatus.value='详情'
diff --git a/src/views/pages/environment/videoInfo/index.vue b/src/views/pages/environment/videoInfo/index.vue
index 324ad4a..3578b4d 100644
--- a/src/views/pages/environment/videoInfo/index.vue
+++ b/src/views/pages/environment/videoInfo/index.vue
@@ -18,9 +18,11 @@
选择文件{{fileList}}
+
+
@@ -34,9 +36,9 @@