bug

src/App.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: Do not edit
  * @Date: 2023-12-27 16:41:40
- * @LastEditTime: 2024-01-07 22:29:50
+ * @LastEditTime: 2024-02-18 09:26:27
  * @LastEditors: DY
  * @Description:
 -->
@@ -31,18 +31,6 @@ export default {
   -moz-osx-font-smoothing: grayscale;
   text-align: center;
   color: #2c3e50;
-}
+  margin: 0;
-
-nav {
-  padding: 30px;
-
-  a {
-    font-weight: bold;
-    color: #2c3e50;
-
-    &.router-link-exact-active {
-      color: #42b983;
-    }
-  }
 }
 </style>

src/main.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-12-27 16:41:40
- * @LastEditTime: 2024-01-09 17:50:38
+ * @LastEditTime: 2024-03-28 10:45:26
  * @LastEditors: DY
  * @Description:
  */

src/views/Login.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: Do not edit
  * @Date: 2023-12-28 11:21:53
- * @LastEditTime: 2024-01-29 17:57:32
+ * @LastEditTime: 2024-01-31 10:38:46
  * @LastEditors: DY
  * @Description: 登陆
 -->
@@ -195,6 +195,8 @@ export default {
           this.$router.push({
             path: 'home'
           })
+        } else {
+          this.$message.error(res.data.msg)
         }
       })
     }

src/views/Quality.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: Do not edit
  * @Date: 2024-01-09 13:48:42
- * @LastEditTime: 2024-01-30 16:23:17
+ * @LastEditTime: 2024-03-28 11:13:01
  * @LastEditors: DY
  * @Description:
 -->
@@ -54,6 +54,10 @@
         </van-col>
       </van-row>
     </div>
+    <!-- <div class="ext"></div> -->
+    <!-- <el-backtop target=".quality" :visibility-height="10" :bottom="10">
+      <i class="el-icon-caret-top" />
+    </el-backtop> -->
   </div>
 </template>
 
@@ -89,7 +93,13 @@ export default {
         checkTime: formattedTime
       }).then(res => {
         if (res.data.code === 0) {
-          this.$set(value, 'active', true)
+          this.typeList.forEach(element => {
+            element.forEach(el => {
+              el.active = false
+            })
+          })
+          value.active = true
+          // this.$set(value, 'active', true)
           value.count++
           this.count++
         }
@@ -113,8 +123,7 @@ export default {
     },
     getLine () {
       authList({ userId: getUserId() }).then(res => {
-        console.log('res', res.data.data)
+        if (res && res?.data?.data?.datas?.length > 0) {
-        if (res && res.data.data.datas.length > 0) {
           this.lineArray = res.data.data.datas.map(item => {
             item.text = item.name
             item.value = item.id
@@ -172,7 +181,7 @@ export default {
   width: 226px;
   line-height: 72px;
   box-shadow: 5px 6px 8px 0px rgba(206,212,226,0.72), inset 6px 0px 6px 0px #FFFFFF;
-  background-color: #276BFF;
+  background-color: #456DFF;
 }
 .rightDiv {
   border-radius: 7px;
@@ -205,9 +214,10 @@ export default {
 }
 .leftDiv {
   border-radius: 7px 36px 36px 7px;
-  background-color: #276BFF;
+  background-color: #456DFF;
   height: 72px;
   width: 77px;
+  color: white;
   line-height: 72px;
   /* margin: 5px 0 5px 0; */
 }
@@ -251,9 +261,11 @@ export default {
 }
 .quality {
   background-image: url('./../assets/quality-bg.png');
-  min-height: 100vh;
+  background-size: cover;
+  height: 100vh;
   width: 100vw;
   padding: 20px 20px;
+  overflow: auto;
   box-sizing: border-box;
 }
 </style>

src/views/Scrap.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: Do not edit
  * @Date: 2024-01-09 13:49:03
- * @LastEditTime: 2024-01-30 14:59:42
+ * @LastEditTime: 2024-03-29 08:46:18
  * @LastEditors: DY
  * @Description:
 -->
@@ -26,6 +26,10 @@
         <el-col :span="12">
           <div class="whiteForm">
             <el-form-item label="工单选择" prop="workOrderId">
+              <div slot="label" class="labelDiv">
+                <img class="formLabelIcon" src="./../assets/form1.png" alt="">
+                工单选择
+              </div>
               <el-select v-model="ruleForm.workOrderId" filterable clearable @focus="focusInput($event)" placeholder="请选择工单" style="width: 100%; display: block">
                 <el-option v-for="(item, index) in workOrderList" :key="index" :label="item.name" :value="item.id"></el-option>
               </el-select>
@@ -35,7 +39,11 @@
         <el-col :span="12">
           <div class="whiteForm">
             <el-form-item label="报废数量" prop="num">
-              <el-input v-model="ruleForm.num" @focus="show = true" controls-position="right" :min="0" style="width: 100%; display: block"></el-input>
+              <div slot="label" class="labelDiv">
+                <img class="formLabelIcon" src="./../assets/form2.png" alt="">
+                报废数量
+              </div>
+              <el-input v-model="ruleForm.num" @focus="showNumber" clearable controls-position="right" :min="0" placeholder="请输入报废数量" style="width: 100%; display: block"></el-input>
             </el-form-item>
           </div>
         </el-col>
@@ -48,6 +56,10 @@
         @delete="onDelete"
       />
       <el-form-item label="报废原因" prop="detName" class="reson">
+        <div slot="label" class="labelDiv">
+          <img class="formLabelIcon" src="./../assets/form3.png" alt="">
+          报废原因
+        </div>
         <br>
         <div class="resonDiv">
           <el-checkbox-group v-model="ruleForm.detName" style="width: 100%; display: block; text-align: left">
@@ -59,6 +71,10 @@
         <el-col :span="12">
           <div class="whiteForm">
             <el-form-item label="产线" prop="lineId">
+              <div slot="label" class="labelDiv">
+                <img class="formLabelIcon" src="./../assets/form4.png" alt="">
+                产线
+              </div>
               <el-select v-model="ruleForm.lineId" filterable clearable placeholder="请选择产线" @focus="focusInput1($event)" style="width: 100%; display: block" @change="getSection">
                 <el-option v-for="(item, index) in lineArray" :key="index" :label="item.name" :value="item.id"></el-option>
               </el-select>
@@ -68,6 +84,10 @@
         <el-col :span="12">
           <div class="whiteForm">
             <el-form-item label="工段" prop="sectionId">
+              <div slot="label" class="labelDiv">
+                <img class="formLabelIcon" src="./../assets/form5.png" alt="">
+                工段
+              </div>
               <el-select v-model="ruleForm.sectionId" filterable clearable placeholder="请选择产线" @focus="focusInput2($event)" style="width: 100%; display: block">
                 <el-option v-for="(item, index) in sectionArray" :key="index" :label="item.name" :value="item.id"></el-option>
               </el-select>
@@ -79,14 +99,28 @@
         <el-col :span="12">
           <div class="whiteForm">
             <el-form-item label="时间" prop="logTime">
-              <el-date-picker type="datetime" placeholder="选择日期" value-format="timestamp" v-model="ruleForm.logTime" style="width: 100%;"></el-date-picker>
+              <div slot="label" class="labelDiv">
+                <img class="formLabelIcon" src="./../assets/form6.png" alt="">
+                时间
+              </div>
+              <div class="timeDiv">
+                <el-date-picker type="datetime" placeholder="选择日期" value-format="timestamp" v-model="ruleForm.logTime" style="width: 100%;">
+                </el-date-picker>
+                <div style="margin-right: 10px" @click="refresh">
+                  <i class="el-icon-refresh-right" />
+                </div>
+              </div>
             </el-form-item>
           </div>
         </el-col>
         <el-col :span="12">
           <div class="whiteForm">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="ruleForm.remark" @focus="focusInput3($event)"></el-input>
+              <div slot="label" class="labelDiv">
+                <img class="formLabelIcon" src="./../assets/form7.png" alt="">
+                备注
+              </div>
+              <el-input v-model="ruleForm.remark" @focus="focusInput3($event)" placeholder="请输入备注"></el-input>
               <!-- <el-date-picker type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss" v-model="ruleForm.logTime" style="width: 100%;"></el-date-picker> -->
             </el-form-item>
           </div>
@@ -95,7 +129,8 @@
       <el-row>
         <el-form-item>
           <!-- <el-button @click="resetForm('ruleForm')">取消</el-button> -->
-          <el-button class="subButton" :disabled="disabled" type="primary" @click="submitForm('ruleForm')">提交</el-button>
+          <!-- <el-button :disabled="disabled" type="primary" @click="submitForm('ruleForm')"> <i class="el-icon-sub"></i>11</el-button> -->
+          <el-button class="subButton" icon="el-icon-circle-check" :disabled="disabled" type="primary" @click="submitForm('ruleForm')">提交</el-button>
         </el-form-item>
       </el-row>
     </el-form>
@@ -182,6 +217,7 @@ export default {
       scrapList: [],
       sectionArray: [],
       disabled: true,
+      subIconUrl: require('@/assets/sub-right.png'),
       rules: {
         // workOrderId: [
         //   { required: true, message: '请选择工单', trigger: 'change' }
@@ -257,6 +293,9 @@ export default {
     }
   },
   methods: {
+    refresh () {
+      this.ruleForm.logTime = new Date().getTime()
+    },
     getSection (value) {
       const temp = this.lineArray.filter(item => {
         return item.id === value
@@ -274,6 +313,13 @@ export default {
     inputFun () {
       this.$emit('input')
     },
+    showNumber () {
+      this.show = true
+      this.simpleShow = false
+      this.simpleShow1 = false
+      this.simpleShow2 = false
+      this.simpleShow3 = false
+    },
     focusInput (e) {
       this.inputEle = e.srcElement
       // 关闭所有keyboard
@@ -288,6 +334,7 @@ export default {
       this.simpleShow1 = false
       this.simpleShow2 = false
       this.simpleShow3 = false
+      this.show = false
       // this.$emit('focus')
     },
     focusInput1 (e) {
@@ -296,6 +343,7 @@ export default {
       this.simpleShow = false
       this.simpleShow2 = false
       this.simpleShow3 = false
+      this.show = false
     },
     focusInput2 (e) {
       this.inputEle2 = e.srcElement
@@ -303,6 +351,7 @@ export default {
       this.simpleShow1 = false
       this.simpleShow = false
       this.simpleShow3 = false
+      this.show = false
     },
     focusInput3 (e) {
       this.inputEle3 = e.srcElement
@@ -310,6 +359,7 @@ export default {
       this.simpleShow2 = false
       this.simpleShow1 = false
       this.simpleShow = false
+      this.show = false
     },
     onChange1 (input) {
       this.inputValue1 = input
@@ -349,7 +399,6 @@ export default {
       console.log('onKeyPress', button)
     },
     onInput (value) {
-      // Toast(value);
       console.log('value', value, this.ruleForm.num)
     },
     onDelete () {
@@ -373,8 +422,8 @@ export default {
       //   })
       // })
       await authList({ userId: getUserId() }).then(res => {
-        console.log('res', res.data.data)
+        // console.log('res', res.data.data)
-        if (res && res.data.data.datas.length > 0) {
+        if (res && res?.data?.data?.datas.length > 0) {
           this.lineArray = res.data.data.datas
           this.ruleForm.lineId = this.lineArray[0].id
           this.getSection(this.ruleForm.lineId)
@@ -403,6 +452,8 @@ export default {
               this.$router.push({
                 path: 'list'
               })
+            } else {
+              this.$message.error(res.data.msg)
             }
           })
         } else {
@@ -419,22 +470,42 @@ export default {
 </script>
 
 <style>
+.labelDiv {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100px;
+}
+.formLabelIcon {
+  width: 17px;
+  height: 17px;
+  margin-right: 8px;
+}
+.timeDiv {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+}
 .subButton {
   background-color: #456DFF;
   width: 168px;
   height: 56px;
   box-shadow: 0px 16px 16px 0px rgba(25,70,170,0.31);
   border-radius: 31px;
+  font-size: 20px;
+  text-align: center;
 }
 .el-checkbox {
   background: #EDF0FD;
   box-shadow: 0px 6px 8px 0px #D2D9E8, inset 0px 6px 6px 0px #FFFFFF;
-  width: 216px;
+  width: 206px;
   height: 56px;
   border-radius: 7px;
   line-height: 56px;
   padding: 5px;
   box-sizing: border-box;
+  margin-bottom: 8px;
 }
 .reson {
   background-color: #FFFFFF;
@@ -484,6 +555,7 @@ export default {
 }
 .scrap {
   background-image: url('./../assets/quality-bg.png');
+  background-size: cover;
   height: 100vh;
   width: 100vw;
   padding: 20px 24px;

src/views/ScrapList.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: Do not edit
  * @Date: 2023-12-29 10:01:55
- * @LastEditTime: 2024-01-30 14:42:15
+ * @LastEditTime: 2024-03-28 09:07:41
  * @LastEditors: DY
  * @Description: 报废列表
 -->
@@ -24,6 +24,7 @@
     border
     :header-cell-style="{ background: 'rgba(210, 220, 242, 1)', color: '#000', height: '33px' }"
     show-header
+    max-height="600"
     style="width: 100%">
       <el-table-column
       type="index" label="序号" width="60" />
@@ -107,7 +108,7 @@ export default {
     },
     getList () {
       scrapLogList(this.listQuery).then(res => {
-        if (res.data.code === 0) {
+        if (res && res?.data?.code === 0) {
           this.tableData = res.data.data.list.map(item => {
             item.sources = item.source === 1 ? '平板端' : '网页端'
             item.scrapTime = parseTime(item.logTime)
@@ -140,12 +141,14 @@ export default {
   background-color: #a76c6c; /* 奇数行背景颜色 */
 }
 .pagination {
-  margin-top: 10px;
+  margin-top: 15px;
   float: right;
 }
 .list {
   background-image: url('./../assets/quality-bg.png');
-  height: 100vh;
+  background-repeat: no-repeat;
+  background-size: cover;
+  min-height: 100vh;
   width: 100vw;
   padding: 20px 24px;
   box-sizing: border-box;