feature/1.增加触摸提示开关2.按效果优化界面

.env.development

@@ -11,7 +11,7 @@ VITE_APP_BASE_API = '/dev-api'
 VITE_APP_UPLOAD_URL = 'http://192.168.101.4:9000'
 
 # 开发接口地址
-VITE_APP_API_URL = 'http://121.41.179.41:8079'
+VITE_APP_API_URL = 'http://192.168.101.4:8079'
 # Websocket地址
 VITE_WEBSOCKET_URL = 'ws://192.168.101.4:8079'
 ``

src/App.vue

@@ -11,7 +11,7 @@
     </el-watermark>
     <!-- 关闭水印 -->
     <router-view v-else />
-    <Waves />
+    <Waves v-if="userStore.user.notice" />
   </el-config-provider>
 </template>
 
@@ -19,7 +19,9 @@
 import { useAppStore, useSettingsStore } from "@/store";
 import defaultSettings from "@/settings";
 import { ThemeEnum } from "@/enums/ThemeEnum";
+import { useUserStore } from "@/store";
 
+const userStore = useUserStore();
 const appStore = useAppStore();
 const settingsStore = useSettingsStore();
 const locale = computed(() => appStore.locale);

src/api/user/types.ts

@@ -12,6 +12,7 @@ export interface UserInfo {
   perms: string[];
   deptId?: string;
   stationType?: string;
+  notice?: boolean;
 }
 
 /**

src/layout/components/header.vue

@@ -57,6 +57,9 @@
               <!--              <el-dropdown-item command="a">Action 1</el-dropdown-item>-->
               <el-dropdown-item command="b">退出登录</el-dropdown-item>
               <!--              <el-dropdown-item command="c" divided>Action 3</el-dropdown-item>-->
+              <el-dropdown-item command="c"
+                >{{ notice ? "关闭" : "打开" }}触摸提示</el-dropdown-item
+              >
             </el-dropdown-menu>
           </template>
         </el-dropdown>
@@ -79,7 +82,7 @@ const route = useRoute();
 const routeMeta = computed(() => {
   return route.meta;
 });
-
+const notice = ref(true);
 const dropdown1 = ref<DropdownInstance>();
 
 const date = dayjs().format("YYYY-MM-DD");
@@ -93,6 +96,16 @@ const headUrl = ref("");
 let timer: any = -1;
 
 onMounted(() => {
+  //获取触摸提示
+  //@ts-ignore
+  if (localStorage.getItem("notice") == true) {
+    notice.value = true;
+  } else {
+    notice.value = false;
+  }
+  //@ts-ignore
+  localStorage.setItem("notice", notice.value);
+  userStore.user.notice = notice.value;
   timer = setInterval(() => {
     time.value = dayjs().format("HH:mm:ss");
   }, 1000);
@@ -120,6 +133,12 @@ const handleCommand = (command: string | number | object) => {
       location.reload();
     });
   }
+  if (command === "c") {
+    notice.value = !notice.value;
+    localStorage.setItem("notice", notice.value);
+    userStore.user.notice = notice.value;
+    ElMessage.success("设置成功！");
+  }
 };
 </script>
 

src/store/modules/user.ts

@@ -12,6 +12,7 @@ export const useUserStore = defineStore(
     const user = ref<UserInfo>({
       roles: [],
       perms: [],
+      notice: true,
     });
 
     const isGetAuth = ref(false); //是否已经请求过auth接口活的role和menus了

src/styles/index.scss

@@ -3,7 +3,16 @@
 .app-container {
   padding: 10px;
 }
-
+.el-button-big {
+  height: 80px !important;
+  border-radius: 40px !important;
+  font-size: $f24 !important;
+}
+.el-button-update {
+  height: 80px !important;
+  border-radius: 16px !important;
+  font-size: $f24 !important;
+}
 .search-container {
   padding: 18px 0 0 10px;
   margin-bottom: 10px;

src/views/material-flow/creatTask.vue

@@ -94,7 +94,7 @@
             </div>
           </el-scrollbar>
         </div>
-        <el-button class="sureBtn" type="primary" @click="createTask"
+        <el-button class="sureBtn el-button-big" type="primary" @click="createTask"
           >创建任务
         </el-button>
       </el-col>
@@ -347,6 +347,7 @@ const createTask = () => {
   border-radius: 76px 76px 76px 76px;
   width: 100%;
   margin-top: 10px;
+  font-size: $f24;
 }
 
 .number {

src/views/pro-operation/appoint-out/applyFor.vue

@@ -98,8 +98,13 @@
         </el-form-item>
       </el-form>
       <div class="bottom-btns">
-        <el-button class="cancelBtn" @click="cancelClick">重置</el-button>
-        <el-button class="sureBtn" type="primary" @click="confirmClick"
+        <el-button class="cancelBtn el-button-big" @click="cancelClick"
+          >重置</el-button
+        >
+        <el-button
+          class="sureBtn el-button-big"
+          type="primary"
+          @click="confirmClick"
           >发起申请
         </el-button>
       </div>
@@ -180,6 +185,9 @@ const confirmClick = () => {
 </script>
 
 <style lang="scss" scoped>
+:deep(.el-form-item__label) {
+  font-size: $f20;
+}
 #drawContent {
   width: 100%;
   //:deep(.el-form--large.el-form--label-top .el-form-item .el-form-item__label) {

src/views/pro-operation/report-work/index.vue

@@ -84,10 +84,12 @@
     </template>
     <template #footer>
       <div class="bottom-btns">
-        <el-button class="cancelBtn" @click="cancelClick">取消</el-button>
+        <el-button class="cancelBtn el-button-big" @click="cancelClick"
+          >取消</el-button
+        >
         <el-button
           v-if="!formDisabled"
-          class="sureBtn"
+          class="sureBtn el-button-big"
           type="primary"
           @click="confirmClick"
           >报工

src/views/process/components/operate.vue

@@ -3,7 +3,7 @@
   <div class="body">
     <ScanCode />
     <div class="btnBox">
-      <el-button class="btn" color="#0A59F7" round @click="call">
+      <el-button class="btn el-button-big" color="#0A59F7" round @click="call">
         <span class="btnText">叫料</span>
       </el-button>
     </div>

src/views/process/components/scanCode.vue

@@ -56,9 +56,11 @@ const toProSteps = () => {
   getScanData();
 };
 const getScanData = async () => {
+  const value = inputValue.value;
+  inputValue.value = "";
   const { code, data, msg } = await getScan({
     operationId: Number(store.odersData.operationId),
-    qrCode: inputValue.value,
+    qrCode: value,
     workOrderCode: store.odersData.workOrderCode,
     //stationId暂时随便传一个
     stationId: 1,

src/views/process/popUpView/checkPop.vue

@@ -5,12 +5,20 @@
       <div class="title describeText">(需填完后开工)</div>
       <el-scrollbar class="listBody">
         <el-form ref="formRef" :model="checkListArray" label-width="aotu">
-          <div class="item" v-for="(item, index) in checkListArray.array" :key="item.key">
-            <el-form-item :label="`${index + 1}.` + item.deviceName + '-' + item.deviceNo" :rules="{
-              required: true,
-              message: '该选项为必选',
-              trigger: 'change',
-            }" :prop="'array.' + index + '.result'">
+          <div
+            class="item"
+            v-for="(item, index) in checkListArray.array"
+            :key="item.key"
+          >
+            <el-form-item
+              :label="`${index + 1}.` + item.deviceName + '-' + item.deviceNo"
+              :rules="{
+                required: true,
+                message: '该选项为必选',
+                trigger: 'change',
+              }"
+              :prop="'array.' + index + '.result'"
+            >
               <div class="showInfo">
                 <span class="remark">&nbsp;( {{ item.showremark }} ) :</span>
                 <el-radio-group v-model="item.result">
@@ -19,12 +27,23 @@
                 </el-radio-group>
               </div>
             </el-form-item>
-            <el-input v-if="item.result == 1" v-model="item.remark" type="textarea" placeholder="请输入异常原因" />
+            <el-input
+              v-if="item.result == 1"
+              v-model="item.remark"
+              type="textarea"
+              placeholder="请输入异常原因"
+            />
           </div>
         </el-form>
       </el-scrollbar>
       <div class="btns">
-        <el-button size="large" type="primary" @click="validate" class="titleText">提交
+        <el-button
+          size="large"
+          type="primary"
+          @click="validate"
+          class="titleText el-button-update"
+          style="width: 292px"
+          >提 交
         </el-button>
       </div>
     </div>