Merge branch 'master' of ssh://172.16.23.188:9022/tian-group/skyeye-admin-fe

src/views/cameras/preview/components/CameraViewSetting/CameraViewSetting.vue

@@ -45,9 +45,9 @@
     </div>
   </div>
   <div class="cameraParamsSettingWrapper">
-    <div class="cameraParamsSetting">
+    <!-- <div class="cameraParamsSetting">
       <CameraParams />
-    </div>
+    </div> -->
     <div class="algorithmsSetting"> <AlgorithmsSetting /> </div>
   </div>
 </template>
@@ -221,7 +221,7 @@
     flex: 1;
     min-height: 300px;
     margin-left: 10px;
-    border-left: 1px solid #ccc;
+    /* border-left: 1px solid #ccc; */
     padding-left: 15px;
   }
   .cameraParamsSetting {

src/views/system/tenant/CreateDrawer.vue

@@ -19,6 +19,7 @@
           type="datetime"
           clearable
           placeholder="请选择开始时间"
+          :disabled-date="handleDisabledBeginDate"
         />
       </el-form-item>
       <el-form-item label="结束时间" prop="endDate">
@@ -27,6 +28,7 @@
           type="datetime"
           clearable
           placeholder="请选择结束时间"
+          :disabled-date="handleDisabledEndDate"
         />
       </el-form-item>
       <el-form-item label="状态" prop="tenantStatus">
@@ -53,6 +55,7 @@
   import { cloneDeep } from 'lodash-es';
   import { addTenant, editTenant, tenantInfo } from '@/api/tenant/index';
   import { formatToDateTime } from '@/utils/dateUtil';
+  import dayjs, { Dayjs } from 'dayjs';
 
   const rules: FormRules = {
     tenantCode: {
@@ -170,7 +173,17 @@
     });
   }
 
-  onMounted(() => {});
+  const handleDisabledBeginDate = (currentDate: Date) => {
+    const endDate = formParams.value.endDate;
+    if (!endDate) return false;
+    return dayjs(currentDate).isAfter(endDate);
+  };
+
+  const handleDisabledEndDate = (currentDate: Date) => {
+    const beginDate = formParams.value.beginDate;
+    if (!beginDate) return false;
+    return dayjs(currentDate).isBefore(beginDate);
+  };
 
   defineExpose({
     openDrawer,