.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,6 +45,31 @@ 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() {
@@ -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,7 +132,19 @@ 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,
@@ -115,13 +152,16 @@ export default {
 						data: this.chartData && this.chartData.length > 0 && this.chartData.map((item, index) => ({
 						name:item.name,
             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/base/packagingPrintLog/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2024-04-08 11:49:33
+ * @LastEditTime: 2024-04-10 16:34:40
  * @Description:
 -->
 <template>
@@ -142,7 +142,7 @@ export default {
 				// 	name: 'reset',
 				// },
         {
-					type: 'separate',
+          type: this.$auth.hasPermi('base:packaging-print-log:create') ? 'separate' : '',
 				},
 				{
           type: this.$auth.hasPermi('base:packaging-print-log:create') ? 'button' : '',

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') {
@@ -293,6 +290,9 @@ export default {
 				this.idAttrShow = true
 			} else {
         this.idAttrShow = false
+        getMaterialCode().then(res => {
+          this.dataForm.code = res.data
+        })
 			}
 
 			this.$nextTick(() => {

src/views/extend/processEquMaterialBom/index.vue

@@ -118,7 +118,8 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+          // type: 'separate',
+          type: this.$auth.hasPermi('extend:process-equ-material-bom:create') ? 'separate' : '',
 				},
 				{
           type: this.$auth.hasPermi('extend:process-equ-material-bom:create') ? 'button' : '',

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') {
@@ -326,6 +324,9 @@ export default {
 				this.idAttrShow = true
 			} else {
         this.idAttrShow = false
+        getValueCode().then(res => {
+          this.dataForm.code = res.data
+        })
 			}
 
 			this.$nextTick(() => {

src/views/extend/processEquValueBom/index.vue

@@ -119,7 +119,8 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+          // type: 'separate',
+          type: this.$auth.hasPermi('extend:process-equ-value-bom:create') ? 'separate' : '',
 				},
 				{
           type: this.$auth.hasPermi('extend:process-equ-value-bom:create') ? 'button' : '',

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

@@ -62,7 +62,9 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+          type: this.$auth.hasPermi('base:quality-inspection-box-btn:create')
+            ? 'separate'
+            : '',
 				},
 				{
 					type: this.$auth.hasPermi('base:quality-inspection-box-btn:create')

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,10 +74,12 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+          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: '新增',
@@ -87,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: '删除',

src/views/quality/base/qualityHotMaterial/add-or-updata.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-08 13:46:17
- * @LastEditTime: 2024-03-25 08:50:25
+ * @LastEditTime: 2024-04-10 16:46:44
  * @LastEditors: zhp
  * @Description:
 -->
@@ -73,13 +73,13 @@
           </el-form-item>
         </el-row>
         <el-row :gutter="24" v-for="(item,index) in ingredientList" :key="item.id">
-          <el-col :span="6">
+          <el-col :span="4">
             <el-form-item label="成分">
               {{ item.name }}
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item :prop="'checkValueList.' + index + '.checkValue'" label="成分含量"
+            <el-form-item :prop="'checkValueList.' + index + '.minCheckValue'" label="最小检测值"
               :rules="[{ required: true, message: '成分含量不能为空', trigger: 'blur' }]">
               <el-input oninput="value=value.replace(/[^\d]/g,'')" :disabled="isdetail"
                 style="width: 90%;margin-right: 10px;" :max="item.maxValue" :min='item.minValue'
@@ -93,11 +93,25 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item :prop="'checkValueList.' + index + '.maxCheckValue'" label="最大检测值"
+              :rules="[{ required: true, message: '成分含量不能为空', trigger: 'blur' }]">
+              <el-input oninput="value=value.replace(/[^\d]/g,'')" :disabled="isdetail"
+                style="width: 90%;margin-right: 10px;" :max="item.maxValue" :min='item.minValue'
+                v-model.number="dataForm.checkValueList[index].checkValue"
+                @change="judgeValue(arguments[0],item.minValue,item.maxValue,index)"></el-input>
+              <span v-if="dataForm.checkValueList[index].showIcon">
+                <!-- <i class="el-icon-success"></i> -->
+                <svg-icon v-if="dataForm.checkValueList[index].isStandard" icon-class="standards" />
+                <svg-icon v-else icon-class="noStandards" />
+              </span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
             <el-form-item :prop="'checkValueList.' + index + '.minValue'" label="最小值">
               <el-input disabled style="width: 90%;margin-right: 10px;" v-model="item.minValue"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="4">
             <el-form-item :prop="'checkValueList.' + index + '.minValue'" label="最大值">
               <el-input disabled style="width: 90%;margin-right: 10px;" v-model="item.maxValue"></el-input>
             </el-form-item>
@@ -304,7 +318,9 @@ export default {
                 mainId: this.dataForm.id,
                 id:ele.id,
                 checkDetId: ele.checkDetId,
-                checkValue: ele.checkValue
+                minCheckValue: ele.minCheckValue,
+                maxCheckValue: ele.maxCheckValue
+
               }))
             })
             Promise.all(array).then(res => {
@@ -344,7 +360,9 @@ export default {
             array.push(this.createDet({
               mainId: response.data,
               checkDetId: ele.checkDetId,
-              checkValue: ele.checkValue
+              minCheckValue: ele.minCheckValue,
+              maxCheckValue: ele.maxCheckValue
+
             }))
           })
           Promise.all(array).then(res => {
@@ -382,7 +400,8 @@ export default {
           return {
             mainId: null,
             checkDetId: ele.id,
-            checkValue: null,
+            minCheckValue:null,
+            maxCheckValue: null,
             isStandard: true,
             showIcon:false,
           }

src/views/quality/base/qualityHotMaterial/index.vue

@@ -141,7 +141,8 @@ export default {
 					color: 'primary',
 				},
         {
-					type: 'separate',
+          type: this.$auth.hasPermi('base:quality-hot-material:create') ? 'separate' : '',
+					// type: 'separate',
 				},
 				{
           type: this.$auth.hasPermi('base:quality-hot-material:create') ? 'button' : '',

src/views/quality/base/qualityInspectionDet/index.vue

@@ -105,7 +105,10 @@ export default {
 				// 	name: 'reset',
 				// },
 				{
-					type: 'separate',
+          // type: 'separate',
+          type: this.$auth.hasPermi('base:quality-inspection-det:create')
+            ? 'separate'
+            : '',
 				},
 				{
 					type: this.$auth.hasPermi('base:quality-inspection-det:create')

src/views/quality/base/qualityInspectionType/index.vue

@@ -147,7 +147,10 @@ export default {
 				// 	name: 'reset',
 				// },
         {
-					type: 'separate',
+          type: this.$auth.hasPermi('base:quality-inspection-type:create')
+            ? 'separate'
+            : '',
+					// type: 'separate',
 				},
 				{
 					type: this.$auth.hasPermi('base:quality-inspection-type:create')

src/views/quality/base/qualityScrapDet/index.vue

@@ -98,7 +98,8 @@ export default {
 					color: 'primary',
 				},
         {
-					type: 'separate',
+          type: this.$auth.hasPermi('base:quality-scrap-det:create') ? 'separate' : '',
+					// type: 'separate',
 				},
 				{
           type: this.$auth.hasPermi('base:quality-scrap-det:create') ? 'button' : '',

src/views/quality/base/qualityScrapLog/index.vue

@@ -125,7 +125,8 @@ export default {
 					color: 'primary',
 				},
         {
-					type: 'separate',
+          type: this.$auth.hasPermi('base:quality-scrap-det:create') ? 'separate' : '',
+					// type: 'separate',
 				},
 				{
           type: this.$auth.hasPermi('base:quality-scrap-det:create') ? 'button' : '',

src/views/quality/base/qualityScrapType/index.vue

@@ -88,7 +88,8 @@ export default {
 					color: 'primary',
 				},
         {
-					type: 'separate',
+          type: this.$auth.hasPermi('base:quality-scrap-type:create') ? 'separate' : '',
+					// type: 'separate',
 				},
 				{
           type: this.$auth.hasPermi('base:quality-scrap-type:create') ? 'button' : '',

src/views/quality/monitoring/equipmentTraceability/index.vue

@@ -269,6 +269,13 @@ export default {
 					name: 'search',
 					color: 'primary',
         },
+        {
+          type: this.$auth.hasPermi(
+            'monitoring:equipment-traceability:export'
+          )
+            ? 'separate'
+            : '',
+        },
         {
           type: this.$auth.hasPermi(
             'monitoring:equipment-traceability:export'

src/views/quality/monitoring/materielDateFrom/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2024-04-07 16:19:18
+ * @LastEditTime: 2024-04-10 16:31:48
  * @Description:
 -->
 <template>
@@ -161,6 +161,13 @@ export default {
         // 	type: 'separate',
         // 	type: this.$auth.hasPermi('base:product:create') ? 'separate' : '',
         // },
+        {
+          type: this.$auth.hasPermi(
+            'monitoring:materiel-date-from:export'
+          )
+            ? 'separate'
+            : '',
+        },
         {
           type: this.$auth.hasPermi('monitoring:materiel-date-from:export') ? 'button' : '',
         	btnName: '导出',

src/views/quality/monitoring/qualityInspectionRecord/index.vue

@@ -169,7 +169,12 @@ export default {
 					color: 'primary',
 				},
         {
-					type: 'separate',
+          type: this.$auth.hasPermi(
+            'base:quality-inspection-record:create'
+          )
+            ? 'separate'
+            : '',
+					// type: 'separate',
 				},
 				{
 					type: this.$auth.hasPermi(