zhangshi_app_web.git

			@@ -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);
			},

			@@ -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 = "家庭收支台账详细信息";//列表的名称

			@@ -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)

			@@ -36,9 +36,9 @@
			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/',
			// target: 'https://www.bendudu.com:8080/',
			changeOrigin: true,
			pathRewrite: {
			['^' + process.env.VUE_APP_BASE_API]: ''

	ruoyi-ui/src/views/device/index.vue	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-ui/src/views/economy/economyInfo.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-ui/src/views/self/memo.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-ui/vue.config.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史