Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client

frontend/src/views/plan/planList/components/planPopup.vue

@@ -66,10 +66,15 @@
             />
           </el-select>
           </el-form-item>
-          <el-form-item label='检测功能' :label-width='100' prop='device_Id'>
+          <!-- <el-form-item label='检测功能' :label-width='100' prop='device_Id'>
             <el-checkbox v-model="checked1" label="守时检测" size="large" />
+          </el-form-item> -->
+          <el-form-item label="守时检测" :label-width="100">
+            <el-radio-group v-model="timeFlag" >
+              <el-radio value="1">是</el-radio>
+              <el-radio value="0">否</el-radio>
+            </el-radio-group>
           </el-form-item>
-
       </el-form>
     </div>
       <template #footer>
@@ -109,6 +114,7 @@
     };
   }>();
   const checked1 = ref(false)
+  const timeFlag = ref('0')
   const fatherPlanList = [
   { label: '/', value: 'type0' },
   { label: '检测计划1', value: 'type1' },