.env.dev

@@ -1,7 +1,7 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-04-10 08:26:13
+ # @LastEditTime: 2024-04-10 16:58:06
  # @LastEditors: zhp
  # @Description:
 ###
@@ -20,11 +20,11 @@ VUE_APP_TITLE = MES系统
 # VUE_APP_BASE_API = 'http://192.168.1.8:48082'
 # VUE_APP_BASE_API = 'http://192.168.4.173:9001'
 # VUE_APP_BASE_API = 'http://192.168.1.104:48082'
-VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+# 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'
+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'

src/views/OperationalOverview/coldBoard.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-29 16:50:26
- * @LastEditTime: 2024-04-07 16:05:59
+ * @LastEditTime: 2024-04-11 09:55:04
  * @LastEditors: zhp
  * @Description:
 -->

src/views/OperationalOverview/components/ISRAChart.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-29 13:45:56
- * @LastEditTime: 2024-03-13 08:58:01
+ * @LastEditTime: 2024-04-11 11:02:53
  * @LastEditors: zhp
  * @Description:
 -->
@@ -26,7 +26,7 @@ export default {
 		return {
 			chart: null,
 			// notMsg:true,
-			colors:['#2760ff', '#518eec', '#0ee8e4', '#ddb523'],
+      colors: ['#2760ff', '#518eec', '#49FBD6', '#ddb523'],
 			chartData: []
 		};
 	},
@@ -45,7 +45,32 @@ export default {
 				this.$emit('emitFun')
 			}
 		}
-	},
+  },
+  mounted() {
+    this.chartData = [
+      {
+        name: '细长泡',
+        num: 1112,
+        yield: 0.97,
+      },
+      {
+        name: '长泡',
+        num: 1112,
+        yield: 0.97,
+      },
+       {
+         name: '开口泡',
+        num: 1112,
+        yield: 0.97,
+      },
+       {
+         name: '结石',
+        num: 1112,
+        yield: 0.97,
+      }
+    ]
+    this.updateChart()
+  },
 	methods: {
 		updateChart() {
 			console.log('update')
@@ -71,7 +96,7 @@ export default {
 				color:this.colors,
 				title:{
 					text: num,
-					subtext: '总数',
+					subtext: '总数/片',
 					top: '32%',
 					left: '49%',
 					textAlign: 'center',
@@ -89,7 +114,7 @@ export default {
 					left: 'center',
 					itemWidth: 12,
 					itemHeight:12,
-          icon: 'rect',
+          icon: 'roundRect',
 					textStyle: {
 						color: '#fff'
 					},
@@ -107,21 +132,36 @@ export default {
 						radius: ['45%', '70%'],
 						avoidLabelOverlap: true,
 						label: {
-							show: false
+              show: true,
+            normal: {
+              // 各分区的提示内容
+              // params: 即下面传入的data数组,通过自定义函数，展示你想要的内容和格式
+              formatter: function (params) {
+                console.log(params);
+                return params.value + " | " + params.percent.toFixed(0) + "%" + "\n\n" + params.name;
+              },
+              textStyle: {            // 提示文字的样式
+                // color: '#595959',
+                fontSize: 24.48
+              }
+            }
 						},
 						labelLine: {
 							show: true,
 						},
 						data: this.chartData && this.chartData.length > 0 && this.chartData.map((item, index) => ({
 						name:item.name,
-						value: item.num,
+            value: item.num,
+            label: {
+              color: this.colors[index % 4]
+            },
 						itemStyle:{
 							color:{
 								type: 'linear',
-								x: 1,
+								x: 0,
-								y: 1,
+								y: 0,
 								x2: 0,
-								y2: 0,
+								y2: 1,
 								global: false,
 								colorStops:[
 									{offset: 0,color: this.colors[index%4]},

src/views/extend/processEquMaterialBom/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zhp
- * @LastEditTime: 2024-03-22 17:11:55
+ * @LastEditTime: 2024-04-11 09:10:16
  * @Description:
 -->
 <template>
@@ -237,9 +237,6 @@ export default {
         // console.log(response);
         this.equipmentList = res.data
       })
-      getMaterialCode().then(res => {
-        this.dataForm.code = res.data
-      })
     },
 		handleClick(raw) {
 			if (raw.type === 'delete') {
@@ -292,7 +289,10 @@ export default {
 			if (id) {
 				this.idAttrShow = true
 			} else {
-				this.idAttrShow = false
+        this.idAttrShow = false
+        getMaterialCode().then(res => {
+          this.dataForm.code = res.data
+        })
 			}
 
 			this.$nextTick(() => {

src/views/extend/processEquValueBom/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zhp
- * @LastEditTime: 2024-03-25 14:07:31
+ * @LastEditTime: 2024-04-11 09:10:35
  * @Description:
 -->
 <template>
@@ -246,9 +246,7 @@ export default {
         // console.log(response);
         this.equipmentList = res.data
       })
-      getValueCode().then(res => {
+
-        this.dataForm.code = res.data
-      })
     },
 		handleClick(raw) {
 			if (raw.type === 'delete') {
@@ -325,7 +323,10 @@ export default {
 			if (id) {
 				this.idAttrShow = true
 			} else {
-				this.idAttrShow = false
+        this.idAttrShow = false
+        getValueCode().then(res => {
+          this.dataForm.code = res.data
+        })
 			}
 
 			this.$nextTick(() => {

src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue

@@ -66,7 +66,7 @@ export default {
           param: 'nickName',
         },
 				{
-          type: this.$auth.hasPermi('base:quality-inspection-box-permissions:query')
+          type: this.$auth.hasPermi('base:quality-inspection-box-btn-auth:query')
             ? 'button'
             : '',
 					btnName: '查询',
@@ -74,12 +74,12 @@ export default {
 					color: 'primary',
 				},
 				{
-          type: this.$auth.hasPermi('base:quality-inspection-box-permissions:create')
+          type: this.$auth.hasPermi('base:quality-inspection-box-btn-auth:create')
             ? 'separate'
             : '',
 				},
 				{
-          type: this.$auth.hasPermi('base:quality-inspection-box-permissions:create')
+          type: this.$auth.hasPermi('base:quality-inspection-box-btn-auth:create')
 						? 'button'
 						: '',
 					btnName: '新增',
@@ -89,13 +89,13 @@ export default {
 				},
 			],
 			tableBtn: [
-        this.$auth.hasPermi('base:quality-inspection-box-permissions:update')
+        this.$auth.hasPermi('base:quality-inspection-box-btn-auth:update')
 					? {
 							type: 'edit',
 							btnName: '修改',
 					  }
 					: undefined,
-        this.$auth.hasPermi('base:quality-inspection-box-permissions:delete')
+        this.$auth.hasPermi('base:quality-inspection-box-btn-auth:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',