bill 1 рік тому
батько
коміт
340f010039
2 змінених файлів з 33 додано та 9 видалено
  1. 24 0
      pnpm-lock.yaml
  2. 9 9
      src/view/vrmodel/modelContent.vue

+ 24 - 0
pnpm-lock.yaml

@@ -6,6 +6,7 @@ specifiers:
   '@types/node': ^20.4.5
   '@types/qs': ^6.9.7
   '@vitejs/plugin-vue': ^4.2.3
+  '@vueuse/router': ^10.11.0
   axios: ^1.4.0
   echarts: ^5.4.3
   element-plus: ^2.3.8
@@ -31,6 +32,7 @@ dependencies:
   '@amap/amap-jsapi-loader': 1.0.1
   '@element-plus/icons-vue': 2.3.1_vue@3.4.31
   '@types/qs': 6.9.15
+  '@vueuse/router': 10.11.0_t6yugvvfk3qpnriubpgidwndjm
   axios: 1.7.2
   echarts: 5.5.1
   element-plus: 2.7.6_vue@3.4.31
@@ -521,6 +523,28 @@ packages:
     resolution: {integrity: sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==}
     dev: false
 
+  /@vueuse/router/10.11.0_t6yugvvfk3qpnriubpgidwndjm:
+    resolution: {integrity: sha512-1U4DiJuRhe3JeUXxuoKM2wlBslqu5ug8yraluD9bgWDHCRDtY9XUDsjViZufMKjQrddqvv2H6DRSRf9MWO4VSA==}
+    peerDependencies:
+      vue-router: '>=4.0.0-rc.1'
+    dependencies:
+      '@vueuse/shared': 10.11.0_vue@3.4.31
+      vue-demi: 0.14.8_vue@3.4.31
+      vue-router: 4.4.0_vue@3.4.31
+    transitivePeerDependencies:
+      - '@vue/composition-api'
+      - vue
+    dev: false
+
+  /@vueuse/shared/10.11.0_vue@3.4.31:
+    resolution: {integrity: sha512-fyNoIXEq3PfX1L3NkNhtVQUSRtqYwJtJg+Bp9rIzculIZWHTkKSysujrOk2J+NrRulLTQH9+3gGSfYLWSEWU1A==}
+    dependencies:
+      vue-demi: 0.14.8_vue@3.4.31
+    transitivePeerDependencies:
+      - '@vue/composition-api'
+      - vue
+    dev: false
+
   /@vueuse/shared/9.13.0_vue@3.4.31:
     resolution: {integrity: sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==}
     dependencies:

+ 9 - 9
src/view/vrmodel/modelContent.vue

@@ -60,7 +60,16 @@
         >
           查看
         </span>
+        <span
+          class="oper-span delBtn"
+          v-pdscene="row"
+          @click="delOrCancel(row)"
+          v-pdpath="'del'"
+        >
+          {{ row.createStatus !== ModelSceneStatus.RUN ? "删除" : "取消上传" }}
+        </span>
       </template>
+
       <span
         v-else-if="row.createStatus === ModelSceneStatus.REV"
         class="oper-span"
@@ -68,15 +77,6 @@
       >
         模型转换中…
       </span>
-      <span
-        v-else
-        class="oper-span delBtn"
-        v-pdscene="row"
-        @click="delOrCancel(row)"
-        v-pdpath="'del'"
-      >
-        {{ row.createStatus !== ModelSceneStatus.RUN ? "删除" : "取消上传" }}
-      </span>
     </el-table-column>
   </el-table>