.env.dev

@@ -1,7 +1,7 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-03-25 15:59:53
+ # @LastEditTime: 2024-03-22 14:18:33
  # @LastEditors: zhp
  # @Description:
 ###

src/views/OperationalOverview/coldBoard.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-29 16:50:26
- * @LastEditTime: 2024-03-25 18:33:48
+ * @LastEditTime: 2024-03-13 09:07:37
  * @LastEditors: zhp
  * @Description:
 -->
@@ -793,11 +793,11 @@ export default {
             // formatDate(item.planStartTime) || '',
             // `<span style="color:rgba(255,255,255,0.5)" >${item.line || ''}
             // </span>`,
-          `<span style="color:rgba(255,255,255,0.5)">${ele.name || ''}</span>`,
+          `<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)">${ele.run || ''}</span>`,
+          `<span style="color:rgba(255,255,255,0.5)">${item.run || ''}</span>`,
           // `<span style="color:rgba(255,255,255,0.5)">${item.error || ''}</span>`,
-          ])
+          ]);
       }
       this.realEqConfig.data = this.realEqList
       this.$refs['realEqScrollBoard'].updateRows(this.realEqList)

src/views/OperationalOverview/components/coldDoubleYChart.vue

@@ -2,7 +2,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-09-21 09:06:28
- * @LastEditTime: 2024-03-25 18:34:58
+ * @LastEditTime: 2024-01-29 15:39:59
  * @LastEditors: zhp
  * @Description:
 -->
@@ -158,7 +158,7 @@ export default {
         legend: {
           itemWidth: 10,
           itemHeight: 10,
-          top: '20',
+          top: '1%',
           // right: '20px',
           data: ['产线产量', '产线良品率'],
           textStyle: {

src/views/OperationalOverview/components/linearBarChart.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div :id="id" :class="className" :style="{ height: '420px', width: width }" />
+    <div :id="id" :class="className" :style="{ height: height + 'px', width: width }" />
   </div>
 </template>
 
@@ -19,7 +19,7 @@ export default {
     },
     className: {
       type: String,
-      default: 'enChart'
+      default: 'chart'
     },
     width: {
       type: String,
@@ -84,7 +84,7 @@ export default {
   },
   methods: {
     initChart(nameList, dataList) {
-      // console.log('1111', dataList);
+      console.log('1111', dataList);
       // console.log(1)
       this.chart = echarts.init(document.getElementById(this.id))
       // if (dataList.length !== 0) {
@@ -123,7 +123,13 @@ export default {
             type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
           }
         },
-        grid: { top: 90, right: 60, bottom: 20, left: 90 },
+        grid: {
+          top: 30,
+          left: '2%',
+          right: '2%',
+          bottom: '3%',
+          containLabel: true
+        },
         // legend: {
         //   itemWidth: 10,
         //   itemHeight: 10,
@@ -199,11 +205,4 @@ export default {
   }
 }
 </script>
-<style>
+
-.enChart {
-  position: absolute;
-  height: 100%;
-  width: 100%;
-  top: -30px;
-}
-</style>

src/views/OperationalOverview/components/pileBarChart.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-27 13:54:52
- * @LastEditTime: 2024-03-25 18:37:26
+ * @LastEditTime: 2024-03-13 09:04:11
  * @LastEditors: zhp
  * @Description:
 -->
@@ -92,8 +92,6 @@ export default {
   methods: {
     initChart(nameList, topNameList, nameWasteList, passRateList, wasteList) {
       let rawData = []
-      let colors = ['#0fdedb', '#2359ec']
-      if (passRateList && wasteList) {
       rawData.push(passRateList,wasteList)
       // console.log(1)
       const totalData = [];
@@ -104,8 +102,8 @@ export default {
         }
         totalData.push(sum);
       }
+      let colors = ['#0fdedb', '#2359ec' ]
       console.log('total', totalData);
-      }
       this.chart = echarts.init(document.getElementById(this.id))
       const series = [
         '良品',
@@ -125,9 +123,9 @@ export default {
             formatter: (params) => Math.round(params.value * 1000) / 10 + '%'
           },
           color:colors[sid],
-          data: rawData.length != 0 ? rawData[sid].map((d, did) =>
+          data: rawData[sid].map((d, did) =>
             totalData[did] <= 0 ? 0 : d / totalData[did]
-          ) : []
+          )
         };
       });
       // let series = [
@@ -174,7 +172,6 @@ export default {
         legend: {
           itemWidth: 12,
           itemHeight: 12,
-          top:'10',
           icon: 'rect',
           textStyle: {
             color: '#ffffff'

src/views/OperationalOverview/processingBoard.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2024-03-25 16:54:49
+ * @LastEditTime: 2024-03-21 16:07:39
  * @Description:
 -->
 <template>
@@ -605,7 +605,10 @@ export default {
     }
   },
   created() {
-    this.getData()
+    // this.fetchList('exception-alarm')
+    // this.fetchList('inAndOutOfEachLine')
+    // this.fetchList('order-process')
+    // this.fetchList('line-chart-data')
     this.init()
     setTimeout(() => {
       window.location.reload()
@@ -668,22 +671,6 @@ export default {
   //   removeEventListener('resize', resizeFun)
   // },
   methods: {
-    getData() {
-      let processArr = qualityMonthList.map((item, index) => [
-        // console.log(item)
-        `<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
-            </span>`,
-        // formatDate(item.planStartTime) || '',
-        `
-          <span style="color:rgba(255,255,255,0.5)" >${item.productionLineName || ''}
-            </span>`,
-        `<span style="color:rgba(255,255,255,0.5)">${item.sectionName || ''}</span>`,
-        `<span style="color:rgba(255,255,255,0.5)">${item.count || ''}</span>`,
-        `<span style="color:rgba(255,255,255,0.5)">${item.inspectionTypeName || ''}</span>`,
-      ])
-      this.processConfig.data = processArr
-      this.$refs['processScrollBoard'].updateRows(processArr)
-    },
     // getList() {
     //   // this.$axios.get(
     //   //   'base/core-production-line/listAll',
@@ -880,6 +867,20 @@ export default {
         // this.$nextTick(() => {
         this.$refs.productLineChart.initChart(nameList, passRateList, outputNumList)
       } else if (this.SJGInitWebSocket === 'inspection') {
+        let processArr = qualityMonthList.map((item, index) => [
+          // console.log(item)
+          `<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
+            </span>`,
+          // formatDate(item.planStartTime) || '',
+          `
+          <span style="color:rgba(255,255,255,0.5)" >${item.productionLineName || ''}
+            </span>`,
+          `<span style="color:rgba(255,255,255,0.5)">${item.sectionName || ''}</span>`,
+          `<span style="color:rgba(255,255,255,0.5)">${item.count || ''}</span>`,
+          `<span style="color:rgba(255,255,255,0.5)">${item.inspectionTypeName || ''}</span>`,
+        ])
+        this.processConfig.data = processArr
+        this.$refs['processScrollBoard'].updateRows(processArr)
       }
     },
     // 数据发送

src/views/cost/energyCost/index.vue

@@ -12,7 +12,6 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-      :max-height="tableH"
 			:table-data="tableData"></base-table>
 		<pagination
 			:limit.sync="listQuery.pageSize"
@@ -70,7 +69,6 @@ export default {
 			},
 			tableData: [],
 			tableProps,
-      tableH: this.tableHeight(260),
 			drawerVisible: false,
 			formConfig: [
 				{
@@ -111,9 +109,6 @@ export default {
 	},
 	components: {},
 	created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
 		getEnergyTypeListAll().then((response) => {
 			this.formConfig[0].selectOptions = response.data;
 		});
@@ -138,7 +133,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.energyTypeId = val.energyTypeId;
           this.listQuery.searchTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.startTime = val.searchTime

src/views/cost/energyCostHis/index.vue

@@ -12,7 +12,6 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-      :max-height="tableH"
 			:table-data="tableData"></base-table>
 		<pagination
 			:limit.sync="listQuery.pageSize"
@@ -80,7 +79,6 @@ export default {
 			},
 			tableData: [],
 			tableProps,
-      tableH: this.tableHeight(260),
 			drawerVisible: false,
 			formConfig: [
 				{
@@ -135,9 +133,6 @@ export default {
 	},
 	components: {},
 	created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
 		const end = new Date();
 		const start = new Date();
 		start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
@@ -155,7 +150,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.reportType = val.reportType;
 					this.listQuery.energyTypeId = val.energyTypeId;
 					this.listQuery.reportTime = val.searchTime

src/views/cost/mixins/basic-page.js

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2022-08-24 11:19:43
  * @LastEditors: zwq
- * @LastEditTime: 2024-03-25 14:11:46
+ * @LastEditTime: 2023-12-07 09:35:33
  * @Description:
  */
 export default {
@@ -17,7 +17,7 @@ export default {
       },
       tableData: [],
       listQuery: {
-        pageSize: 20,
+        pageSize: 10,
         pageNo: 1,
         total: 1,
       },

src/views/cost/rawMaterialConfig/index.vue

@@ -12,7 +12,6 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-      :max-height="tableH"
 			:table-data="tableData">
 			<method-btn
 				v-if="tableBtn.length"
@@ -62,7 +61,7 @@ const tableProps = [
 	{
 		prop: 'code',
 		label: '原料编码',
-		width: 180,
+		width: 190,
 	},
 	{
 		prop: 'grade',
@@ -99,7 +98,6 @@ export default {
 				deleteURL: deleteCostMaterialSet,
 			},
 			tableProps,
-      tableH: this.tableHeight(260),
 			tableBtn: [
 				this.$auth.hasPermi(`cost:rawMaterialConfig:update`)
 					? {
@@ -148,9 +146,6 @@ export default {
 		AddOrUpdate,
 	},
 	created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
 		getHotMaterialList().then((response) => {
 			this.formConfig[0].selectOptions = response.data;
 		});
@@ -160,14 +155,14 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.materialId = val.name;
 					this.getDataList();
 					break;
 				case 'reset':
 					this.$refs.searchBarForm.resetForm();
 					this.listQuery = {
-						pageSize: 20,
+						pageSize: 10,
 						pageNo: 1,
 						total: 1,
 					};

src/views/cost/rawMaterialCost/index.vue

@@ -12,7 +12,6 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-      :max-height="tableH"
 			:table-data="tableData"></base-table>
 		<pagination
 			:limit.sync="listQuery.pageSize"
@@ -75,7 +74,6 @@ export default {
 			},
 			tableData: [],
 			tableProps,
-      tableH: this.tableHeight(260),
 			drawerVisible: false,
 			formConfig: [
 				{
@@ -116,9 +114,6 @@ export default {
 	},
 	components: {},
 	created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
 		getHotMaterialList().then((response) => {
 			this.formConfig[0].selectOptions = response.data;
 		});
@@ -143,7 +138,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.materialId = val.materialId;
 					this.listQuery.searchTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.startTime = val.searchTime

src/views/cost/rawMaterialCostHis/index.vue

@@ -12,7 +12,6 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-      :max-height="tableH"
 			:table-data="tableData"></base-table>
 		<pagination
 			:limit.sync="listQuery.pageSize"
@@ -42,7 +41,7 @@ const tableProps = [
 	{
 		prop: 'reportName',
 		label: '时间',
-		minWidth: 160,
+		minWidth: 150,
 	},
 	{
 		prop: 'rawMaterialName',
@@ -79,7 +78,6 @@ export default {
 			},
 			tableData: [],
 			tableProps,
-      tableH: this.tableHeight(260),
 			drawerVisible: false,
 			formConfig: [
 				{
@@ -134,9 +132,6 @@ export default {
 	},
 	components: {},
 	created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
 		const end = new Date();
 		const start = new Date();
 		start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
@@ -154,7 +149,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.reportType = val.reportType;
 					this.listQuery.materialId = val.materialId;
 					this.listQuery.times = val.searchTime

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

@@ -2,11 +2,11 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zhp
- * @LastEditTime: 2024-03-22 17:11:55
+ * @LastEditTime: 2024-03-20 09:18:30
  * @Description:
 -->
 <template>
-  <el-drawer :visible.sync="visible" :show-close="false" :wrapper-closable="true" class="drawer" size="50%">
+  <el-drawer :visible.sync="visible" :show-close="false" :wrapper-closable="false" class="drawer" size="50%">
     <small-title slot="title" :no-padding="true">
       {{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
     </small-title>
@@ -75,7 +75,7 @@
           :limit.sync="listQuery.pageSize" :page-sizes="[5, 10, 15]" @pagination="getList" />
       </div>
     </div>
-    <div v-if="!isdetail" class="drawer-body__footer">
+    <div class="drawer-body__footer">
       <el-button style="" @click="goback()">取消</el-button>
       <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
     </div>
@@ -198,7 +198,7 @@ export default {
         }
         // 修改的提交
         if (this.dataForm.id) {
-          this.urlOptions.updateURL(this.dataForm).then(res => {
+          this.urlOptions.updateURL(this.dataForm).then(response => {
             this.$modal.msgSuccess("修改成功");
             this.visible = false;
             this.$emit("refreshDataList");
@@ -206,7 +206,7 @@ export default {
           return;
         }
         // 添加的提交
-        this.urlOptions.createURL(this.dataForm).then(res => {
+        this.urlOptions.createURL(this.dataForm).then(response => {
           this.$modal.msgSuccess("新增成功");
           this.idAttrShow = true;
           this.dataForm.id = res.data

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-03-22 09:01:30
  * @Description:
 -->
 <template>
@@ -289,7 +289,7 @@ export default {
         }
         // 修改的提交
         if (this.dataForm.id) {
-          this.urlOptions.updateURL(this.dataForm).then(res => {
+          this.urlOptions.updateURL(this.dataForm).then(response => {
             this.$modal.msgSuccess("修改成功");
             this.visible = false;
             this.$emit("refreshDataList");
@@ -297,7 +297,7 @@ export default {
           return;
         }
         // 添加的提交
-        this.urlOptions.createURL(this.dataForm).then(res => {
+        this.urlOptions.createURL(this.dataForm).then(response => {
           this.$modal.msgSuccess("新增成功");
           this.idAttrShow = true;
           this.dataForm.id = res.data

src/views/extend/processEquValueBom/attr-add.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-08 15:30:27
- * @LastEditTime: 2024-03-25 14:14:04
+ * @LastEditTime: 2023-12-04 15:19:33
  * @LastEditors: zhp
  * @Description:
 -->
@@ -118,7 +118,7 @@ export default {
 				this.$refs['dataForm'].resetFields();
 				if (this.dataForm.id) {
           getProcessEquValueBomDet({
-            id: this.dataForm.id,
+						id: this.dataForm.id
 					}).then((res) => {
             this.dataForm = res.data;
             const arr = []

src/views/extend/processEquValueBom/statusBtn.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-08 14:00:52
- * @LastEditTime: 2024-03-25 14:09:33
+ * @LastEditTime: 2023-11-09 09:59:53
  * @LastEditors: zhp
  * @Description:
 -->
@@ -25,24 +25,24 @@ export default {
   },
   data() {
     return {
-      // state: false
+      state: false
-    }
-  },
-  computed: {
-    state() {
-      return this.injectData.enabled === 1 ? true : false
     }
   },
+  // computed: {
+  //   readonly() {
+  //     return !!this.injectData.readonly
+  //   }
+  // },
   mounted() {
-    // this.mapToState()
+    this.mapToState()
   },
 
   methods: {
-    // mapToState() {
+    mapToState() {
-    //   if (this.injectData.prop === 'enabled') {
+      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 = {}

src/views/login.vue

@@ -299,14 +299,14 @@ export default {
 		getCookie() {
 			// const username = getUsername();
 			// const password = getPassword();
-			const rememberMe = getRememberMe()
+			// const rememberMe = getRememberMe();
-			// const tenantName = getTenantName();
+			const tenantName = getTenantName();
 			this.loginForm = {
 				...this.loginForm,
-				username: this.loginForm.username,
+				username: username ? username : this.loginForm.username,
-				password: this.loginForm.password,
+				password: password ? password : this.loginForm.password,
 				rememberMe: rememberMe ? getRememberMe() : false,
-				tenantName: this.loginForm.tenantName,
+				tenantName: tenantName ? tenantName : this.loginForm.tenantName,
 			};
 		},
 		handleLogin(captchaParams) {

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-03-21 10:40:52
  * @LastEditors: zhp
  * @Description:
 -->
@@ -73,12 +73,12 @@
           </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="8">
             <el-form-item label="成分">
               {{ item.name }}
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item :prop="'checkValueList.' + index + '.checkValue'" label="成分含量"
               :rules="[{ required: true, message: '成分含量不能为空', trigger: 'blur' }]">
               <el-input oninput="value=value.replace(/[^\d]/g,'')" :disabled="isdetail"
@@ -92,12 +92,12 @@
               </span>
             </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.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>

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-03-20 09:38:10
  * @LastEditors: zhp
  * @Description:
 -->
@@ -10,7 +10,7 @@
     <el-row :gutter="20">
       <el-col :span="8">
         <el-form-item label="工单号" prop="workOrderId">
-          <el-select filterable v-model="dataForm.workOrderId" placeholder="请选择工单号">
+          <el-select v-model="dataForm.workOrderId" placeholder="请选择工单号">
             <el-option v-for="dict in workOrderList" :key="dict.id" :label="dict.name" :value="dict.id" />
           </el-select>
         </el-form-item>
@@ -58,13 +58,6 @@
         </el-form-item>
       </el-col>
     </el-row>
-    <el-col :span="8">
-      <el-form-item label="来源" prop="source">
-        <el-select v-model="dataForm.source" placeholder="请选择来源" multiple>
-          <el-option v-for="dict in sourceList" :key="dict.id" :label="dict.name" :value="dict.id" />
-        </el-select>
-      </el-form-item>
-    </el-col>
     <el-col :span="8">
       <el-form-item label="备注" prop="remark">
         <el-input v-model="dataForm.remark" placeholder="备注" />

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2024-03-25 16:07:07
+ * @LastEditTime: 2024-03-21 15:14:04
  * @Description:
 -->
 <template>
@@ -64,7 +64,7 @@ const tableProps = [
   {
     prop: 'source',
     label: '数据来源',
-    filter: (val) => val == 1 ? '手动' : '自动'
+    filter: (val) => val == 1 ? '内部' : '外部'
   },
   {
     prop: 'remark',

src/views/report/glass/day.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-24 15:15:24
- * @LastEditTime: 2024-03-22 17:05:51
+ * @LastEditTime: 2024-03-22 10:14:23
  * @LastEditors: zhp
  * @Description:
 -->
@@ -66,7 +66,7 @@ export default {
 		};
 	},
 	created() {
-    // this.getDict()
+    this.getDict()
     this.getTodayStartTimeAndEndTime()
     this.getDataList()
 	},
@@ -104,8 +104,6 @@ export default {
 
     },
     async getDataList() {
-      const res = await getCorePLList()
-      this.proLineList = res.data;
       this.dataListLoading = true
       if (this.listQuery.reportTime.length == 0) {
         this.$message({
@@ -137,9 +135,9 @@ export default {
               //   item.dailyOutputTrend = null
               // }
               item.dailyOutputTrend = item.dailyOutputTrend && item.dailyOutputTrend != 0 ? this.multipliedByHundred(item.dailyOutputTrend) + '%' : item.dailyOutputTrend == 0 ? 0 : null
-              item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null
+              item.originalGlassStatisticsTrend = item.dailyOutputTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null
-              item.actualProductTrend = item.actualProductTrend &&  item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null
+              item.actualProductTrend = item.dailyOutputTrend &&  item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null
-              item.originalGlassPassTrend = item.originalGlassPassTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null
+              item.originalGlassPassTrend = item.dailyOutputTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null
             }
           })
         })

src/views/report/glass/month.vue

@@ -57,7 +57,7 @@ export default {
 	},
   created() {
     this.getCurrentMonthFirst()
-    // this.getDict()
+    this.getDict()
     this.getDataList()
 	},
 	methods: {
@@ -98,8 +98,6 @@ export default {
     },
 		// 获取数据列表
     async getDataList() {
-      const res = await getCorePLList()
-      this.proLineList = res.data;
       this.dataListLoading = true;
       if (this.listQuery.reportTime.length == 0) {
         this.$message({
@@ -131,9 +129,9 @@ export default {
               //   item.dailyOutputTrend = null
               // }
               item.dailyOutputTrend = item.dailyOutputTrend && item.dailyOutputTrend != 0 ? this.multipliedByHundred(item.dailyOutputTrend) + '%' : item.dailyOutputTrend == 0 ? 0 : null
-              item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null
+              item.originalGlassStatisticsTrend = item.dailyOutputTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null
-              item.actualProductTrend = item.actualProductTrend && item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null
+              item.actualProductTrend = item.dailyOutputTrend && item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null
-              item.originalGlassPassTrend = item.originalGlassPassTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null
+              item.originalGlassPassTrend = item.dailyOutputTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null
             }
           })
         })

src/views/report/glass/weekly.vue

@@ -86,23 +86,23 @@ export default {
 				},
 			],
 		};
-  },
-  created () {
-    // this.getDict()
 	},
 	mounted() {
 		// const day = new Date().getDay()
     // console.log('周四', day)
     this.getCurrentWeekStartTimeAndEndTime()
 		// this.changeTime(new Date(new Date().getTime() - day * 24 * 60 * 60 * 1000))
+    this.getDict()
     this.getDataList()
 	},
 	methods: {
-		// async getDict() {
+		async getDict() {
-		// 	// 产线列表
+			// 产线列表
-
+			await getCorePLList().then(res => {
-
+				this.proLineList = res.data;
-    // },
+				// this.getDataList()
+			});
+    },
     getCurrentWeekStartTimeAndEndTime() {
       this.reportTime = new Date()
       var weekday = new Array(7);
@@ -187,8 +187,6 @@ export default {
     },
 		// 获取数据列表
     async getDataList() {
-      const res = await getCorePLList()
-      this.proLineList = res.data;
       this.dataListLoading = true;
       if (this.listQuery.reportTime.length == 0) {
         this.$message({
@@ -220,9 +218,9 @@ export default {
               //   item.dailyOutputTrend = null
               // }
               item.dailyOutputTrend = item.dailyOutputTrend && item.dailyOutputTrend != 0 ? this.multipliedByHundred(item.dailyOutputTrend) + '%' : item.dailyOutputTrend == 0 ? 0 : null
-              item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null
+              item.originalGlassStatisticsTrend = item.dailyOutputTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null
-              item.actualProductTrend = item.actualProductTrend && item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null
+              item.actualProductTrend = item.dailyOutputTrend && item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null
-              item.originalGlassPassTrend = item.originalGlassPassTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null
+              item.originalGlassPassTrend = item.dailyOutputTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null
             }
           })
         })

src/views/report/glass/year.vue

@@ -53,7 +53,7 @@ export default {
 		};
 	},
   created() {
-		// this.getDict()
+		this.getDict()
   },
   mounted () {
     this.getCurrentYearFirst()
@@ -98,8 +98,6 @@ export default {
     },
 		// 获取数据列表
     async getDataList() {
-      const res = await getCorePLList()
-      this.proLineList = res.data;
       this.dataListLoading = true;
       if (this.listQuery.reportTime.length == 0) {
         this.$message({
@@ -131,9 +129,9 @@ export default {
               //   item.dailyOutputTrend = null
               // }
               item.dailyOutputTrend = item.dailyOutputTrend && item.dailyOutputTrend != 0 ? this.multipliedByHundred(item.dailyOutputTrend) + '%' : item.dailyOutputTrend == 0 ? 0 : null
-              item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null
+              item.originalGlassStatisticsTrend = item.dailyOutputTrend && item.originalGlassStatisticsTrend != 0 ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : item.originalGlassStatisticsTrend == 0 ? 0 : null
-              item.actualProductTrend = item.actualProductTrend && item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null
+              item.actualProductTrend = item.dailyOutputTrend && item.actualProductTrend != 0 ? this.multipliedByHundred(item.actualProductTrend) + '%' : item.actualProductTrend == 0 ? 0 : null
-              item.originalGlassPassTrend = item.originalGlassPassTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null
+              item.originalGlassPassTrend = item.dailyOutputTrend && item.originalGlassPassTrend != 0 ? this.multipliedByHundred(item.originalGlassPassTrend) + '%' : item.originalGlassPassTrend == 0 ? 0 : null
             }
           })
         })

src/views/socialLogin.vue

@@ -83,8 +83,8 @@ export default {
       captchaEnable: true,
       loginForm: {
         loginType: "uname",
-        username: "",
+        username: "admin",
-        password: "",
+        password: "admin123",
         rememberMe: false,
         captchaVerification: "",
       },
@@ -140,12 +140,12 @@ export default {
       this.$refs.verify.show()
     },
     getCookie() {
-      // const username = getUsername();
+      const username = getUsername();
-      // const password = getPassword();
+      const password = getPassword();
       const rememberMe = getRememberMe();
       this.loginForm = {
-        username: this.loginForm.username,
+        username: username ? username : this.loginForm.username,
-        password: this.loginForm.password,
+        password: password ? password : this.loginForm.password,
         rememberMe: rememberMe ? getRememberMe() : false,
         loginType: this.loginForm.loginType,
       };