1.9.4 init

src/views/dataEntry_manage/components/addMarkerDialog.vue

@@ -35,42 +35,52 @@
           <el-form-item :label="form.markerType==='line'?$t('EtaChartAddPage.label_line_scale'):$t('EtaChartAddPage.label_area_scale')" prop="value">
             <!-- 标识线 -->
             <template v-if="form.markerType==='line'">
-              <!-- 时间轴1,2,4,6的y轴数字 x轴日期  -->
-              <template v-if="[1,2,4,6].includes(chartInfo.ChartType)">
-                <el-date-picker
-                  v-if="markerForm.axis===3"
-                  v-model="markerForm.value"
-                  :popper-class="{'month-day-picker':chartInfo.ChartType===2}"
-                  type="date"
-                  style="width: 200px;"
-                  :placeholder="$t('EtaChartAddPage.label_date_choose')"
-                  :clearable="false"
-                  :format="chartInfo.ChartType===2?'MM-dd':'yyyy-MM-dd'"
-                  :value-format="chartInfo.ChartType===2?'MM-dd':'yyyy-MM-dd'"
-                ></el-date-picker>
+              <div class="mark-value-wrap">
+                <!-- 固定值：原标识线输入框 -->
+                <div class="default-value">
+                    <el-radio v-model="radio" label="固定值"></el-radio>
+                    <!-- 时间轴1,2,4,6的y轴数字 x轴日期  -->
+                    <template v-if="[1,2,4,6].includes(chartInfo.ChartType)">
+                        <el-date-picker
+                            v-if="markerForm.axis===3"
+                            v-model="markerForm.value"
+                            :popper-class="{'month-day-picker':chartInfo.ChartType===2}"
+                            type="date"
+                            style="width: 200px;"
+                            :placeholder="$t('EtaChartAddPage.label_date_choose')"
+                            :clearable="false"
+                            :format="chartInfo.ChartType===2?'MM-dd':'yyyy-MM-dd'"
+                            :value-format="chartInfo.ChartType===2?'MM-dd':'yyyy-MM-dd'"
+                        ></el-date-picker>
 
-                <el-input
-                  v-else
-                  v-model="markerForm.value"
-                  class="number-input"
-                  style="width: 200px;"
-                  type="number"
-                  :placeholder="$t('Edb.InputHolderAll.input_number')"
-                />
+                        <el-input
+                            v-else
+                            v-model="markerForm.value"
+                            class="number-input"
+                            style="width: 200px;"
+                            type="number"
+                            :placeholder="$t('Edb.InputHolderAll.input_number')"
+                        />
+                    </template>
 
-              </template>
-
-              <!-- 柱形图，散点，截面散点只可选数字 -->
-              <template v-else-if="[5,7,10].includes(chartInfo.ChartType)">
-                <el-input
-                  v-model="markerForm.value"
-                  style="width: 200px;"
-                  type="number"
-                  class="number-input"
-                  :placeholder="$t('Edb.InputHolderAll.input_number')"
-                  clearable
-                />
-              </template>
+                    <!-- 柱形图，散点，截面散点只可选数字 -->
+                    <template v-else-if="[5,7,10].includes(chartInfo.ChartType)">
+                        <el-input
+                            v-model="markerForm.value"
+                            style="width: 200px;"
+                            type="number"
+                            class="number-input"
+                            :placeholder="$t('Edb.InputHolderAll.input_number')"
+                            clearable
+                        />
+                    </template>
+                </div>
+                <!-- 指标计算 -->
+                <div class="custom-value">
+                    <el-radio v-model="radio" label="指标计算"></el-radio>
+                </div>
+              </div>
+              
             </template>
 
 
@@ -142,8 +152,18 @@
 
               </div>
             </template>
-            
           </el-form-item>
+          <!-- 指标计算部分 -->
+          <div class="custom-value-setting-wrap">
+            <!-- 指标选择 -->
+            <el-form-item></el-form-item>
+          </div>
+
+
+
+
+
+
           <el-form-item :label="$t('EtaChartAddPage.label_line_sty')" prop="dashStyle" v-if="form.markerType==='line'">
             <el-select 
               v-model="markerForm.dashStyle"
@@ -335,6 +355,9 @@ export default {
         2: '右二轴',
         3: '横轴',
       },
+
+      //temp mock
+      radio:'固定值'
     }
   },
   mounted(){