liujiejie 10 месяцев назад
Родитель
Сommit
b0a6b1d485

+ 2 - 0
src/views/ledger/milltype.vue

@@ -570,10 +570,12 @@ export default {
     resetForm(formName) {
       this.$refs[formName].resetFields();
       this.nuedialog = false;
+      this.isEdit = false;
     },
     handleClose(done) {
       this.$refs.ruleForm.resetFields();
       this.nuedialog = false;
+      this.isEdit = false;
       done();
     },
 

+ 1 - 1
src/views/performance/components/EditAnalysis.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-05-29 09:14:23
- * @LastEditTime: 2024-07-29 15:52:09
+ * @LastEditTime: 2024-07-29 16:59:15
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/components/EditAnalysis.vue

+ 34 - 4
src/views/performance/components/analysisEvent.vue

@@ -1,14 +1,19 @@
 <!--
  * @Author: your name
  * @Date: 2024-05-29 09:13:51
- * @LastEditTime: 2024-07-17 14:15:50
+ * @LastEditTime: 2024-07-30 10:33:56
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/components/analysisEvent.vue
 -->
 <template>
   <div v-loading="loading">
-    <el-form ref="form" :model="form" label-position="right">
+    <el-form
+      ref="form"
+      :model="form"
+      label-position="right"
+      label-width="100px"
+    >
       <el-row type="flex" justify="end">
         <el-col :span="5">
           <el-form-item class="searchFrom">
@@ -122,13 +127,22 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="9">
+            <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="5">
               <el-form-item
-                label="分析时间"
+                label="开始时间"
                 v-if="checkedCities.find((item) => item === '分析时间')"
               >
                 <el-date-picker
                   value-format="yyyy-MM-dd HH:mm:ss"
+                  v-model="picker[0]"
+                  size="small"
+                  type="datetime"
+                  placeholder="选择分析开始时间"
+                  :picker-options="pickerOptions"
+                >
+                </el-date-picker>
+                <!-- <el-date-picker
+                  value-format="yyyy-MM-dd HH:mm:ss"
                   v-model="picker"
                   type="datetimerange"
                   size="small"
@@ -137,6 +151,22 @@
                   end-placeholder="结束日期"
                   :picker-options="pickerOptions"
                 >
+                </el-date-picker> -->
+              </el-form-item></el-col
+            >
+            <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="5">
+              <el-form-item
+                label="结束时间"
+                v-if="checkedCities.find((item) => item === '分析时间')"
+              >
+                <el-date-picker
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  v-model="picker[1]"
+                  size="small"
+                  type="datetime"
+                  placeholder="选择分析结束时间"
+                  :picker-options="pickerOptions"
+                >
                 </el-date-picker> </el-form-item
             ></el-col>
           </el-row>