bug修改

src/App.vue

@@ -22,7 +22,7 @@ const setDefaultTheme = () => {
   }
   appStore.setIsDark(isDarkTheme)
 }
-setDefaultTheme()
+// setDefaultTheme()
 </script>
 <template>
   <ConfigGlobal :size="currentSize">
@@ -54,13 +54,13 @@ body {
 .#{$prefix-cls}-grey-mode {
   filter: grayscale(100%);
 }
-.indexpage-custom-message-style{
+.indexpage-custom-message-style {
   // padding: 0 !important;
-  background: #C60606;
+  background: #c60606;
   border: none;
-  padding: 9px 20px!important;
+  padding: 9px 20px !important;
-  .el-message-icon--info{
+  .el-message-icon--info {
-    color: #ffffff!important;
+    color: #ffffff !important;
   }
 }
 </style>

src/store/modules/app.ts

@@ -66,7 +66,8 @@ export const useAppStore = defineStore('app', {
       greyMode: false, // 是否开始灰色模式，用于特殊悼念日
       fixedMenu: wsCache.get('fixedMenu') || false, // 是否固定菜单
       layout: wsCache.get(CACHE_KEY.LAYOUT) || 'classic', // layout布局
-      isDark: wsCache.get(CACHE_KEY.IS_DARK) || false, // 是否是暗黑模式
+      // isDark: wsCache.get(CACHE_KEY.IS_DARK) || false, // 是否是暗黑模式
+      isDark: false, // 是否是暗黑模式
       currentSize: wsCache.get('default') || 'default', // 组件尺寸
       theme: wsCache.get(CACHE_KEY.THEME) || {
         // 主题色

src/views/mapPage/realTimeMap/components/storeDialog.vue

@@ -8,14 +8,39 @@
           v-for="(item, index) in storeData"
           :key="index"
           :style="{
-            background: item.locationUseStatus == 1 ? '#F1CD0B' : '#4DC606',
+            background: item.locationUseStatus == 1 ? '#4DC606' : '#F1BE0B',
             border: selectIndex == index ? '2px solid #00329F' : '2px solid rgba(0,0,0,0)'
           }"
         >
+          <!-- 是否锁定 -->
+          <el-tooltip class="box-item" effect="light" content="已锁定" placement="top">
+            <el-icon class="lock-icon" color="#ce1126" size="22" v-if="item.locationLock === 0">
+              <Lock />
+            </el-icon>
+          </el-tooltip>
+
+          <!-- 是否禁用 -->
+          <el-tooltip content="已禁用" placement="top" effect="light">
+            <el-icon class="enable-icon" color="#ce1126" size="22" v-if="item.locationEnable === 0">
+              <WarnTriangleFilled />
+            </el-icon>
+          </el-tooltip>
+
+          <!-- 是否占用 -->
+          <el-tooltip content="已占用" placement="top" effect="light">
+            <el-icon
+              class="occupation-icon"
+              color="#ce1126"
+              size="22"
+              v-if="item.locationUseStatus === 1"
+            >
+              <RemoveFilled />
+            </el-icon>
+          </el-tooltip>
+
           {{ item.locationNo || '--' }}
         </div>
       </div>
-      <div>
       <el-form :model="formData" label-width="auto" ref="formRef" :rules="formRules">
         <el-form-item label="库位编号">
           <el-input v-model="formData.locationNo" :disabled="true" />
@@ -40,7 +65,6 @@
         </el-form-item>
       </el-form>
     </div>
-    </div>
 
     <template #footer>
       <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -120,79 +144,27 @@ const resetForm = () => {
 </script>
 
 <style lang="scss" scoped>
-.task-tips {
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-}
-
-.el-select-dropdown__loading {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  height: 100px;
-  font-size: 20px;
-}
-
-.circular {
-  display: inline;
-  height: 30px;
-  width: 30px;
-  animation: loading-rotate 2s linear infinite;
-}
-.path {
-  animation: loading-dash 1.5s ease-in-out infinite;
-  stroke-dasharray: 90, 150;
-  stroke-dashoffset: 0;
-  stroke-width: 2;
-  stroke: var(--el-color-primary);
-  stroke-linecap: round;
-}
-
-@keyframes loading-rotate {
-  to {
-    transform: rotate(360deg);
-  }
-}
-@keyframes loading-dash {
-  0% {
-    stroke-dasharray: 1, 200;
-    stroke-dashoffset: 0;
-  }
-  50% {
-    stroke-dasharray: 90, 150;
-    stroke-dashoffset: -40px;
-  }
-  100% {
-    stroke-dasharray: 90, 150;
-    stroke-dashoffset: -120px;
-  }
-}
-@keyframes custom-spin-move {
-  to {
-    opacity: 1;
-  }
-}
 .store-dialog {
   display: flex;
   align-items: flex-end;
 }
 .store-dialog-left {
-  margin-right: 24px;
+  margin-right: 40px;
+  margin-bottom: 18px;
   flex-shrink: 0;
 
   .store-dialog-left-item {
-    width: 132px;
+    width: 230px;
-    height: 50px;
+    height: 56px;
+    line-height: 56px;
     text-align: center;
-    margin-top: 1px;
+    margin-top: 3px;
     font-family:
       PingFangSC,
       PingFang SC;
     font-weight: 500;
     font-size: 18px;
     color: #0d162a;
-    vertical-align: middle;
     cursor: pointer;
     border: 1px solid rgba(0, 0, 0, 0);
     position: relative;
@@ -205,5 +177,23 @@ const resetForm = () => {
     overflow: hidden;
     text-overflow: ellipsis;
   }
+
+  .lock-icon {
+    position: absolute;
+    top: 0;
+    left: 0;
+  }
+
+  .enable-icon {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+  }
+
+  .occupation-icon {
+    position: absolute;
+    top: 0;
+    right: 0;
+  }
 }
 </style>

src/views/mapPage/taskManagement/createTask.vue

@@ -5,14 +5,14 @@
         <span class="title">发起任务</span>
         <div>
           <el-button :icon="RefreshRight" @click="resetFormData">重置</el-button>
-          <el-button type="primary" :icon="Position" @click="submit" :disabled="formLoading"
+          <el-button type="primary" :icon="Position" @click="submitForm" :disabled="formLoading"
             >确认</el-button
           >
         </div>
       </div>
     </ContentWrap>
 
-    <el-form :model="formData" label-width="94" ref="formRef">
+    <el-form :model="formData" label-width="94" ref="taskFormRef">
       <el-card shadow="never">
         <template #header>
           <div class="card-header">
@@ -819,7 +819,7 @@ const resetFormData = () => {
     taskNo: undefined //	任务号
   }
   getTaskNo()
-  formRef.value?.resetFields()
+  taskFormRef.value?.resetFields()
 }
 
 //获取任务号
@@ -1089,25 +1089,24 @@ const chooseCarErrorMsg = (e) => {
 }
 
 //提交表单
-const formRef = ref()
+const taskFormRef = ref()
 const formLoading = ref(false)
 
-const submit = async () => {
+const submitForm = async () => {
-  await formRef.value.validate(async (valid, fields) => {
+  let valid = await taskFormRef.value.validate()
   if (valid) {
     formLoading.value = true
     try {
       await MapTaskAPi.createTask(formData.value)
       message.success(t('common.createSuccess'))
-        resetFormData()
       push({ name: 'taskManagementTaskList' })
+      resetFormData()
     } finally {
       formLoading.value = false
     }
   } else {
     message.warning('请补充完整表单信息！')
   }
-  })
 }
 
 //打卡地图选择放货和取货位置