权限

4.11
Merge branch 'projects/mesxc-test' into projects/mesxc-zjl
2024-04-11 15:22:09 +08:00 · 2024-04-11 11:18:08 +08:00 · 2024-04-10 17:37:50 +08:00 · 2024-04-10 17:36:37 +08:00 · 2024-04-10 16:26:37 +08:00 · 2024-04-10 16:12:23 +08:00
49 changed files with 1899 additions and 1518 deletions
--- a/.env.dev
+++ b/.env.dev
@@ -1,8 +1,8 @@
 ###
 # @Author: Do not edit
 # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-04-08 16:46:49
- # @LastEditors: DY
+ # @LastEditTime: 2024-04-10 08:26:13
+ # @LastEditors: zhp
 # @Description:
 ###
 # 开发环境配置
@@ -24,6 +24,7 @@ VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.62:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.78:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.47:48082'
+# VUE_APP_BASE_API = 'http://192.168.1.78:48082'
 # socket地址
 # VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
 # VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
--- a/src/api/base/qualityHotMaterial.js
+++ b/src/api/base/qualityHotMaterial.js
@@ -2,7 +2,7 @@
 /*
 * @Author: zhp
 * @Date: 2023-11-06 15:38:12
- * @LastEditTime: 2023-12-15 15:29:16
+ * @LastEditTime: 2024-04-09 15:14:40
 * @LastEditors: zhp
 * @Description:
 */
--- a/src/api/base/qualityScrapLog.js
+++ b/src/api/base/qualityScrapLog.js
@@ -1,7 +1,7 @@
 /*
 * @Author: zhp
 * @Date: 2023-11-07 15:02:37
- * @LastEditTime: 2023-11-07 18:32:07
+ * @LastEditTime: 2024-04-09 15:14:42
 * @LastEditors: zhp
 * @Description:
 */
--- a/src/api/monitoring/statisticalData.js
+++ b/src/api/monitoring/statisticalData.js
@@ -1,7 +1,7 @@
 /*
 * @Author: zhp
 * @Date: 2023-11-07 14:10:18
- * @LastEditTime: 2023-11-16 17:49:52
+ * @LastEditTime: 2024-04-09 09:17:02
 * @LastEditors: zhp
 * @Description:
 */
@@ -18,14 +18,14 @@ export function getStatisticalDataPage(query) {

 export function getWorkOrderList(query) {
  return request({
-    url: '/base/core-work-order/listbyfilter',
+    url: 'base/quality-inspection-record/listbyfilter',
    method: 'get',
    params: query,
  })
 }
 export function getProductList(query) {
  return request({
-    url: '/base/core-product/listAll',
+    url: 'base/statistical-data/listAll',
    method: 'get',
    params: query,
  })
--- a/src/views/OperationalOverview/components/coldDoubleYChart.vue
+++ b/src/views/OperationalOverview/components/coldDoubleYChart.vue
@@ -2,7 +2,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-09-21 09:06:28
- * @LastEditTime: 2024-04-03 16:28:40
+ * @LastEditTime: 2024-04-09 15:24:39
 * @LastEditors: zhp
 * @Description:
 -->
@@ -225,6 +225,9 @@ export default {
            scale: true,
            type: 'value',
            name: '良品率/%',
+            max: 100,//最大值
+            min: 0,//最小值
+            interval: 20,//间隔
            nameTextStyle: {// y轴上方单位的颜色
              color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
              align: "left",
--- a/src/views/OperationalOverview/components/doubleYChart
+++ b/src/views/OperationalOverview/components/doubleYChart
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-09-21 09:06:28
- * @LastEditTime: 2024-04-03 17:09:12
+ * @LastEditTime: 2024-04-09 15:24:28
 * @LastEditors: zhp
 * @Description:
 -->
@@ -224,6 +224,9 @@ export default {
              scale: true,
              type: 'value',
              name: '良品率/%',
+              max: 100,//最大值
+              min: 0,//最小值
+              interval: 20,//间隔
              nameTextStyle: {// y轴上方单位的颜色
                color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
                align: "left",
--- a/src/views/OperationalOverview/processingBoard.vue
+++ b/src/views/OperationalOverview/processingBoard.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-07-19 15:18:30
 * @LastEditors: zhp
- * @LastEditTime: 2024-04-03 17:14:03
+ * @LastEditTime: 2024-04-10 16:10:11
 * @Description:
 -->
 <template>
@@ -39,10 +39,23 @@
        <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8" height="100%">
          <base-container :height="318" :size="'small'" :title="'工单监控'" :title-icon="'eqMonitoring'">
            <div class="order" style="width: 100%; overflow: hidden scroll; height: 350px">
-              <el-row v-for="op in orderList" :key="op.id" style="margin-bottom: .5em">
+              <el-row v-for="op in orderList" :key="op.id" style="margin-bottom: .5em;overflow: hidden;">
                <!-- <el-col :span="12"> -->
-
-                <p class="now-secondary-title" style="font-size: 14px;opacity: calc(.6);">{{ op.name }}</p>
+                <!-- <div style="height: 34px;"> -->
+                <span class="now-secondary-title" style="font-size: 14px;opacity: calc(.6);">{{ op.name }}</span>
+                <el-divider class="split" v-if="op.specifications" direction="vertical"></el-divider>
+                <!-- <span v-if="op.size" class="split"></span> -->
+                <span v-if="op.specifications" class="orderSize" style="font-size: 14px;opacity: calc(.6);">{{
+                op.specifications }}</span>
+                <el-divider class="split" v-if="op.planQuantity" direction="vertical"></el-divider>
+                <span v-if="op.planQuantity" class="orderPlan" style="font-size: 14px;opacity: calc(.6);">{{
+                op.planQuantity }}</span>
+                <span v-if="op.actualQuantity" class="orderFinish"
+                  style="font-size: 14px;opacity: calc(.6);margin-left: 130px;">{{
+                  op.actualQuantity
+                  }}</span>
+                <el-divider class="split" v-if="op.actualQuantity" direction="vertical"></el-divider>
+                <!-- </div> -->
                <el-progress style="width: 620px;" text-color="rgba(255, 255, 255, .6)" :stroke-width="10"
                  define-back-color="rgba(32, 57, 96, 1)" :percentage="op.progressRate" class="custom-progress-bar" />
              </el-row>
@@ -365,41 +378,65 @@ export default {
 				id: '1',
 				name: '测试工单',
        progressRate: 0.933333,
+        specifications: '1100*5554*22',
+        plan: 11111,
+        finish:111,
 			},
 			{
 				id: '2',
 				name: '测试工单2',
        progressRate: 0.932323,
+        size: '1100*5554*22',
+        plan: 11111,
+        finish: 111,
 			},
 			{
 				id: '3',
 				name: '测试工单3',
        progressRate: 0.23232,
+        size: '1100*5554*22',
+        plan: 11111,
+        finish: 111,
 			},
 			{
 				id: '4',
 				name: '测试工单4',
        progressRate: 0.32323,
+        size: '1100*5554*22',
+        plan: 11111,
+        finish: 111,
      },
      {
-        id: '4',
+        id: '5',
        name: '测试工单4',
        progressRate: 0.32323,
+        size: '1100*5554*22',
+        plan: 11111,
+        finish: 111,
      },
      {
-        id: '4',
+        id: '6',
        name: '测试工单4',
+        size: '1100*5554*22',
        progressRate: 0.32323,
+        plan: 11111,
+        finish: 111,
      },
      {
-        id: '4',
+        id: '7',
        name: '测试工单4',
+        size: '1100*5554*22',
        progressRate: 0.32323,
+        plan: 11111,
+        finish: 111,
      },
      {
-        id: '4',
+        id: '8',
        name: '测试工单4',
        progressRate: 0.32323,
+        size: '1100*5554*22',
+        plan: 11111,
+        finish: 111,
      },
 			// {
 			//   id: '5',
@@ -417,6 +454,9 @@ export default {
 					id: ele.id,
 					name: ele.name,
          progressRate: parseFloat((ele.progressRate * 100).toFixed(0)),
+          specifications: ele.specifications ?  '规格' + ele.specifications :null,
+          planQuantity: ele.plan ? '计划' + ele.plan + '片' : null,
+          finish: ele.finish + '片',
 				};
 			}
 		});
@@ -440,8 +480,8 @@ export default {
          <span style="color:rgba(255,255,255,0.5)" >${item.name || ''}
            </span>`,
 			`<span style="color:rgba(255,255,255,0.5)">${item.code || ''}</span>`,
-			`<span style="color:rgba(255,255,255,0.5)">${item.status || ''}</span>`,
-			`<span style="color:rgba(255,255,255,0.5)">${item.error || ''}</span>`,
+      `<span style="color:rgba(255,255,255,0.5)"><div style="${item.status == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;  background-color: #FFBD02;float:left;margin:13px 10px 0 0 '}"></div>  ${item.status || ''}</span>`,
+      `<span style="color:rgba(255,255,255,0.5)"><div style="${item.error == '是' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;  background-color: #FFBD02;float:left;margin:13px 10px 0 0 '}"></div>  ${item.error || ''}</span>`,
 		]);
    this.eqConfig.data = eqArr;
    let data = [
@@ -691,6 +731,9 @@ export default {
 								id: ele.id,
 								name: ele.name,
                progressRate: parseFloat((ele.progressRate * 100).toFixed(0)),
+                specifications: ele.specifications ?  '规格' + ele.specifications :null,
+                planQuantity: ele.planQuantity  ? '计划' + ele.planQuantity + '片' : null,
+                actualQuantity: ele.actualQuantity ? ele.actualQuantity + '片' : null,
 							};
 						}
 					});
@@ -704,12 +747,8 @@ export default {
 						`<span style="color:rgba(255,255,255,0.5)">${
 							item.code || ''
 						}</span>`,
-						`<span style="color:rgba(255,255,255,0.5)"><span style="color:rgba(255,255,255,0.5)"></span>  ${
-							item.status || ''
-						}</span>`,
-						`<span style="color:rgba(255,255,255,0.5)">${
-							item.error || ''
-						}</span>`,
+            `<span style="color:rgba(255,255,255,0.5)"><div style="${item.status == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;  background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div>  ${item.status || ''}</span>`,
+            `<span style="color:rgba(255,255,255,0.5)"><div style="${item.error == '是' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;  background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div>  ${item.error || ''}</span>`,
 					]);
          this.eqConfig.data = eqArr;
          // this.$nextTick(() => {
@@ -802,6 +841,18 @@ export default {
 </script>

 <style lang="scss" scoped>
+.split{
+  width: 1px;
+  // display: inline-block;
+  height: 14px;
+  // margin-top: 2px;
+  // line-height: 0;
+  margin-left: 8px;
+  opacity:calc(.6);
+  margin-right: 8px;
+  background-color: #C8CDD7;
+  // border: 1px solid #C8CDD7;
+}
 .myLegend {
  position: absolute;
  top: -28px;
@@ -902,12 +953,39 @@ export default {
 }

 .now-secondary-title {
+  display: inline-block;
+  width: 70px;
 	margin: 0;
-	font-size: 1em;
+	font-size: 14px;
 	line-height: 2em;
 	color: #fff;
 }
-
+.orderSize {
+  display: inline-block;
+  width: 120px;
+  margin: 0;
+  font-size: 14px;
+  line-height: 2em;
+  color: #fff;
+}
+.orderFinish {
+  display: inline-block;
+  width: 60px;
+  margin: 0;
+  font-size: 14px;
+  line-height: 2em;
+  text-align: right;
+  color: #fff;
+}
+.orderPlan {
+  display: inline-block;
+  width: 100px;
+  margin: 0;
+  font-size: 14px;
+  line-height: 2em;
+  color: #fff;
+  text-align: left;
+}
 .now-team-content {
 	font-size: 3em;
 	line-height: 1em;
--- a/src/views/choicePart/index.vue
+++ b/src/views/choicePart/index.vue
@@ -2,19 +2,30 @@
 	<div class="choicepart-container">
 		<navbar />
 		<div class="choicepart-wrapper">
-      <div class="choicepart-box" id="choicepartBox" :style="'transform:scale('+scale+');width:1710px;height:538px;'" v-show="showItem">
+			<div
+				class="choicepart-box"
+				id="choicepartBox"
+				:style="'transform:scale(' + scale + ')'"
+				style="width: 1710px; height: 538px"
+				v-show="showItem">
 				<div class="choicepart-line1">
 					<div
 						v-for="(item, index) in menuArr1"
 						:key="index"
 						class="choicepart-item"
 						@click="handelClick(item, item.choicepart)"
-          :style="{opacity: item.visible?1:0.4, pointerEvents:item.visible?'auto':'none'}"
-        >
+						:style="{
+							opacity: item.visible ? 1 : 0.4,
+							pointerEvents: item.visible ? 'auto' : 'none',
+						}">
 						<div>
-            <img :src="require(`../../assets/images/choicepart/${item.name}.png`)" alt="">
+							<img
+								:src="
+									require(`../../assets/images/choicepart/${item.name}.png`)
+								"
+								alt="" />
 						</div>
-          <div class="choicepart-item-title">{{item.meta.title}}</div>
+						<div class="choicepart-item-title">{{ item.meta.title }}</div>
 					</div>
 				</div>
 				<div class="choicepart-line2">
@@ -23,12 +34,18 @@
 						:key="index"
 						class="choicepart-item"
 						@click="handelClick(item, item.choicepart)"
-          :style="{opacity: item.visible?1:0.4, pointerEvents:item.visible?'auto':'none'}"
-        >
+						:style="{
+							opacity: item.visible ? 1 : 0.4,
+							pointerEvents: item.visible ? 'auto' : 'none',
+						}">
 						<div>
-            <img :src="require(`../../assets/images/choicepart/${item.name}.png`)" alt="">
+							<img
+								:src="
+									require(`../../assets/images/choicepart/${item.name}.png`)
+								"
+								alt="" />
 						</div>
-          <div class="choicepart-item-title">{{item.meta.title}}</div>
+						<div class="choicepart-item-title">{{ item.meta.title }}</div>
 					</div>
 				</div>
 			</div>
@@ -37,14 +54,13 @@
 	</div>
 </template>
 <script>
-import Navbar from './components/Navbar'
-import { debounce } from '@/utils/debounce'
+import Navbar from './components/Navbar';
+import { debounce } from '@/utils/debounce';
 export default {
 	components: { Navbar },
 	name: 'choicePart',
 	data() {
 		return {
-      boxReset: '',
 			scale: 1,
 			menuArr1: [
 				{
@@ -52,65 +68,65 @@ export default {
 					title: '基础核心',
 					visible: false,
 					meta: {
-            title: ''
-          }
+						title: '',
+					},
 				},
 				{
 					name: 'Order',
 					title: '订单管理',
 					visible: false,
 					meta: {
-            title: ''
-          }
+						title: '',
+					},
 				},
 				{
 					name: 'Equipment',
 					title: '设备管理',
 					visible: false,
 					meta: {
-            title: ''
-          }
+						title: '',
+					},
 				},
 				{
 					name: 'Group',
 					title: '班组管理',
 					visible: false,
 					meta: {
-            title: ''
-          }
+						title: '',
+					},
 				},
 				{
 					name: 'Quality',
 					title: '质量管理',
 					visible: false,
 					meta: {
-            title: ''
-          }
+						title: '',
+					},
 				},
 				{
 					name: 'Warehouse',
 					title: '仓库管理',
 					visible: false,
 					meta: {
-            title: ''
-          }
+						title: '',
+					},
 				},
 				{
 					name: 'Energy',
 					title: '能源管理',
 					visible: false,
 					meta: {
-            title: ''
-          }
+						title: '',
+					},
 				},
 				{
 					name: 'Packaging',
 					title: '包装管理',
 					visible: false,
 					meta: {
-            title: ''
-          }
-        }
+						title: '',
+					},
+				},
 			],
 			menuArr2: [
 				{
@@ -118,16 +134,16 @@ export default {
 					title: '物料管理',
 					visible: false,
 					meta: {
-            title: ''
-          }
+						title: '',
+					},
 				},
 				{
 					name: 'Extend',
 					title: '工艺管理',
 					visible: false,
 					meta: {
-            title: ''
-          }
+						title: '',
+					},
 				},
 				// {
 				//   name: 'Delivery',
@@ -142,91 +158,94 @@ export default {
 					title: '报表管理',
 					visible: false,
 					meta: {
-            title: ''
-          }
+						title: '',
+					},
 				},
 				{
 					name: 'Cost',
 					title: '成本管理',
 					visible: false,
 					meta: {
-            title: ''
-          }
+						title: '',
+					},
 				},
 				{
 					name: 'SafetyEnvironmental',
 					title: '安环管理',
 					visible: false,
 					meta: {
-            title: ''
-          }
+						title: '',
+					},
 				},
 				{
 					name: 'Databoard',
 					title: '数据驾驶舱',
 					visible: false,
 					meta: {
-            title: ''
-          }
+						title: '',
+					},
 				},
 				{
 					name: 'System',
 					title: '系统管理',
 					visible: false,
 					meta: {
-            title: ''
-          }
-        }
+						title: '',
+					},
+				},
 			],
-      showItem: false
-    }
+			showItem: false,
+		};
 	},
 	// computed:{
 	//   ...mapGetters(['sidebarRouters'])
 	// },
 	mounted() {
-    this.getMsg()
-    this.boxReset = debounce(() => {
-      this.resetSize()
-    }, 300)
-    this.boxReset()
-    window.addEventListener('resize', () => {
-      this.boxReset()
-    })
+		this.getMsg();
+		this.boxReset();
+		window.addEventListener('resize', this.boxReset);
+	},
+	destroyed() {
+		window.removeEventListener('resize', this.boxReset);
 	},
 	methods: {
+		boxReset() {
+			debounce(() => {
+				this.resetSize();
+			}, 300)();
+		},
 		getMsg() {
-      let menuList = this.$store.state.permission.sidebarRouters
-      console.log(menuList)
+			let menuList = this.$store.state.permission.sidebarRouters;
+			console.log(menuList);
 			if (menuList.length > 0) {
-        for (let i = 0; i < menuList.length; i ++) {
+				for (let i = 0; i < menuList.length; i++) {
 					for (let k = 0; k < 8; k++) {
 						if (menuList[i].name === this.menuArr1[k].name) {
-              this.menuArr1[k].visible = true
-              this.menuArr1[k].id = menuList[i].id
-              this.menuArr1[k].choicepart = i
-              this.menuArr1[k].children = menuList[i].children
-              this.menuArr1[k].meta = menuList[i].meta
+							this.menuArr1[k].visible = true;
+							this.menuArr1[k].id = menuList[i].id;
+							this.menuArr1[k].choicepart = i;
+							this.menuArr1[k].children = menuList[i].children;
+							this.menuArr1[k].meta = menuList[i].meta;
 						}
 					}
 					for (let j = 0; j < 7; j++) {
 						if (menuList[i].name === this.menuArr2[j].name) {
-              this.menuArr2[j].visible = true
-              this.menuArr2[j].id = menuList[i].id
-              this.menuArr2[j].choicepart = i
-              this.menuArr2[j].children = menuList[i].children
-              this.menuArr2[j].meta = menuList[i].meta
+							this.menuArr2[j].visible = true;
+							this.menuArr2[j].id = menuList[i].id;
+							this.menuArr2[j].choicepart = i;
+							this.menuArr2[j].children = menuList[i].children;
+							this.menuArr2[j].meta = menuList[i].meta;
 						}
 					}
 				}
 			}
-      console.log(this.menuArr1)
-      console.log(this.menuArr2)
+			console.log(this.menuArr1);
+			console.log(this.menuArr2);
 		},
 		handelClick(item, index) {
 			// this.$router.push({name: 'SystemUser'})
-      this.$store.dispatch('app/setChoicepart', index)
-      this.toRouter(item)
+			this.$store.dispatch('app/setChoicepart', index);
+			this.toRouter(item);
 			// if (item.meta.unuse) {
 			//   this.$message.warning(this.$t('暂无数据'))
 			// } else {
@@ -234,36 +253,36 @@ export default {
 			// }
 		},
 		toRouter(item) {
-      console.log(item)
+			console.log(item);
 			if (item.children) {
-        this.toRouter(item.children[0])
+				this.toRouter(item.children[0]);
 			} else {
-        this.$router.push({ name: item.name })
+				this.$router.push({ name: item.name });
 			}
 		},
 		resetSize() {
-      let _this = this
-      _this.showItem = false
-      _this.loading = true
-      let choicepartBox = document.querySelector('#choicepartBox')
-      let rw = parseFloat(window.innerWidth)
-      let rh = parseFloat(window.innerHeight)
-      let bw = parseFloat(choicepartBox.style.width)
-      let bh = parseFloat(choicepartBox.style.height)
-      let wx = 0.82/(bw / rw)
-      let hx = 0.56/(bh / rh)
-      _this.scale = wx > hx ? hx : wx
-      setTimeout(_this.showItemFun, 700)
+			let _this = this;
+			_this.showItem = false;
+			_this.loading = true;
+			let choicepartBox = document.querySelector('#choicepartBox');
+			let rw = parseFloat(window.innerWidth);
+			let rh = parseFloat(window.innerHeight);
+			let bw = parseFloat(choicepartBox.style.width);
+			let bh = parseFloat(choicepartBox.style.height);
+			let wx = 0.82 / (bw / rw);
+			let hx = 0.56 / (bh / rh);
+			_this.scale = wx > hx ? hx : wx;
+			setTimeout(_this.showItemFun, 700);
 		},
 		showItemFun() {
-      this.loading = false
-      this.showItem = true
-    }
+			this.loading = false;
+			this.showItem = true;
+		},
 	},
 	beforeDestroy() {
-    this.showItem = false
-  }
-}
+		this.showItem = false;
+	},
+};
 </script>
 <style lang='scss' scoped>
 .choicepart-container {
@@ -296,7 +315,8 @@ export default {
 		.choicepart-item {
 			width: 184px;
 			height: 224px;
-      background: url('../../assets/images/choicepart/choice-item-back.png') no-repeat;
+			background: url('../../assets/images/choicepart/choice-item-back.png')
+				no-repeat;
 			background-size: 100% 100%;
 			border-radius: 5px;
 			overflow: hidden;
@@ -334,7 +354,7 @@ export default {
 	.choicepart-footer {
 		position: absolute;
 		width: 100%;
-    color: #C7C7C7;
+		color: #c7c7c7;
 		user-select: none;
 		font-size: 12px;
 		letter-spacing: 1px;
--- a/src/views/databoard/deepProcessing/index.vue
+++ b/src/views/databoard/deepProcessing/index.vue
@@ -1,8 +1,11 @@
 <template>
-	<div id='deepProcessingContainerB' ref='deepProcessingContainerB' style="width: 100%;height: 100%;">
 	<div
-			id='deepProcessingContainer'
-			ref='deepProcessingContainer'
+		id="deepProcessingContainerB"
+		ref="deepProcessingContainerB"
+		style="width: 100%; height: 100%">
+		<div
+			id="deepProcessingContainer"
+			ref="deepProcessingContainer"
 			class="deepProcessingBoard"
 			style="
 				position: absolute;
@@ -16,15 +19,14 @@
 				flex-direction: column;
 				gap: 24px;
 			"
-			:style="{transform:'scale('+scaleNum+')'}">
-			<KHeader :isFullScreen='isFullScreen' @screenfullChange='screenfullChange' topTitle='深加工生产运行驾驶舱'/>
+			:style="{ transform: 'scale(' + scaleNum + ')' }">
+			<KHeader
+				:isFullScreen="isFullScreen"
+				@screenfullChange="screenfullChange"
+				topTitle="深加工生产运行驾驶舱" />
 			<div
 				class="main-body"
-				style="
-					display: grid;
-					gap: 16px;
-					grid-template-rows: 462px 462px;
-				">
+				style="display: grid; gap: 16px; grid-template-rows: 462px 462px">
 				<TopThree />
 				<BottomTwo />
 			</div>
@@ -47,16 +49,16 @@
 import KHeader from '../components/Header';
 import TopThree from './TopThree';
 import BottomTwo from './BottomTwo';
-import screenfull from 'screenfull'
-import { debounce } from '@/utils/debounce'
-import { getDcsMsg, getMesMsg } from './../utils/wsInterface'
+import screenfull from 'screenfull';
+import { debounce } from '@/utils/debounce';
+import { getDcsMsg, getMesMsg } from './../utils/wsInterface';

 export default {
 	name: 'deepProcessingBoard',
 	components: {
 		KHeader,
 		TopThree,
-		BottomTwo
+		BottomTwo,
 	},
 	// provide() {
 	// 	return {
@@ -66,43 +68,52 @@ export default {
 	data() {
 		return {
 			isFullScreen: false,
-			scaleNum: 0.8
+			scaleNum: 0.8,
 		};
 	},
 	created() {
-		this.init()
+		this.init();
 	},
 	destroy() {
-		this.destroy()
+		this.destroy();
 	},
 	mounted() {
 		this.boxReset = debounce(() => {
-      this.resetSize()
-    }, 300)
-    this.boxReset()
+			this.resetSize();
+		}, 300);
+		this.boxReset();
 		window.addEventListener('resize', () => {
-      this.boxReset()
-    })
+			this.boxReset();
+		});
 		// closeWebsocket()
 		// getDcsMsg()
 		// getMesMsg()
-		console.log('mounted...........')
+	},
+	mounted() {
+		this.boxReset();
+		window.addEventListener('resize', this.boxReset);
 	},
 	destroyed() {
-		console.log('destroyed...........')
+		window.removeEventListener('resize', this.boxReset);
+		this.destroy();
 	},
 	methods: {
+		boxReset() {
+			debounce(() => {
+				this.resetSize();
+			}, 300)();
+		},
 		change() {
-      this.isFullScreen = screenfull.isFullscreen
+			this.isFullScreen = screenfull.isFullscreen;
 		},
 		init() {
 			if (screenfull.isEnabled) {
-        screenfull.on('change', this.change)
+				screenfull.on('change', this.change);
 			}
 		},
 		destroy() {
 			if (screenfull.isEnabled) {
-        screenfull.off('change', this.change)
+				screenfull.off('change', this.change);
 			}
 		},
 		// 全屏
@@ -110,39 +121,37 @@ export default {
 			if (!screenfull.isEnabled) {
 				this.$message({
 					message: 'you browser can not work',
-          type: 'warning'
-        })
-        return false
+					type: 'warning',
+				});
+				return false;
 			}
-      screenfull.toggle(this.$refs.deepProcessingContainerB)
+			screenfull.toggle(this.$refs.deepProcessingContainerB);
 		},
 		resetSize() {
-      let deepProcessingContainer = document.getElementById('deepProcessingContainer')
-      let rw = parseFloat(window.innerWidth)
-      let rh = parseFloat(window.innerHeight)
-      let bw = parseFloat(deepProcessingContainer.style.width)
-      let bh = parseFloat(deepProcessingContainer.style.height)
-			let wx = 0
-			let hx = 0
+			let deepProcessingContainer = document.getElementById(
+				'deepProcessingContainer'
+			);
+			let rw = parseFloat(window.innerWidth);
+			let rh = parseFloat(window.innerHeight);
+			let bw = parseFloat(deepProcessingContainer.style.width);
+			let bh = parseFloat(deepProcessingContainer.style.height);
+			let wx = 0;
+			let hx = 0;
 			if (screenfull.isFullscreen) {
-				console.log('全屏')
-				wx = rw / bw
-				hx = rh / bh
-				console.log(this.scaleNum)
-			}else{
-				console.log('非全屏')
-				console.log(this.$store.state.app.sidebar.opened)
+				wx = rw / bw;
+				hx = rh / bh;
+			} else {
 				if (this.$store.state.app.sidebar.opened) {
-					wx = (rw-280) / bw
-					hx = (rh-116) / bh
-				}else{
-					wx = (rw-85) / bw
-					hx = (rh-116) / bh
-				}
-			}
-			this.scaleNum = wx
+					wx = (rw - 280) / bw;
+					hx = (rh - 116) / bh;
+				} else {
+					wx = (rw - 85) / bw;
+					hx = (rh - 116) / bh;
 				}
 			}
+			this.scaleNum = wx;
+		},
+	},
 };
 </script>

--- a/src/views/databoard/kiln/index.vue
+++ b/src/views/databoard/kiln/index.vue
@@ -1,8 +1,11 @@
 <template>
-	<div id='kilnContainerB' ref='kilnContainerB' style="width: 100%;height: 100%;">
 	<div
-			id='kilnContainer'
-			ref='kilnContainer'
+		id="kilnContainerB"
+		ref="kilnContainerB"
+		style="width: 100%; height: 100%">
+		<div
+			id="kilnContainer"
+			ref="kilnContainer"
 			class="KilnDataBoard"
 			style="
 				position: absolute;
@@ -16,15 +19,22 @@
 				flex-direction: column;
 				gap: 24px;
 			"
-			:style="{transform:'scale('+scaleNum+')'}">
-			<KHeader :isFullScreen='isFullScreen' @screenfullChange='screenfullChange' topTitle='窑炉生产运行驾驶舱'/>
+			:style="{ transform: 'scale(' + scaleNum + ')' }">
+			<KHeader
+				:isFullScreen="isFullScreen"
+				@screenfullChange="screenfullChange"
+				topTitle="窑炉生产运行驾驶舱" />
 			<div
 				class="main-body"
 				style="flex: 1; display: flex; gap: 20px; padding: 0px 16px">
-				<div class="left-side" style="flex: 2">
+				<div
+					class="left-side"
+					style="flex: 2">
 					<LeftFour />
 				</div>
-				<div class="right-side" style="flex: 1">
+				<div
+					class="right-side"
+					style="flex: 1">
 					<RightTwo />
 				</div>
 			</div>
@@ -36,8 +46,8 @@
 import KHeader from '../components/Header';
 import LeftFour from './LeftFour';
 import RightTwo from './RightTwo.vue';
-import screenfull from 'screenfull'
-import { debounce } from '@/utils/debounce'
+import screenfull from 'screenfull';
+import { debounce } from '@/utils/debounce';

 export default {
 	name: 'Kiln',
@@ -46,10 +56,10 @@ export default {
 		LeftFour,
 		RightTwo,
 	},
-	computed:{
+	computed: {
 		sidebarStatus() {
 			return this.$store.state.app.sidebar.opened;
-		}
+		},
 	},
 	// provide() {
 	// 	return {
@@ -59,43 +69,44 @@ export default {
 	data() {
 		return {
 			isFullScreen: false,
-			scaleNum: 0.8
+			scaleNum: 0.8,
 		};
 	},
 	watch: {
 		sidebarStatus() {
-			this.boxReset()
+			this.boxReset();
 		},
 	},
 	created() {
-		this.init()
-	},
-	destroy() {
-		this.destroy()
+		this.init();
 	},
 	mounted() {
-		this.boxReset = debounce(() => {
-      this.resetSize()
-    }, 300)
-    this.boxReset()
-    window.addEventListener('resize', () => {
-      this.boxReset()
-    })
+		this.boxReset();
+		window.addEventListener('resize', this.boxReset);
+	},
+	destroyed() {
+		window.removeEventListener('resize', this.boxReset);
+		this.destroy();
 	},
 	methods: {
+		boxReset() {
+			debounce(() => {
+				this.resetSize();
+			}, 300)();
+		},
 		change() {
-      this.isFullScreen = screenfull.isFullscreen
+			this.isFullScreen = screenfull.isFullscreen;
 		},

 		init() {
 			if (screenfull.isEnabled) {
-        screenfull.on('change', this.change)
+				screenfull.on('change', this.change);
 			}
 		},

 		destroy() {
 			if (screenfull.isEnabled) {
-        screenfull.off('change', this.change)
+				screenfull.off('change', this.change);
 			}
 		},
 		// 全屏
@@ -103,40 +114,35 @@ export default {
 			if (!screenfull.isEnabled) {
 				this.$message({
 					message: 'you browser can not work',
-          type: 'warning'
-        })
-        return false
+					type: 'warning',
+				});
+				return false;
 			}
-      screenfull.toggle(this.$refs.kilnContainerB)
+			screenfull.toggle(this.$refs.kilnContainerB);
 		},
 		resetSize() {
-      let kilnContainerBox = document.getElementById('kilnContainer')
-			console.log(kilnContainerBox)
-      let rw = parseFloat(window.innerWidth)
-      let rh = parseFloat(window.innerHeight)
-      let bw = parseFloat(kilnContainerBox.style.width)
-      let bh = parseFloat(kilnContainerBox.style.height)
-			let wx = 0
-			let hx = 0
+			let kilnContainerBox = document.getElementById('kilnContainer');
+			let rw = parseFloat(window.innerWidth);
+			let rh = parseFloat(window.innerHeight);
+			let bw = parseFloat(kilnContainerBox.style.width);
+			let bh = parseFloat(kilnContainerBox.style.height);
+			let wx = 0;
+			let hx = 0;
 			if (screenfull.isFullscreen) {
-				console.log('全屏')
-				wx = rw / bw
-				hx = rh / bh
-				console.log(this.scaleNum)
-			}else{
-				console.log('非全屏')
-				console.log(this.$store.state.app.sidebar.opened)
+				wx = rw / bw;
+				hx = rh / bh;
+			} else {
 				if (this.$store.state.app.sidebar.opened) {
-					wx = (rw-280) / bw
-					hx = (rh-116) / bh
-				}else{
-					wx = (rw-85) / bw
-					hx = (rh-116) / bh
-				}
-			}
-			this.scaleNum = wx
+					wx = (rw - 280) / bw;
+					hx = (rh - 116) / bh;
+				} else {
+					wx = (rw - 85) / bw;
+					hx = (rh - 116) / bh;
 				}
 			}
+			this.scaleNum = wx;
+		},
+	},
 };
 </script>

--- a/src/views/databoard/wholePlant/index.vue
+++ b/src/views/databoard/wholePlant/index.vue
@@ -1,8 +1,11 @@
 <template>
-	<div id='wholePlantContainerB' ref='wholePlantContainerB' style="width: 100%;height: 100%;">
 	<div
-			id='wholePlantContainer'
-			ref='wholePlantContainer'
+		id="wholePlantContainerB"
+		ref="wholePlantContainerB"
+		style="width: 100%; height: 100%">
+		<div
+			id="wholePlantContainer"
+			ref="wholePlantContainer"
 			class="wholePlantBoard"
 			style="
 				position: absolute;
@@ -16,18 +19,27 @@
 				flex-direction: column;
 				gap: 24px;
 			"
-			:style="{transform:'scale('+scaleNum+')'}">
-			<KHeader :isFullScreen='isFullScreen' @screenfullChange='screenfullChange' topTitle='全厂总览驾驶舱'/>
+			:style="{ transform: 'scale(' + scaleNum + ')' }">
+			<KHeader
+				:isFullScreen="isFullScreen"
+				@screenfullChange="screenfullChange"
+				topTitle="全厂总览驾驶舱" />
 			<div
 				class="main-body"
 				style="flex: 1; display: flex; gap: 20px; padding: 0px 16px">
-				<div class="left-side" style="flex: 1">
+				<div
+					class="left-side"
+					style="flex: 1">
 					<LeftTwo />
 				</div>
-				<div class="middle-side" style="flex: 1">
+				<div
+					class="middle-side"
+					style="flex: 1">
 					<MiddleTwo />
 				</div>
-				<div class="right-side" style="flex: 1">
+				<div
+					class="right-side"
+					style="flex: 1">
 					<RightTwo />
 				</div>
 			</div>
@@ -40,8 +52,8 @@ import KHeader from '../components/Header';
 import LeftTwo from './LeftTwo';
 import MiddleTwo from './MiddleTwo';
 import RightTwo from './RightTwo';
-import screenfull from 'screenfull'
-import { debounce } from '@/utils/debounce'
+import screenfull from 'screenfull';
+import { debounce } from '@/utils/debounce';

 export default {
 	name: 'wholePlantBoard',
@@ -49,7 +61,7 @@ export default {
 		KHeader,
 		LeftTwo,
 		MiddleTwo,
-		RightTwo
+		RightTwo,
 	},
 	// provide() {
 	// 	return {
@@ -59,40 +71,39 @@ export default {
 	data() {
 		return {
 			isFullScreen: false,
-			scaleNum: 0.8
+			scaleNum: 0.8,
 		};
 	},
 	created() {
-		this.init()
+		this.init();
 	},
 	destroy() {
-		this.destroy()
+		this.destroy();
 	},
 	mounted() {
-		this.boxReset = debounce(() => {
-      this.resetSize()
-    }, 300)
-    this.boxReset()
-    window.addEventListener('resize', () => {
-      this.boxReset()
-    })
-		console.log('mounted...........')
+		this.boxReset();
+		window.addEventListener('resize', this.boxReset);
 	},
 	destroyed() {
-		console.log('destroyed...........')
+		window.removeEventListener('resize', this.boxReset);
 	},
 	methods: {
+		boxReset() {
+			debounce(() => {
+				this.resetSize();
+			}, 300)();
+		},
 		change() {
-      this.isFullScreen = screenfull.isFullscreen
+			this.isFullScreen = screenfull.isFullscreen;
 		},
 		init() {
 			if (screenfull.isEnabled) {
-        screenfull.on('change', this.change)
+				screenfull.on('change', this.change);
 			}
 		},
 		destroy() {
 			if (screenfull.isEnabled) {
-        screenfull.off('change', this.change)
+				screenfull.off('change', this.change);
 			}
 		},
 		// 全屏
@@ -100,39 +111,37 @@ export default {
 			if (!screenfull.isEnabled) {
 				this.$message({
 					message: 'you browser can not work',
-          type: 'warning'
-        })
-        return false
+					type: 'warning',
+				});
+				return false;
 			}
-      screenfull.toggle(this.$refs.wholePlantContainerB)
+			screenfull.toggle(this.$refs.wholePlantContainerB);
 		},
 		resetSize() {
-      let wholePlantContainerBox = document.getElementById('wholePlantContainer')
-      let rw = parseFloat(window.innerWidth)
-      let rh = parseFloat(window.innerHeight)
-      let bw = parseFloat(wholePlantContainerBox.style.width)
-      let bh = parseFloat(wholePlantContainerBox.style.height)
-			let wx = 0
-			let hx = 0
+			let wholePlantContainerBox = document.getElementById(
+				'wholePlantContainer'
+			);
+			let rw = parseFloat(window.innerWidth);
+			let rh = parseFloat(window.innerHeight);
+			let bw = parseFloat(wholePlantContainerBox.style.width);
+			let bh = parseFloat(wholePlantContainerBox.style.height);
+			let wx = 0;
+			let hx = 0;
 			if (screenfull.isFullscreen) {
-				console.log('全屏')
-				wx = rw / bw
-				hx = rh / bh
-				console.log(this.scaleNum)
-			}else{
-				console.log('非全屏')
-				console.log(this.$store.state.app.sidebar.opened)
+				wx = rw / bw;
+				hx = rh / bh;
+			} else {
 				if (this.$store.state.app.sidebar.opened) {
-					wx = (rw-280) / bw
-					hx = (rh-116) / bh
-				}else{
-					wx = (rw-85) / bw
-					hx = (rh-116) / bh
-				}
-			}
-			this.scaleNum = wx
+					wx = (rw - 280) / bw;
+					hx = (rh - 116) / bh;
+				} else {
+					wx = (rw - 85) / bw;
+					hx = (rh - 116) / bh;
 				}
 			}
+			this.scaleNum = wx;
+		},
+	},
 };
 </script>

--- a/src/views/energy/analysis/contrastAnalysis/components/barChart.vue
+++ b/src/views/energy/analysis/contrastAnalysis/components/barChart.vue
@@ -76,10 +76,6 @@ export default {
 					name: this.chartData[i].objName + this.chartData[i].objCode,
 					type: 'bar',
 					barMaxWidth: 20,
-					label: {
-						show: true,
-						position: 'top',
-					},
 					data: [],
 				};
 				legendData.push(this.chartData[i].objName + this.chartData[i].objCode);
--- a/src/views/energy/analysis/contrastAnalysis/components/searchArea.vue
+++ b/src/views/energy/analysis/contrastAnalysis/components/searchArea.vue
@@ -1,8 +1,7 @@
 <template>
 	<div
 		class="searchBarBox divHeight"
-		ref="searchBarRef"
-		:style="{ paddingRight: isFold ? '55px' : '0px' }">
+		ref="searchBarRef">
 		<el-form
 			:inline="true"
 			class="demo-form-inline">
@@ -200,13 +199,6 @@
 				</el-button>
 			</el-form-item>
 		</el-form>
-		<span
-			v-if="isFold"
-			class="foldClass"
-			@click="switchMode">
-			{{ isExpand ? '收起' : '展开' }}
-			<svg-icon :icon-class="isExpand ? 'upward' : 'downward'" />
-		</span>
 	</div>
 </template>
 <script>
@@ -217,16 +209,8 @@ import { getFactoryList } from '@/api/core/base/factory';
 import moment from 'moment';
 export default {
 	name: 'searchArea',
-	props: {
-		isFold: {
-			// 多行模式（默认否）
-			type: Boolean,
-			default: false,
-		},
-	},
 	data() {
 		return {
-			isExpand: false, // 展开收起
 			// 查询参数
 			queryParams: {
 				energyTypeId: null,
@@ -525,16 +509,6 @@ export default {
 			let value = new Date(newData).getTime();
 			return value;
 		},
-		switchMode() {
-			// 展开和收起切换
-			this.isExpand = !this.isExpand;
-			const element = this.$refs.searchBarRef;
-			if (this.isExpand) {
-				element.classList.remove('divHeight');
-			} else {
-				element.classList.add('divHeight');
-			}
-		},
 	},
 };
 </script>
@@ -573,21 +547,6 @@ export default {
 		margin-bottom: 4px;
 	}
 }
-.searchBarBox .foldClass {
-	position: absolute;
-	top: 14px;
-	right: 0;
-	cursor: pointer;
-	font-size: 12px;
-	color: #0b58ff;
-}
-.searchBarBox .foldClass .iconfont {
-	font-size: 14px;
-}
-.divHeight {
-	height: 45px;
-	overflow: hidden;
-}
 .separateStyle {
 	display: inline-block;
 	width: 1px;
--- a/src/views/energy/analysis/contrastAnalysis/index.vue
+++ b/src/views/energy/analysis/contrastAnalysis/index.vue
@@ -4,7 +4,6 @@
 		id="contrastAnalysisBox">
 		<!-- 搜索工作栏 -->
 		<search-area
-			:isFold="isFold"
 			@submit="getList"
 			@export="exportExl" />
 		<div v-show="chartData.length">
@@ -38,7 +37,6 @@ export default {
 	mixins: [tableHeightMixin],
 	data() {
 		return {
-			isFold: false,
 			chartData: [],
 			timeDim: '',
 			tableProps: [],
@@ -46,13 +44,6 @@ export default {
 			tableH: this.tableHeight(250) / 2,
 		};
 	},
-	mounted() {
-		window.addEventListener('resize', () => {
-			this.isFold = this.searchBarWidth('contrastAnalysisBox', 1437);
-			// console.log(document.getElementById("contrastAnalysisBox").offsetWidth)
-		});
-		this.isFold = this.searchBarWidth('contrastAnalysisBox', 1437);
-	},
 	methods: {
 		_setTableHeight() {
 			this.tableH = this.tableHeight(250) / 2;
--- a/src/views/energy/analysis/trendAnalysis/components/lineChart.vue
+++ b/src/views/energy/analysis/trendAnalysis/components/lineChart.vue
@@ -68,9 +68,9 @@ export default {

 			var option = {
 				color: ['#288AFF'],
-				// tooltip: {
-				//   trigger: 'axis'
-				// },
+				tooltip: {
+					trigger: 'axis',
+				},
 				grid: {
 					left: '4%',
 					right: '1%',
--- a/src/views/energy/analysis/trendAnalysis/components/searchArea.vue
+++ b/src/views/energy/analysis/trendAnalysis/components/searchArea.vue
@@ -1,8 +1,7 @@
 <template>
 	<div
-		class="searchBarBox divHeight"
-		ref="searchBarRef"
-		:style="{ paddingRight: isFold ? '55px' : '0px' }">
+		class="searchBarBox"
+		ref="searchBarRef">
 		<el-form
 			:inline="true"
 			class="demo-form-inline">
@@ -172,9 +171,9 @@
 				</el-button>
 				<span
 					class="separateStyle"
-					v-hasPermi="['analysis:trend-analysis:export']"></span>
+					v-hasPermi="['analysis:energy-analysis:query']"></span>
 				<el-button
-					v-hasPermi="['analysis:trend-analysis:export']"
+					v-hasPermi="['analysis:energy-analysis:query']"
 					type="primary"
 					size="small"
 					plain
@@ -183,13 +182,6 @@
 				</el-button>
 			</el-form-item>
 		</el-form>
-		<span
-			v-if="isFold"
-			class="foldClass"
-			@click="switchMode">
-			{{ isExpand ? '收起' : '展开' }}
-			<svg-icon :icon-class="isExpand ? 'upward' : 'downward'" />
-		</span>
 	</div>
 </template>
 <script>
@@ -198,16 +190,8 @@ import { getEnergyTypeListAll } from '@/api/base/energyType';
 import moment from 'moment';
 export default {
 	name: 'searchArea',
-	props: {
-		isFold: {
-			// 多行模式（默认否）
-			type: Boolean,
-			default: false,
-		},
-	},
 	data() {
 		return {
-			isExpand: false, // 展开收起
 			// 查询参数
 			queryParams: {
 				energyTypeId: null,
@@ -509,16 +493,6 @@ export default {
 			let value = new Date(newData).getTime();
 			return value;
 		},
-		switchMode() {
-			// 展开和收起切换
-			this.isExpand = !this.isExpand;
-			const element = this.$refs.searchBarRef;
-			if (this.isExpand) {
-				element.classList.remove('divHeight');
-			} else {
-				element.classList.add('divHeight');
-			}
-		},
 	},
 };
 </script>
@@ -557,21 +531,6 @@ export default {
 		margin-bottom: 4px;
 	}
 }
-.searchBarBox .foldClass {
-	position: absolute;
-	top: 14px;
-	right: 0;
-	cursor: pointer;
-	font-size: 12px;
-	color: #0b58ff;
-}
-.searchBarBox .foldClass .iconfont {
-	font-size: 14px;
-}
-.divHeight {
-	height: 45px;
-	overflow: hidden;
-}
 .separateStyle {
 	display: inline-block;
 	width: 1px;
--- a/src/views/energy/analysis/trendAnalysis/index.vue
+++ b/src/views/energy/analysis/trendAnalysis/index.vue
@@ -4,7 +4,6 @@
 		id="trendAnalysisBox">
 		<!-- 搜索工作栏 -->
 		<search-area
-			:isFold="isFold"
 			@submit="getList"
 			@export="exportExl" />
 		<div v-show="chartData.length">
@@ -33,20 +32,12 @@ export default {
 	components: { SearchArea, LineChart },
 	data() {
 		return {
-			isFold: false,
 			chartData: [],
 			timeDim: '',
 			tableProps: [],
 			list: [],
 		};
 	},
-	mounted() {
-		window.addEventListener('resize', () => {
-			this.tableH = this.tableHeight(260);
-			this.isFold = this.searchBarWidth('trendAnalysisBox', 1480);
-		});
-		this.isFold = this.searchBarWidth('trendAnalysisBox', 1480);
-	},
 	methods: {
 		getList(params) {
 			this.timeDim = params.timeDim;
@@ -66,8 +57,10 @@ export default {
 			let listObj = { useNum: '消耗量' }; // 数据
 			for (let i = 0; i < arr.length; i++) {
 				let obj = {};
+				let fName = arr[i].time.slice(0, 4);
+				let lName = arr[i].time.slice(4, 6);
 				obj.prop = arr[i].time;
-				obj.label = arr[i].time;
+				obj.label = fName + ' 第 ' + lName + ' 周';
 				obj.minWidth = 100;
 				tempX.push(obj);
 				listObj[arr[i].time] = arr[i].useNum || null;
--- a/src/views/energy/base/energyPlc/index.vue
+++ b/src/views/energy/base/energyPlc/index.vue
@@ -89,13 +89,13 @@ export default {
 					param: 'name',
 				},
 				{
-					type: 'button',
+					type: this.$auth.hasPermi('base:energy-plc:query') ? 'button' : '',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermi('base:energy-plc:create') ? 'separate' : '',
 				},
 				{
 					type: this.$auth.hasPermi('base:energy-plc:create') ? 'button' : '',
--- a/src/views/energy/base/energyPlcConnect/components/energyPlcParam.vue
+++ b/src/views/energy/base/energyPlcConnect/components/energyPlcParam.vue
@@ -22,7 +22,9 @@
 							readonly
 							style="width: 250px"></el-input>
 					</el-form-item>
-					<el-form-item v-if="showBtn">
+					<el-form-item
+						v-if="showBtn"
+						v-hasPermi="['base:energy-plc-param:create']">
 						<el-button
 							type="success"
 							size="small"
@@ -160,15 +162,19 @@ export default {
 				this.drawerTitle = '参数绑定';
 				this.showBtn = true;
 				this.tableBtn = [
-					{
+					this.$auth.hasPermi('base:energy-plc-param:update')
+						? {
 								type: 'edit',
 								btnName: '编辑',
-					},
-					{
+						  }
+						: undefined,
+					this.$auth.hasPermi('base:energy-plc-param:delete')
+						? {
 								type: 'delete',
 								btnName: '删除',
-					},
-				];
+						  }
+						: undefined,
+				].filter((v) => v);
 			}
 		},
 		getList() {
--- a/src/views/energy/base/energyPlcConnect/index.vue
+++ b/src/views/energy/base/energyPlcConnect/index.vue
@@ -107,13 +107,17 @@ export default {
 					param: 'cnName',
 				},
 				{
-					type: 'button',
+					type: this.$auth.hasPermi('base:energy-plc-connect:query')
+						? 'button'
+						: '',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermi('base:energy-plc-connect:create')
+						? 'separate'
+						: '',
 				},
 				{
 					type: this.$auth.hasPermi('base:energy-plc-connect:create')
@@ -127,17 +131,25 @@ export default {
 			],
 			tableProps,
 			tableBtn: [
-				this.$auth.hasPermi('base:energy-plc-connect:bind')
+				this.$auth.hasPermiAnd([
+					'base:energy-plc-param:query',
+					'base:energy-type:query',
+				])
 					? {
 							type: 'connect',
 							btnName: '绑定',
 					  }
 					: undefined,
-				{
+				this.$auth.hasPermi('base:energy-plc-param:query')
+					? {
 							type: 'detail',
 							btnName: '详情',
-				},
-				this.$auth.hasPermi('base:energy-plc-connect:update')
+					  }
+					: undefined,
+				this.$auth.hasPermiAnd([
+					'base:energy-plc-connect:update',
+					'base:energy-plc-connect:query',
+				])
 					? {
 							type: 'edit',
 							btnName: '编辑',
--- a/src/views/energy/base/energyQuantityManual/components/AddTable.vue
+++ b/src/views/energy/base/energyQuantityManual/components/AddTable.vue
@@ -45,6 +45,7 @@
 			</el-table-column>
 		</el-table>
 		<el-button
+			v-show="!isEdit"
 			class="addButton"
 			icon="el-icon-plus"
 			@click="emitButtonClick">
@@ -70,6 +71,13 @@ export default {
 				return [];
 			},
 		},
+		isEdit: {
+			type: Boolean,
+			required: true,
+			default: () => {
+				return false;
+			},
+		},
 	},
 	data() {
 		return {};
--- a/src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue
+++ b/src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue
@@ -42,6 +42,7 @@
 				<add-table
 					:table-data="tableData"
 					:table-name-list="tableNameList"
+					:isEdit="isEdit"
 					@emitFun="inputChange"
 					@emitButtonClick="emitButtonClick" />
 			</el-col>
--- a/src/views/energy/base/energyQuantityManual/index.vue
+++ b/src/views/energy/base/energyQuantityManual/index.vue
@@ -114,13 +114,20 @@ export default {
 					defaultSelect: [],
 				},
 				{
-					type: 'button',
+					type: this.$auth.hasPermi('base:energy-quantity-manual:query')
+						? 'button'
+						: '',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermiOr([
+						'base:energy-quantity-manual:export',
+						'base:energy-quantity-manual:create',
+					])
+						? 'separate'
+						: '',
 				},
 				{
 					type: this.$auth.hasPermi('base:energy-quantity-manual:export')
@@ -147,13 +154,19 @@ export default {
 			// 班次基础信息列表
 			list: [],
 			tableBtn: [
-				this.$auth.hasPermi('base:energy-quantity-manual:create')
+				this.$auth.hasPermiAnd([
+					'base:energy-quantity-manual:query',
+					'base:energy-quantity-manual:create',
+				])
 					? {
 							type: 'meterReading',
 							btnName: '抄表',
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:energy-quantity-manual:update')
+				this.$auth.hasPermiAnd([
+					'base:energy-quantity-manual:update',
+					'base:energy-quantity-manual:query',
+				])
 					? {
 							type: 'edit',
 							btnName: '编辑',
--- a/src/views/energy/base/energyQuantityRealtime/index.vue
+++ b/src/views/energy/base/energyQuantityRealtime/index.vue
@@ -90,7 +90,9 @@ export default {
 					width: 350,
 				},
 				{
-					type: 'button',
+					type: this.$auth.hasPermi('base:energy-quantity-realtime:query')
+						? 'button'
+						: '',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
--- a/src/views/energy/base/tableNameConfig/index.vue
+++ b/src/views/energy/base/tableNameConfig/index.vue
@@ -52,7 +52,10 @@ export default {
 		return {
 			tableProps,
 			tableBtn: [
-				this.$auth.hasPermi('base:table-name-config:edit')
+				this.$auth.hasPermiAnd([
+					'base:energy-table:query',
+					'base:energy-table:update',
+				])
 					? {
 							type: 'edit',
 							btnName: '编辑',
--- a/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
+++ b/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
@@ -66,7 +66,7 @@
 						placeholder="请选择"
 						style="width: 100%">
 						<el-option
-							v-for="item in getDictDatas(DICT_TYPE.TABLE_NAME)"
+							v-for="item in tableNameList"
 							:key="item.value"
 							:label="item.label"
 							:value="item.value"></el-option>
@@ -154,6 +154,7 @@ import {
 	createEnergyLimit,
 	getEnergyParamList,
 } from '@/api/monitoring/energyLimit';
+import { energyTableGet } from '@/api/base/energyQuantityManual';
 export default {
 	name: 'energyLimitAdd',
 	props: {
@@ -203,6 +204,7 @@ export default {
 					{ required: true, message: '指标类型不能为空', trigger: 'change' },
 				],
 			},
+			tableNameList: [],
 			detailList: [],
 		};
 	},
@@ -267,11 +269,22 @@ export default {
 			}
 		},
 		toggleType() {
-			if (this.form.energyTypeId && this.form.type) {
-				this.getDetailList();
-				this.form.plcParamId = '';
+			if (this.form.energyTypeId && this.form.method == 2) {
+				this.form.tableName = '';
+				this.getTableNameList(this.form.energyTypeId);
 			}
 		},
+		// 获取能源表名list
+		getTableNameList(id) {
+			energyTableGet({ energyTypeId: id }).then((res) => {
+				this.tableNameList = res.data.tableObjs || [];
+				if (this.tableNameList.length === 0) {
+					this.$modal.msgWarning(
+						'当前能源类型暂无配置表名，请先到《表名配置》页面配置'
+					);
+				}
+			});
+		},
 		// 递归处理分类回显问题
 		changeDetSelect(key, treeData) {
 			let arr = []; // 递归时操作的数组
--- a/src/views/energy/monitoring/energyLimit/index.vue
+++ b/src/views/energy/monitoring/energyLimit/index.vue
@@ -125,13 +125,17 @@ export default {
 					param: 'limitType',
 				},
 				{
-					type: 'button',
+					type: this.$auth.hasPermi('monitoring:energy-limit:query')
+						? 'button'
+						: '',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermi('monitoring:energy-limit:create')
+						? 'separate'
+						: '',
 				},
 				{
 					type: this.$auth.hasPermi('monitoring:energy-limit:create')
--- a/src/views/energy/monitoring/energyReport/index.vue
+++ b/src/views/energy/monitoring/energyReport/index.vue
@@ -113,7 +113,9 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermi('monitoring:energy-report:export')
+						? 'separate'
+						: '',
 				},
 				{
 					type: this.$auth.hasPermi('monitoring:energy-report:export')
--- a/src/views/energy/monitoring/energyStatistics/components/energyStatisticsDet.vue
+++ b/src/views/energy/monitoring/energyStatistics/components/energyStatisticsDet.vue
@@ -22,6 +22,7 @@
 					</el-form-item>
 					<el-form-item>
 						<el-button
+							v-hasPermi="['monitoring:energy-statistics-det:query']"
 							type="success"
 							size="small"
 							v-if="showBtn"
@@ -30,6 +31,7 @@
 							新增
 						</el-button>
 						<el-button
+							v-hasPermi="['monitoring:energy-statistics-det:delete']"
 							type="danger"
 							size="small"
 							v-if="showBtn"
@@ -161,11 +163,13 @@ export default {
 				this.drawerTitle = '参数绑定';
 				this.showBtn = true;
 				this.tableBtn = [
-					{
+					this.$auth.hasPermi('monitoring:energy-statistics-det:delete')
+						? {
 								type: 'delete',
 								btnName: '删除',
-					},
-				];
+						  }
+						: undefined,
+				].filter((v) => v);
 			}
 		},
 		getList() {
--- a/src/views/energy/monitoring/energyStatistics/components/energyStatisticsDetAdd.vue
+++ b/src/views/energy/monitoring/energyStatistics/components/energyStatisticsDetAdd.vue
@@ -88,7 +88,9 @@ export default {
 					type: 'separate',
 				},
 				{
-					type: 'button',
+					type: this.$auth.hasPermi('monitoring:energy-statistics-det:create')
+						? 'button'
+						: '',
 					btnName: '关联',
 					name: 'add',
 					color: 'primary',
--- a/src/views/energy/monitoring/energyStatistics/index.vue
+++ b/src/views/energy/monitoring/energyStatistics/index.vue
@@ -104,7 +104,9 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermi('monitoring:energy-statistics:create')
+						? 'separate'
+						: '',
 				},
 				{
 					type: this.$auth.hasPermi('monitoring:energy-statistics:create')
@@ -118,17 +120,22 @@ export default {
 			],
 			tableProps,
 			tableBtn: [
-				this.$auth.hasPermi('monitoring:energy-statistics:bind')
+				this.$auth.hasPermi('monitoring:energy-statistics-det:query')
 					? {
 							type: 'connect',
 							btnName: '绑定',
 					  }
 					: undefined,
-				{
+				this.$auth.hasPermi('monitoring:energy-statistics:query')
+					? {
 							type: 'detail',
 							btnName: '详情',
-				},
-				this.$auth.hasPermi('monitoring:energy-statistics:update')
+					  }
+					: undefined,
+				this.$auth.hasPermiAnd([
+					'monitoring:energy-statistics:update',
+					'monitoring:energy-statistics:query',
+				])
 					? {
 							type: 'edit',
 							btnName: '编辑',
--- a/src/views/group/base/groupTeam/components/statusBtn.vue
+++ b/src/views/group/base/groupTeam/components/statusBtn.vue
@@ -1,5 +1,11 @@
 <template>
-  <el-switch v-model="state" type="text" size="small" :disabled="readonly" @change="changeHandler" />
+	<el-switch
+		v-hasPermi="['base:group-team:edit-worker']"
+		v-model="state"
+		type="text"
+		size="small"
+		:disabled="readonly"
+		@change="changeHandler" />
 </template>

 <script>
@@ -7,40 +13,40 @@ export default {
 	props: {
 		injectData: {
 			type: Object,
-      default: () => ({})
-    }
+			default: () => ({}),
+		},
 	},
 	data() {
 		return {
-      state: false
-    }
+			state: false,
+		};
 	},
 	computed: {
 		readonly() {
-      return !!this.injectData.readonly
-    }
+			return !!this.injectData.readonly;
+		},
 	},
 	mounted() {
-    this.mapToState()
+		this.mapToState();
 	},
 	methods: {
 		mapToState() {
 			if (this.injectData.prop === 'enabled') {
-        this.state = this.injectData.enabled === 1 ? true : false
+				this.state = this.injectData.enabled === 1 ? true : false;
 			}
 		},
 		changeHandler() {
-      let params = {}
-      let payload = {}
-      params.name = 'state'
-      payload.id = this.injectData.id
-      payload.enabled = this.state ? '1' : '0'
-      payload.code = this.injectData.code
-      payload.name = this.injectData.name
-      payload.leaderId = this.injectData.leaderId
-      params.payload = payload
-      this.$emit('emitData', params)
-    }
-  }
-}
+			let params = {};
+			let payload = {};
+			params.name = 'state';
+			payload.id = this.injectData.id;
+			payload.enabled = this.state ? '1' : '0';
+			payload.code = this.injectData.code;
+			payload.name = this.injectData.name;
+			payload.leaderId = this.injectData.leaderId;
+			params.payload = payload;
+			this.$emit('emitData', params);
+		},
+	},
+};
 </script>
--- a/src/views/group/base/groupTeam/components/workerOperate.vue
+++ b/src/views/group/base/groupTeam/components/workerOperate.vue
@@ -1,8 +1,18 @@
 <template>
 	<div class="workerOperate">
 		<div class="operateBtn">
-      <span class="view" v-if="this.$auth.hasPermi('base:group-team:view-worker')" @click="emitParams('view')">查看</span>
-      <span class="edit" v-if="this.$auth.hasPermi('base:group-team:edit-worker')" @click="emitParams('edit')">编辑</span>
+			<span
+				class="view"
+				v-hasPermi="['base:group-team:view-worker']"
+				@click="emitParams('view')">
+				查看
+			</span>
+			<span
+				class="edit"
+				v-hasPermi="['base:group-team:edit-worker']"
+				@click="emitParams('edit')">
+				编辑
+			</span>
 		</div>
 	</div>
 </template>
@@ -12,23 +22,23 @@ export default {
 	props: {
 		injectData: {
 			type: Object,
-      default: () => ({})
-    }
+			default: () => ({}),
+		},
 	},
 	methods: {
 		emitParams(data) {
-      let params = {}
-      params.name = data
-      params.payload = this.injectData
-      this.$emit('emitData', params)
-    }
-  }
-}
+			let params = {};
+			params.name = data;
+			params.payload = this.injectData;
+			this.$emit('emitData', params);
+		},
+	},
+};
 </script>
 <style lang='scss' scoped>
 .workerOperate {
-  .operateBtn{
-    color: #0B58FF;
+	.operateBtn {
+		color: #0b58ff;
 		.view {
 			margin-right: 10px;
 			cursor: pointer;
--- a/src/views/group/base/groupTeam/index.vue
+++ b/src/views/group/base/groupTeam/index.vue
@@ -125,7 +125,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermi('base:group-team:create') ? 'separate' : '',
 				},
 				{
 					type: this.$auth.hasPermi('base:group-team:create') ? 'button' : '',
--- a/src/views/group/base/groupTeamScheduling/index.vue
+++ b/src/views/group/base/groupTeamScheduling/index.vue
@@ -1,8 +1,12 @@
 <template>
 	<div class="groupTeamScheduling">
-    <TopTab :roomNameDict='roomNameDict' @emitFun='toggleName'/>
+		<TopTab
+			:roomNameDict="roomNameDict"
+			@emitFun="toggleName" />
 		<div class="operationArea">
-      <el-form :inline="true" class="demo-form-inline">
+			<el-form
+				:inline="true"
+				class="demo-form-inline">
 				<span class="blue-block"></span>
 				<el-form-item label="月份选择">
 					<el-date-picker
@@ -13,42 +17,86 @@
 						:disabled="showSetting"
 						@change="selectMonth"
 						:clearable="false"
-            style="width: 120px">
-          </el-date-picker>
+						style="width: 120px"></el-date-picker>
 				</el-form-item>
 				<el-form-item>
-          <span class="separateStyle" v-if="this.$auth.hasPermi('base:group-team-scheduling:set')"></span>
+					<span
+						class="separateStyle"
+						v-if="this.$auth.hasPermi('base:group-team-scheduling:set')"></span>
 				</el-form-item>
 				<el-form-item>
-          <el-button type="primary" size="small" v-if="this.$auth.hasPermi('base:group-team-scheduling:set')" :disabled="showSetting || settingBtnDis" @click="settingMsg">设置</el-button>
+					<el-button
+						type="primary"
+						size="small"
+						v-if="this.$auth.hasPermi('base:group-team-scheduling:set')"
+						:disabled="showSetting || settingBtnDis"
+						@click="settingMsg">
+						设置
+					</el-button>
 				</el-form-item>
 				<el-form-item>
-          <el-button type="primary" size="small" v-show="showSetting && autoScheduling" @click="schedulingBtn">自动排班</el-button>
+					<el-button
+						type="primary"
+						size="small"
+						v-show="showSetting && autoScheduling"
+						@click="schedulingBtn">
+						自动排班
+					</el-button>
 				</el-form-item>
 				<el-form-item>
-          <span class="separateStyle" v-show="showSetting"></span>
+					<span
+						class="separateStyle"
+						v-show="showSetting"></span>
 				</el-form-item>
 				<el-form-item>
-          <el-button type="primary" size="small" v-show="showSetting" @click="confirmSetting">确认</el-button>
+					<el-button
+						type="primary"
+						size="small"
+						v-show="showSetting"
+						@click="confirmSetting">
+						确认
+					</el-button>
 				</el-form-item>
 				<el-form-item>
-          <el-button type="primary" size="small" plain v-show="showSetting" @click="cancelSetting">取消</el-button>
+					<el-button
+						type="primary"
+						size="small"
+						plain
+						v-show="showSetting"
+						@click="cancelSetting">
+						取消
+					</el-button>
 				</el-form-item>
-        <el-form-item label="请先选择查询的班组" class="rightItem">
+				<el-form-item
+					v-hasPermi="[
+						'base:quality-inspection-record:query',
+						'base:core-work-order:query',
+						'base:core-product:query',
+					]"
+					label="请先选择查询的班组"
+					class="rightItem">
 					<!-- <el-button type="primary" size="small" :disabled="jumpDisabled" @click="toOtherPage('1')">班组上下片查询</el-button> -->
-          <el-button type="primary" size="small" :disabled="jumpDisabled" @click="toOtherPage('2')">班组能源查询</el-button>
-          <el-button type="primary" size="small" :disabled="jumpDisabled" @click="toOtherPage('3')">班组检测查询</el-button>
+					<!-- <el-button type="primary" size="small" :disabled="jumpDisabled" @click="toOtherPage('2')">班组能源查询</el-button> -->
+					<el-button
+						type="primary"
+						size="small"
+						:disabled="jumpDisabled"
+						@click="toOtherPage('3')">
+						班组检测查询
+					</el-button>
 				</el-form-item>
 			</el-form>
 		</div>
 		<!-- 日历区域 -->
 		<div class="calenderArea">
-      <div style="font-size: 24px;font-weight: 500">{{ this.month }} {{ this.year }}</div>
+			<div style="font-size: 24px; font-weight: 500">
+				{{ this.month }} {{ this.year }}
+			</div>
 			<el-calendar v-model="startDay">
 				<!-- 这里使用的是 2.5 slot 语法，对于新项目请使用 2.6 slot 语法-->
 				<template
 					slot="dateCell"
-          slot-scope="{date, data}">
+					slot-scope="{ date, data }">
 					<div v-if="data.type === 'current-month'">
 						<!-- 日期 -->
 						<div class="dateStyle">
@@ -56,27 +104,64 @@
 						</div>
 						<!-- 班次班组 -->
 						<!-- class有两个样式，一个是类似class1，还有个是选中红框显示 -->
-            <el-row :gutter="2" :class="'class' + (index+1) + (chooseTip === (item.startDay+item.classesId) ? ' team-active' : '')" v-for="(item, index) in list[Number(data.day.split('-')[2])]" :key='index'>
+						<el-row
+							:gutter="2"
+							:class="
+								'class' +
+								(index + 1) +
+								(chooseTip === item.startDay + item.classesId
+									? ' team-active'
+									: '')
+							"
+							v-for="(item, index) in list[Number(data.day.split('-')[2])]"
+							:key="index">
 							<el-col :span="12">
 								<div class="selectDiv">
 									<!-- 选择班组图标 -->
-                  <div class="toggle-icon" v-show="showSetting && (new Date(data.day).valueOf() < new Date().valueOf() ? false: true)">
-                    <svg-icon icon-class="toggle"/>
+									<div
+										class="toggle-icon"
+										v-show="
+											showSetting &&
+											(new Date(data.day).valueOf() < new Date().valueOf()
+												? false
+												: true)
+										">
+										<svg-icon icon-class="toggle" />
 									</div>
 									<!-- 不能选择班组 -->
-                  <div class="toggle-icon-hide" v-show="!(showSetting && (new Date(data.day).valueOf() < new Date().valueOf() ? false: true))"></div>
-                  <el-select v-model="item.teamId" size='small' :disabled="!showSetting || (new Date(data.day).valueOf() > new Date().valueOf() ? false: true)">
+									<div
+										class="toggle-icon-hide"
+										v-show="
+											!(
+												showSetting &&
+												(new Date(data.day).valueOf() < new Date().valueOf()
+													? false
+													: true)
+											)
+										"></div>
+									<el-select
+										v-model="item.teamId"
+										size="small"
+										:disabled="
+											!showSetting ||
+											(new Date(data.day).valueOf() > new Date().valueOf()
+												? false
+												: true)
+										">
 										<el-option
 											v-for="i in teamList"
 											:key="i.id"
 											:label="i.name"
-                      :value="i.id">
-                    </el-option>
+											:value="i.id"></el-option>
 									</el-select>
 								</div>
 							</el-col>
 							<el-col :span="12">
-                <el-button class="labelClass" @click="chooseTeam(item)">{{ item.classesName }}</el-button>
+								<el-button
+									class="labelClass"
+									@click="chooseTeam(item)">
+									{{ item.classesName }}
+								</el-button>
 							</el-col>
 						</el-row>
 					</div>
@@ -87,263 +172,299 @@
 </template>

 <script>
-import { getPreset, createOrUpdateList, autoSet } from "@/api/base/groupTeamScheduling";
-import { listEnabledByRoom } from "@/api/base/groupTeam";
+import {
+	getPreset,
+	createOrUpdateList,
+	autoSet,
+} from '@/api/base/groupTeamScheduling';
+import { listEnabledByRoom } from '@/api/base/groupTeam';
 import moment from 'moment';
-import TopTab from './components/topTab'
+import TopTab from './components/topTab';

 export default {
-  name: "GroupTeamScheduling",
+	name: 'GroupTeamScheduling',
 	data() {
 		return {
-      roomNameDict:null,
-      startDay: '',// 查询参数
-      year: '',// 2023
-      month: '',// 九月
-      monthList: ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],
+			roomNameDict: null,
+			startDay: '', // 查询参数
+			year: '', // 2023
+			month: '', // 九月
+			monthList: [
+				'一月',
+				'二月',
+				'三月',
+				'四月',
+				'五月',
+				'六月',
+				'七月',
+				'八月',
+				'九月',
+				'十月',
+				'十一月',
+				'十二月',
+			],
 			list: {},
-      teamList: [],// 班组下拉
-      showSetting: false,// 设置模式。自动排班，确认，取消按钮显示
+			teamList: [], // 班组下拉
+			showSetting: false, // 设置模式。自动排班，确认，取消按钮显示
 			settingBtnDis: false,
-      jumpDisabled: true,// 操作按钮控制
+			jumpDisabled: true, // 操作按钮控制
 			chooseObj: {}, //当前选中的数据，查询按钮用
-      chooseTip: '',// 当前选中数据的唯一值，显示红框
-      autoScheduling: false // 只有在当前日期后的月份才生效
+			chooseTip: '', // 当前选中数据的唯一值，显示红框
+			autoScheduling: false, // 只有在当前日期后的月份才生效
 		};
 	},
-  components:{ TopTab },
+	components: { TopTab },
 	created() {
-    this.roomNameDict = this.getDictDatas('workshop')[0].value
-    this.startDay = new Date()
+		this.roomNameDict = this.getDictDatas('workshop')[0].value;
+		this.startDay = new Date();
 		// 设置按钮是否置灰
-    this.settingBtn()
-    this.getTeamList()
-    this.toggleMonth()
-    this.getList()
+		this.settingBtn();
+		this.getTeamList();
+		this.toggleMonth();
+		this.getList();
 	},
 	methods: {
 		// 切换车间
 		toggleName(val) {
-      this.roomNameDict = val
+			this.roomNameDict = val;
 			// 如果当前在设置，则取消设置
 			if (this.showSetting) {
-        this.showSetting = !this.showSetting
+				this.showSetting = !this.showSetting;
 			}
 			// 如果红框选中，清除红框选中
 			if (!this.jumpDisabled) {
-        this.clearChoose()
+				this.clearChoose();
 			}
 			// 获取班组列表
-      this.getTeamList()
+			this.getTeamList();
 			// 重新获取日历数据
-      this.getList()
+			this.getList();
 		},
 		// 切换月份
 		selectMonth() {
 			if (this.startDay) {
-        this.settingBtn() // 设置按钮状态,需在getlist前面
-        this.toggleMonth()
-        this.getList()
-        this.clearChoose()
-        if ( moment(this.startDay).valueOf() > moment().endOf('month').valueOf()) {
-          this.autoScheduling = true
+				this.settingBtn(); // 设置按钮状态,需在getlist前面
+				this.toggleMonth();
+				this.getList();
+				this.clearChoose();
+				if (
+					moment(this.startDay).valueOf() > moment().endOf('month').valueOf()
+				) {
+					this.autoScheduling = true;
 				} else {
-          this.autoScheduling = false
+					this.autoScheduling = false;
 				}
 			}
 		},
 		// 获取班组列表
 		getTeamList() {
-      console.log(this.roomNameDict)
+			console.log(this.roomNameDict);
 			listEnabledByRoom({
-        room: this.roomNameDict
-      }).then(res => {
-        this.teamList = res.data || []
-      })
+				room: this.roomNameDict,
+			}).then((res) => {
+				this.teamList = res.data || [];
+			});
 		},
 		// 获取日历数据
 		getList() {
-      let year = moment(this.startDay).format('YYYY')
-      let month = moment(this.startDay).format('M')
+			let year = moment(this.startDay).format('YYYY');
+			let month = moment(this.startDay).format('M');
 			getPreset({
 				year: year,
 				month: month,
-        roomNameDict: this.roomNameDict
-      }).then(res => {
-        let obj = res.data || {}
+				roomNameDict: this.roomNameDict,
+			})
+				.then((res) => {
+					let obj = res.data || {};
 					if (obj) {
 						for (let item in obj) {
 							for (let i = 0; i < obj[item].length; i++) {
 								if (!obj[item][i].teamId) {
-                obj[item][i].teamId = ''
+									obj[item][i].teamId = '';
 								}
 							}
 						}
 					}
-        this.list = obj
-        this.settingBtnDis = false
-      }).catch(() => {
-        this.list = {}
-        this.settingBtnDis = true // 禁用设置按钮
+					this.list = obj;
+					this.settingBtnDis = false;
 				})
+				.catch(() => {
+					this.list = {};
+					this.settingBtnDis = true; // 禁用设置按钮
+				});
 		},
 		// 设置
 		settingMsg() {
-      this.showSetting = !this.showSetting
-      this.clearChoose()
+			this.showSetting = !this.showSetting;
+			this.clearChoose();
 		},
 		// 取消
 		cancelSetting() {
-      this.showSetting = !this.showSetting
-      this.getList() // 数据还原
+			this.showSetting = !this.showSetting;
+			this.getList(); // 数据还原
 		},
 		// 确认
 		confirmSetting() {
-      let num = 0
+			let num = 0;
 			// 当月数据的话，今天及今天之前的不传
-      if (moment(this.startDay).format('YYYY-MM') === moment().format('YYYY-MM')) {
-        num = Number(moment().format('DD'))
+			if (
+				moment(this.startDay).format('YYYY-MM') === moment().format('YYYY-MM')
+			) {
+				num = Number(moment().format('DD'));
 			} else {
-        num = 0
+				num = 0;
 			}
 			// 下月数据全部都传
 			// 打平数据
-      let tempArr = Object.values(this.list)
-      let arr = []
+			let tempArr = Object.values(this.list);
+			let arr = [];
 			for (let i = num; i < tempArr.length; i++) {
 				for (let j = 0; j < tempArr[i].length; j++) {
-          arr.push(tempArr[i][j])
+					arr.push(tempArr[i][j]);
 				}
 			}
-      createOrUpdateList(arr).then(res => {
+			createOrUpdateList(arr).then((res) => {
 				if (res.code === 0) {
-          this.showSetting = !this.showSetting
-          this.$modal.msgSuccess("操作成功")
-          this.getList() // 数据更新
+					this.showSetting = !this.showSetting;
+					this.$modal.msgSuccess('操作成功');
+					this.getList(); // 数据更新
 				}
-      })
+			});
 		},
 		// 点击班次红框选中当前数据
 		chooseTeam(value) {
 			if (this.showSetting) {
-        this.$modal.msgWarning("当前处于设置模式")
-        return false
+				this.$modal.msgWarning('当前处于设置模式');
+				return false;
 			}
-      this.chooseObj = value
-      this.chooseTip = value.startDay + value.classesId // 匹配当前的样式
-      this.jumpDisabled = false //查询按钮不禁用
+			this.chooseObj = value;
+			this.chooseTip = value.startDay + value.classesId; // 匹配当前的样式
+			this.jumpDisabled = false; //查询按钮不禁用
 		},
 		// 自动排班
 		schedulingBtn() {
-      let tempData = this.list
+			let tempData = this.list;
 			// 次月1号有值前端排班
 			if (this.list[1][0].teamId) {
-        let tempArr = Object.values(this.list)
-        let arr = []
-        let n = 0
+				let tempArr = Object.values(this.list);
+				let arr = [];
+				let n = 0;
 				for (let i = 0; i < tempArr.length; i++) {
 					if (n > 0) {
 						break;
 					}
 					for (let j = 0; j < tempArr[i].length; j++) {
 						if (tempArr[i][j].teamId) {
-              arr.push(tempArr[i][j].teamId)
+							arr.push(tempArr[i][j].teamId);
 						} else {
-              n++
+							n++;
 						}
 					}
 				}
-        let tempNum = 0
+				let tempNum = 0;
 				for (let k = 0; k < tempArr.length; k++) {
 					for (let v = 0; v < tempArr[k].length; v++) {
-            let t = tempNum % arr.length
+						let t = tempNum % arr.length;
 						if (arr.length === 1) {
-              tempData[k+1][v].teamId = arr[0]
+							tempData[k + 1][v].teamId = arr[0];
 						} else {
-              tempData[k+1][v].teamId = arr[t]
+							tempData[k + 1][v].teamId = arr[t];
 						}
-            tempNum++
+						tempNum++;
 					}
 				}
-        this.list = []
-        this.list = tempData
+				this.list = [];
+				this.list = tempData;
 			} else {
 				// 次月1号没有值,接口排班
 				// console.log(moment(this.startDay).format("YYYY-MM-DD"))
 				autoSet({
 					year: this.year,
 					month: moment(this.startDay).month() + 1,
-          roomNameDict: this.roomNameDict
-        }).then(res => {
-          this.list = res.data || {}
-        })
+					roomNameDict: this.roomNameDict,
+				}).then((res) => {
+					this.list = res.data || {};
+				});
 			}
 		},
 		// 设置按钮如果是上个月或者今天是本月最后一天，设置按钮置灰
 		settingBtn() {
-      let nowMonth = moment().startOf('month').valueOf()
-      let startMonth = moment(this.startDay).valueOf()
-      let nowDate = moment(new Date()).date()
-      let sumDate = moment().daysInMonth()
-      if (nowMonth > startMonth) { // 之前月
-        this.settingBtnDis = true
+			let nowMonth = moment().startOf('month').valueOf();
+			let startMonth = moment(this.startDay).valueOf();
+			let nowDate = moment(new Date()).date();
+			let sumDate = moment().daysInMonth();
+			if (nowMonth > startMonth) {
+				// 之前月
+				this.settingBtnDis = true;
 			} else {
 				if (nowDate < sumDate) {
-          this.settingBtnDis = false
+					this.settingBtnDis = false;
 				} else {
-          this.settingBtnDis = true
+					this.settingBtnDis = true;
 				}
 			}
 		},
 		// 清除红框选中数据
 		clearChoose() {
-      this.chooseObj = {}
-      this.chooseTip = ""
-      this.jumpDisabled = true
+			this.chooseObj = {};
+			this.chooseTip = '';
+			this.jumpDisabled = true;
 		},
 		// 切换月份显示
 		toggleMonth() {
-      this.year = moment(this.startDay).format("YYYY")
-      let month = Number(moment(this.startDay).format("MM"))
-      this.month = this.monthList[month - 1]
+			this.year = moment(this.startDay).format('YYYY');
+			let month = Number(moment(this.startDay).format('MM'));
+			this.month = this.monthList[month - 1];
 		},
 		// 3个跳转按钮
 		toOtherPage(val) {
 			switch (val) {
 				case '1':
 					this.$router.push({
-            path: '/core/enhance/product-line-24h?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime,
-          })
+						path:
+							'/core/enhance/product-line-24h?startTime=' +
+							this.chooseObj.startTime +
+							'&endTime=' +
+							this.chooseObj.endTime,
+					});
 					break;
 				case '2': // 能源
 					this.$router.push({
-            path: '/energy/base/energy-quantity-realtime?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime
-          })
+						path:
+							'/energy/base/energy-quantity-realtime?startTime=' +
+							this.chooseObj.startTime +
+							'&endTime=' +
+							this.chooseObj.endTime,
+					});
 					break;
 				default:
 					this.$router.push({
-            path: '/quality/base/quality-inspection-data/detection-information/statistical-data?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime,
+						path:
+							'/quality/base/quality-inspection-data/detection-information/statistical-data?startTime=' +
+							this.chooseObj.startTime +
+							'&endTime=' +
+							this.chooseObj.endTime,
 						// name: 'QualityStatistics',
 						// params: { startTime: this.chooseObj.startTime, endTime: this.chooseObj.endTime }
-          })
-      }
-    }
-    }
+					});
 			}
+		},
+	},
+};
 </script>
 <style lang='scss'>
 .demo-form-inline {
 	.el-date-editor .el-range__icon {
 		font-size: 16px;
-    color: #0B58FF;
+		color: #0b58ff;
 	}
 	.el-input__prefix .el-icon-date {
 		font-size: 16px;
-    color: #0B58FF;
+		color: #0b58ff;
 	}
 }
 .groupTeamScheduling {
-  background-color: #F2F4F9;
+	background-color: #f2f4f9;
 	.operationArea {
 		padding: 14px 10px 0 16px;
 		margin-bottom: 8px;
@@ -353,7 +474,7 @@ export default {
 			display: inline-block;
 			width: 4px;
 			height: 16px;
-      background-color: #0B58FF;
+			background-color: #0b58ff;
 			border-radius: 1px;
 			margin-right: 8px;
 			margin-top: 10px;
@@ -362,7 +483,7 @@ export default {
 			display: inline-block;
 			width: 1px;
 			height: 24px;
-      background: #E8E8E8;
+			background: #e8e8e8;
 			vertical-align: middle;
 		}
 		.el-form-item {
@@ -394,7 +515,8 @@ export default {
 		}
 		.el-calendar-table__row {
 			height: 133px;
-      .prev, .next {
+			.prev,
+			.next {
 				pointer-events: none;
 			}
 			.el-calendar-day {
@@ -411,10 +533,13 @@ export default {
 				}
 			}
 		}
-    .team-active {// 选中班组
-      border:2px solid red
+		.team-active {
+			// 选中班组
+			border: 2px solid red;
 		}
-    .class1, .class2, .class3 {
+		.class1,
+		.class2,
+		.class3 {
 			padding: 0;
 			font-weight: 600;
 			margin-bottom: 2px;
@@ -458,47 +583,50 @@ export default {
 		}
 		.class1 {
 			.selectDiv {
-        .toggle-icon, .toggle-icon-hide {
-          background-color: #FACE00;
+				.toggle-icon,
+				.toggle-icon-hide {
+					background-color: #face00;
 				}
 				.el-input--small .el-input__inner {
-          color: #E7A200;
-          background-color: #FFEFC0;
+					color: #e7a200;
+					background-color: #ffefc0;
 				}
 			}
 			.labelClass {
-        color: #E7A200;
-        background-color: #FFEFC0;
+				color: #e7a200;
+				background-color: #ffefc0;
 			}
 		}
 		.class2 {
 			.selectDiv {
-        .toggle-icon, .toggle-icon-hide {
-          background-color: #3984FF;
+				.toggle-icon,
+				.toggle-icon-hide {
+					background-color: #3984ff;
 				}
 				.el-input--small .el-input__inner {
-          color: #2D7BFF;
-          background-color: #BEEAFF;
+					color: #2d7bff;
+					background-color: #beeaff;
 				}
 			}
 			.labelClass {
-        color: #2D7BFF;
-        background-color: #BEEAFF;
+				color: #2d7bff;
+				background-color: #beeaff;
 			}
 		}
 		.class3 {
 			.selectDiv {
-        .toggle-icon, .toggle-icon-hide {
-          background-color: #37D97F;
+				.toggle-icon,
+				.toggle-icon-hide {
+					background-color: #37d97f;
 				}
 				.el-input--small .el-input__inner {
-          color: #129F51;
-          background-color: #E0FFEE;
+					color: #129f51;
+					background-color: #e0ffee;
 				}
 			}
 			.labelClass {
-        color: #129F51;
-        background-color: #E0FFEE;
+				color: #129f51;
+				background-color: #e0ffee;
 			}
 		}
 	}
--- a/src/views/group/monitoring/groupTeamView/index.vue
+++ b/src/views/group/monitoring/groupTeamView/index.vue
@@ -88,7 +88,7 @@ export default {
 			workOrderList: [],
 			workOrderName: '',
 			tableBtn: [
-				this.$auth.hasPermi('base:group-team-view:detail')
+				this.$auth.hasPermi('monitoring:group-team-scheduling:query')
 					? {
 							type: 'detail',
 							btnName: '详情',
--- a/src/views/group/monitoring/teamProduction/index.vue
+++ b/src/views/group/monitoring/teamProduction/index.vue
@@ -97,7 +97,7 @@ export default {
 			},
 			tableProps,
 			tableBtn: [
-				this.$auth.hasPermi('base:team-production:detail')
+				this.$auth.hasPermi('monitoring:group-team-scheduling:query')
 					? {
 							type: 'productionDetail',
 							btnName: '查看',
--- a/src/views/order/base/orderGroup/index.vue
+++ b/src/views/order/base/orderGroup/index.vue
@@ -173,12 +173,24 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:order-group:create')
+					type: this.$auth.hasPermiAnd([
+						'base:order-group:create',
+						'base:core-product:query',
+						'base:core-customer:query',
+						'base:order:query',
+					])
 						? 'separate'
 						: '',
 				},
 				{
-					type: this.$auth.hasPermi('base:order-group:create') ? 'button' : '',
+					type: this.$auth.hasPermiAnd([
+						'base:order-group:create',
+						'base:core-product:query',
+						'base:core-customer:query',
+						'base:order:query',
+					])
+						? 'button'
+						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
@@ -197,7 +209,10 @@ export default {
 			tableProps,
 			list: [],
 			tableBtn: [
-				this.$auth.hasPermi('base:order-group:bind')
+				this.$auth.hasPermiAnd([
+					'base:order:query',
+					'base:order-con-group-order:create',
+				])
 					? {
 							type: 'bind',
 							btnName: '绑定',
@@ -214,7 +229,7 @@ export default {
 							},
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:order-group:complete')
+				this.$auth.hasPermi('base:order-group:update')
 					? {
 							type: 'complete',
 							btnName: '完成',
@@ -231,7 +246,7 @@ export default {
 							},
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:order-group:termination')
+				this.$auth.hasPermi('base:order-group:update')
 					? {
 							type: 'termination',
 							btnName: '终止',
@@ -248,7 +263,7 @@ export default {
 							},
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:order-group:cancel')
+				this.$auth.hasPermi('base:order-group:update')
 					? {
 							type: 'cancel',
 							btnName: '作废',
@@ -265,11 +280,17 @@ export default {
 							},
 					  }
 					: undefined,
-				{
+				this.$auth.hasPermi('base:order-group:update')
+					? {
 							type: 'detail',
 							btnName: '详情',
-				},
-				this.$auth.hasPermi('base:order-group:edit')
+					  }
+					: undefined,
+				this.$auth.hasPermiAnd([
+					'base:order-group:update',
+					'base:core-product:query',
+					'base:core-customer:query',
+				])
 					? {
 							type: 'edit',
 							btnName: '编辑',
--- a/src/views/order/base/orderManage/index.vue
+++ b/src/views/order/base/orderManage/index.vue
@@ -15,7 +15,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="290"
+				:width="250"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -169,12 +169,22 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:order-manage:create')
+					type: this.$auth.hasPermiAnd([
+						'base:order:query',
+						'base:core-product:query',
+						'base:order:create',
+					])
 						? 'separate'
 						: '',
 				},
 				{
-					type: this.$auth.hasPermi('base:order-manage:create') ? 'button' : '',
+					type: this.$auth.hasPermiAnd([
+						'base:order:query',
+						'base:core-product:query',
+						'base:order:create',
+					])
+						? 'button'
+						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
@@ -210,7 +220,14 @@ export default {
 							},
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:order-manage:bindWorkOrder')
+				this.$auth.hasPermiAnd([
+					'base:order:update',
+					'base:core-product:query',
+					'base:production-line:query',
+					'extend:process-flow:query',
+					'base:core-work-order:query',
+					'base:order:query',
+				])
 					? {
 							type: 'bind',
 							btnName: '绑定',
@@ -227,7 +244,7 @@ export default {
 							},
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:order-manage:complete')
+				this.$auth.hasPermi('base:order:update')
 					? {
 							type: 'complete',
 							btnName: '完成',
@@ -244,7 +261,7 @@ export default {
 							},
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:order-manage:termination')
+				this.$auth.hasPermi('base:order:update')
 					? {
 							type: 'termination',
 							btnName: '终止',
@@ -261,7 +278,7 @@ export default {
 							},
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:order-manage:cancel')
+				this.$auth.hasPermi('base:order:update')
 					? {
 							type: 'cancel',
 							btnName: '作废',
@@ -278,13 +295,20 @@ export default {
 							},
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:order-manage:detail')
+				this.$auth.hasPermiAnd([
+					'base:order:query',
+					'extend:process-flow:query',
+				])
 					? {
 							type: 'detail',
 							btnName: '详情',
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:order-manage:edit')
+				this.$auth.hasPermiAnd([
+					'base:order:query',
+					'base:core-product:query',
+					'base:order:update',
+				])
 					? {
 							type: 'edit',
 							btnName: '编辑',
--- a/src/views/order/monitoring/components/monitoringRingCharts.vue
+++ b/src/views/order/monitoring/components/monitoringRingCharts.vue
@@ -4,24 +4,72 @@
 			<span class="blueTitle"></span>
 			<span>各集团订单环形图</span>
 		</div>
-    <div class="chartBox" id='orderChartBox' v-show='chartList.length'>
-      <div class="chartItem" v-for="(item, index) in chartList" :key='index' :style="{width: 388*beilv+'px',height: 286*beilv+'px',padding:14*beilv+'px',marginRight:9*beilv+'px',marginBottom:9*beilv+'px'}">
-        <div class="topTitle" :style="{fontSize: 14 * beilv + 'px'}">
-          <svg-icon icon-class="order-monitoring" :style="{fontSize: 16*beilv+'px'}"/>
-          <span class="orderName" :style="{paddingRight:8*beilv+'px',marginRight:8*beilv+'px'}">{{item.orderGroupName}}</span>
-          <span>订单计划数量{{item.num}}</span>
+		<div
+			class="chartBox"
+			id="orderChartBox"
+			v-show="chartList.length">
+			<div
+				class="chartItem"
+				v-for="(item, index) in chartList"
+				:key="index"
+				:style="{
+					width: 388 * beilv + 'px',
+					height: 286 * beilv + 'px',
+					padding: 14 * beilv + 'px',
+					marginRight: 9 * beilv + 'px',
+					marginBottom: 9 * beilv + 'px',
+				}">
+				<div
+					class="topTitle"
+					:style="{ fontSize: 14 * beilv + 'px' }">
+					<svg-icon
+						icon-class="order-monitoring"
+						:style="{ fontSize: 16 * beilv + 'px' }" />
+					<span
+						class="orderName"
+						:style="{
+							paddingRight: 8 * beilv + 'px',
+							marginRight: 8 * beilv + 'px',
+						}">
+						{{ item.orderGroupName }}
+					</span>
+					<span>订单计划数量{{ item.num }}</span>
 				</div>
 				<div
 					:id="item.id"
-          :style="{width: 166*beilv+'px',height: 166*beilv+'px',margin: 'auto'}"
-        ></div>
-        <div class="legend" :style="{height: 54 * beilv + 'px', marginTop: 10*beilv+'px'}">
-          <div class="legendItem" v-for="(subItem, i) in item.order" :key='i' :style="{paddingRight:9*beilv+'px',marginRight:9*beilv+'px'}">
-            <span class="itemNum" :style="{fontSize: 18 * beilv + 'px'}">{{subItem.value}}</span>
+					:style="{
+						width: 166 * beilv + 'px',
+						height: 166 * beilv + 'px',
+						margin: 'auto',
+					}"></div>
+				<div
+					class="legend"
+					:style="{ height: 54 * beilv + 'px', marginTop: 10 * beilv + 'px' }">
+					<div
+						class="legendItem"
+						v-for="(subItem, i) in item.order"
+						:key="i"
+						:style="{
+							paddingRight: 9 * beilv + 'px',
+							marginRight: 9 * beilv + 'px',
+						}">
+						<span
+							class="itemNum"
+							:style="{ fontSize: 18 * beilv + 'px' }">
+							{{ subItem.value }}
+						</span>
 						<div>
-              <span class="itemName" :style="{fontSize: 14 * beilv + 'px'}">
-                <span class="smallBlock" :style="{backgroundColor:subItem.color,width:8*beilv+'px',height:8*beilv+'px'}"></span>
-                {{subItem.name}}
+							<span
+								class="itemName"
+								:style="{ fontSize: 14 * beilv + 'px' }">
+								<span
+									class="smallBlock"
+									:style="{
+										backgroundColor: subItem.color,
+										width: 8 * beilv + 'px',
+										height: 8 * beilv + 'px',
+									}"></span>
+								{{ subItem.name }}
 							</span>
 						</div>
 					</div>
@@ -29,59 +77,66 @@
 			</div>
 		</div>
 		<!-- 空图 -->
-    <div class="no-data-bg" v-show='!chartList.length'></div>
+		<div
+			class="no-data-bg"
+			v-show="!chartList.length"></div>
 	</div>
 </template>
 <script>
-import * as echarts from 'echarts'
-import { debounce } from '@/utils/debounce'
+import * as echarts from 'echarts';
+import { debounce } from '@/utils/debounce';
 export default {
 	name: 'MonitoringRingCharts',
 	props: {
 		chartList: {
 			type: Array,
 			default: () => {
-        return []
-      }
-    }
+				return [];
+			},
+		},
 	},
 	data() {
 		return {
 			myChart: [],
 			beilv: 1,
-      canvasReset: ''
-    }
+		};
 	},
 	mounted() {
-    this.beilv = document.getElementById('orderChartBox').offsetWidth / 1610
-    this.canvasReset = debounce(() => {
-      this.initChart()
-    }, 500)
-    window.addEventListener('resize', () => {
-      this.beilv = document.getElementById('orderChartBox').offsetWidth / 1610
-      this.canvasReset()
-    })
+		this.canvasReset();
+		window.addEventListener('resize', this.canvasReset);
+	},
+	destroyed() {
+		window.removeEventListener('resize', this.canvasReset);
 	},
 	methods: {
+		canvasReset() {
+			debounce(() => {
+				this.initChart();
+			}, 500)();
+			this.beilv = document.getElementById('orderChartBox').offsetWidth / 1610;
+		},
 		// 饼图
 		initChart() {
 			if (this.chartList.length <= 0) {
-        return false
+				return false;
 			}
 			// 销毁实例
-      for (let j = 0;j < this.chartList.length; j++) {
+			for (let j = 0; j < this.chartList.length; j++) {
 				if (this.myChart[j]) {
-          this.myChart[j].dispose() // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
+					this.myChart[j].dispose(); // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
 				}
 			}
 			for (let i = 0; i < this.chartList.length; i++) {
 				var chartDom = document.getElementById(this.chartList[i].id);
 				this.myChart[i] = echarts.init(chartDom);
-        let colorList = []
-        this.chartList[i].order.map(item => {
-          colorList.push(item.color)
-        })
-        let percentage = (this.chartList[i].sunNum/this.chartList[i].num*100).toFixed(0)
+				let colorList = [];
+				this.chartList[i].order.map((item) => {
+					colorList.push(item.color);
+				});
+				let percentage = (
+					(this.chartList[i].sunNum / this.chartList[i].num) *
+					100
+				).toFixed(0);
 				var option = {
 					color: colorList,
 					series: [
@@ -93,40 +148,40 @@ export default {
 							itemStyle: {
 								borderRadius: 5,
 								borderColor: '#fff',
-                borderWidth: 2
+								borderWidth: 2,
 							},
 							label: {
 								show: true,
 								position: 'center',
 								color: '#000',
 								formatter: [
-                    '{a|'+percentage+'%}',
-                    '{b|生产'+this.chartList[i].sunNum+'}'
+									'{a|' + percentage + '%}',
+									'{b|生产' + this.chartList[i].sunNum + '}',
 								].join('\n\n'),
 								rich: {
 									a: {
-                      fontSize: this.beilv*24 +'px'
+										fontSize: this.beilv * 24 + 'px',
 									},
 									b: {
-                      fontSize: this.beilv*12 +'px'
-                  }
-                }
+										fontSize: this.beilv * 12 + 'px',
+									},
+								},
 							},
 							emphasis: {
-                disabled: true
+								disabled: true,
 							},
 							labelLine: {
-                show: false
+								show: false,
 							},
-              data: this.chartList[i].order
-            }
-          ]
+							data: this.chartList[i].order,
+						},
+					],
 				};
-        option && this.myChart[i].setOption(option)
+				option && this.myChart[i].setOption(option);
 			}
-    }
-  }
-}
+		},
+	},
+};
 </script>
 <style lang='scss' scoped>
 .chartBox {
@@ -139,11 +194,11 @@ export default {
 	align-content: flex-start;
 	.chartItem {
 		border-radius: 8px;
-    border: 1px solid #CACACA;
+		border: 1px solid #cacaca;
 		.topTitle {
 			margin-bottom: 10px;
 			.orderName {
-        border-right: 1px solid #CACACA;
+				border-right: 1px solid #cacaca;
 			}
 		}
 		.legend {
@@ -152,7 +207,7 @@ export default {
 			overflow: auto;
 			.legendItem {
 				display: inline-block;
-        border-right: 1px solid #E8E8E8;
+				border-right: 1px solid #e8e8e8;
 				.itemName {
 					.smallBlock {
 						display: inline-block;
--- a/src/views/order/monitoring/orderCompletionMonitoring/index.vue
+++ b/src/views/order/monitoring/orderCompletionMonitoring/index.vue
@@ -181,7 +181,10 @@ export default {
 			list: [],
 			total: 0,
 			tableBtn: [
-				this.$auth.hasPermi('base:order-completion-monitoring:orderDet')
+				this.$auth.hasPermiAnd([
+					'base:order:query',
+					'extend:process-flow:query',
+				])
 					? {
 							type: 'orderDetail',
 							btnName: '详情',
@@ -198,7 +201,11 @@ export default {
 							},
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:order-completion-monitoring:qualityDet')
+				this.$auth.hasPermiAnd([
+					'base:quality-inspection-record:query',
+					'base:core-product:query',
+					'base:core-work-order:query',
+				])
 					? {
 							type: 'qualityDetail',
 							btnName: '质量',
--- a/src/views/quality/base/qualityScrapLog/add-or-updata.vue
+++ b/src/views/quality/base/qualityScrapLog/add-or-updata.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-03-22 17:13:16
+ * @LastEditTime: 2024-04-09 15:14:08
 * @LastEditors: zhp
 * @Description:
 -->
--- a/src/views/quality/base/qualityScrapLog/index.vue
+++ b/src/views/quality/base/qualityScrapLog/index.vue
@@ -26,7 +26,7 @@ import {
  getQualityScrapLogPage,
  deleteQualityScrapLog,
  getWorkOrderList,
-  getTeamList
+  // getTeamList
 } from '@/api/base/qualityScrapLog';

 const tableProps = [
@@ -189,18 +189,18 @@ export default {
        // console.log(this.formConfig[0].selectOptions);
        // this.listQuery.total = response.data.total;
      })
-      getTeamList().then((res) => {
-        console.log(res);
-        // console.log(response);
-        this.formConfig[1].selectOptions = res.data.map((item) => {
-          return {
-            name: item.name,
-            id: item.id
-          }
-        })
-        // console.log(this.formConfig[0].selectOptions);
-        // this.listQuery.total = response.data.total;
-      })
+      // getTeamList().then((res) => {
+      //   console.log(res);
+      //   // console.log(response);
+      //   this.formConfig[1].selectOptions = res.data.map((item) => {
+      //     return {
+      //       name: item.name,
+      //       id: item.id
+      //     }
+      //   })
+      //   // console.log(this.formConfig[0].selectOptions);
+      //   // this.listQuery.total = response.data.total;
+      // })
    },
    getDataList() {
      this.dataListLoading = true;
--- a/src/views/safetyEnvironmental/environmental/voc/vocDetectionHistory/index.vue
+++ b/src/views/safetyEnvironmental/environmental/voc/vocDetectionHistory/index.vue
@@ -99,10 +99,14 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:voc:export') ? 'separate' : '',
+					type: this.$auth.hasPermi('base:environmental-check-record:export')
+						? 'separate'
+						: '',
 				},
 				{
-					type: this.$auth.hasPermi('base:voc:export') ? 'button' : '',
+					type: this.$auth.hasPermi('base:environmental-check-record:export')
+						? 'button'
+						: '',
 					btnName: '导出',
 					name: 'export',
 					color: 'primary',
--- a/src/views/safetyEnvironmental/environmental/voc/vocDetectionIndication/index.vue
+++ b/src/views/safetyEnvironmental/environmental/voc/vocDetectionIndication/index.vue
@@ -103,10 +103,14 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:voc:create') ? 'separate' : '',
+					type: this.$auth.hasPermi('base:environmental-check:create')
+						? 'separate'
+						: '',
 				},
 				{
-					type: this.$auth.hasPermi('base:voc:create') ? 'button' : '',
+					type: this.$auth.hasPermi('base:environmental-check:create')
+						? 'button'
+						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
@@ -124,13 +128,16 @@ export default {
 			tableProps,
 			list: [],
 			tableBtn: [
-				this.$auth.hasPermi('base:voc:update')
+				this.$auth.hasPermiAnd([
+					'base:environmental-check:update',
+					'base:environmental-check:query',
+				])
 					? {
 							type: 'edit',
 							btnName: '编辑',
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:voc:delete')
+				this.$auth.hasPermi('base:environmental-check:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
--- a/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionHistory/index.vue
+++ b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionHistory/index.vue
@@ -99,10 +99,14 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:waste-gas:export') ? 'separate' : '',
+					type: this.$auth.hasPermi('base:environmental-check-record:export')
+						? 'separate'
+						: '',
 				},
 				{
-					type: this.$auth.hasPermi('base:waste-gas:export') ? 'button' : '',
+					type: this.$auth.hasPermi('base:environmental-check-record:export')
+						? 'button'
+						: '',
 					btnName: '导出',
 					name: 'export',
 					color: 'primary',
--- a/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionIndication/index.vue
+++ b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionIndication/index.vue
@@ -103,10 +103,14 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:waste-gas:create') ? 'separate' : '',
+					type: this.$auth.hasPermi('base:environmental-check:create')
+						? 'separate'
+						: '',
 				},
 				{
-					type: this.$auth.hasPermi('base:waste-gas:create') ? 'button' : '',
+					type: this.$auth.hasPermi('base:environmental-check:create')
+						? 'button'
+						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
@@ -124,13 +128,16 @@ export default {
 			tableProps,
 			list: [],
 			tableBtn: [
-				this.$auth.hasPermi('base:waste-gas:update')
+				this.$auth.hasPermiAnd([
+					'base:environmental-check:update',
+					'base:environmental-check:query',
+				])
 					? {
 							type: 'edit',
 							btnName: '编辑',
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:waste-gas:delete')
+				this.$auth.hasPermi('base:environmental-check:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
--- a/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionHistory/index.vue
+++ b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionHistory/index.vue
@@ -99,12 +99,14 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:waste-water:export')
+					type: this.$auth.hasPermi('base:environmental-check-record:export')
 						? 'separate'
 						: '',
 				},
 				{
-					type: this.$auth.hasPermi('base:waste-water:export') ? 'button' : '',
+					type: this.$auth.hasPermi('base:environmental-check-record:export')
+						? 'button'
+						: '',
 					btnName: '导出',
 					name: 'export',
 					color: 'primary',
--- a/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionIndication/index.vue
+++ b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionIndication/index.vue
@@ -103,12 +103,14 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:waste-water:create')
+					type: this.$auth.hasPermi('base:environmental-check:create')
 						? 'separate'
 						: '',
 				},
 				{
-					type: this.$auth.hasPermi('base:waste-water:create') ? 'button' : '',
+					type: this.$auth.hasPermi('base:environmental-check:create')
+						? 'button'
+						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
@@ -126,13 +128,13 @@ export default {
 			tableProps,
 			list: [],
 			tableBtn: [
-				this.$auth.hasPermi('base:waste-water:update')
+				this.$auth.hasPermi('base:environmental-check:update')
 					? {
 							type: 'edit',
 							btnName: '编辑',
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:waste-water:delete')
+				this.$auth.hasPermi('base:environmental-check:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
Author	SHA1	Message	Date
juzi	5d3622bf62	权限	2024-04-11 15:22:09 +08:00
juzi	5ccb9297e1	4.11	2024-04-11 11:18:08 +08:00
juzi	7f504e5cdd	Merge branch 'projects/mesxc-test' into projects/mesxc-zjl	2024-04-10 17:37:50 +08:00
juzi	7c5d8bde0b	能源权限	2024-04-10 17:36:37 +08:00
juzi	ed46ed7d09	Merge pull request 'projects/mesxc-zhp' (#323 ) from projects/mesxc-zhp into projects/mesxc-test Reviewed-on: #323	2024-04-10 16:26:37 +08:00
‘937886381’	f89c6dfe14	Merge branch 'projects/mesxc-test' into projects/mesxc-zhp	2024-04-10 16:12:23 +08:00
‘937886381’	a3b2eae33f	深加工新需求	2024-04-10 16:11:29 +08:00
朱文强	e70ff40554	Merge pull request '修改成本新的权限字段' (#322 ) from projects/mesxc-zwq into projects/mesxc-test Reviewed-on: #322	2024-04-10 14:49:44 +08:00
juzi	93236f9828	移除部分监听	2024-04-10 14:17:30 +08:00
‘937886381’	fef8824844	修改bug	2024-04-09 16:05:28 +08:00