Browse Source

开始处理

kongwenhao 8 months ago
parent
commit
2f3a444ef8

+ 9 - 1
frontend/src/styles/index.scss

@@ -10,8 +10,16 @@
   border-radius: 4px;
   &.disabled{
     pointer-events:none;
-    opacity: .6;
+    background: #909399 !important;
+    cursor: not-allowed;
   }
+
+  &.is-disabled{
+    pointer-events:none;
+    background: #909399 !important;
+    cursor: not-allowed;
+  }
+
 }
 
 .button--white{

+ 2 - 2
frontend/src/views/Photography/components/LoadingDialog.vue

@@ -28,7 +28,7 @@
         class="action-button   button--primary1  mar-top-20"
         @click="handleButtonClick"
       >
-        {{ buttonText }}
+        {{ buttonText }} 
       </el-button>
     </div>
   </el-dialog>
@@ -48,7 +48,7 @@ interface Props {
 const props = withDefaults(defineProps<Props>(), {
   progress: 0,
   message: '正在为您处理,请稍后',
-  showButton: false,
+  showButton: true,
   buttonText: '全部处理完毕,点击打开最终图片目录'
 })
 

+ 21 - 16
frontend/src/views/Photography/seniorDetail.vue

@@ -1,16 +1,16 @@
 <template>
   <div class="image-config">
     <div class="config-card">
-      <!-- 图片图与货号图生成 -->
+      <!-- 图片图与货号图生成 -->
       <div class="section">
         <div class="section-title">
           <img src="@/assets/images/Photography/zhuangshi.png" style="width: 32px; height: 32px;" />
-          图片图与货号图生成
+          图片图与货号图生成
         </div>
         <div class="section-content">
 
 
-          <div class="instruction-out flex top left">
+          <div v-if="showTips" class="instruction-out flex top left">
             <img style="fill: #000" src="@/assets/images/xinxi.svg" />
             <ol class="instruction-list">
               <li>请在下方确认图片拍摄过程中的顺序,确保所有拍摄的图片的顺序一致。</li>
@@ -18,7 +18,7 @@
               <li>图片的名称不能随意修改,否则无法正常生成详情页。</li>
               <li>现有图片名称有:俯视、侧视、后视、鞋底、内里</li>
             </ol>
-            <el-icon class="close-icon">
+            <el-icon @click="showTips = false" class="close-icon">
               <Close />
             </el-icon>
           </div>
@@ -41,12 +41,12 @@
             </div>
           </div>
 
-          <!-- 图模式 -->
+          <!-- 图模式 -->
           <div class="form-item">
             <div class="label">抠图模式:</div>
             <el-radio-group v-model="reportMode">
               <el-radio label="normal">普通模式</el-radio>
-              <el-radio label="optimized">精细化图</el-radio>
+              <el-radio label="optimized">精细化图</el-radio>
             </el-radio-group>
           </div>
         </div>
@@ -113,22 +113,24 @@ import client from "@/stores/modules/client";
 import icpList from '@/utils/ipc'
 const clientStore = client();
 
-const folderPath = ref('')
-const reportMode = ref('normal')
-const checkSimilar = ref(false)
-const specificPage = ref('')
-const imageOrder = ref('俯视、侧视、后跟、鞋底、内里、组合、组合2、组合3')
+const showTips = ref(true)
+
+const folderPath = ref('') //货号文件夹
+const reportMode = ref('normal') // 抠图模式
+const imageOrder = ref('俯视、侧视、后跟、鞋底、内里、组合、组合2、组合3') // 图片顺序
+const checkSimilar = ref(false) // 同款检验
+const specificPage = ref('')  // 可指定页面独修改
 
 
 const dialogVisible = ref(false)
 const progress = ref(0)
 const message = ref('正在为您处理,请稍后')
-const showButton = ref(false)
+const showButton = ref(true)
+
 const startProcess = () => {
   dialogVisible.value = true
   progress.value = 0
-  showButton.value = false
-
+  showButton.value = true
   // 模拟进度更新
   const interval = setInterval(() => {
     if (progress.value < 100) {
@@ -136,7 +138,7 @@ const startProcess = () => {
     } else {
       clearInterval(interval)
       message.value = '全部处理完毕'
-      showButton.value = true
+      showButton.value = false
     }
   }, 500)
 }
@@ -164,6 +166,7 @@ const selectFolder = () => {
   .config-card {
     background: #EAECED;
     padding: 20px;
+    overflow: hidden;
 
     .card-header {
       display: flex;
@@ -205,6 +208,8 @@ const selectFolder = () => {
     .instruction-list {
       margin: 0px 0 0 10px;
       padding-left: 20px;
+      padding-right: 40px;
+      width: 100%;
 
       li {
         margin-bottom: 4px;
@@ -215,7 +220,7 @@ const selectFolder = () => {
 
     .close-icon {
       position: absolute;
-      top: 19px;
+      top: 12px;
       right: 19px;
     }
   }