From 7c33a1164d3019feb3ad9e4844b3d364e5c6eb44 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 17 十一月 2024 11:31:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/self/memo.vue | 2 +-
ruoyi-ui/src/views/economy/economyInfo.vue | 2 +-
ruoyi-ui/src/views/genealogy/index.vue | 4 ++--
ruoyi-ui/src/views/device/index.vue | 23 +++++++++++++++++------
ruoyi-ui/vue.config.js | 2 +-
5 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index 72e8601..c0cc85f 100644
--- a/ruoyi-ui/src/views/device/index.vue
+++ b/ruoyi-ui/src/views/device/index.vue
@@ -723,7 +723,7 @@
};
},
created() {
- alert(1233)
+ // alert(1233)
this.getList();
// this.getCateInfor()
this.getInfo()
@@ -863,7 +863,7 @@
getList1() {
this.loading1 = true;
let userId = this.$store.state.user.userId
-
+
this.userOptions = []
showShareUser(userId, 2017).then(response=>{
console.log("===========ddddddddddddd")
@@ -957,9 +957,20 @@
getList() {
this.loading = true;
- this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
- this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
- console.log(this.queryParams)
+ console.log(this.dateRange)
+ if(this.dateRange!=null)
+ {
+ this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
+ this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
+ console.log(this.queryParams)
+ }
+ else
+ {
+ this.queryParams.happenStartTime = null
+ this.queryParams.happenEndTime = null
+ }
+
+ console.log(this.queryParams)
//alert(this.queryParams.name)
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
let _this = this
@@ -1043,7 +1054,7 @@
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
const id = row.id;
- this.open2 = false;
+ this.open2 = false;
// alert(988)
this.$router.push("/familymodel/Device/equipmentInfo/" + id);
},
diff --git a/ruoyi-ui/src/views/economy/economyInfo.vue b/ruoyi-ui/src/views/economy/economyInfo.vue
index 434e831..fdc1d57 100644
--- a/ruoyi-ui/src/views/economy/economyInfo.vue
+++ b/ruoyi-ui/src/views/economy/economyInfo.vue
@@ -306,7 +306,7 @@
this.btn= jd;
this.dsb = !jd;
this.isShow=true;
- this.$route.meta.title = "淇敼瀹跺涵鏀舵敮鍙拌处璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+ this.$route.meta.title = "淇敼瀹跺涵鏀舵敮鍙拌处淇℃伅";//鍒楄〃鐨勫悕绉�
}
else{
this.$route.meta.title = "瀹跺涵鏀舵敮鍙拌处璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
diff --git a/ruoyi-ui/src/views/genealogy/index.vue b/ruoyi-ui/src/views/genealogy/index.vue
index 3278f67..45edc93 100644
--- a/ruoyi-ui/src/views/genealogy/index.vue
+++ b/ruoyi-ui/src/views/genealogy/index.vue
@@ -302,11 +302,11 @@
},
typeOption: [{
- value: '1',
+ value: '0',
label: '鐢�',
},
{
- value: '0',
+ value: '1',
label: '濂�',
}],
typeOptions: [{
diff --git a/ruoyi-ui/src/views/self/memo.vue b/ruoyi-ui/src/views/self/memo.vue
index 053cb1e..1f660e0 100644
--- a/ruoyi-ui/src/views/self/memo.vue
+++ b/ruoyi-ui/src/views/self/memo.vue
@@ -1223,7 +1223,7 @@
this.$refs.uploadDemo.clearFiles();
// alert(234)
uploadPics(formData).then(response => {
- alert(response.data.url)
+ // alert(response.data.url)
// // alert(response.data.originalFilename)
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 961b73a..02bed06 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -36,7 +36,7 @@
proxy: {
// detail: https://cli.vuewww.bendudu.comjs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- // target: `https://10.39.18.174:8080/`,
+ // target: `https://10.39.18.174:8080/`,
// target: `https://192.168.1.7:8080/`,
target: 'https://www.bendudu.com:8080/',
changeOrigin: true,
--
Gitblit v1.9.1