mod:设置调整

frontend/src/router/index.ts

@@ -1,3 +1,5 @@
+
+
 import { createRouter, createWebHistory, createWebHashHistory, RouteRecordRaw } from "vue-router";
 
 import { authGuard } from './plugins/authGuard'
@@ -10,7 +12,7 @@ const routes: RouteRecordRaw[] = [
     {
         path: "/home",
         name: "home",
-        component: () => import("@/views/Home/index.vue"),
+        component: () => import("@/views/Home/index_old.vue"),
         meta: {
             noAuth: true,
         },

frontend/src/views/Photography/components/editRow.vue

@@ -230,6 +230,8 @@ const saveRow = () => {
     ...editRowData.value
   });
   clientStore.ipc.on(icpList.setting.saveDeviceConfig, (event, result) => {
+    console.log('saveDeviceConfig');
+    console.log(editRowData.value);
     if (result.code == 0) {
       emit('confirm')
       ElMessage.success('保存成功');

frontend/src/views/Photography/shot.vue

@@ -66,7 +66,7 @@
         </div>
 
         <div class="last-photo" v-show="showlastPhoto" v-key="lastPhoto.file_path">
-          <div>{{lastPhtotoName[lastPhoto.image_index] || ''}}</div>
+          <div>{{lastPhoto.action_name || ''}}</div>
           <el-image  :src="getFilePath(lastPhoto.file_path)"  fit="contain" ></el-image>
         </div>
 
@@ -102,32 +102,33 @@
                 </div>
                 <div class="mar-top-10 clearfix history-item_image_wrap" style="width: 100%" >
                     <component class="history-item_image"
-                         v-loading="!image.image_path && runAction.goods_art_no == item.goods_art_no"
-                         v-for="image in item.items"
-                               :is="image.image_path ? 'div' : 'p'"
+                         v-for="image,index in item.items"
+                               v-loading="!image.PhotoRecord.image_path && runAction.goods_art_no == item.goods_art_no"
+                               :is="image.PhotoRecord.image_path ? 'div' : 'p'"
 
                     >
+                      <span class="tag">{{ image.action_name }}</span>
                       <el-popover
                           :popper-class="configInfoStore.appModel === 1  ? 'shot-image-popper' : 'koutu-image-popper'"
                           :placement=" configInfoStore.appModel === 1  ? 'left' : 'right'"
                           :hide-after="0"
                           width="50%"
                           offset="20"
-                          v-if="image.image_path"
+                          v-if="image.PhotoRecord.image_path"
                       >
                         <template #reference>
                           <div class="flex el-image_view">
-                            <el-image  :src="getFilePath(image.image_path)"  fit="contain" >
+                            <el-image  :src="getFilePath(image.PhotoRecord.image_path)"  fit="contain" >
                               <template #error>
                                 <div class="image-slot"></div>
                               </template>
                             </el-image>
-                            <el-button :disabled="runLoading || takePictureLoading" class="reset-button" @click="reTakePicture(image)">重拍</el-button>
+                            <el-button :disabled="runLoading || takePictureLoading" class="reset-button" @click="reTakePicture(image.PhotoRecord)">重拍</el-button>
                           </div>
                         </template>
 
 
-                        <el-image  :src="getFilePath(image.image_path)"  fit="contain" >
+                        <el-image  :src="getFilePath(image.PhotoRecord.image_path)"  fit="contain" >
                           <template #error>
                             <div class="image-slot"></div>
                           </template>
@@ -136,14 +137,21 @@
 
 
                       <div class="flex el-image_view"  v-else>
-                      <el-image :src="getFilePath(image.image_path)"  fit="contain">
+                      <el-image :src="getFilePath(image.PhotoRecord.image_path)"  fit="contain">
                         <template #error>
                           <div class="image-slot"></div>
-                          <el-button :disabled="runLoading || takePictureLoading" class="reset-button" @click="reTakePicture(image)">重拍</el-button>
+                          <el-button :disabled="runLoading || takePictureLoading" class="reset-button" @click="reTakePicture(image.PhotoRecord)">重拍</el-button>
                         </template>
                       </el-image>
                       </div>
                     </component>
+                    <div v-if="item.items.length < 5"
+                      v-for="item in (5 - item.items.length)"
+                         class="history-item_image"
+                    >
+                      <span class="tag" style="font-size: 12px;">暂未配置</span>
+
+                    </div>
                 </div>
               </div>
 
@@ -350,7 +358,7 @@ async function runGoods(data) {
     console.log(result);
     if(result.code !== 0 && result.msg){
       ElMessage.error(result.msg)
-   //   runLoading.value = false
+      runLoading.value = false
       return;
     }
   })
@@ -669,13 +677,6 @@ onBeforeUnmount(() => {
 * */
 const lastPhoto = ref({})
 const showlastPhoto = ref(false)
-const lastPhtotoName = ref({
-  0:"俯视图",
-  1:"侧视图",
-  2:"后视图",
-  3:"鞋底",
-  4:"内里",
-})
 const  getLastPhotoRecord = async ()=>{
 
   return;
@@ -719,7 +720,8 @@ clientStore.ipc.on(icpList.socket.message + '_run_mcu_update', (event, result) =
           if(item.goods_art_no === result.data?.goods_art_no){
             console.log('========item');
             console.log(item);
-            item.items[result.data.image_index].image_path = result.data?.file_path
+            item.items[result.data.image_index].PhotoRecord.image_path = result.data?.file_path
+            result.data.action_name =  item.items[result.data.image_index].action_name
             console.log(item);
             console.log( goodsList.value);
           }
@@ -1227,7 +1229,7 @@ function openPhotographyDetail() {
               border-bottom: 1px solid #CCCCCC;
             }
             .history-item_image {
-              &::before{
+              .tag {
                 color: #bbb;
                 position: absolute;
                 left: 0;
@@ -1237,7 +1239,7 @@ function openPhotographyDetail() {
                 line-height: 30px;
               }
 
-              &:nth-child(1)::before{
+             /* &:nth-child(1)::before{
                 content:"俯视图";
               }
               &:nth-child(2)::before{
@@ -1251,7 +1253,7 @@ function openPhotographyDetail() {
               }
               &:nth-child(5)::before{
                 content:"内里";
-              }
+              }*/
 
               position: relative;
               width: 70px;

frontend/src/views/Setting/components/action_config.vue

@@ -145,8 +145,8 @@ const getList = () => {
     console.log(result)
     if (result.code == 0) {
       tableData.value = result.data.list;
-      const calibration =  result.data.list.filter(item=>(item.is_system && item.action_name === '侧视'))
-      if(calibration.length === 1){
+      const calibration =  result.data.list.filter(item=>(item.action_name === '侧视'))
+      if(calibration.length >= 1){
         calibrationId.value = calibration[0].id
       }else{