From 5237d75a9c44b033c72120d41382a3906fd5cd1c Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期四, 02 五月 2024 22:24:46 +0800
Subject: [PATCH] 1

---
 src/views/console/system/add-scope-manager.vue  |  116 +++++++++++------------
 src/views/console/system/data-scope-manager.vue |  109 ++++++++-------------
 src/views/mdc/time-analysis.vue                 |   48 ++++----
 3 files changed, 123 insertions(+), 150 deletions(-)

diff --git a/src/views/console/system/add-scope-manager.vue b/src/views/console/system/add-scope-manager.vue
index 51b0ce8..ebc31e4 100644
--- a/src/views/console/system/add-scope-manager.vue
+++ b/src/views/console/system/add-scope-manager.vue
@@ -3,43 +3,35 @@
 		<el-form :model="addDictForm" :rules="addDictRules" :disabled="mode=='show'" ref="dialogForm" label-width="120px" label-position="center">
 			<el-row>
 				<el-col :span="12">
-					<el-form-item label="鏉冮檺鍚嶇О" prop="scopeName">
-						<el-input v-model="addDictForm.scopeName" placeholder="鏉冮檺鍚嶇О" clearable></el-input>
+					<el-form-item label="鏉冮檺鍚嶇О" prop="deptName">
+						<el-input v-model="addDictForm.deptName" placeholder="鏉冮檺鍚嶇О" clearable></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
-					<el-form-item label="鏉冮檺缂栧彿" prop="resourceCode">
-						<el-input v-model="addDictForm.resourceCode" placeholder="鏉冮檺缂栧彿" clearable></el-input>
+					<el-form-item label="鏉冮檺鎻忚堪" prop="fullName">
+						<el-input v-model="addDictForm.fullName" placeholder="鏉冮檺鎻忚堪" clearable></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
-					<el-form-item label="鏉冮檺瀛楁" prop="scopeColumn">
-						<el-input v-model="addDictForm.scopeColumn" placeholder="鏉冮檺瀛楁" clearable></el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="12">
-					<el-form-item label="瑙勫垯鍒嗙被" prop="scopeType">
-						<el-select v-model="addDictForm.scopeType" style="width: 100%" @change="scopeTypeNameChange" placeholder="瑙勫垯鍒嗙被">
-							<el-option v-for="item in scopeTypeNameList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+					<el-form-item label="涓婄骇鏉冮檺">
+						<el-select v-model="addDictForm.parentId" placeholder="璇烽�夋嫨涓婄骇鏉冮檺" style="width: 100%" @change="parentIdChange" :disabled="mode=='add'">
+							<el-option v-for="item in parentIdList" :key="item.parentId" :label="item.title" :value="item.parentId"/>
 						</el-select>
 					</el-form-item>
 				</el-col>
-				<el-col :span="24">
-					<el-form-item label="鍙瀛楁" prop="scopeField">
-						<el-input v-model="addDictForm.scopeField" placeholder="鍙瀛楁" clearable></el-input>
+				<el-col :span="12">
+					<el-form-item label="鏉冮檺绫诲瀷" pros="deptCategory">
+						<el-select v-model="addDictForm.deptCategory" placeholder="璇烽�夋嫨鏉冮檺绫诲瀷" style="width: 100%" @change="deptCategoryChange">
+							<el-option v-for="item in deptCategoryList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+						</el-select>
 					</el-form-item>
 				</el-col>
-				<el-col :span="24">
-					<el-form-item label="鏉冮檺绫诲悕" prop="scopeClass">
-						<el-input v-model="addDictForm.scopeClass" placeholder="鏉冮檺绫诲悕" clearable></el-input>
+				<el-col :span="12">
+					<el-form-item label="鎺掑簭" prop="sort">
+						<el-input v-model="addDictForm.sort" placeholder="鎺掑簭" clearable></el-input>
 					</el-form-item>
 				</el-col>
-				<el-col :span="24">
-					<el-form-item label="瑙勫垯鍊�" v-if="addDictForm.scopeType == '5'">
-						<el-input type="textarea" v-model="addDictForm.scopeValue" placeholder="瑙勫垯鍊�" clearable></el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24">
+				<el-col :span="12">
 					<el-form-item label="澶囨敞">
 						<el-input v-model="addDictForm.remark" placeholder="澶囨敞" clearable></el-input>
 					</el-form-item>
@@ -47,8 +39,8 @@
 			</el-row>
 		</el-form>
 		<template #footer>
+			<el-button v-if="mode!='show'" type="primary" :loading="isSaveing" @click="dictSubmit">淇� 瀛�</el-button>
 			<el-button @click="visible=false" >鍙� 娑�</el-button>
-			<el-button v-if="mode!='show'" type="primary" :loading="isSaveing" @click="dictSubmit()">淇� 瀛�</el-button>
 		</template>
 	</el-dialog>
 </template>
@@ -56,8 +48,11 @@
 <script>
 	export default {
 		emits: ['success', 'closed'],
+		props: ["deptCategoryList","parentIdList"],
 		data() {
 			return {
+				deptCategoryList: [],
+				parentIdList: [],
 				value1: true,
 				mode: "add",
 				titleMap: {
@@ -69,24 +64,21 @@
 				isSaveing: false,
 				//琛ㄥ崟鏁版嵁
 				addDictForm: {
-					$scopeType: "",
-					scopeName: "宸ヤ綔鍙癧鏆傛棤]",
-					resourceCode: "",
-					scopeColumn: "",
-					scopeType: "",
-					scopeField: "",
-					scopeClass: "",
+					$deptCategory: "",
+					$parentId: "",
+					deptCategory: "",
+					deptName: "",
+					fullName: "",
+					parentId: "",
 					remark: "",
-					scopeValue: ""
+					sort: ""
 				},
 				//楠岃瘉瑙勫垯
 				addDictRules: {
-					scopeName:[{required: true, message: '璇疯緭鍏ユ潈闄愬悕绉�'}],
-					resourceCode:[{required: true, message: '璇疯緭鍏ユ潈闄愮紪鍙�'}],
-					scopeColumn:[{required: true, message: '璇疯緭鍏ユ潈闄愬瓧娈�'}],
-					scopeType:[{required: true, message: '璇疯緭鍏ヨ鍒欏垎绫�',trigger: 'change'}],
-					scopeField:[{required: true, message: '璇疯緭鍏ュ彲瑙佸瓧娈�'}],
-					scopeClass:[{required: true, message: '璇疯緭鍏ユ潈闄愮被鍚�'}],
+					deptName:[{required: true, message: '璇疯緭鍏ユ潈闄愬悕绉�'}],
+					fullName:[{required: true, message: '璇疯緭鍏ユ潈闄愭弿杩�'}],
+					deptCategory:[{required: true, message: '璇疯緭鍏ユ潈闄愮被鍨�',trigger: 'change'}],
+					sort:[{required: true, message: '璇疯緭鍏ユ帓搴�'}]
 				},
 				//鎵�闇�鏁版嵁閫夐」
 				groups: [],
@@ -103,30 +95,28 @@
 			}
 		},
 		mounted() {
-			// this.getDept()
+			// this.getParentIdList();  //涓婄骇鏉冮檺list
+			// this.getDictionary();  //鏉冮檺绫诲瀷list
 		},
-		props: ['scopeTypeNameList','tableRow'],
 		methods: {
-			scopeTypeNameChange(value) {
-				this.scopeTypeNameList.forEach(item=> {
-					if(item.dictKey == value) {
-						this.addDictForm.scopeName = `宸ヤ綔鍙癧${item.dictValue}]`;
-						this.addDictForm.$scopeType = item.dictValue;
+			parentIdChange(value) {
+				this.parentIdList.forEach(item=> {
+					if(item.parentId == value) {
+						this.addDictForm.$parentId = item.title;
 					}
 				})
-				if(value == "2") {
-					this.addDictForm.scopeColumn = 'create_user';
-				}else if(value == "3" || value == "4") {
-					this.addDictForm.scopeColumn = 'create_dept';
-				}else {
-					this.addDictForm.scopeColumn = "";
-				}
+			},
+			deptCategoryChange(value) {
+				this.deptCategoryList.forEach(item=> {
+					if(item.dictKey == value) {
+						this.addDictForm.$deptCategory = item.dictValue;
+					}
+				})
 			},
 			//鏄剧ず
 			open(mode='add'){
 				this.mode = mode;
 				this.visible = true;
-				this.addDictForm.resourceCode = this.tableRow.alias;
 				return this
 			},
 			//鍔犺浇鏍戞暟鎹�
@@ -138,14 +128,22 @@
 				var res = await this.$API.system.dept.list.get();
 				this.depts = res.data;
 			},
+			getDetail(id) {
+				console.log(this.deptCategoryList)
+				this.$HTTP.get(`/api/blade-system/data-scope-manager/detail?id=${id}`).then(res=> {
+					if(res.code == 200) {
+						//鍙互鍜屼笂闈竴鏍峰崟涓敞鍏ワ紝涔熷彲浠ュ儚涓嬮潰涓�鏍风洿鎺ュ悎骞惰繘鍘�
+						Object.assign(this.addDictForm, res.data);
+					}
+				})
+			},
 			//琛ㄥ崟鎻愪氦鏂规硶
 			dictSubmit(){
-				this.addDictForm.menuId = this.tableRow.id;
-				var obj = Object.assign({},this.addDictForm);
+				var obj = Object.assign({},this.addDictForm);;
 				this.$refs.dialogForm.validate(async (valid) => {
 					if (valid) {
 						this.isSaveing = true;
-						this.$HTTP.post("/api/blade-system/data-scope/submit",obj).then(res=> {
+						this.$HTTP.post("/api/blade-system/data-scope-manager/submit",obj).then(res=> {
 							this.isSaveing = false;
 							if(res.code == 200) {
 								this.$emit('success', this.addDictForm, this.mode);
@@ -162,9 +160,7 @@
 			},
 			//琛ㄥ崟娉ㄥ叆鏁版嵁
 			setData(data){
-				data.scopeType = String(data.scopeType);
-				//鍙互鍜屼笂闈竴鏍峰崟涓敞鍏ワ紝涔熷彲浠ュ儚涓嬮潰涓�鏍风洿鎺ュ悎骞惰繘鍘�
-				Object.assign(this.addDictForm, data);
+				this.getDetail(data.id);
 			}
 		}
 	}
diff --git a/src/views/console/system/data-scope-manager.vue b/src/views/console/system/data-scope-manager.vue
index 37ac3d9..7d49217 100644
--- a/src/views/console/system/data-scope-manager.vue
+++ b/src/views/console/system/data-scope-manager.vue
@@ -2,7 +2,7 @@
  * @Author: lzhe lzhe@example.com
  * @Date: 2024-03-26 10:28:33
  * @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-04-17 18:02:12
+ * @LastEditTime: 2024-05-02 22:20:47
  * @FilePath: /smart-web/src/views/master/person/main/index.vue
  * @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -10,10 +10,10 @@
 	<div class="dict-main">
 		<el-form :inline="true" :model="searchData" abel-width="120px">
 			<el-form-item label="鏉冮檺鍚嶇О">
-				<el-input v-model="searchData.name" placeholder="鏉冮檺鍚嶇О" clearable />
+				<el-input v-model="searchData.deptName" placeholder="鏉冮檺鍚嶇О" clearable />
 			</el-form-item>
 			<el-form-item label="鏉冮檺鎻忚堪">
-				<el-input v-model="searchData.code" placeholder="鏉冮檺鎻忚堪" clearable></el-input>
+				<el-input v-model="searchData.deptName" placeholder="鏉冮檺鎻忚堪" clearable></el-input>
 			</el-form-item>
 			<el-form-item>
 				<el-button type="primary" @click="searchclick">鎼滅储</el-button>
@@ -22,26 +22,29 @@
 		</el-form>
 		<div>
 			<div style="margin-bottom: 12px;">
-				<el-button type="primary">娣诲姞</el-button>
+				<el-button type="primary" @click="addData">娣诲姞</el-button>
 				<el-button type="danger" @click="delData">鍒犻櫎</el-button>
 				<el-button type="primary" @click="addAuthority">鏉冮檺璁剧疆</el-button>
 			</div>
 			<div class="dict-table">
 				<el-table ref="multipleTableRef" :data="tableData" border row-key="id" style="width: 100%" class="multipleTableRef" @selection-change="handleSelectionChange" :tree-props="{ children: 'children', hasChildren: 'has' }">
 					<el-table-column type="selection" width="55" />
-					<el-table-column prop="test" label="鏉冮檺鍚嶇О"></el-table-column>
-					<el-table-column prop="test" label="鏉冮檺鎻忚堪"></el-table-column>
-					<el-table-column prop="test" label="鏉冮檺绫诲瀷"></el-table-column>
-					<el-table-column prop="test" label="鎺掑簭"></el-table-column>
-					<el-table-column fixed="right" label="鎿嶄綔">
+					<el-table-column prop="deptName" label="鏉冮檺鍚嶇О"></el-table-column>
+					<el-table-column prop="fullName" label="鏉冮檺鎻忚堪"></el-table-column>
+					<el-table-column prop="deptCategoryName" label="鏉冮檺绫诲瀷"></el-table-column>
+					<el-table-column prop="sort" label="鎺掑簭"></el-table-column>
+					<el-table-column fixed="right" label="鎿嶄綔" width="280">
 						<template #default="scope">
-							<el-button text type="primary" size="small" @click="showDrawer(scope.row, scope.$index)">鏉冮檺閰嶇疆</el-button>
+							<el-button text type="primary" size="small" @click="table_show(scope.row, scope.$index)">鏌ョ湅</el-button>
+							<el-button text type="primary" size="small" @click="showDrawer(scope.row, scope.$index)">缂栬緫</el-button>
+							<el-button text type="primary" size="small" @click="showDrawer(scope.row, scope.$index)">鍒犻櫎</el-button>
+							<el-button text type="primary" size="small" @click="showDrawer(scope.row, scope.$index)">鏂板瀛愰」</el-button>
 						</template>
 					</el-table-column>
 				</el-table>
 			</div>
 		</div>
-		<save-dialog v-if="dialog.save" ref="saveDialog" :scopeTypeNameList="scopeTypeNameList" :tableRow="tableRow" @success="addDatascopeSuccess" @closed="dialog.save=false"></save-dialog>
+		<save-dialog v-if="dialog.save" ref="saveDialog" :deptCategoryList="deptCategoryList" :parentIdList ="parentIdList" @success="addDatascopeSuccess" @closed="dialog.save=false"></save-dialog>
 	</div>
 </template>
 <script>
@@ -77,46 +80,55 @@
 					size: 10
 				},
 				searchData: {
-					name: "",
-					code: "",
-					belongApplication: "",
-					parentId: ""
+					deptName: "",
+					fullName: "",
+					parentId: "0"
 				},
 				dialog: {
 					save: false,
 					allocation: false
 				},
 				tableData: [],
-				drawerTableData: [],
 				rowId: "",
-				tableRow: {}
+				tableRow: {},
+				parentIdList: [],
+				deptCategoryList: []
 			}
 		},
 		created(){
 			
 		},
 		mounted(){
-			this.getscopeTypeNameList();//瑙勫垯鍒嗙被鏋氫妇
 			this.searchBtn();
+			this.getDictionary();
+			this.getParentIdList();
 		},
 		components: {
 	    	...ElementPlusIconsVue,saveDialog
 	    },
 		methods: {
-			getscopeTypeNameList() {  //瑙勫垯鍒嗙被鏋氫妇
-				this.$HTTP.get("/api/blade-system/dict/dictionary?code=data_scope_type").then(res=> {
+			getParentIdList() {
+				this.$HTTP.get("/api/blade-system/data-scope-manager/tree").then(res=> {
 					if(res.code == 200) {
-						this.scopeTypeNameList = res.data;
+						this.parentIdList = res.data;
+					}
+				})
+			},
+			getDictionary() {
+				this.$HTTP.get("/api/blade-system/dict/dictionary?code=data_scope_category").then(res=> {
+					if(res.code == 200) {
+						this.deptCategoryList = res.data;
 					}
 				})
 			},
 			addDatascopeSuccess() {
-				this.drawerSearchclick();
+				this.searchclick();
 			},
+			//娣诲姞
 			addData(){
-				this.dialog.save = true
+				this.dialog.save = true;
 				this.$nextTick(() => {
-					this.$refs.saveDialog.open()
+					this.$refs.saveDialog.open();
 				})
 			},
 			addAuthority() {
@@ -143,7 +155,6 @@
 				this.$HTTP.post("/api/blade-system/data-scope/remove?ids="+selStr).then(res=> {
 					if(res.code == 200) {
 						that.$message.success("鎿嶄綔鎴愬姛");
-						that.drawerSearchclick();
 					}
 				})
 			},
@@ -173,17 +184,12 @@
 					this.$HTTP.post("/api/blade-system/data-scope/remove?ids="+row.id).then(res=> {
 						if(res.code == 200) {
 							that.$message.success("鎿嶄綔鎴愬姛");
-							that.drawerSearchclick();
 						}
 					})
 				}).catch(() => {
 
 				})
 			},
-			handleClose(done) {
-				this.drawerTableData = [];
-		        done();
-		    },
 			exportFile(row,index){
 				window.open(row.link);
 			},
@@ -192,9 +198,8 @@
 			},
 			searchClearBtn() {
 				this.searchData = {
-					name: "",
-					code: "",
-					belongApplication: "",
+					deptName: "",
+					fullName: "",
 					parentId: ""
 				}
 				this.searchBtn();
@@ -202,33 +207,7 @@
 			showDrawer(row){
 				this.rowId = row.id;
 				this.tableRow = row;  //鍚庨潰缁勪欢浼氱敤鍒�
-				this.drawerSearchclick();
 				this.drawer = true;
-			},
-			drawerSearchclick() {
-				var obj = {};
-				for(var key in this.drawerSearchData) {
-					if(this.drawerSearchData[key]) {
-						obj[key] = this.drawerSearchData[key];
-					}
-				}
-				obj.menuId = this.rowId;
-				this.$HTTP.get("/api/blade-system/data-scope/list?"+this.$TOOL.qsStringify(obj)).then(res=> {
-					if(res.code == 200) {
-						this.drawerTableData = res.data.records;
-						this.drawerTotal = res.data.total;
-					}
-				})
-			},
-			drawerSearchClearBtn() {
-				this.drawerSearchData = {
-					scopeName: "",
-					resourceCode: "",
-					menuId: this.rowId,
-					current: 1,
-					size: 10
-				}
-				this.drawerSearchclick();
 			},
 			searchclick() {
 				this.searchBtn();
@@ -240,11 +219,11 @@
 						obj[key] = this.searchData[key];
 					}
 				}
-				// this.$HTTP.get("/api/blade-system/menu/lazy-menu-list",obj).then(res=> {
-				// 	if(res.code == 200) {
-				// 		this.tableData = res.data;
-				// 	}
-				// })
+				this.$HTTP.get("/api/blade-system/data-scope-manager/lazy-list?" + this.$TOOL.qsStringify(obj)).then(res=> {
+					if(res.code == 200) {
+						this.tableData = res.data;
+					}
+				})
 			},
 			handleSelectionChange(selection) {
 				this.selection = selection;
@@ -259,12 +238,10 @@
 				console.log(`姣忛〉 ${val} 鏉);
 				this.drawerSearchData.current = "1";
 				this.drawerSearchData.size = val;
-				this.drawerSearchclick();
 			},
 			handleCurrentChange(val) {
 				console.log(`褰撳墠椤�: ${val}`);
 				this.drawerSearchData.current = val;
-				this.drawerSearchclick();
 			}
 		}
 	}
diff --git a/src/views/mdc/time-analysis.vue b/src/views/mdc/time-analysis.vue
index 6308394..d25393b 100644
--- a/src/views/mdc/time-analysis.vue
+++ b/src/views/mdc/time-analysis.vue
@@ -2,7 +2,7 @@
  * @Author: lzhe lzhe@example.com
  * @Date: 2024-04-26 09:36:18
  * @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-05-01 22:44:46
+ * @LastEditTime: 2024-05-02 20:46:36
  * @FilePath: /smart-web/src/views/mdc/status-record.vue
  * @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -198,7 +198,7 @@
                     show: true,
                     axisLabel: {
                         formatter: function (value) {
-                            return value + "%";
+                            return value * 100 + "%";
                         }
                     },
                     data: [2,20,40,60,80,100]
@@ -234,7 +234,7 @@
                     show: true,
                     axisLabel: {
                         formatter: function (value) {
-                            return value + "%";
+                            return value * 100 + "%";
                         }
                     },
                     data: [2,20,40,60,80,100]
@@ -270,7 +270,7 @@
                     show: true,
                     axisLabel: {
                         formatter: function (value) {
-                            return value + "%";
+                            return value * 100 + "%";
                         }
                     },
                     data: [2,20,40,60,80,100]
@@ -306,7 +306,7 @@
                     show: true,
                     axisLabel: {
                         formatter: function (value) {
-                            return value + "%";
+                            return value * 100 + "%";
                         }
                     },
                     data: [2,20,40,60,80,100]
@@ -325,21 +325,17 @@
     },
     methods: {
     	getDataA() {
-    		var ids = [];
-    		this.treeChecked.forEach(item=> {
-    			ids.push(item.id);
-    		})
             if(this.btnLeftctive == 1) {  //鎸夊伐浣嶇粺璁�
                 var obj = {
-                    ids: ids,
+                    ids: this.ids,
                     localDate: this.date,
                     type: 0
                 }
-            }else if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粍缁熻
+            }else if(this.btnLeftctive == 2) { //鎸夊伐浣嶇粍缁熻
                 var obj = {
                     groupCategory: 1,
                     groupType: "group_workstation",
-                    ids: ids,
+                    ids: this.ids,
                     localDate: this.date,
                     type: 1
                 }
@@ -414,7 +410,7 @@
             }
             if(this.btnLeftctive == 1) {  //鎸夊伐浣嶇粺璁�
                 obj.type = 0;
-            }else if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粍缁熻
+            }else if(this.btnLeftctive == 2) { //鎸夊伐浣嶇粍缁熻
                 obj.type = 1;
             }
             this.$HTTP.post(`/api/blade-mdc/time-used-analysis/work-stations?current=${this.current}&size=${this.size}`,obj).then(res=> {
@@ -426,7 +422,6 @@
                     this.chartOptionA.xAxis.data = xAxis;
                     var recordDom = document.getElementById('recordwork' + index);
                     this.chartOptionA.series = this.formatChartData(res.data.countStatus);
-                    console.log(this.chartOptionA.series)
                     var myChart = echarts.init(recordDom);
                     myChart.setOption(this.chartOptionA);
                 }
@@ -449,12 +444,14 @@
             }
             if(this.btnLeftctive == 1) {  //鎸夊伐浣嶇粺璁�
                 obj.type = 0;
-            }else if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粍缁熻
+            }else if(this.btnLeftctive == 2) { //鎸夊伐浣嶇粍缁熻
                 obj.type = 1;
             }
             this.$HTTP.post(`/api/blade-mdc/time-used-analysis/work-stations?current=${this.current}&size=${this.size}`,obj).then(res=> {
                 if(res.code == 200) {
                     var xAxis = [];
+                    res.data.workStationDetails == null ? res.data.workStationDetails = [] : res.data.workStationDetails;
+                    res.data.countStatus == null ? res.data.countStatus = [] : res.data.countStatus;
                     res.data.workStationDetails.forEach(item=> {
                         xAxis.push(item.name);
                     })
@@ -560,9 +557,7 @@
             this.getDataA();
         },
         changeTabB(item,index,index1) {
-            if(index == 0) {
-                this.setTitle1[0].btnListActive = item.id;
-            }
+            this.setTitle1[index].btnListActive = item.id;
             this.date = this.setTitle1[0].btnListActive;
             if(index == 0) {
                 this.getDataChartsB("DAY");
@@ -600,21 +595,26 @@
             this.date = this.time[1];
         },
         query() {
+            console.log(this.activeName)
+            this.getTime({endDate: this.time[1],startDate: this.time[0],statisticalMethod: 'SHIFT'});
+            this.date = this.time[1];
             this.ids = [];
-            console.log(this.btnLeftctive)
             if(this.btnLeftctive == 1) {  //鎸夊伐浣嶇粺璁�
                 this.treeChecked.forEach(item=> {
                     this.ids.push(item.id);
                 })
-            }else if(this.btnLeftctive == 1) { //鎸夊伐浣嶇粍缁熻
+            }else if(this.btnLeftctive == 2) { //鎸夊伐浣嶇粍缁熻
                 this.treeListNodeList.forEach(item=> {
                     this.ids.push(item.id);
                 })
             }
-            console.log(this.ids,2)
-            this.getTime({endDate: this.time[1],startDate: this.time[0],statisticalMethod: 'SHIFT'});
-            this.date = this.time[1];
-            this.getDataA();
+            if(this.activeName == "shift") {  //鎸夌彮娆$粺璁�
+                this.getDataA();
+            }else if(this.activeName == "time") { //鎸夊懆鏈熺粺璁�
+                this.getDataChartsB("DAY");
+                this.getDataChartsB("WEEK");
+                this.getDataChartsB("MONTH",this.setTitle1[2].btnListActive.split("鏈�")[0]);
+            }
         }
     }
 }

--
Gitblit v1.9.3