ZaiZai hace 1 año
padre
commit
1605d06bd2
Se han modificado 2 ficheros con 11 adiciones y 9 borrados
  1. 2 2
      src/config/index.json
  2. 9 7
      src/views/tentative/device/approach.vue

+ 2 - 2
src/config/index.json

@@ -1,7 +1,7 @@
 {
     "version": "20230607160059",
-    "target": "http://127.0.0.1:8090",
-    "target1": "http://39.108.216.210:8090",
+    "target1": "http://127.0.0.1:8090",
+    "target": "http://39.108.216.210:8090",
     "smsPhone": "",
     "vite": {
         "port": 5174,

+ 9 - 7
src/views/tentative/device/approach.vue

@@ -2,7 +2,7 @@
     <div class="hc-page-layout-box">
         <div :style="`width:${leftWidth}px;`" class="hc-layout-left-box menu">
             <div class="hc-menu-header-box">
-                <div class="text-xl name">
+                <div class="name text-xl">
                     设备分类
                 </div>
                 <HcTooltip keys="tentative_device_approach_menu_add">
@@ -69,16 +69,16 @@
                             <el-option :value="0" label="否" />
                         </el-select>
                     </div>
-                    <div class="w-32 ml-2">
+                    <div class="ml-2 w-32">
                         <el-select v-model="searchForm.status" clearable placeholder="状态">
                             <el-option :value="1" label="启用中" />
                             <el-option :value="0" label="已停用" />
                         </el-select>
                     </div>
-                    <div class="w-64 ml-2">
+                    <div class="ml-2 w-64">
                         <HcDatePicker :dates="betweenTime" clearable @change="betweenTimeUpdate" />
                     </div>
-                    <div class="w-72 ml-2">
+                    <div class="ml-2 w-72">
                         <el-input
                             v-model="searchForm.queryValue" clearable placeholder="请输入设备名称\设备型号查询"
                             @keyup="keyUpEvent"
@@ -211,7 +211,7 @@
                         <el-input v-model="addEditFormModel.equipmentAcquisitionNumber" />
                     </el-form-item>
                     <el-form-item label="是否需要效验">
-                        <el-select v-model="addEditFormModel.isCalibration" block disabled>
+                        <el-select v-model="addEditFormModel.isCalibration" disabled block>
                             <el-option :value="1" label="是" />
                             <el-option :value="0" label="否" />
                         </el-select>
@@ -231,13 +231,13 @@
             v-model="importModal" :loading="importModalLoading" is-footer-center is-table title="导入设备数据"
             widths="70rem" @close="importModalClose" @save="importModalYesClick"
         >
-            <div class="text-orange mb-6">
+            <div class="mb-6 text-orange">
                 <span>请先下载模板模板表格 (</span>
                 <span class="text-link" @click="downloadImportClick">范例试验设备文件</span>
                 <span>) ,按模板样式编辑试验容器后,在点击“选择文件”按钮选择编辑好的文件,点击确认即可导入成功!</span>
             </div>
 
-            <HcDragUpload action="mobilization/read-excel" @finished="uploadFinished" @progress="uploadprogress" />
+            <HcDragUpload :datas="uploadData" action="mobilization/read-excel" @finished="uploadFinished" @progress="uploadprogress" />
 
             <div class="hc-import-modal-table-box">
                 <HcTable
@@ -575,8 +575,10 @@ const printerClick = async () => {
 
 //导入
 const importModal = ref(false)
+const uploadData = ref({})
 const importModalClick = () => {
     tableImportData.value = []
+    uploadData.value = { classNameId: menuKey.value }
     importModal.value = true
 }