Ver Fonte

导出模板,名字修改等。。

jxq há 1 mês atrás
pai
commit
82442ba875

+ 1 - 1
.env.development

@@ -8,7 +8,7 @@ VITE_APP_PORT = 4001
 VITE_APP_BASE_API = '/dev-api'
 
 # 开发接口地址
-VITE_APP_API_URL = 'http://127.0.0.1:7205/'
+VITE_APP_API_URL = 'http://192.168.1.69:7205/'
 
 # VITE_APP_API_URL = 'http://192.168.1.43:7205/'
 # VITE_APP_API_URL = 'http://192.168.1.4:18000/'

+ 1 - 1
src/views/main/components/header.vue

@@ -2,7 +2,7 @@
   <div class="main-header">
     <div class="main-logo">
       <img src="@/assets/logo.png" alt="" />
-      <span>维修检测平台</span>
+      <span>自动化测试管理系统</span>
     </div>
     <div class="main-user" ref="buttonRef" @click="onClickOutside">
       <span class="user-name">李明华</span>

+ 1 - 1
src/views/modules/global-config/components/engrInstrumentConfig.vue

@@ -119,7 +119,7 @@ const configHandleDelete = (index: number, row: any) => {
     <div>
       <el-table :data="instrumentConfigList" style="width: 100%">
         <el-table-column label="序号" type="index" width="80" />
-        <el-table-column label="配置地址" prop="configIp" />
+        <!--        <el-table-column label="配置地址" prop="configIp" />-->
         <el-table-column label="配置名称" prop="configName" />
         <!--        <el-table-column label="仪器编码" prop="instrumentCode" />-->
         <el-table-column label="仪器类型" prop="typeLabel" />

+ 1 - 1
src/views/modules/home/components/add.vue

@@ -2,7 +2,7 @@
   <div class="add">
     <el-dialog
       v-model="dialogVisible"
-      title="新建测试工程"
+      :title="isEdit1 ? '编辑测试工程' : '新建测试工程'"
       width="500"
       :close-on-click-modal="false"
       @closed="handleClose"

+ 6 - 6
src/views/modules/report-template/report-template.vue

@@ -22,7 +22,6 @@ const onSelectTemplate = (tem) => {
   refreshTemplate.value = false;
   refreshTemplate.value = true;
 
-
   currentTemplate.value = tem;
   temsDrawerVisible.value = false;
 
@@ -55,7 +54,8 @@ const onImportTemplate = () => {
 
 const onExportTemplate = () => {
   if (excelRef.value) {
-    excelRef.value.exportExcel();
+    console.log("ddd", excelRef.value);
+    excelRef.value?.downloadExcel();
   }
   console.log("onExportTemplate");
 };
@@ -183,22 +183,22 @@ onMounted(() => {
         <div class="header-left">
           <div class="blue-btn" @click="onOpenTemplate">
             <svg-icon icon-class="save" />
-            打开模
+            打开模
           </div>
           <div class="blue-btn" @click="onImportTemplate">
             <svg-icon icon-class="report-template" />
-            导入模
+            导入模
           </div>
           <div class="blue-btn" @click="onExportTemplate">
             <svg-icon icon-class="save" />
-            导出模
+            导出模
           </div>
         </div>
 
         <div>
           <div class="blue-btn" @click="onSaveTemplate">
             <svg-icon icon-class="save" />
-            保存模
+            保存模
           </div>
         </div>
       </div>

+ 3 - 6
src/views/modules/runTest/run-test.vue

@@ -162,7 +162,7 @@ const onClickGlobalConfig = () => {
     ConfigDataAndDeviceRef.value && ConfigDataAndDeviceRef.value.openDrawer();
   });
 };
-const iconStatus = ref(true);
+
 // 开始测试相关
 const isTesting = ref(false);
 const usedTime = ref(0);
@@ -181,7 +181,7 @@ const startToRunTest = async () => {
   };
 
   let res = await startExecuteProjects(params);
-  iconStatus.value = false;
+
   wsClient.open();
 
   currentTestingProject.value = res.data;
@@ -631,10 +631,7 @@ const cancelMsgType5 = () => {
               class="csyq-item"
             >
               <div>
-                <span
-                  class="item-icon"
-                  :style="{ display: iconStatus ? 'none' : 'block' }"
-                >
+                <span class="item-icon">
                   <svg-icon
                     v-if="item.deviceState"
                     icon-class="gougou"