Merge branch 'wyf-dev' into 'all-v4'

Wyf dev

See merge request skyeye/skyeye_frontend/skyeye-admin!275

src/api/camera/camera-nvr.ts

@@ -10,7 +10,6 @@ export interface NVRListItem {
   principal?: string; // 设备安装负责人
   remark?: string; // 备注
   username: string; // NVR登录用户名
-  workshopList: number[]; // NVR使用车间列表
 }
 
 export interface NVRListItemAll extends NVRListItem {
@@ -48,7 +47,7 @@ export const deleteNVRListItem = (nvrId: number) => {
 export const updateNVRListItem = (data: NVRListItem) => {
   return http.request({
     url: '/admin/nvr/updateNvr',
-    method: 'post',
+    method: 'put',
     data,
   });
 };

src/api/datamanagement/playback.ts

@@ -2,13 +2,13 @@ import { http } from '@/utils/http/axios';
 
 export interface GetReplayNvrBody {
   cameraId: number;
-  endTime: string;
   startTime: string;
+  endTime: string;
 }
 /** 回放nvr */
 export const getReplayNvr = (data: GetReplayNvrBody) => {
   return http.request({
-    url: '/nvrOption/replayNvr',
+    url: '/admin/nvr/replayNvr',
     method: 'post',
     data,
   });
@@ -41,7 +41,7 @@ export interface ViolationRecordItem {
 /** 获取nvr下载链接 */
 export const getNvrDownloadUrl = (data: GetReplayNvrBody) => {
   return http.request({
-    url: '/nvrOption/download',
+    url: '/admin/nvr/download',
     method: 'post',
     data,
     timeout: 100000000000,

src/hooks/setting/useWebsocket.ts

@@ -15,7 +15,7 @@ export const useWebsocket = (onMessage: (data: string) => unknown) => {
     console.log('start msg', msg);
     console.log({ url });
 
-    const defaultUrl = `/skyeye/${userStore.info.userId}`;
+    const defaultUrl = `/skyeye/${userStore.info.id}`;
 
     const path = url || defaultUrl;
 

src/store/modules/user.ts

@@ -17,7 +17,8 @@ export interface IUserState {
   avatar: string;
   permissions: any[];
   info: {
-    userId: number;
+    // userId: number;
+    id: number;
     username: string;
     realname: string;
     avatar: string;
@@ -144,13 +145,12 @@ export const useUserStore = defineStore({
 
     /**
      * 用户是否有某个权限
-     * @param permission 
-     * @returns 
+     * @param permission
+     * @returns
      */
     checkPermission(permission: string) {
       return this.permissions.find((x) => x.code === permission);
     },
-    
   },
 });
 

src/types/scene/constant.ts

@@ -1,7 +1,7 @@
-export enum IS_DISABLED {
-  FALSE = 0,
-  TRUE = 1,
-}
+// export enum IS_DISABLED {
+//   FALSE = 0,
+//   TRUE = 1,
+// }
 
 export enum DATA_LEVEL {
   'company' = 0,

src/types/scene/type.ts

@@ -177,7 +177,7 @@ export interface ComAddDatas {
   name: string; //公司名字
   parentId?: number; //上级公司id  无上级为0
   remark?: string; //描述
-  status?: number; //状态  0-启动  1-禁用
+  // isDisabled?: number; //状态  0-启动  1-禁用
   updatedAt?: string;
   serial?: number; //排序
   labelList?: string[]; //创建的多个场景标签   自定义后面需要修改 这里没
@@ -198,7 +198,7 @@ export interface WorkshopAddDatas {
   isDeleted?: number;
   name: string;
   remark?: string;
-  status?: number;
+  // isDisabled?: number; //状态  0-启动  1-禁用
   updatedAt?: string;
   serial?: number;
   parent?: null | WorkshopAddDatas;
@@ -219,7 +219,7 @@ export interface WorkspaceAddDatas {
   name: string;
   principal?: string; //工位负责人
   remark?: string;
-  status?: number;
+  // isDisabled?: number; //状态  0-启动  1-禁用
   serial?: number;
   updatedAt?: string;
   workshopId?: number; //车间id

src/views/cameras/nvrlist/components/CreateDrawer.vue

@@ -25,12 +25,10 @@
         <el-form-item label="密码：" prop="password">
           <el-input v-model="formParams.password" placeholder="请输入设备密码" type="password" show-password />
         </el-form-item>
-        <el-form-item label="使用场景：" prop="workshopList">
+        <!-- <el-form-item label="使用场景：" prop="workshopList">
           <el-tree-select class="temp" v-model="workLocations" :data="locationOptions" multiple
             :render-after-expand="false" placeholder="请选择使用该NVR的车间" @change="handleCascaderChange" />
-          <!-- <el-cascader v-model="workLocations" :options="locationOptions" :props="ismultiple" collapse-tags
-            collapse-tags-tooltip clearable placeholder="请选择使用该NVR的车间" @change="handleCascaderChange" /> -->
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="负责人：" prop="principal">
           <el-input v-model="formParams.principal" placeholder="请输入设备安装负责人" />
         </el-form-item>
@@ -61,8 +59,8 @@ import {
 } from '@/api/camera/camera-nvr';
 
 interface Props {
-  title: String,
-};
+  title: String;
+}
 const props = defineProps<Props>();
 const emit = defineEmits(['form-submit', 'form-edit']);
 
@@ -70,7 +68,7 @@ const isDrawer = ref(false);
 const formRef: any = ref(null);
 // const ismultiple = { multiple: true };
 
-const { locationOptions, getLocationOptions, getWorkLocation } = useWorkLocation();
+const { getLocationOptions } = useWorkLocation();
 // const workLocations = ref<[number | undefined, number | undefined] | []>([]);
 const workLocations = ref<number[]>([]);
 
@@ -85,26 +83,31 @@ const initFormNvr = () => ({
   nvrPort: '',
   username: '',
   password: '',
-  workshopList: [],
   principal: '',
   remark: '',
 });
 const formParams = ref<NVRListItem>(initFormNvr());
 
 const deleteKey = (obj, ...args) => {
-  args.forEach(v => { delete obj[v] });
+  args.forEach((v) => {
+    delete obj[v];
+  });
   return obj;
-}
+};
 const openDrawer = (row: NVRListItemAll) => {
   isDrawer.value = true;
   if (row) {
     formParams.value = Object.assign(formParams.value, row);
-    deleteKey(formParams.value, 'createdAt', 'isDeleted', 'tenantId', 'updatedAt', 'workshopName');
-    formParams.value.workshopList.map((item, index) => {
-      workLocations.value[index] = getWorkLocation(item, locationOptions.value)
-    });
+    deleteKey(
+      formParams.value,
+      'createdAt',
+      'isDeleted',
+      'tenantId',
+      'updatedAt',
+      'workshopName',
+    );
     return;
-  };
+  }
 };
 
 const closeDrawer = () => {
@@ -122,7 +125,11 @@ const rules: FormRules = {
   name: { required: true, message: '设备名称不能为空', trigger: 'blur' },
   code: [
     { required: true, message: '设备编号不能为空', trigger: 'change' },
-    { pattern: /^[a-zA-Z0-9-_]+$/, message: '请输入大小写字母、数字、-、_的组合', trigger: 'change' }
+    {
+      pattern: /^[a-zA-Z0-9-_]+$/,
+      message: '请输入大小写字母、数字、-、_的组合',
+      trigger: 'change',
+    },
   ],
   nvrType: { required: true, message: '设备品牌不能为空', trigger: 'change' },
   nvrIp: { required: true, message: '设备IP不能为空', trigger: 'change' },
@@ -132,22 +139,17 @@ const rules: FormRules = {
   workshopList: { required: true, message: '使用场景不能为空', trigger: 'change' },
 };
 
-const handleCascaderChange = () => {
-  formParams.value.workshopList = workLocations.value;
-};
-
 const formSubmit = () => {
   const errorText = ref('');
   // 捕获当前表单中是否有el-form-item__error即错误信息
   const errorTipElements = document.querySelectorAll('.el-form-item__error');
   errorTipElements.forEach((element) => {
-    if (element.textContent)
-      errorText.value = element.textContent;
+    if (element.textContent) errorText.value = element.textContent;
   });
 
   if (errorText.value === '') {
-    codeError.value = '';
-    ipError.value = '';
+    // codeError.value = '';
+    // ipError.value = '';
     formRef.value.validate((valid) => {
       if (valid) {
         const nvrData = {
@@ -158,30 +160,29 @@ const formSubmit = () => {
           nvrPort: formParams.value.nvrPort,
           username: formParams.value.username,
           password: formParams.value.password,
-          workshopList: formParams.value.workshopList,
           principal: formParams.value.principal,
           remark: formParams.value.remark,
         };
 
         if (isAddUser.value) {
-          addNVRListItem(nvrData).then((res) => {
-            if (Object.getOwnPropertyNames(res).length != 0) {
-              codeError.value = res.code;
-              ipError.value = res.nvrIp;
-            } else {
-              emit('form-submit');
-              closeDrawer();
-            }
+          addNVRListItem(nvrData).then(() => {
+            emit('form-submit');
+            closeDrawer();
+            // if (Object.getOwnPropertyNames(res).length != 0) {
+            //   codeError.value = res.code;
+            //   ipError.value = res.nvrIp;
+            // } else {
+            // }
           });
         } else {
-          updateNVRListItem(formParams.value).then((res) => {
-            if (Object.getOwnPropertyNames(res).length != 0) {
-              codeError.value = res.code;
-              ipError.value = res.nvrIp;
-            } else {
-              emit('form-edit');
-              closeDrawer();
-            }
+          updateNVRListItem(formParams.value).then(() => {
+            emit('form-edit');
+            closeDrawer();
+            // if (Object.getOwnPropertyNames(res).length != 0) {
+            //   codeError.value = res.code;
+            //   ipError.value = res.nvrIp;
+            // } else {
+            // }
           });
         }
       }
@@ -196,14 +197,14 @@ defineExpose({
 
 onMounted(() => {
   getLocationOptions();
-})
+});
 </script>
 
 <style lang="scss" scoped>
 :deep(.el-drawer__header) {
   position: relative;
 
-  >:first-child {
+  > :first-child {
     margin-left: 32px;
     font-weight: 600;
     font-size: 16px;
@@ -217,7 +218,7 @@ onMounted(() => {
 }
 
 :deep(.el-drawer__body) {
-  border-top: 1px solid #0000000F;
+  border-top: 1px solid #0000000f;
 }
 
 :deep(.el-form-item__label) {
@@ -241,4 +242,4 @@ onMounted(() => {
   max-height: 55px;
   overflow: auto;
 }
-</style>
+</style>

src/views/datamanager/playback/components/NvrCameraView.vue

@@ -257,8 +257,8 @@
   const videoUrl = computed(() => {
     return nvrUrl.value
       ? nvrUrl.value
-      : cameraDetailStore.detail?.pushstreamIp
-      ? cameraDetailStore.detail?.pushstreamIp
+      : cameraDetailStore.detail?.pushStreamDTO?.videoUrls?.pushstreamIp
+      ? cameraDetailStore.detail?.pushStreamDTO?.videoUrls?.pushstreamIp
       : '';
   });
 

src/views/system-config/scene-manage/SceneManage.vue

@@ -104,36 +104,23 @@
   import WorkshopDrawer_shangfei from './components/WorkshopDrawer-shangfei.vue';
   import WorkspaceDrawer from './components/WorkspaceDrawer.vue';
   import WorkspaceDrawer_shangfei from './components/WorkspaceDrawer-shangfei.vue';
-  import { DrawerType, IS_DISABLED } from '@/types/scene/constant.ts';
+  import { DrawerType } from '@/types/scene/constant.ts';
   import SceneDialog from './components/SceneDialog.vue';
-  import {
-    colomns,
-    // updateSerials,
-    // findItemLevel,
-    // removeParent,
-    // flattenCodes,
-    // getParent,
-  } from './hook/use-table-method';
+  import { colomns } from './hook/use-table-method';
   import {
     delCompany,
     delWorkshop,
     delWorkspace,
     updateComShopSpaceTreeSort,
-    // updateComShopSpaceTreeSort,
   } from '@/api/scene/scene';
   import {
     ComTreeType,
-    // ComAddDatas,
-    // WorkshopAddDatas,
-    // WorkspaceAddDatas,
     UseComType,
     UseWorkshopType,
     UseWorkspaceType,
   } from '@/types/scene/type.ts';
   import useComTree from './store/use-com-tree';
-  // import useSceneTemplete from './hook/use-sence-templete';
   import { storeToRefs } from 'pinia';
-  // import { ElMessageBox } from 'element-plus';
   import { useGlobSetting } from '@/hooks/setting';
   import { ElMessageBox } from 'element-plus';
   import { cloneDeep } from 'lodash-es';
@@ -147,8 +134,7 @@
   const { comTreeData } = storeToRefs(comTree);
 
   const { getComTreeDetail } = comTree;
-  // const useSceneTempleteDetail = useSceneTemplete();
-  // const { sceneList, templateList, workshopTemplateList } = useSceneTempleteDetail;
+
   const expendRowKeys = ref(['']);
 
   const showDrawer = ref<DrawerType | null>(null);
@@ -196,7 +182,7 @@
   const companyAdd = () => {
     showDrawer.value = DrawerType.company;
     detail.value = {
-      isDisabled: IS_DISABLED.FALSE,
+      // isDisabled: IS_DISABLED.FALSE,
       name: '',
       // orderNum: comTreeData.value.length,
     };
@@ -260,7 +246,7 @@
         // 因为是添加车间所以没有id
         name: '',
         seniorScene: editedItem.value?.name,
-        isDisabled: IS_DISABLED.FALSE,
+        // isDisabled: IS_DISABLED.FALSE,
         companyId: editedItem.value?.id,
         // orderNum: editedItem.value?.children?.length,
       };
@@ -273,7 +259,7 @@
         code: '', // 上飞定制需要
         seniorScene: editedItem.value?.name,
         principalName: '',
-        isDisabled: IS_DISABLED.FALSE,
+        // isDisabled: IS_DISABLED.FALSE,
         workshopId: editedItem.value?.id,
         workshopCode: editedItem.value?.code, // 上飞定制需要
       };
@@ -291,7 +277,7 @@
         id: editedItem.value.id,
         name: editedItem.value.name,
         regionCode: editedItem.value.regionCode,
-        isDisabled: editedItem.value.isDisabled,
+        // isDisabled: editedItem.value.isDisabled,
         thumbnail: editedItem.value.thumbnail,
       };
     } else if (editedItem.value?.nodeType === DrawerType.workshop) {
@@ -300,7 +286,7 @@
         id: editedItem.value.id,
         name: editedItem.value.name,
         seniorScene: comTreeData.value.find((it) => it.id === editedItem.value?.companyId)!.name,
-        isDisabled: editedItem.value.isDisabled,
+        // isDisabled: editedItem.value.isDisabled,
       };
     } else if (editedItem.value?.nodeType === DrawerType.workspace) {
       const curWorkshop = comTreeData.value
@@ -313,7 +299,7 @@
         code: editedItem.value.code, // 上飞定制需要
         seniorScene: curWorkshop?.name,
         principalName: editedItem.value.principalName,
-        isDisabled: editedItem.value.isDisabled,
+        // isDisabled: editedItem.value.isDisabled,
         workshopCode: curWorkshop?.code, // 上飞定制需要
       };
     }

src/views/system-config/scene-manage/components/CompanyDrawer-shangfei.vue

@@ -47,14 +47,14 @@
         <el-form-item label="备注" prop="remark">
           <el-input v-model="ruleForm.remark" style="width: 200px" />
         </el-form-item>
-        <el-form-item label="状态">
+        <!-- <el-form-item label="状态">
           <el-switch
             v-model="ruleForm.isDisabled"
             :active-value="IS_DISABLED.FALSE"
             :inactive-value="IS_DISABLED.TRUE"
             class="switchUse"
           />
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div style="position: absolute; left: 108px; bottom: 67px">
         <el-button v-if="!props.detail.id" @click="resetDrawCom">重置</el-button>
@@ -70,7 +70,7 @@
 <script setup lang="ts">
   import { computed, reactive, ref, defineProps, defineEmits, watch } from 'vue';
   import { addCompany, editCompany } from '@/api/scene/scene.ts';
-  import { IS_DISABLED } from '@/types/scene/constant.ts';
+  // import { IS_DISABLED } from '@/types/scene/constant.ts';
   import type { FormInstance, FormRules } from 'element-plus';
   import { getProvinceList } from '@/api/system/region';
   import { useRequest } from 'vue-hooks-plus';
@@ -79,7 +79,7 @@
     detail: {
       id?: number; // 传不传id关系到是不是修改
       name?: string;
-      isDisabled?: IS_DISABLED;
+      // isDisabled?: IS_DISABLED;
       remark?: string;
       longitude?: number; //经度
       latitude?: number; //纬度
@@ -111,12 +111,12 @@
     remark?: string; //备注
     longitude?: number; //经度
     latitude?: number; //纬度
-    isDisabled?: IS_DISABLED;
+    // isDisabled?: IS_DISABLED;
   }
 
   const ruleForm = reactive<RuleForm>({
     name: '上海飞机制造有限公司',
-    isDisabled: IS_DISABLED.FALSE,
+    // isDisabled: IS_DISABLED.FALSE,
     remark: '',
     longitude: undefined,
     latitude: undefined,
@@ -137,7 +137,7 @@
     () => props.detail,
     (data) => {
       // ruleForm.name = data.name!; //上飞定制不可变
-      ruleForm.isDisabled = data.isDisabled;
+      // ruleForm.isDisabled = data.isDisabled;
       ruleForm.remark = data.remark;
       ruleForm.latitude = data.latitude;
       ruleForm.longitude = data.longitude;
@@ -156,7 +156,7 @@
 
       const newComData = {
         name: ruleForm.name,
-        isDisabled: ruleForm.isDisabled,
+        // isDisabled: ruleForm.isDisabled,
         remark: ruleForm.remark,
         longitude: ruleForm.longitude,
         latitude: ruleForm.latitude,
@@ -188,7 +188,7 @@
       const editNewCom = {
         id: props.detail.id,
         name: ruleForm.name,
-        isDisabled: ruleForm.isDisabled,
+        // isDisabled: ruleForm.isDisabled,
         remark: ruleForm.remark,
         longitude: ruleForm.longitude,
         latitude: ruleForm.latitude,
@@ -208,7 +208,7 @@
   //重置编辑框
   const resetDrawCom = () => {
     ruleForm.name = '';
-    ruleForm.isDisabled = IS_DISABLED.FALSE;
+    // ruleForm.isDisabled = IS_DISABLED.FALSE;
     ruleForm.regionCode = '';
     ruleForm.remark = '';
     ruleForm.latitude = undefined;

src/views/system-config/scene-manage/components/CompanyDrawer.vue

@@ -43,14 +43,14 @@
         <el-form-item label="备注" prop="remark">
           <el-input v-model="ruleForm.remark" style="width: 200px" />
         </el-form-item>
-        <el-form-item label="状态">
+        <!-- <el-form-item label="状态">
           <el-switch
             v-model="ruleForm.isDisabled"
             :active-value="IS_DISABLED.FALSE"
             :inactive-value="IS_DISABLED.TRUE"
             class="switchUse"
           />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="公司头像">
           <el-upload
             ref="uploadRef"
@@ -99,7 +99,7 @@
   } from '@/api/scene/scene.ts';
   // import { SceneLabelType, TemplateType } from '@/types/scene/type.ts';
 
-  import { IS_DISABLED } from '@/types/scene/constant.ts';
+  // import { IS_DISABLED } from '@/types/scene/constant.ts';
   import type { FormInstance, FormRules } from 'element-plus';
   import { ElMessage } from 'element-plus';
   // import { CirclePlus } from '@element-plus/icons-vue';
@@ -116,7 +116,7 @@
       id?: number; //传不传id代表着是不是编辑
       name?: string;
       // orderNum?: number;
-      isDisabled?: IS_DISABLED;
+      // isDisabled?: IS_DISABLED;
       remark?: string;
       longitude?: number; //经度
       latitude?: number; //纬度
@@ -188,7 +188,7 @@
 
   interface RuleForm {
     name: string; //名称
-    isDisabled?: IS_DISABLED; //状态
+    // isDisabled?: IS_DISABLED; //状态
     remark?: string; //备注
     longitude?: number; //经度
     latitude?: number; //纬度
@@ -198,7 +198,7 @@
 
   const ruleForm = reactive<RuleForm>({
     name: '',
-    isDisabled: IS_DISABLED.TRUE,
+    // isDisabled: IS_DISABLED.TRUE,
     remark: '',
     longitude: undefined, //经度
     latitude: undefined, //纬度
@@ -220,7 +220,7 @@
     () => props.detail,
     (data) => {
       ruleForm.name = data.name!;
-      ruleForm.isDisabled = data.isDisabled;
+      // ruleForm.isDisabled = data.isDisabled;
       ruleForm.remark = data.remark;
       ruleForm.latitude = data.latitude;
       ruleForm.longitude = data.longitude;
@@ -240,7 +240,7 @@
 
       const newComData = {
         name: ruleForm.name,
-        isDisabled: ruleForm.isDisabled,
+        // isDisabled: ruleForm.isDisabled,
         // orderNum: props.detail.orderNum,
         remark: ruleForm.remark,
         longitude: ruleForm.longitude,
@@ -274,7 +274,7 @@
       const editNewCom = {
         id: props.detail.id,
         name: ruleForm.name,
-        isDisabled: ruleForm.isDisabled,
+        // isDisabled: ruleForm.isDisabled,
         remark: ruleForm.remark,
         longitude: ruleForm.longitude,
         latitude: ruleForm.latitude,
@@ -295,7 +295,7 @@
   //重置编辑框
   const resetDrawCom = () => {
     ruleForm.name = '';
-    ruleForm.isDisabled = IS_DISABLED.TRUE;
+    // ruleForm.isDisabled = IS_DISABLED.TRUE;
     ruleForm.regionCode = '';
     ruleForm.latitude = undefined;
     ruleForm.longitude = undefined;

src/views/system-config/scene-manage/components/WorkshopDrawer-shangfei.vue

@@ -35,14 +35,14 @@
           <el-input v-model="ruleForm.seniorScene" disabled />
         </el-form-item>
 
-        <el-form-item label="状态">
+        <!-- <el-form-item label="状态">
           <el-switch
             v-model="ruleForm.isDisabled"
             :active-value="IS_DISABLED.FALSE"
             :inactive-value="IS_DISABLED.TRUE"
             class="switchUse"
           />
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div style="position: absolute; left: 108px; bottom: 67px">
         <el-button v-if="!props.detail.id" @click="resetDraw">重置</el-button>
@@ -59,7 +59,7 @@
 
 <script setup lang="ts">
   import { computed, reactive, ref, defineProps, defineEmits, watch } from 'vue';
-  import { IS_DISABLED } from '@/types/scene/constant.ts';
+  // import { IS_DISABLED } from '@/types/scene/constant.ts';
   import { type FormInstance, type FormRules } from 'element-plus';
   import { addWorkshop, editWorkshop } from '@/api/scene/scene.ts';
   import { getWorkshopInfoList } from '@/api/workShopData';
@@ -86,7 +86,7 @@
       code?: string;
       name?: string;
       seniorScene?: string;
-      isDisabled?: IS_DISABLED;
+      // isDisabled?: IS_DISABLED;
       companyId?: number;
     };
   }>();
@@ -111,13 +111,13 @@
     name: string; //名称
     code: string; //车间code
     seniorScene: string; //上级场景
-    isDisabled?: IS_DISABLED; //状态
+    // isDisabled?: IS_DISABLED; //状态
   }
   const ruleForm = reactive<RuleForm>({
     name: '',
     code: '',
     seniorScene: '',
-    isDisabled: IS_DISABLED.FALSE,
+    // isDisabled: IS_DISABLED.FALSE,
   });
   const rules = reactive<FormRules>({
     name: [
@@ -136,7 +136,7 @@
     (data) => {
       ruleForm.name = data.name!;
       ruleForm.seniorScene = data.seniorScene!;
-      ruleForm.isDisabled = data.isDisabled;
+      // ruleForm.isDisabled = data.isDisabled;
     },
     { immediate: true },
   );
@@ -152,7 +152,7 @@
         companyId: props.detail.companyId,
         name: ruleForm.name,
         code: ruleForm.code,
-        isDisabled: ruleForm.isDisabled,
+        // isDisabled: ruleForm.isDisabled,
       };
 
       addWorkshop(newAddData)
@@ -180,7 +180,7 @@
         id: props.detail.id,
         code: ruleForm.code,
         name: ruleForm.name,
-        isDisabled: ruleForm.isDisabled,
+        // isDisabled: ruleForm.isDisabled,
       };
 
       editWorkshop(editNewWorkshopData)
@@ -200,7 +200,7 @@
   const resetDraw = () => {
     ruleForm.name = '';
     ruleForm.code = '';
-    ruleForm.isDisabled = IS_DISABLED.FALSE;
+    // ruleForm.isDisabled = IS_DISABLED.FALSE;
   };
 </script>
 

src/views/system-config/scene-manage/components/WorkshopDrawer.vue

@@ -25,14 +25,14 @@
         <el-form-item label="所属公司" prop="seniorScene">
           <el-input v-model="ruleForm.seniorScene" disabled />
         </el-form-item>
-        <el-form-item label="状态">
+        <!-- <el-form-item label="状态">
           <el-switch
             v-model="ruleForm.isDisabled"
             :active-value="IS_DISABLED.FALSE"
             :inactive-value="IS_DISABLED.TRUE"
             class="switchUse"
           />
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div style="position: absolute; left: 108px; bottom: 67px">
         <el-button v-if="!props.detail.id" @click="resetDraw">重置</el-button>
@@ -49,7 +49,6 @@
 
 <script setup lang="ts">
   import { computed, reactive, ref, defineProps, defineEmits, watch } from 'vue';
-  import { IS_DISABLED } from '@/types/scene/constant.ts';
   import { type FormInstance, type FormRules } from 'element-plus';
   import { addWorkshop, editWorkshop } from '@/api/scene/scene.ts';
 
@@ -58,7 +57,7 @@
       id?: number;
       name?: string;
       seniorScene?: string;
-      isDisabled?: IS_DISABLED;
+      // isDisabled?: IS_DISABLED;
       companyId?: number;
       // orderNum?: number;
     };
@@ -83,12 +82,12 @@
   interface RuleForm {
     name: string; //名称
     seniorScene: string; //上级场景
-    isDisabled?: IS_DISABLED; //状态
+    // isDisabled?: IS_DISABLED; //状态
   }
   const ruleForm = reactive<RuleForm>({
     name: '',
     seniorScene: '',
-    isDisabled: IS_DISABLED.TRUE,
+    // isDisabled: IS_DISABLED.TRUE,
   });
   const rules = reactive<FormRules>({
     name: [
@@ -107,7 +106,7 @@
     (data) => {
       ruleForm.name = data.name!;
       ruleForm.seniorScene = data.seniorScene!;
-      ruleForm.isDisabled = data.isDisabled;
+      // // ruleForm.isDisabled = data.isDisabled;
     },
     { immediate: true },
   );
@@ -121,7 +120,7 @@
       }
       const newAddData = {
         name: ruleForm.name,
-        status: Number(ruleForm.isDisabled),
+        // status: Number(ruleForm.isDisabled),
         companyId: props.detail.companyId,
         // orderNum: props.detail.orderNum,
       };
@@ -149,7 +148,7 @@
       const editNewWorkshopData = {
         id: props.detail.id,
         name: ruleForm.name,
-        isDisabled: ruleForm.isDisabled,
+        // // isDisabled: ruleForm.isDisabled,
       };
 
       editWorkshop(editNewWorkshopData)
@@ -168,7 +167,7 @@
   //重置编辑框
   const resetDraw = () => {
     ruleForm.name = '';
-    ruleForm.isDisabled = IS_DISABLED.FALSE;
+    // ruleForm.isDisabled = IS_DISABLED.FALSE;
   };
 </script>
 

src/views/system-config/scene-manage/components/WorkspaceDrawer-shangfei.vue

@@ -37,14 +37,14 @@
         <el-form-item label="负责人" prop="principalName">
           <el-input v-model="ruleForm.principalName" />
         </el-form-item>
-        <el-form-item label="状态">
+        <!-- <el-form-item label="状态">
           <el-switch
             v-model="ruleForm.isDisabled"
             :active-value="IS_DISABLED.FALSE"
             :inactive-value="IS_DISABLED.TRUE"
             class="switchUse"
           />
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div style="position: absolute; left: 108px; bottom: 67px">
         <el-button v-if="!props.detail.id" @click="resetDraw">重置</el-button>
@@ -61,7 +61,7 @@
 
 <script setup lang="ts">
   import { computed, reactive, ref, defineProps, defineEmits, watch } from 'vue';
-  import { IS_DISABLED } from '@/types/scene/constant.ts';
+  // import { IS_DISABLED } from '@/types/scene/constant.ts';
   import { type FormInstance, type FormRules } from 'element-plus';
   import { addWorkspace, editWorkspace } from '@/api/scene/scene.ts';
   import { getWorkSpaceInfoList } from '@/api/workShopData';
@@ -73,7 +73,7 @@
       code?: string;
       seniorScene?: string;
       principalName?: string;
-      isDisabled?: IS_DISABLED;
+      // isDisabled?: IS_DISABLED;
       workshopId?: number;
       workshopCode?: string;
     };
@@ -114,14 +114,14 @@
     seniorScene: string; //上级场景
     code: string; //代码
     principalName?: string; //负责人
-    isDisabled?: IS_DISABLED;
+    // isDisabled?: IS_DISABLED;
   }
   const ruleForm = reactive<RuleForm>({
     name: '',
     seniorScene: '',
     code: '',
     principalName: '',
-    isDisabled: IS_DISABLED.FALSE,
+    // isDisabled: IS_DISAsBLED.FALSE,
   });
   const rules = reactive<FormRules>({
     name: [
@@ -145,7 +145,7 @@
       ruleForm.seniorScene = data.seniorScene!;
       ruleForm.code = data.code!;
       ruleForm.principalName = data.principalName;
-      ruleForm.isDisabled = data.isDisabled;
+      // ruleForm.isDisabled = data.isDisabled;
     },
     { immediate: true },
   );
@@ -164,7 +164,7 @@
         workshopId: props.detail.workshopId,
         name: ruleForm.name,
         principalName: ruleForm.principalName,
-        isDisabled: ruleForm.isDisabled,
+        // isDisabled: ruleForm.isDisabled,
       };
 
       addWorkspace(newAddData)
@@ -194,7 +194,7 @@
         code: ruleForm.code,
         name: ruleForm.name,
         principalName: ruleForm.principalName,
-        isDisabled: ruleForm.isDisabled,
+        // isDisabled: ruleForm.isDisabled,
       };
 
       //编辑并上传
@@ -215,7 +215,7 @@
   const resetDraw = () => {
     ruleForm.name = '';
     ruleForm.code = '';
-    ruleForm.isDisabled = IS_DISABLED.FALSE;
+    // ruleForm.isDisabled = IS_DISABLED.FALSE;
     ruleForm.principalName = '';
   };
 </script>

src/views/system-config/scene-manage/components/WorkspaceDrawer.vue

@@ -28,14 +28,14 @@
         <el-form-item label="负责人" prop="principalName">
           <el-input v-model="ruleForm.principalName" />
         </el-form-item>
-        <el-form-item label="状态">
+        <!-- <el-form-item label="状态">
           <el-switch
             v-model="ruleForm.isDisabled"
             :active-value="IS_DISABLED.FALSE"
             :inactive-value="IS_DISABLED.TRUE"
             class="switchUse"
           />
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div style="position: absolute; left: 108px; bottom: 67px">
         <el-button v-if="!props.detail.id" @click="resetDraw">重置</el-button>
@@ -52,7 +52,7 @@
 
 <script setup lang="ts">
   import { computed, reactive, ref, defineProps, defineEmits, watch } from 'vue';
-  import { IS_DISABLED } from '@/types/scene/constant.ts';
+  // import { IS_DISABLED } from '@/types/scene/constant.ts';
   import { type FormInstance, type FormRules } from 'element-plus';
   import { addWorkspace, editWorkspace } from '@/api/scene/scene.ts';
 
@@ -63,7 +63,7 @@
       name?: string;
       seniorScene?: string;
       principalName?: string;
-      isDisabled?: IS_DISABLED;
+      // isDisabled?: IS_DISABLED;
       workshopId?: number;
       // orderNum?: number;
     };
@@ -88,13 +88,13 @@
     name: string; //名称
     seniorScene: string; //所属车间
     principalName?: string; //负责人
-    isDisabled?: IS_DISABLED;
+    // isDisabled?: IS_DISABLED;
   }
   const ruleForm = reactive<RuleForm>({
     name: '',
     seniorScene: '',
     principalName: '',
-    isDisabled: IS_DISABLED.FALSE,
+    // isDisabled: IS_DISABLED.FALSE,
   });
   const rules = reactive<FormRules>({
     name: [
@@ -113,7 +113,7 @@
       ruleForm.name = data.name!;
       ruleForm.seniorScene = data.seniorScene!;
       ruleForm.principalName = data.principalName;
-      ruleForm.isDisabled = data.isDisabled;
+      // // ruleForm.isDisabled = data.isDisabled;
     },
     { immediate: true },
   );
@@ -130,7 +130,7 @@
       const newAddData = {
         name: ruleForm.name,
         principalName: ruleForm.principalName,
-        isDisabled: ruleForm.isDisabled,
+        // // isDisabled: ruleForm.isDisabled,
         workshopId: props.detail.workshopId,
         // orderNum: props.detail.orderNum,
       };
@@ -159,7 +159,7 @@
       const editNewWorkspaceData = {
         id: props.detail.id,
         name: ruleForm.name,
-        isDisabled: ruleForm.isDisabled,
+        // // isDisabled: ruleForm.isDisabled,
         principalName: ruleForm.principalName,
       };
 
@@ -180,7 +180,7 @@
   //重置编辑框
   const resetDraw = () => {
     ruleForm.name = '';
-    ruleForm.isDisabled = IS_DISABLED.FALSE;
+    // ruleForm.isDisabled = IS_DISABLED.FALSE;
     ruleForm.principalName = '';
   };
 </script>