zhudie 2 éve
szülő
commit
434e618a57

+ 2 - 2
src/api/scene/secene-templet.ts

@@ -104,7 +104,7 @@ export const addCompanyModuleLabel = (data: SceneTempleteType[]) => {
 export const editCompanyModuleLabel = (data: SceneTempleteType[]) => {
   return http.request({
     url: '/template/updateCompanyModuleLabelRel',
-    method: 'put',
+    method: 'post',
     data,
   });
 };
@@ -131,7 +131,7 @@ export const addWorkshopModuleLabel = (data: workShopTempleteType) => {
 export const editWorkshopModuleLabel = (data: workShopTempleteType) => {
   return http.request({
     url: '/template/updateWorkshopModuleRel',
-    method: 'put',
+    method: 'post',
     data,
   });
 };

+ 122 - 99
src/views/dashboard/monitor/addCompany.vue

@@ -1,8 +1,25 @@
 <template>
   <div>
-    <el-drawer class="test" v-if="props.tableCom" with-header="true" size="35%">
+    <!-- <div style="position: absolute; top: 20px; left: 30px">
+      <el-button type="primary" @click="companyAdd">
+        <template #icon>
+          <el-icon>
+            <Plus />
+          </el-icon>
+        </template>
+        添加
+      </el-button></div
+    > -->
+    <el-drawer
+      class="test"
+      v-model="showDrawer"
+      with-header="true"
+      size="35%"
+      @open="() => emit('update-tab-com', true)"
+      @close="() => emit('update-tab-com', false)"
+    >
       <template #header="{ titleId }">
-        <p :id="titleId">{{ companyAddTitle }}</p>
+        <p :id="titleId">{{ props.companyAddTitle }}</p>
       </template>
       <el-form
         ref="ruleFormRef"
@@ -66,43 +83,45 @@
           ></div>
         </el-form-item>
         <el-form-item label="状态">
-          <el-switch v-model="addEnable" active-value="0" inactive-value="1" class="switchUse" />
+          <el-switch
+            v-model="addEnable"
+            :active-value="ENABLED.TRUE"
+            :inactive-value="ENABLED.FALSE"
+            class="switchUse"
+          />
         </el-form-item>
       </el-form>
       <div style="position: absolute; left: 108px; bottom: 67px">
-        <el-button v-if="companyAddTitle === '添加公司'" type="warning" @click="props.resetDraw"
-          >重置</el-button
-        >
-        <el-button type="primary" v-if="companyAddTitle === '添加公司'" @click="newCompanyAdd">
-          提交
-        </el-button>
-        <el-button type="primary" v-if="companyAddTitle !== '添加公司'" @click="props.editedSub">
-          提交
-        </el-button>
+        <el-button v-if="!props.comEdit" type="warning" @click="resetDraw">重置</el-button>
+        <el-button type="primary" v-if="!props.comEdit" @click="newCompanyAdd"> 提交 </el-button>
+        <el-button type="primary" v-if="props.comEdit" @click="editedSub"> 提交 </el-button>
       </div>
     </el-drawer></div
   >
 </template>
 
 <script setup lang="ts">
-  import { computed, reactive, ref, defineProps, defineEmits } from 'vue';
+  import { computed, reactive, ref, defineProps, defineEmits, watch, onMounted } from 'vue';
   import { sceneLabelType, templateType } from '@/api/scene/secene-templet';
   import { ENABLED } from './use-method';
   import type { FormInstance, FormRules } from 'element-plus';
   import { ElMessageBox } from 'element-plus';
+  import { CirclePlus } from '@element-plus/icons-vue';
+
+  // import { ENABLED } from './use-method';
   //   import { SubscribeItem } from '@/api/subscribe/subscribe';
 
-  interface RuleForm {
-    name: string; //名称
-    seniorScene: string; //上级场景
-    code: string; //代码
-    sceneCode: string; //场景代码
-    tagCom?: string[]; //公司场景标签 可选多个
-    templateCom?: string[]; //公司场景模板 可选多个
-    tagWorkshop?: number; //场景标签  车间
-    templateWorkshop?: string; //车间模板
-    principal?: string; //负责人
-  }
+  // interface RuleForm {
+  //   name: string; //名称
+  //   seniorScene: string; //上级场景
+  //   code: string; //代码
+  //   sceneCode: string; //场景代码
+  //   tagCom?: string[]; //公司场景标签 可选多个
+  //   templateCom?: string[]; //公司场景模板 可选多个
+  //   tagWorkshop?: number; //场景标签  车间
+  //   templateWorkshop?: string; //车间模板
+  //   principal?: string; //负责人
+  // }
 
   interface SelectItemType {
     tag: string;
@@ -114,16 +133,35 @@
     companyAddTitle: string;
     sceneList: sceneLabelType[];
     templateList: templateType[];
-    resetDraw: () => unknown;
-    addNewTypeCom: (formEl) => unknown;
-    editedSub: () => unknown;
+    ruleForm: RuleForm;
+    selectItems: SelectItemType[];
+    addEnable: ENABLED;
+    comEdit: boolean;
+    // resetDraw: () => unknown;
+    // addNewTypeCom: (formEl) => unknown;
+    // editedSub: () => unknown;
   }>();
 
   const addEnable = ref(ENABLED.TRUE);
   const selectItems = ref<SelectItemType[]>([{ tag: '', template: '' }]);
 
   //将表单数据传至父组件
-  const emit = defineEmits(['upload-data']);
+  const emit = defineEmits(['upload-company-data', 'edit-company-data', 'update-tab-com']);
+
+  const showDrawer = computed(() => props.tableCom);
+
+  // onMounted(() => {
+  //   emit('update:modelValue', tableCom.value);
+  // });
+  // const tableCom = ref(false);
+
+  //外界传来的打开el-drawer的指令
+  // watch(
+  //   () => props.tableCom,
+  //   (newValue) => {
+  //     tableCom.value = newValue;
+  //   },
+  // );
   //表格中的规则
   const ruleFormRef = ref<FormInstance>();
 
@@ -135,18 +173,18 @@
     tagCom?: string[]; //公司场景标签 可选多个
     templateCom?: string[]; //公司场景模板 可选多个
     tagWorkshop?: number; //场景标签  车间
-    templateWorkshop?: string; //车间模板
+    templateWorkshop?: number; //车间模板
     principal?: string; //负责人
   }
   const ruleForm = reactive<RuleForm>({
     name: '',
-    seniorScene: '',
+    seniorScene: '顶级场景',
     code: '',
     sceneCode: '',
     tagCom: [],
     templateCom: [],
-    tagWorkshop: 0,
-    templateWorkshop: '',
+    tagWorkshop: undefined,
+    templateWorkshop: undefined,
     principal: '',
   });
   const rules = reactive<FormRules<RuleForm>>({
@@ -182,18 +220,46 @@
     ],
   });
 
+  // const companyAdd = () => {
+  //   tableCom.value = true;
+  //   resetDraw();
+  //   ruleForm.seniorScene = '顶级场景';
+  //   // emit('change-companyAddTitle', '添加公司');
+  //   // props.companyAddTitle = '添加公司';
+  //   // console.log('sceneList', sceneList.value);
+  //   // console.log('templateList', templateList.value);
+  // };
+  watch(
+    () => props.ruleForm,
+    (newRuleForm) => {
+      // console.log('111');
+      ruleForm.name = newRuleForm.name;
+      ruleForm.code = newRuleForm.code;
+      ruleForm.seniorScene = '顶级场景';
+      addEnable.value;
+    },
+    { deep: true },
+  );
+
+  watch(
+    [() => props.addEnable, () => props.selectItems],
+    ([newAddEnable, newSelectItems]) => {
+      addEnable.value = newAddEnable;
+      selectItems.value = newSelectItems;
+    },
+    { deep: true },
+  );
+
   //增加空的场景&模板
   const addChange = () => {
     selectItems.value.push({
       tag: '',
       template: '',
     });
-    console.log(selectItems.value);
   };
 
   //删除场景&模板
   const deleScene = (index) => {
-    // console.log('row', index);
     ElMessageBox.confirm('请确认是否关闭该场景?', '状态关闭', {
       confirmButtonText: '确认',
       cancelButtonText: '取消',
@@ -207,78 +273,35 @@
       });
   };
 
-  const formEl = ref<FormInstance>();
+  // const formEl = ref<FormInstance>();
 
-  const newCompanyAdd = () => {
-    emit('upload-data', {
-      ruleFormCom: ruleForm,
-      selectItemsCom: selectItems,
-      addEnableCom: addEnable,
+  //添加新公司的提交
+  const newCompanyAdd = (formEl: FormInstance | undefined) => {
+    if (!formEl) return;
+    emit('upload-company-data', ruleForm, selectItems, addEnable, () => {
+      resetDraw();
     });
-    props.addNewTypeCom(formEl);
   };
 
-  // //清空
-  // const resetDraw = () => {
-  //   ruleForm.name = '';
-  //   // ruleForm.seniorScene = '';
-  //   ruleForm.code = '';
-  //   ruleForm.sceneCode = '';
-  //   addEnable.value = 1;
-  //   selectItems.value = [{ tag: '', template: '' }];
-  //   ruleForm.principal = '';
-  //   ruleForm.templateWorkshop = '';
-  //   ruleForm.tagWorkshop = undefined;
-  // };
-
-  const isBook = computed(() => (props.subscribeItem.booking === '0' ? true : false));
-
-  const changeConig = () => {
-    props.handleConig(props.subItem);
-  };
-
-  const changeAdd = () => {
-    props.handleAdd(props.subItem);
-  };
-
-  const changeEdit = () => {
-    props.handleEdit(props.subItem);
-  };
-
-  const changeDelete = () => {
-    props.handleDelete(props.subItem);
+  //编辑公司时的提交
+  const editedSub = () => {
+    emit('edit-company-data', ruleForm, selectItems, addEnable, () => {
+      resetDraw();
+    });
   };
 
-  const changeUp = () => {
-    props.handleUp(props.subItem);
-  };
+  //重置编辑框
+  const resetDraw = () => {
+    ruleForm.name = '';
 
-  const changeDown = () => {
-    props.handleDown(props.subItem);
+    ruleForm.code = '';
+    ruleForm.sceneCode = '';
+    addEnable.value = 0;
+    selectItems.value = [{ tag: '', template: '' }];
+    ruleForm.principal = '';
+    ruleForm.templateWorkshop = undefined;
+    ruleForm.tagWorkshop = undefined;
   };
 </script>
 
-<style scoped>
-  .wordStyle {
-    height: 22px;
-    font-size: 14px;
-    color: #1890ff;
-    line-height: 22px;
-    cursor: pointer;
-  }
-  .otp-btn {
-    width: 52px;
-    height: 26px;
-  }
-
-  :deep(.el-button--primary) {
-    --el-button-bg-color: #3f9eff;
-    --el-button-hover-bg-color: #64b0fe;
-    --el-button-active-bg-color: #2f8ae7;
-  }
-  :deep(.el-button--danger) {
-    --el-button-bg-color: #f56c6c;
-    --el-button-hover-bg-color: #f68888;
-    --el-button-active-bg-color: #c35353;
-  }
-</style>
+<style scoped></style>

+ 240 - 0
src/views/dashboard/monitor/WorkShopSpaceDrawer.vue

@@ -0,0 +1,240 @@
+<template>
+  <div>
+    <el-drawer
+      class="test"
+      v-model="showDrawer"
+      @open="() => emit('update-tab-com', true)"
+      @close="() => emit('update-tab-com', false)"
+      with-header="true"
+      size="35%"
+    >
+      <template #header="{ titleId }">
+        <p :id="titleId">{{ props.addTitle }}</p>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="ruleForm"
+        :rules="rules"
+        label-width="120px"
+        class="demo-ruleForm"
+        size="default"
+        status-icon
+      >
+        <el-form-item :label="`${props.addName}`" prop="name">
+          <el-input v-model="ruleForm.name" />
+        </el-form-item>
+        <el-form-item label="上级场景" prop="seniorScene">
+          <el-input v-model="ruleForm.seniorScene" disabled />
+        </el-form-item>
+        <el-form-item :label="`${props.addCodeName}`" prop="code">
+          <el-input v-model="ruleForm.code" />
+        </el-form-item>
+        <el-form-item v-if="levelFindWorkshop" label="场景标签" prop="tagWorkshop">
+          <el-radio-group
+            v-model="ruleForm.tagWorkshop"
+            size="10px"
+            style="display: flex; justify-content: space-between"
+          >
+            <el-radio-button
+              v-for="item in props.tagList"
+              :label="item.id!"
+              class="tag-select"
+              style="margin-right: 10px"
+              >{{ item.name }}</el-radio-button
+            >
+            <!-- <el-radio-button
+              v-for="item in tagList"
+              :label="item.name"
+              :key="item.id"
+              :value="item.id"
+              class="tag-select"
+            /> -->
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item v-if="levelFindWorkshop" label="车间模板" prop="templateWorkshop">
+          <el-radio-group
+            v-model="ruleForm.templateWorkshop"
+            size="10px"
+            style="display: flex; justify-content: space-between"
+          >
+            <el-radio-button
+              v-for="item in props.workshopTemplateList"
+              :label="item.id!"
+              class="tag-select"
+              >{{ item.name }}</el-radio-button
+            >
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item v-if="!levelFindWorkshop" label="负责人" prop="principal">
+          <el-input v-model="ruleForm.principal" />
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-switch
+            v-model="addEnable"
+            :active-value="ENABLED.TRUE"
+            :inactive-value="ENABLED.FALSE"
+            class="switchUse"
+          />
+        </el-form-item>
+      </el-form>
+      <div style="position: absolute; left: 108px; bottom: 67px">
+        <el-button v-if="!props.editWork" type="warning" @click="resetDraw">重置</el-button>
+        <el-button v-if="!props.editWork" type="primary" @click="addNewType"> 提交 </el-button>
+        <el-button v-if="props.editWork" type="primary" @click="editedSub"> 提交 </el-button>
+      </div>
+    </el-drawer></div
+  >
+</template>
+
+<script setup lang="ts">
+  import { computed, reactive, ref, defineProps, defineEmits, watch } from 'vue';
+  import { ENABLED } from './use-method';
+  import type { FormInstance, FormRules } from 'element-plus';
+  import { labelModuleListType } from '@/api/scene/sceneOperate';
+  import { WorkshopModuleType } from '@/api/scene/secene-templet';
+
+  interface SelectItemType {
+    tag: string;
+    template: string;
+  }
+
+  const props = defineProps<{
+    table: boolean;
+    addTitle: string;
+    addName: string;
+    addCodeName: string;
+    levelFindWorkshop: boolean;
+    tagList: labelModuleListType[];
+    editWork: boolean;
+    workshopTemplateList: WorkshopModuleType[];
+    ruleForm: RuleForm;
+    addEnable: ENABLED;
+  }>();
+
+  const addEnable = ref(ENABLED.TRUE);
+  const selectItems = ref<SelectItemType[]>([{ tag: '', template: '' }]);
+
+  //将表单数据传至父组件
+  const emit = defineEmits(['upload-work-data', 'edit-work-data', 'update-tab-com']);
+
+  const showDrawer = computed(() => props.table);
+
+  //表格中的规则
+  const ruleFormRef = ref<FormInstance>();
+
+  interface RuleForm {
+    name: string; //名称
+    seniorScene: string; //上级场景
+    code: string; //代码
+    sceneCode: string; //场景代码
+    tagCom?: string[]; //公司场景标签 可选多个
+    templateCom?: string[]; //公司场景模板 可选多个
+    tagWorkshop?: number; //场景标签  车间
+    templateWorkshop?: number; //车间模板
+    principal?: string; //负责人
+  }
+  const ruleForm = reactive<RuleForm>({
+    name: '',
+    seniorScene: '',
+    code: '',
+    sceneCode: '',
+    tagCom: [],
+    templateCom: [],
+    tagWorkshop: undefined,
+    templateWorkshop: undefined,
+    principal: '',
+  });
+  const rules = reactive<FormRules<RuleForm>>({
+    name: [
+      { required: true, message: '', trigger: 'blur' },
+      { min: 1, max: 100, message: 'Length should be 3 to 5', trigger: 'blur' },
+    ],
+    seniorScene: [
+      { required: true, message: '', trigger: 'blur' },
+      { min: 1, max: 100, message: 'Length should be 1 to 100', trigger: 'blur' },
+    ],
+    code: [
+      { required: true, message: '', trigger: 'blur' },
+      { min: 1, max: 100, message: 'Length should be 1 to 100', trigger: 'blur' },
+    ],
+    sceneCode: [
+      { required: true, message: '', trigger: 'blur' },
+      { min: 1, max: 100, message: 'Length should be 1 to 100', trigger: 'blur' },
+    ],
+    tagCom: [{ required: true, message: '', trigger: 'blur' }],
+    templateCom: [{ required: true, message: '', trigger: 'blur' }],
+    tagWorkshop: [
+      { required: true, message: '', trigger: 'blur' },
+      { min: 1, max: 100, message: 'Length should be 1 to 100', trigger: 'blur' },
+    ],
+    templateWorkshop: [
+      { required: true, message: '', trigger: 'blur' },
+      { min: 1, max: 100, message: 'Length should be 1 to 100', trigger: 'blur' },
+    ],
+    principal: [
+      { required: true, message: '', trigger: 'blur' },
+      { min: 1, max: 100, message: 'Length should be 1 to 100', trigger: 'blur' },
+    ],
+  });
+
+  watch(
+    () => props.ruleForm,
+    (newRuleForm) => {
+      // console.log('111');
+      ruleForm.seniorScene = newRuleForm.seniorScene!;
+      ruleForm.name = newRuleForm.name;
+      ruleForm.code = newRuleForm.code;
+      ruleForm.tagWorkshop = newRuleForm.tagWorkshop;
+      ruleForm.templateWorkshop = newRuleForm.templateWorkshop;
+      ruleForm.principal = newRuleForm.principal;
+      // ruleForm.code = newRuleForm.code;
+      // ruleForm.seniorScene = '顶级场景';
+      // addEnable.value;
+    },
+    { deep: true },
+  );
+
+  watch(
+    [() => props.addEnable],
+    ([newAddEnable]) => {
+      addEnable.value = newAddEnable;
+    },
+    { deep: true },
+  );
+
+  //添加新公司的提交
+  const addNewType = (formEl: FormInstance | undefined) => {
+    if (!formEl) return;
+    emit('upload-work-data', ruleForm, addEnable, () => {
+      resetDraw();
+    });
+  };
+
+  //编辑公司时的提交
+  const editedSub = () => {
+    emit('edit-work-data', ruleForm, addEnable, () => {
+      resetDraw();
+    });
+  };
+
+  //重置编辑框
+  const resetDraw = () => {
+    ruleForm.name = '';
+    ruleForm.code = '';
+    ruleForm.sceneCode = '';
+    addEnable.value = 0;
+    selectItems.value = [{ tag: '', template: '' }];
+    ruleForm.principal = '';
+    ruleForm.templateWorkshop = undefined;
+    ruleForm.tagWorkshop = undefined;
+  };
+</script>
+
+<style scoped>
+  .tag-select {
+    margin-right: 10px;
+    margin-bottom: 10px;
+    border-radius: 4px;
+    border: 1px solid rgba(0, 0, 0, 0.15);
+  }
+</style>

+ 0 - 151
src/views/dashboard/monitor/addWorkspace.vue

@@ -1,151 +0,0 @@
-<template>
-  <el-drawer class="test" v-model="tableCom" with-header="true" size="35%">
-    <template #header="{ titleId }">
-      <p :id="titleId">{{ companyAddTitle }}</p>
-    </template>
-    <el-form
-      ref="ruleFormRef"
-      :model="ruleForm"
-      :rules="rules"
-      label-width="90px"
-      class="demo-ruleForm"
-      size="default"
-      status-icon
-    >
-      <el-form-item label="公司名称" prop="name">
-        <el-input v-model="ruleForm.name" style="width: 200px" />
-      </el-form-item>
-      <el-form-item label="上级场景" prop="seniorScene">
-        <el-input v-model="ruleForm.seniorScene" style="width: 200px" disabled />
-      </el-form-item>
-      <el-form-item label="公司代码" prop="code">
-        <el-input v-model="ruleForm.code" style="width: 200px" />
-      </el-form-item>
-      <el-form-item label="标签&模板" prop="sceneCode">
-        <div style="width: 200px; height: 30px"></div>
-        <div
-          v-for="(item, index) in selectItems"
-          :key="index"
-          style="margin-bottom: 16px; display: flex"
-        >
-          <el-select v-model="item.tag" placeholder="请选择标签" style="width: 126px">
-            <el-option
-              v-for="item1 in options"
-              :key="item1.value"
-              :label="item1.label"
-              :value="item1.value"
-            />
-          </el-select>
-          <img
-            src="@/assets/icons/link.png"
-            alt=""
-            style="width: 16px; margin-left: 2px; margin-right: 2px" />
-          <el-select v-model="item.template" placeholder="请选择模板" style="width: 126px">
-            <el-option
-              v-for="item2 in options"
-              :key="item2.value"
-              :label="item2.label"
-              :value="item2.value"
-            />
-          </el-select>
-          <img
-            src="../../../assets/icons/close.png"
-            @click="deleScene(index)"
-            alt=""
-            style="width: 13px; height: 13px; margin-top: 10px; margin-left: 3px; cursor: pointer"
-        /></div>
-        <div style="width: 200px">
-          <el-icon size="28px" @click="addChange" style="cursor: pointer"><CirclePlus /></el-icon
-        ></div>
-      </el-form-item>
-      <el-form-item label="状态">
-        <el-switch v-model="addEnable" active-value="1" inactive-value="0" class="switchUse" />
-      </el-form-item>
-    </el-form>
-    <div style="position: absolute; left: 108px; bottom: 67px">
-      <el-button v-if="companyAddTitle === '添加公司'" type="warning" @click="resetDraw"
-        >重置</el-button
-      >
-      <el-button type="primary" v-if="companyAddTitle === '添加公司'" @click="addNewTypeCom">
-        提交
-      </el-button>
-      <el-button type="primary" v-if="companyAddTitle !== '添加公司'" @click="editedSub">
-        提交
-      </el-button>
-    </div>
-  </el-drawer>
-</template>
-
-<script setup lang="ts">
-  import { computed } from 'vue';
-  //   import { SubscribeItem } from '@/api/subscribe/subscribe';
-
-  interface User {
-    name?: string;
-    tag?: string;
-    code?: string;
-    hasChildren?: boolean;
-    children?: User[];
-  }
-
-  const props = defineProps<{
-    subItem: User;
-    handleConig: (row) => unknown;
-    handleAdd: (row) => unknown;
-    handleEdit: (row) => unknown;
-    handleDelete: (row) => unknown;
-    handleUp: (row) => unknown;
-    handleDown: (row) => unknown;
-  }>();
-
-  const isBook = computed(() => (props.subscribeItem.booking === '0' ? true : false));
-
-  const changeConig = () => {
-    props.handleConig(props.subItem);
-  };
-
-  const changeAdd = () => {
-    props.handleAdd(props.subItem);
-  };
-
-  const changeEdit = () => {
-    props.handleEdit(props.subItem);
-  };
-
-  const changeDelete = () => {
-    props.handleDelete(props.subItem);
-  };
-
-  const changeUp = () => {
-    props.handleUp(props.subItem);
-  };
-
-  const changeDown = () => {
-    props.handleDown(props.subItem);
-  };
-</script>
-
-<style scoped>
-  .wordStyle {
-    height: 22px;
-    font-size: 14px;
-    color: #1890ff;
-    line-height: 22px;
-    cursor: pointer;
-  }
-  .otp-btn {
-    width: 52px;
-    height: 26px;
-  }
-
-  :deep(.el-button--primary) {
-    --el-button-bg-color: #3f9eff;
-    --el-button-hover-bg-color: #64b0fe;
-    --el-button-active-bg-color: #2f8ae7;
-  }
-  :deep(.el-button--danger) {
-    --el-button-bg-color: #f56c6c;
-    --el-button-hover-bg-color: #f68888;
-    --el-button-active-bg-color: #c35353;
-  }
-</style>

+ 0 - 0
src/views/dashboard/monitor/constant.ts


+ 143 - 426
src/views/dashboard/monitor/monitor.vue

@@ -49,7 +49,7 @@
     <!-- 添加的抽屉内容 -->
 
     <!-- 公司 -->
-    <el-drawer class="test" v-model="tableCom" with-header="true" size="35%">
+    <!-- <el-drawer class="test" v-model="tableCom" with-header="true" size="35%">
       <template #header="{ titleId }">
         <p :id="titleId">{{ companyAddTitle }}</p>
       </template>
@@ -134,21 +134,24 @@
           提交
         </el-button>
       </div>
-    </el-drawer>
-    <!-- <AddCompany
-      :tableCom="tableCom"
+    </el-drawer> -->
+    <CompanyDrawer
+      :table-com="tableCom"
       :companyAddTitle="companyAddTitle"
+      :comEdit="comEdit"
       :sceneList="sceneList"
       :templateList="templateList"
-      @upload-data="eldrawData"
-      @resetDraw="resetDraw"
-      @addNewTypeCom="addNewTypeCom"
-      @editedSub="editedSub"
-    /> -->
+      :ruleForm="ruleForm"
+      :selectItems="selectItems"
+      :addEnable="addEnable"
+      @upload-company-data="addNewTypeCom"
+      @edit-company-data="editedSubCom"
+      @update-tab-com="handleUpdateTableCom"
+    />
 
     <!-- 车间和工位 -->
 
-    <el-drawer class="test" v-model="table" with-header="true" size="35%">
+    <!-- <el-drawer class="test" v-model="table" with-header="true" size="35%">
       <template #header="{ titleId }">
         <p :id="titleId">{{ addTitle }}</p>
       </template>
@@ -179,13 +182,6 @@
             <el-radio-button v-for="item in tagList" :label="item.id!" class="tag-select">{{
               item.name
             }}</el-radio-button>
-            <!-- <el-radio-button
-              v-for="item in tagList"
-              :label="item.name"
-              :key="item.id"
-              :value="item.id"
-              class="tag-select"
-            /> -->
           </el-radio-group>
         </el-form-item>
         <el-form-item v-if="level === 0" label="车间模板" prop="templateWorkshop">
@@ -200,13 +196,6 @@
               class="tag-select"
               >{{ item.name }}</el-radio-button
             >
-            <!-- <el-radio-button
-              v-for="item in workshopTemplateList"
-              :label="item.name"
-              :key="item.id"
-              :value="item.id"
-              class="tag-select"
-            /> -->
           </el-radio-group>
         </el-form-item>
         <el-form-item v-if="level === 1" label="负责人" prop="principal">
@@ -243,28 +232,35 @@
           提交
         </el-button>
       </div>
-    </el-drawer>
+    </el-drawer> -->
+    <WorkshopAndWorkspace
+      :table="table"
+      :add-title="addTitle"
+      :add-name="addName"
+      :add-code-name="addCodeName"
+      :tag-list="tagList"
+      :levelFindWorkshop="levelFindWorkshop"
+      :ruleForm="ruleForm"
+      :workshopTemplateList="workshopTemplateList"
+      :add-enable="addEnable"
+      :editWork="editWork"
+      @update-tab-com="handleUpdataWorkTab"
+      @upload-work-data="addNewType"
+      @edit-work-data="editedSub"
+    />
   </page-wrapper>
 </template>
 
 <script setup lang="ts">
   import { ref, onMounted, reactive, h, watch } from 'vue';
-  import { Plus, CirclePlus } from '@element-plus/icons-vue';
+  import { Plus } from '@element-plus/icons-vue';
   import { BasicTable, BasicColumn } from '@/components/Table';
-  import type { FormInstance, FormRules } from 'element-plus';
+  import type { FormRules } from 'element-plus';
   import { ElMessageBox } from 'element-plus';
   import ActionColomn from './actionColomns.vue';
-  import AddCompany from './addCompany.vue';
-  import {
-    ENABLED,
-    colomns,
-    dataSourceWithParent,
-    deleteTableRow,
-    editTableRow,
-    findItemLevel,
-    options,
-    updateData,
-  } from './use-method';
+  import CompanyDrawer from './CompanyDrawer.vue';
+  import WorkshopAndWorkspace from './WorkShopSpaceDrawer.vue';
+  import { ENABLED, colomns, dataSourceWithParent, findItemLevel } from './use-method';
   import {
     ComAddDatas,
     addCompany,
@@ -278,9 +274,6 @@
     addWorkspace,
     editWorkspace,
     delWorkspace,
-    sceneListType,
-    getListWorkshop,
-    getSceneList,
     labelModuleListType,
   } from '@/api/scene/sceneOperate';
   import useScene from './use-scene';
@@ -291,27 +284,17 @@
     editWorkshopModuleLabel,
   } from '@/api/scene/secene-templet';
   import useSceneTemplete from './use-sence-templete';
-  import { storeToRefs } from 'pinia';
 
-  // const cameraOverview = useCameraOverview();
-  // const { loading } = storeToRefs(cameraOverview);
   const useSceneList = useScene();
   const { tableData, getSceneDetail } = useSceneList;
   const useSceneTempleteDetail = useSceneTemplete();
-  const {
-    sceneList,
-    getSceneLabel,
-    templateList,
-    getTemplete,
-    workshopTemplateList,
-    getWorkshopTemplete,
-  } = useSceneTempleteDetail;
+  const { sceneList, templateList, workshopTemplateList } = useSceneTempleteDetail;
 
   // 新增类型的参数值
   const addEnable = ref(ENABLED.TRUE); //启动按钮的值
 
   //表格中的规则
-  const ruleFormRef = ref<FormInstance>();
+  // const ruleFormRef = ref<FormInstance>();
 
   interface RuleForm {
     name: string; //名称
@@ -372,19 +355,22 @@
   const table = ref(false); //添加公司级的场景
   const tableCom = ref(false); //添加车间或者工位
 
+  const handleUpdateTableCom = (val: boolean) => {
+    tableCom.value = val;
+  };
+  const handleUpdataWorkTab = (val: boolean) => {
+    table.value = val;
+  };
   //添加公司级场景
 
-  const companyAddTitle = ref('添加公司');
+  const companyAddTitle = ref('');
+  const comEdit = ref<boolean>(false);
 
   const addTitle = ref('');
   const addName = ref('');
+  const addCodeName = ref('');
   const level = ref<number>();
 
-  // const total = ref<number>(100);
-  // const pageSize = ref<number>(10);
-
-  // const tableData = ref<sceneListType<getListWorkshop<workspaceAddDatas>>[]>([]);
-
   onMounted(() => {
     //添加父级,主要用于排序功能
     dataSourceWithParent(tableData.value, null);
@@ -398,28 +384,10 @@
     },
   );
 
-  //用于新增数据后,将新增数据加入父级
-  // watch(
-  //   tableData.value,
-  //   () => {
-  //     dataSourceWithParent(tableData.value, null);
-  //     console.log(tableData.value);
-  //   },
-  //   { deep: true },
-  // );
-
   function onCheckedRow(rowKeys) {
     console.log(rowKeys);
   }
 
-  //从子组件中获取数据
-  const eldrawData = (ruleFormCom, selectItemsCom, addEnableCom) => {
-    ruleFormCom.value = ruleFormCom;
-    selectItems.value = selectItemsCom;
-    addEnable.value = addEnableCom;
-    console.log(ruleForm, selectItems, addEnable);
-  };
-
   const orderByItem = () => {};
   const handlePageNumChange = () => {};
   const handlePageSizeChange = () => {};
@@ -427,16 +395,15 @@
   const companyAdd = () => {
     tableCom.value = true;
     resetDraw();
+    addEnable.value = ENABLED.TRUE;
     ruleForm.seniorScene = '顶级场景';
     companyAddTitle.value = '添加公司';
-    console.log('sceneList', sceneList.value);
-    console.log('templateList', templateList.value);
+    comEdit.value = false;
   };
 
   //重置编辑框
   const resetDraw = () => {
     ruleForm.name = '';
-    // ruleForm.seniorScene = '';
     ruleForm.code = '';
     ruleForm.sceneCode = '';
     addEnable.value = 0;
@@ -448,29 +415,6 @@
 
   //用于新增场景
   const selectItems = ref([{ tag: '', template: '' }] as { tag: string; template: string }[]);
-  const addChange = () => {
-    selectItems.value.push({
-      tag: '',
-      template: '',
-    });
-    console.log(selectItems.value);
-  };
-
-  //删除顶级场景的场景
-  const deleScene = (index) => {
-    // console.log('row', index);
-    ElMessageBox.confirm('请确认是否关闭该场景?', '状态关闭', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    })
-      .then(() => {
-        selectItems.value.splice(index, 1);
-      })
-      .catch(() => {
-        console.log('取消删除物件');
-      });
-  };
 
   //找出数据中的全部code
   const flattenCodes = (data) => {
@@ -486,38 +430,34 @@
   };
 
   //添加公司场景的提交按钮
-  const addNewTypeCom = (formEl: FormInstance | undefined) => {
-    if (!formEl) return;
-    // eldrawData(ruleFormCom, selectItemsCom, addEnableCom);
-
+  const addNewTypeCom = (ruleFormCom, selectItemsCom, addEnableCom) => {
     //选出不为空字符串的数据
-    selectItems.value = selectItems.value.filter((item) => {
+    selectItemsCom.value = selectItemsCom.value.filter((item) => {
       return item.tag && item.template;
     });
-    console.log('selectItems.value', selectItems.value);
 
     //取出数据中所有的code数据
     const allCodes = flattenCodes(tableData.value);
 
     //新接口中用的newdata
     const newComData = {
-      name: ruleForm.name,
-      code: ruleForm.code,
-      status: Number(addEnable.value),
+      name: ruleFormCom.name,
+      code: ruleFormCom.code,
+      status: Number(addEnableCom.value),
       isDeleted: 0,
       parentId: 0,
       serial: 0,
     };
 
     //判断新数据中是否与原有的code重复
-    if (allCodes.indexOf(ruleForm.code) > -1) {
+    if (allCodes.indexOf(ruleFormCom.code) > -1) {
       ElMessageBox.confirm('场景代码重复,请重新填写', '代码重复', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'error',
       })
         .then(() => {
-          ruleForm.code = '';
+          ruleFormCom.code = '';
         })
         .catch(() => {
           console.log('取消删除物件');
@@ -525,15 +465,11 @@
     } else {
       // tableData.value.push(newComData);
 
-      console.log('selectItems.value', selectItems.value);
       //提交数据并重置关闭el-draw
       addCompany(newComData)
         .then((res) => {
-          console.log('res', res);
-          // dataSourceWithParent(tableData.value, null);
-
           //将selectItems加工成保存公司-模板的数据类型
-          const newModuleLabel = selectItems.value.map((item) => {
+          const newModuleLabel = selectItemsCom.value.map((item) => {
             return {
               companyId: res,
               isDeleted: 0,
@@ -550,91 +486,47 @@
         })
         .finally(() => {
           getSceneDetail();
-          resetDraw();
           tableCom.value = false;
         });
-
-      // resetDraw();
-      // tableCom.value = false;
     }
   };
 
-  //新增工位或者车间的提交按钮
-  const addNewType = (formEl: FormInstance | undefined) => {
-    if (!formEl) return;
-
-    console.log('tagList', tagList.value);
-    console.log('workshopTemplateList', workshopTemplateList.value);
+  //判断是否是车间
+  const levelFindWorkshop = ref<boolean>(true);
 
-    // console.log('tagList', tagList.value.id);
-    console.log('ruleForm.tagWorkshop', ruleForm.tagWorkshop);
-    console.log('ruleForm.templateWorkshop', ruleForm.templateWorkshop);
+  //判断是否是车间或者工位的编辑
+  const editWork = ref<boolean>(true);
 
+  //新增工位或者车间的提交按钮
+  const addNewType = (workRuleForm, addEnableWork) => {
     level.value = findItemLevel(tableData.value, editedItem.value.id, editedItem.value.name);
     const newAddData = ref({});
     if (level.value === 0) {
-      console.log(111);
-      // const tegNum = tagList.value.indexOf(ruleForm.tagWorkshop!);
       newAddData.value = {
-        code: ruleForm.code,
+        code: workRuleForm.code,
         companyId: editedItem.value.id,
-        sceneLabelId: ruleForm.tagWorkshop,
+        sceneLabelId: workRuleForm.tagWorkshop,
         isDeleted: 0,
-        name: ruleForm.name,
-        status: Number(addEnable.value),
+        name: workRuleForm.name,
+        status: Number(addEnableWork.value),
         serial: 0,
         // templete: ruleForm.templateWorkshop,
       };
     } else {
       newAddData.value = {
-        code: ruleForm.code,
+        code: workRuleForm.code,
         workshopId: editedItem.value.id,
         isDeleted: 0,
-        name: ruleForm.name,
-        principal: ruleForm.principal,
-        status: Number(addEnable.value),
+        name: workRuleForm.name,
+        principal: workRuleForm.principal,
+        status: Number(addEnableWork.value),
         serial: 0,
       };
     }
-    console.log('newAddData.value', newAddData.value);
-
-    //添加上传接口
-    // addWorkspace(newAddData.value)
-    //   .then(() => {
-    //     getSceneDetail();
-    //     resetDraw();
-    //     table.value = false;
-    //   })
-    //   .catch((err) => {
-    //     console.log(err);
-    //   });
-
-    // const tegNum = tagList.value.indexOf(ruleForm.tagWorkshop!);
-    // console.log('tegNum', tegNum);
-    // const newAddData = {
-    //   code: ruleForm.code,
-    //   companyId: editedItem.value.id,
-    //   sceneLabelId: tegNum,
-    //   isDeleted: 0,
-    //   name: ruleForm.name,
-    //   status: addEnable.value,
-    //   templete: ruleForm.templateWorkshop,
-    // };
-
-    //添加车间
-    // addWorkshop(newAddData)
-    //   .then(() => {
-    //     getSceneDetail()
-    //       resetDraw();
-    //       table.value = false;
-    //   })
-    //   .catch((err) => {
-    //     console.log(err);
-    //   });
 
     const allCodes = flattenCodes(tableData.value);
 
-    if (allCodes.indexOf(ruleForm.code) > -1) {
+    if (allCodes.indexOf(workRuleForm.code) > -1) {
       ElMessageBox.confirm('场景代码重复,请重新填写', '代码重复', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
@@ -650,11 +542,10 @@
       if (level.value === 0) {
         addWorkshop(newAddData.value)
           .then((res) => {
-            // dataSourceWithParent(tableData.value, null);
             const newWorkshopModule = {
               workshopId: res,
               isDeleted: 0,
-              workshopModuleId: ruleForm.templateWorkshop!,
+              workshopModuleId: workRuleForm.templateWorkshop!,
             };
             return addWorkshopModuleLabel(newWorkshopModule);
           })
@@ -663,7 +554,6 @@
           })
           .finally(() => {
             getSceneDetail();
-            resetDraw();
             table.value = false;
           });
       } else {
@@ -673,45 +563,11 @@
           })
           .finally(() => {
             getSceneDetail();
-            resetDraw();
             table.value = false;
           });
       }
-
-      // updateData(tableData.value, ruleForm.seniorScene, newAddData.value);
-      // resetDraw();
-      // table.value = false;
     }
   };
-
-  //编辑规则
-  // const ruleFormRef2 = ref<FormInstance>();
-
-  // interface RuleForm2 {
-  //   name: string;
-  //   tag: string;
-  //   code: string;
-  // }
-  // const ruleForm2 = reactive<RuleForm2>({
-  //   name: '',
-  //   tag: '',
-  //   code: '',
-  // });
-  // const rules2 = reactive<FormRules2<RuleForm2>>({
-  //   name: [
-  //     { required: true, message: '', trigger: 'blur' },
-  //     { min: 1, max: 100, message: 'Length should be 3 to 5', trigger: 'blur' },
-  //   ],
-  //   tag: [
-  //     { required: true, message: '', trigger: 'blur' },
-  //     { min: 1, max: 100, message: 'Length should be 1 to 100', trigger: 'blur' },
-  //   ],
-  //   code: [
-  //     { required: true, message: '', trigger: 'blur' },
-  //     { min: 1, max: 100, message: 'Length should be 1 to 100', trigger: 'blur' },
-  //   ],
-  // });
-
   //操作列
   const actionColumn: BasicColumn = reactive({
     width: 350,
@@ -732,28 +588,27 @@
     },
   });
 
-  //表单中的Operations
-
   //页面设置函数
   const handleConfig = (row) => {
     console.log(row);
   };
 
   const handleAdd = (row) => {
-    console.log(row);
-    console.log(row.code);
     editedItem.value = { ...row }; // 将当前行的内容拷贝到 editedItem 中,以便编辑
-
+    editWork.value = false;
     //得出当前的数据的层级
     level.value = findItemLevel(tableData.value, row.id, row.name);
-    console.log('level', level.value);
 
     if (level.value === 0) {
+      levelFindWorkshop.value = true;
       addTitle.value = '添加车间';
       addName.value = '车间名称';
+      addCodeName.value = '车间代码';
     } else if (level.value === 1) {
+      levelFindWorkshop.value = false;
       addTitle.value = '添加工位';
       addName.value = '工位名称';
+      addCodeName.value = '工位代码';
     } else {
       return;
     }
@@ -766,18 +621,13 @@
 
   //添加车间中的场景标签
   const tagList = ref<labelModuleListType[]>([]);
-  // const templateList = ['厂房', '危险点', '食堂', '停车场'];
 
   //公司,车间,工位的模板数据
   const editedItem = ref<ComAddDatas | workshopAddDatas | workspaceAddDatas>({});
 
   // 在这里实现删除行的函数
-
   const handleDelete = (row: Recordable) => {
     level.value = findItemLevel(tableData.value, row.id, row.name);
-    console.log('level.value', level.value);
-
-    // const newAddData = ref({});
     if (row.children?.length > 0) {
       ElMessageBox.confirm('存在下级场景,无法删除该场景', '无法删除该条信息', {
         confirmButtonText: '确认',
@@ -799,17 +649,10 @@
         .then(() => {
           //删除接口的调用
           if (level.value === 0) {
-            console.log('00');
-
             return delCompany(row.id);
           } else if (level.value === 1) {
-            console.log('11');
-            console.log('row.id', row.id);
-
             return delWorkshop(row.id);
           } else {
-            console.log('22');
-
             return delWorkspace(row.id);
           }
         })
@@ -824,16 +667,13 @@
 
   const handleEdit = (row) => {
     editedItem.value = { ...row }; // 将当前行的内容拷贝到 editedItem 中,以便编辑
-    console.log(' editedItem.value', editedItem.value);
-    console.log('tableData', tableData);
-
+    editWork.value = true;
     level.value = findItemLevel(tableData.value, row.id, row.name);
     if (level.value === 0) {
       tableCom.value = true;
       companyAddTitle.value = '编辑公司';
+      comEdit.value = true;
       selectItems.value = [];
-      console.log('row.labelList', row.labelList);
-
       //复原公司选择的场景集合
       if (row.labelList && Array.isArray(row.labelList)) {
         selectItems.value = row.labelList.map((item, index) => ({
@@ -845,29 +685,22 @@
       ruleForm.seniorScene = '顶级场景';
       ruleForm.code = editedItem.value.code!;
       addEnable.value = editedItem.value.status!;
-
-      // ruleForm.seniorScene = editedItem.value.Toptag!;
     } else if (level.value === 1) {
-      console.log('editedItem.value', editedItem.value);
-
-      level.value = level.value - 1;
       addTitle.value = '编辑车间';
       addName.value = '车间名称';
+      addCodeName.value = '车间代码';
       table.value = true;
       ruleForm.name = editedItem.value.name!;
       ruleForm.seniorScene = editedItem.value.parent.name;
       ruleForm.code = editedItem.value.code!;
       addEnable.value = editedItem.value.status!;
-      // ruleForm.tagWorkshop = editedItem.value.parent.labelList[editedItem.value.sceneLabelId];
-      // ruleForm.templateWorkshop = editedItem.value.templete!;
       tagList.value = editedItem.value.parent.labelList;
       ruleForm.tagWorkshop = editedItem.value.sceneLabelId;
       ruleForm.templateWorkshop = editedItem.value.workshopModule.id;
-      // tagList.value = editedItem.value.Toptag!;
     } else if (level.value === 2) {
-      level.value = level.value - 1;
       addTitle.value = '编辑工位';
       addName.value = '工位名称';
+      addCodeName.value = '工位代码';
       table.value = true;
       ruleForm.name = editedItem.value.name!;
       ruleForm.seniorScene = editedItem.value.parent.name;
@@ -879,11 +712,11 @@
 
   //编辑时的提交按钮功能
 
-  const editedSub = () => {
+  //编辑公司的提交按钮
+  const editedSubCom = (ruleFormCom, selectItemsCom, addEnableCom) => {
     const allCodes = flattenCodes(tableData.value);
-
-    if (allCodes.indexOf(ruleForm.code) > -1) {
-      if (editedItem.value.code !== ruleForm.code) {
+    if (allCodes.indexOf(ruleFormCom.code) > -1) {
+      if (editedItem.value.code !== ruleFormCom.code) {
         ElMessageBox.confirm('场景代码重复,请重新填写', '代码重复', {
           confirmButtonText: '确认',
           cancelButtonText: '取消',
@@ -899,64 +732,74 @@
         return;
       }
     }
-    level.value = findItemLevel(tableData.value, editedItem.value.id, editedItem.value.name);
-    console.log('level', level.value);
 
-    if (level.value === 0) {
-      selectItems.value = selectItems.value.filter((item) => {
-        return item.tag && item.template;
+    selectItems.value = selectItemsCom.value.filter((item) => {
+      return item.tag && item.template;
+    });
+
+    //新增的数据
+    const editNewCom = {
+      id: editedItem.value.id,
+      name: ruleFormCom.name,
+      code: ruleFormCom.code,
+      status: Number(addEnableCom.value),
+    };
+    // 编辑上传
+    editCompany(editNewCom)
+      .then(() => {
+        //保存公司-场景标签-场景模板关系
+        const editModuleLabel = selectItems.value.map((item) => {
+          return {
+            companyId: editedItem.value.id,
+            isDeleted: 0,
+            sceneLabelId: Number(item.tag), //item.tag
+            sceneModuleId: Number(item.template), ///item.template
+          };
+        });
+        return editCompanyModuleLabel(editModuleLabel);
+      })
+      .finally(() => {
+        getSceneDetail();
+        tableCom.value = false;
       });
+  };
 
-      console.log('addEnable.value', addEnable.value);
+  const editedSub = (workRuleForm, addEnableWork) => {
+    const allCodes = flattenCodes(tableData.value);
 
-      //新增的数据
-      const editNewCom = {
-        id: editedItem.value.id,
-        name: ruleForm.name,
-        code: ruleForm.code,
-        // labelList: selectItems.value,
-        status: Number(addEnable.value),
-      };
-      // 编辑上传
-      editCompany(editNewCom)
-        .then(() => {
-          //保存公司-场景标签-场景模板关系
-          const editModuleLabel = selectItems.value.map((item) => {
-            return {
-              companyId: editedItem.value.id,
-              isDeleted: 0,
-              sceneLabelId: Number(item.tag), //item.tag
-              sceneModuleId: Number(item.template), ///item.template
-            };
-          });
-          return editCompanyModuleLabel(editModuleLabel);
+    if (allCodes.indexOf(workRuleForm.code) > -1) {
+      if (editedItem.value.code !== ruleForm.code) {
+        ElMessageBox.confirm('场景代码重复,请重新填写', '代码重复', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'error',
         })
-        .finally(() => {
-          resetDraw();
-          getSceneDetail();
-          tableCom.value = false;
-        });
-    } else if (level.value === 1) {
-      console.log(111111, ruleForm.templateWorkshop, ruleForm.tagWorkshop);
+          .then(() => {
+            console.log('代码重复');
+          })
+          .catch(() => {
+            console.log('取消删除物件');
+          });
+        return;
+      }
+    }
+    level.value = findItemLevel(tableData.value, editedItem.value.id, editedItem.value.name);
 
-      //用接口来编辑
-      // const tegNum = tagList.value.indexOf(ruleForm.tagWorkshop!);
+    if (level.value === 1) {
       const editNewWorkshopData = {
-        code: ruleForm.code,
-        sceneLabelId: ruleForm.tagWorkshop,
-        name: ruleForm.name,
-        status: Number(addEnable.value),
+        code: workRuleForm.code,
+        sceneLabelId: workRuleForm.tagWorkshop,
+        name: workRuleForm.name,
+        status: Number(addEnableWork.value),
         id: editedItem.value.id,
       };
-      console.log('editNewWorkshopData', editNewWorkshopData);
-
       //编辑车间并上传
       editWorkshop(editNewWorkshopData)
         .then(() => {
           const editWorkshopModule = {
             isDeleted: 0,
             workshopId: editedItem.value.id,
-            workshopModuleId: ruleForm.templateWorkshop,
+            workshopModuleId: workRuleForm.templateWorkshop,
           };
           return editWorkshopModuleLabel(editWorkshopModule);
         })
@@ -964,51 +807,17 @@
           console.log(err);
         })
         .finally(() => {
-          resetDraw();
+          // resetDraw();
           getSceneDetail();
           table.value = false;
         });
-
-      // editTableRow(
-      //   tableData.value,
-      //   level.value,
-      //   editedItem.value.name,
-      //   ruleForm.name,
-      //   ruleForm.code,
-      //   addEnable.value,
-      //   '',
-      //   ruleForm.templateWorkshop,
-      //   editedItem.value.parent.labelList.indexOf(ruleForm.tagWorkshop),
-      //   [],
-      // );
-      // table.value = false;
     } else if (level.value === 2) {
-      //用接口来编辑
-      // const editNewWorkspaceData = {
-      // code: ruleForm.code,
-      // name: ruleForm.name,
-      // status: addEnable.value,
-      // principal: ruleForm.principal,
-      // };
-
-      // 编辑车间并上传
-      // editWorkspace(editNewWorkspaceData)
-      //   .then(() => {
-      //     getSceneList().then(() => {
-      //       resetDraw();
-      //       table.value = false;
-      //     });
-      //   })
-      //   .catch((err) => {
-      //     console.log(err);
-      //   });
-
       const editNewWorkspaceData = {
-        code: ruleForm.code,
-        name: ruleForm.name,
-        status: Number(addEnable.value),
+        code: workRuleForm.code,
+        name: workRuleForm.name,
+        status: Number(addEnableWork.value),
         id: editedItem.value.id,
-        principal: ruleForm.principal,
+        principal: workRuleForm.principal,
       };
 
       //编辑车间并上传
@@ -1017,22 +826,12 @@
           console.log(err);
         })
         .finally(() => {
-          resetDraw();
+          // resetDraw();
           getSceneDetail();
           table.value = false;
         });
     }
   };
-  //表单中的启动状态
-  // const handleSwitchChange = (_row: PartItem) => {
-  //   // row.enable = row.enable === '1' ? '0' : '1';
-  //   // const editData = {
-  //   //   partTypeId: row.partTypeId,
-  //   //   enable: row.enable,
-  //   // };
-  //   // console.log(editData);
-  //   // editPartType(editData);
-  // };
 
   //向上排序
   const rowUp = (row) => {
@@ -1071,92 +870,10 @@
 </script>
 
 <style scoped>
-  /* .card{
-    displa;
-  } */
-
-  .data-none {
-    position: absolute;
-    /* left: 383px; */
-    right: 492px;
-    top: 200px;
-  }
-
-  .data-none-word {
-    width: 264px;
-    height: 30px;
-    font-size: 22px;
-    color: rgba(0, 0, 0, 0.45);
-    line-height: 30px;
-    margin-left: 61px;
-  }
-
-  .cark-line {
-    margin-top: 16px;
-  }
-  .caret-rotate {
-    transition: transform 0.3s linear;
-    transform: rotate(0deg);
-  }
-  .caret-collapse {
-    transform: rotate(180deg);
-  }
-  .space-collapse {
-    height: 0;
-    overflow: hidden;
-    transition: all 0.3s linear;
-  }
-  .space-open {
-    height: 100px;
-  }
-  .contentName {
-    margin-bottom: 50px;
-  }
-  .contentOne {
-    margin-right: 40px;
-  }
-  .contentNum {
-    margin-bottom: 50px;
-  }
-  .contentTwo {
-    margin-right: 12px;
-  }
-
-  .titleId {
-    font-size: 30px;
-    text-align: left;
-    margin-left: 20px;
-  }
-
-  .showBody {
-    display: flex;
-    width: 100%;
-    padding-bottom: 50px;
-    align-items: center;
-  }
-  .addContent {
-    width: 300px;
-  }
-
-  .showContent {
-    margin-right: 20px;
-  }
-
-  .switchContent {
-    display: flex;
-    margin-bottom: 50px;
-    align-items: center;
-  }
-
   .tag-select {
     margin-right: 10px;
     margin-bottom: 10px;
-    /* background: #ffffff; */
     border-radius: 4px;
     border: 1px solid rgba(0, 0, 0, 0.15);
   }
-  /* :deep(.el-table--default .cell) {
-        white-space: nowrap;
-        overflow: auto;
-      } */
 </style>