-

src/api/tenantManage/adminConfig.js

@@ -29,10 +29,10 @@ export function addUserData(params) {
 
 
 
-//管理员配置-注销
-export function plannedOutageDel(params) {
+//管理员配置-删除
+export function delUsers(params) {
     return request({
-        url: '/wcBlackoutPlan/plannedOutageDel',
+        url: '/userconfig/delUsers',
         method: 'GET',
         params,
     })

src/api/tenantManage/tenantUnit.js

@@ -27,6 +27,17 @@ export function addTenantData(params) {
     })
 }
 
+//单位配置-系统平台下拉
+export function getPlatformBoxList(params) {
+    return request({
+        url: '/tenantConfig/getPlatformBoxList',
+        method: 'GET',
+        params,
+    })
+}
+
+
+
 //单位配置-修改
 export function updateTenantData(params) {
     return request({

src/views/deviceManage/powerEquip/deviceDetails.vue

@@ -9,14 +9,13 @@
           v-model="store.state.siteId"
           placeholder="请选择"
           style="width: 200px; margin-right: 20px"
-          :disabled="store.state.authorities.indexOf('查询')==-1"
+          :disabled="store.state.authorities.indexOf('查询') == -1"
         >
           <el-option
             v-for="site in store.state.siteList"
             :key="site"
             :label="site.siteName"
             :value="site.id"
-            
           ></el-option>
         </el-select>
 
@@ -27,15 +26,15 @@
           class="firstTopLeftInput"
         ></el-input> -->
 
-         <el-button
-                  type="primary"
-                  icon="el-icon-search"
-                  class="search-button"
-                  @click="listSelect()"
-                  :disabled="store.state.authorities.indexOf('查询')==-1"
-                >
-                  搜索
-                </el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="search-button"
+          @click="listSelect()"
+          :disabled="store.state.authorities.indexOf('查询') == -1"
+        >
+          搜索
+        </el-button>
 
         <!-- <el-button
           class="search-button"
@@ -127,7 +126,7 @@
             size="small"
             style="color: #409eff"
             @click.prevent="editRow(scope.row)"
-            :disabled="store.state.authorities.indexOf('修改')==-1"
+            :disabled="store.state.authorities.indexOf('修改') == -1"
           >
             编辑
           </el-button>
@@ -141,7 +140,12 @@
             @cancel="cancelEvent"
           >
             <template #reference>
-              <el-button type="text" size="small" style="color: red"  :disabled="store.state.authorities.indexOf('删除')==-1">
+              <el-button
+                type="text"
+                size="small"
+                style="color: red"
+                :disabled="store.state.authorities.indexOf('删除') == -1"
+              >
                 删除
               </el-button>
             </template>
@@ -194,7 +198,7 @@ export default defineComponent({
   components: {
     listDialog,
   },
-  emits: ['updateRow', 'closeNo','func'],
+  emits: ['updateRow', 'closeNo', 'func'],
   props: {
     filter_Text: String,
     Height: String,
@@ -210,9 +214,8 @@ export default defineComponent({
     const listDialogBool = ref(false)
     const DialogArray = ref([])
 
-     const goBack = () => {
-       emit('func')
-    
+    const goBack = () => {
+      emit('func')
     }
 
     //变量列表
@@ -311,7 +314,7 @@ export default defineComponent({
       listSelect,
       goBack,
 
-      store
+      store,
     }
   },
 })

src/views/deviceManage/powerEquip/powerDialog/listDialog.vue

@@ -13,9 +13,24 @@
         @change="listTabsChange(listTabPosition)"
         style="margin-bottom: 15px; display: flex"
       >
-        <el-radio-button label="model" :disabled="store.state.authorities.indexOf('查询')==-1">模拟量</el-radio-button>
-        <el-radio-button label="state" :disabled="store.state.authorities.indexOf('查询')==-1">状态量</el-radio-button>
-        <el-radio-button label="parameter" :disabled="store.state.authorities.indexOf('查询')==-1">参数量</el-radio-button>
+        <el-radio-button
+          label="model"
+          :disabled="store.state.authorities.indexOf('查询') == -1"
+        >
+          模拟量
+        </el-radio-button>
+        <el-radio-button
+          label="state"
+          :disabled="store.state.authorities.indexOf('查询') == -1"
+        >
+          状态量
+        </el-radio-button>
+        <el-radio-button
+          label="parameter"
+          :disabled="store.state.authorities.indexOf('查询') == -1"
+        >
+          参数量
+        </el-radio-button>
         <!-- <div style="margin-left: 10px">
           <el-button icon="el-icon-plus" type="success">新增</el-button>
         </div> -->
@@ -25,7 +40,7 @@
         placeholder="搜索变量或编码"
         v-model="listInputText"
         style="width: 15rem; margin-bottom: 15px"
-        :disabled="store.state.authorities.indexOf('查询')==-1"
+        :disabled="store.state.authorities.indexOf('查询') == -1"
       >
         <template #suffix>
           <i class="el-icon-search el-input__icon"></i>
@@ -200,7 +215,6 @@ export default defineComponent({
       context.emit('closeNo', false)
       listDialog.value = false
     }
-   
 
     function listSelect() {
       const array = props.DialogArray
@@ -274,7 +288,7 @@ export default defineComponent({
       listInputText: ref(''), //变量列表input搜索框
       multipleSelection, //变量列表弹窗复选框值存储
       listNumberData,
-      store
+      store,
     }
   },
 })

src/views/tenantManage/adminConfig/component/checkAdminList.vue

@@ -42,21 +42,29 @@
           >
             密码重置
           </el-button>
-          <el-button
-            @click="adminConfig(scope.row)"
-            type="text"
-            size="small"
-            style="color: #409eff"
-          >
-            删除
-          </el-button>
+          <el-popconfirm
+              confirm-button-text="是"
+              cancel-button-text="否"
+              icon="el-icon-info"
+              icon-color="red"
+              title="确定删除?"
+              @confirm="handleDelete(scope.row)"
+              @cancel="cancelEvent"
+            >
+              <template #reference>
+                <el-button type="text" size="small" class="delete-text" >
+                  
+                  删除
+                </el-button>
+              </template>
+            </el-popconfirm>
         </template>
       </el-table-column>
     </el-table>
     <!-- 表格end -->
 
     <!-- 分页start -->
-    <div class="paginationBlock">
+    <div class="paginationBlock1" style="margin-top:30px">
       <el-pagination
         v-model:currentPage="page"
         :page-sizes="[15, 20, 25, 30]"
@@ -229,6 +237,29 @@ export default defineComponent({
       return time.getTime() <= Date.now() - timeRange * 1
     }
 
+
+     //删除 是否删除  ---- 是
+    const handleDelete = (row) => {
+      api.delUsers({ userId: row.userId }).then((requset) => {
+        if (requset.status === 'SUCCESS') {
+          ElMessage.success({
+            message: '删除成功',
+            type: 'success',
+          })
+          Select()
+        } else {
+          ElMessage.error(requset.msg)
+        }
+      })
+    }
+
+    //是否删除  ---- 否
+    const cancelEvent = () => {
+      console.log('cancel!')
+    }
+
+
+
     return {
       pickerEndDate,
       roleValid,
@@ -260,6 +291,14 @@ export default defineComponent({
       DialogArray,
       adminDialogBool,
 
+      total,
+      pageSize,
+      currentPage,
+
+
+      handleDelete,
+      cancelEvent,
+
     }
   },
 })

src/views/tenantManage/adminConfig/index.vue

@@ -281,18 +281,18 @@ export default defineComponent({
     }
 
     //删除 是否删除  ---- 是
-    const handleDelete = (row) => {
-      api.plannedOutageDel({ id: row.id }).then((requset) => {
-        if (requset.status === 'SUCCESS') {
-          ElMessage.success({
-            message: '删除成功',
-            type: 'success',
-          })
-          Select()
-        } else {
-          ElMessage.error(requset.msg)
-        }
-      })
+    const handleDelete = () => {
+      // api.plannedOutageDel({ id: row.id }).then((requset) => {
+      //   if (requset.status === 'SUCCESS') {
+      //     ElMessage.success({
+      //       message: '删除成功',
+      //       type: 'success',
+      //     })
+      //     Select()
+      //   } else {
+      //     ElMessage.error(requset.msg)
+      //   }
+      // })
     }
     //是否删除  ---- 否
     const cancelEvent = () => {

src/views/tenantManage/tenantUnit/dialogComponent.vue

@@ -58,9 +58,18 @@
               v-model="form.systemName"
               placeholder="请选择"
             >
-              <el-option label="永天智慧电力平台" :value="1"></el-option>
+              <!-- <el-option label="永天智慧电力平台" :value="1"></el-option>
               <el-option label="伍继智慧电力平台" :value="2"></el-option>
-              <el-option label="电力运营管理平台" :value="3"></el-option>
+              <el-option label="电力运营管理平台" :value="3"></el-option> -->
+
+              <el-option
+            v-for="(item, index) in getPlatformBoxList"
+            :key="index"
+            :label="item.platformName"
+            :value="item.id"
+          ></el-option>
+
+
             </el-select>
           </el-form-item>
 
@@ -102,7 +111,7 @@
 </template>
 <script>
 import { useStore } from 'vuex'
-import { defineComponent, ref, watchEffect } from 'vue'
+import { defineComponent, ref, watchEffect ,onMounted} from 'vue'
 import * as api from '@/api/tenantManage/tenantUnit.js'
 import { ElMessage } from 'element-plus'
 // import { parseTime } from '@/utils'
@@ -127,6 +136,8 @@ export default defineComponent({
     const form = ref({})
     const formInfo = ref(null)
 
+     const getPlatformBoxList = ref([])
+
     const roleValid = (rule, value, callback) => {
       rule
       if (value.length === 0) {
@@ -196,6 +207,9 @@ export default defineComponent({
       form.value = props.itemInfo;
       console.log('form.value')
       console.log(form.value)
+
+       optionselect()
+       
     }
 
     // 关闭弹框
@@ -209,6 +223,20 @@ export default defineComponent({
       formInfo.value.resetFields()
     }
 
+    //角色下拉请求
+    function optionselect() {
+      api.getPlatformBoxList().then((requset) => {
+        if (requset.status === 'SUCCESS') {
+     
+          getPlatformBoxList.value = requset.data
+        } else {
+          ElMessage.error(requset.msg)
+        }
+      })
+    }
+
+
+
     watchEffect((fn, options) => {
       fn, options
       showDialog.value = props.show_Dialog
@@ -220,6 +248,10 @@ export default defineComponent({
       return time.getTime() <= Date.now() - timeRange * 1
     }
 
+    onMounted(() => {
+     
+    })
+
     return {
       pickerEndDate,
       roleValid,
@@ -234,6 +266,7 @@ export default defineComponent({
       checked: true,
       form,
       formInfo,
+      getPlatformBoxList,
 
       rules: {
         tenantName: [

src/views/tenantManage/tenantUnit/index.vue

@@ -157,9 +157,9 @@
       </el-table-column>
 
       <el-table-column
-        prop="systemName"
+        prop="platformName"
         label="系统平台"
-        min-width="100px"
+        min-width="140px"
       ></el-table-column>
       <el-table-column
         prop="tenantTerm"
@@ -285,7 +285,7 @@ export default defineComponent({
         geoPosition: row.geoPosition,
         tenantType: Number(row.tenantType),
         phoneNumber: row.phoneNumber,
-        systemName: row.systemName,
+        systemName: Number(row.systemName),
         email: row.email,
         address: row.address,
         remark:row.remark