tangning 3 роки тому
батько
коміт
a809ed4441

+ 1 - 0
src/view/camera/index.vue

@@ -49,6 +49,7 @@
         <!-- / {{row.totalSpaceStr}} -->
       </el-table-column>
       <el-table-column label="绑定管理员" prop="nickName"></el-table-column>
+      <el-table-column label="到期时间" prop="activatedTime"></el-table-column>
       <el-table-column label="操作" v-slot:default="{ row }" v-if="auth.unbind || auth.update">
         <!-- <span class="oper-span" @click="oper.readyUpdate(row)" v-if="auth.update">编辑</span> -->
         <span class="oper-span" @click="unbindCamrea(row)" v-power="'unbind'" style="color: var(--primaryColor)">

+ 4 - 2
src/view/organization/list.vue

@@ -208,11 +208,12 @@ export default {
       }
       //校验成功后温馨提示
       let deptIdList = data.superiorValue.join(',')
+      let level = data.superiorValue&& data.superiorValue.length || 0
       let apidata = {
         superior: "sheq",
         ...data.detail,
         deptIdList:deptIdList,
-        level:data.superiorValue&& data.superiorValue.length  || 0
+        level:level+1,
       };
       let requestApi = addTreeitem;
       if (detailType == "编辑") {
@@ -240,8 +241,9 @@ export default {
     };
     const insertProject = (val) => {
       if (val.id) {
+        let superiorValue = val.ancestors && val.ancestors.split(',').slice(1)
         data.detailType = "编辑";
-        data.superiorValue = val.deptIdList? val.deptIdList.split(','):''
+        data.superiorValue = val.ancestors? superiorValue:''
         data.detail = {
           ...val,
           deptType:val.deptType.toString()

+ 0 - 1
src/view/organization/seeInfo.vue

@@ -44,7 +44,6 @@ export default {
         '2':'支队',
         '3':'大队',
       }
-      console.log('type',props);
       return leble[props.detail.deptType] || 'zanw'
     })
     return { ...toRefs(data),type };

+ 3 - 1
src/view/user/index.vue

@@ -217,7 +217,9 @@ export default {
       if (!row.status) {
         return getApp().$message.error("请先启用用户", "提示");
       }
-      let deptIdList = row.deptIdList&&row.deptIdList.split(',') || []
+      let superiorValue = row.ancestors && row.ancestors.split(',').slice(1)
+      let deptIdList = superiorValue || []
+      
       deptIdList.push(row.deptId)
       data.editData = {
         editName:row.nickName,