From 7473fcdf3c3bdeba6306ec930b55012405fe17d7 Mon Sep 17 00:00:00 2001
From: fhysy <1149505133@qq.com>
Date: Wed, 9 Oct 2024 16:02:13 +0800
Subject: [PATCH] =?UTF-8?q?=20fast(=E7=99=BB=E5=BD=95=E3=80=81=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E3=80=81=E8=AE=BE=E5=A4=87=E3=80=81=E9=95=BF=E5=9F=8E?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE):=20=E8=B0=83=E6=95=B4=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E3=80=81=E7=99=BB=E5=BD=95=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=88=87=E6=8D=A2=E6=A0=B7=E5=BC=8F=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E4=BC=81=E4=B8=9A=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD=EF=BC=8C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=95=BF=E5=9F=8E=E9=BB=98=E8=AE=A4=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dr                                       |   4 +-
 .env.drprod                                   |   4 +-
 src/api/tenant/projectUser.js                 |  45 ++
 src/views/iot/device/index.vue                |   7 +-
 .../project/profileV2/EObjectContainer.vue    |   2 +-
 .../iot/project/profileV2/ETenantUser.vue     | 435 ++++++++++++------
 src/views/login-blue-black.vue                |  93 ++--
 src/views/login-blue-white.vue                |  93 ++--
 src/views/login-green.vue                     |  93 ++--
 9 files changed, 530 insertions(+), 246 deletions(-)

diff --git a/.env.dr b/.env.dr
index 99babbcf..edb7b759 100644
--- a/.env.dr
+++ b/.env.dr
@@ -33,7 +33,7 @@ VUE_APP_THEME_CLASS = 'theme-blue-black'
 VUE_APP_BASE_API = '/dev-api'
 
 #平台大屏地址
-VUE_APP_BIGSCREEN_PLATFORM_URL = 'https://goview.drgyen.cn/#/chart/preview/202409060982078'
+VUE_APP_BIGSCREEN_PLATFORM_URL = 'https://goview.drgyen.cn/#/chart/preview/202409030993958'
 #项目大屏地址
 VUE_APP_BIGSCREEN_PROJECT_URL = ''
 
@@ -55,4 +55,4 @@ port= 9988
 // 开发端
 # target = https://digital-core.dieruen-iot.com
 // 黄明 本地
-target = http://192.168.1.17:8899
+target = https://digital-core.dieruen-iot.com
diff --git a/.env.drprod b/.env.drprod
index ed56f0b7..fe61b6e4 100644
--- a/.env.drprod
+++ b/.env.drprod
@@ -34,7 +34,7 @@ VUE_APP_THEME_CLASS = 'theme-blue-black'
 VUE_APP_BASE_API = '/prod-api'
 
 #平台大屏地址
-VUE_APP_BIGSCREEN_PLATFORM_URL = 'https://goview.drgyen.cn/#/chart/preview/202409060982078'
+VUE_APP_BIGSCREEN_PLATFORM_URL = 'https://goview.drgyen.cn/#/chart/preview/202409030993958'
 #项目大屏地址
 VUE_APP_BIGSCREEN_PROJECT_URL = ''
 
@@ -52,4 +52,4 @@ port= 9988
 // 测试端
 // target = http://192.168.10.241:32024
 // 开发端
- target = https://power-core.drgyen.com
+ target = https://digital-core.dieruen-iot.com
diff --git a/src/api/tenant/projectUser.js b/src/api/tenant/projectUser.js
index 5acf3a79..48e7df4a 100644
--- a/src/api/tenant/projectUser.js
+++ b/src/api/tenant/projectUser.js
@@ -27,6 +27,8 @@ export function addProjectUser(data) {
   });
 }
 
+
+
 // 删除项目用户
 export function delProjectUser(projectId, userIds) {
   return request({
@@ -43,3 +45,46 @@ export function exportProjectUser(query) {
     params: query
   });
 }
+
+// 查询项目列表
+export function listProjectMember(query) {
+  return request({
+    url: "/app/project/userlist",
+    method: "get",
+    params: query
+  });
+}
+
+// 新增项目成员
+export function addProjectMember(data) {
+  return request({
+    url: "/app/project/useradd",
+    method: "post",
+    data: data
+  });
+}
+
+// 修改项目成员角色
+export function editProjectMemberRole(projectId, userId,roleKey) {
+  return request({
+    url: "/app/project/" + projectId +  '/' + userId +  '/' + roleKey,
+    method: "put",
+  });
+}
+
+// 移交项目成员
+export function transferProjectMember(data) {
+  return request({
+    url: "/app/project/transfer",
+    method: "post",
+    data: data
+  });
+}
+
+// 删除项目成员
+export function delProjectMember(projectId, userIds) {
+  return request({
+    url: "/app/project/" + projectId +  '/' + userIds,
+    method: "delete"
+  });
+}
diff --git a/src/views/iot/device/index.vue b/src/views/iot/device/index.vue
index ba4557c3..a4dc8207 100644
--- a/src/views/iot/device/index.vue
+++ b/src/views/iot/device/index.vue
@@ -133,22 +133,21 @@
         ></el-table-column>
         <el-table-column align="left" label="设备名称" prop="deviceName" />
         <el-table-column align="left" label="所属型号" prop="modelName" />
-        <el-table-column align="left" label="设备key" prop="deviceKey" width="150px" />
+        <el-table-column align="left" label="设备key" prop="deviceKey"  />
         <el-table-column
           align="center"
           label="设备码"
+          min-width="120"
           prop="deviceState"
-          width="180"
         >
           <template slot-scope="scope">
-            <img :ref="'qrCodeDiv' + scope.row.deviceKey"  style="width: 100%" @click="lookQrCode(scope.row.qrCodeUrl)"/>
+            <img :ref="'qrCodeDiv' + scope.row.deviceKey"  style="width: 100%;cursor: pointer" @click="lookQrCode(scope.row.qrCodeUrl)"/>
           </template>
         </el-table-column>
         <el-table-column
           align="left"
           label="设备类型"
           prop="deviceTypeName"
-          width="120px"
         />
         <!-- <el-table-column
           label="设备标签"
diff --git a/src/views/iot/project/profileV2/EObjectContainer.vue b/src/views/iot/project/profileV2/EObjectContainer.vue
index f2576d2b..fbdc980f 100644
--- a/src/views/iot/project/profileV2/EObjectContainer.vue
+++ b/src/views/iot/project/profileV2/EObjectContainer.vue
@@ -9,7 +9,7 @@
         <e-object-tenant v-if="activeName === 'tenant'" :infoData="projectInfo || {}"/>
       </el-tab-pane>
 
-      <el-tab-pane v-if="!isShowUserTable" label="项目人员" name="user">
+      <el-tab-pane v-if="!isShowUserTable" label="项目成员" name="user">
         <e-tenant-user v-if="activeName === 'user'" :projectId="projectInfo.projectId"></e-tenant-user>
       </el-tab-pane>
 
diff --git a/src/views/iot/project/profileV2/ETenantUser.vue b/src/views/iot/project/profileV2/ETenantUser.vue
index ae80d7bc..360916a3 100644
--- a/src/views/iot/project/profileV2/ETenantUser.vue
+++ b/src/views/iot/project/profileV2/ETenantUser.vue
@@ -1,26 +1,26 @@
 <template>
   <div class="app-container">
     <el-form
-      :model="queryParams"
+      v-show="showSearch"
       ref="queryForm"
       :inline="true"
-      v-show="showSearch"
+      :model="queryParams"
       label-width="68px"
     >
-     
-      <el-form-item label="昵称" prop="nickName">
+
+      <el-form-item label="项目成员" prop="phoneNumber">
         <el-input
-          v-model="queryParams.nickName"
-          placeholder="昵称"
+          v-model="queryParams.phoneNumber"
           clearable
+          placeholder="输入昵称或手机号搜索"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
 
       <el-form-item>
-        <el-button type="primary"  icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-search"  type="primary" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
-        <el-button type="primary" plain icon="el-icon-plus" v-hasPermi="['project:user:add']" @click="handleAdd">新增</el-button>
+        <el-button v-hasPermi="['project:user:add']" icon="el-icon-plus" plain type="primary" @click="handleAdd">新增</el-button>
       </el-form-item>
     </el-form>
 
@@ -30,70 +30,168 @@
       :default-sort="{prop: 'expirationTime', order: 'descending'}"
       @sort-change="sortChange"
     >
-      <el-table-column type="index" label="序号" align="center" :index="indexFormatter" width="80px"></el-table-column>
-      <el-table-column label="用户昵称" align="center" prop="nickName" />
-      <el-table-column label="手机号码" align="center" prop="phoneNumber" />
-      <el-table-column label="邮箱" align="center" prop="email" />
-      <el-table-column label="状态" align="center" prop="status">
+      <el-table-column :index="indexFormatter" align="center" label="序号" type="index" width="80px"></el-table-column>
+      <el-table-column align="center" label="用户昵称" prop="nickName" />
+      <el-table-column align="center" label="手机号码" prop="phoneNumber" />
+      <el-table-column align="center" label="角色" prop="roleName" />
+      <el-table-column align="center" label="状态" prop="status">
         <template slot-scope="scope">
           <span v-text="scope.row.status === '0' ? '正常' : '停用'"></span>
         </template>
       </el-table-column>
+<!--      <el-table-column-->
+<!--        align="center"-->
+<!--        label="创建时间"-->
+<!--        prop="createTime"-->
+<!--        sortable="custom"-->
+<!--        width="160"-->
+<!--      />-->
       <el-table-column
-        label="创建时间"
         align="center"
-        sortable="custom"
-        prop="createTime"
-        width="160"
-      />
-      <el-table-column
-        label="操作"
-        align="center"
-        width="200px"
         class-name="small-padding fixed-width"
+        label="操作"
+        width="300px"
       >
-        <template slot-scope="scope">
+        <template v-if="scope.row.roleKey!='root'" slot-scope="scope">
+<!--          <el-popconfirm-->
+<!--            v-hasPermi="['project:user:relieve']"-->
+<!--            title="确认要将项目移交给该用户吗？"-->
+<!--          >-->
+<!--            <el-button-->
+<!--              slot="reference"-->
+<!--              icon="el-icon-sort"-->
+<!--              size="mini"-->
+<!--              style="margin-right: 10px"-->
+<!--              type="text"-->
+<!--              @click="handleTransfer(scope.row)"-->
+<!--            >项目移交</el-button>-->
+<!--          </el-popconfirm>-->
+
           <el-button
+            v-hasPermi="['project:user:relieve']"
+            icon="el-icon-edit-outline"
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            @click="openEdit(scope.row)"
+          >修改角色</el-button>
+
+          <el-button
             v-hasPermi="['project:user:relieve']"
+            icon="el-icon-delete"
+            size="mini"
+            type="text"
             @click="handleDelete(scope.row)"
-          >解除用户</el-button>
+          >删除成员</el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
       v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.pageNum"
+      :total="total"
       @pagination="getList"
     />
 
+<!--    <el-dialog-->
+<!--      title="选择用户"-->
+<!--      :visible.sync="selectTableShow"-->
+<!--      width="50%"-->
+<!--      top="10vh"-->
+<!--      class="select-table-dialog"-->
+<!--      :close-on-click-modal="false"-->
+<!--      append-to-body-->
+<!--    >-->
+<!--      <select-table-wrap-->
+<!--        v-if="selectTableShow"-->
+<!--        :tableOption="tableSelectOption.tableOpt"-->
+<!--        :queryOption="tableSelectOption.queryOpt"-->
+<!--        :tableList="tableSelectOption.tableList"-->
+<!--        @parentGetList="childGetList($event)"-->
+<!--        :otherOption="tableSelectOption.otherOption"-->
+<!--        @returnEvent="returnEvent($event)"-->
+<!--      />-->
+
+<!--      <div slot="footer" class="dialog-footer">-->
+<!--        <el-button size="mini" type="primary" @click="submitForm">确 定</el-button>-->
+<!--        <el-button size="mini" @click="() =>{selectTableShow = false}">取 消</el-button>-->
+<!--      </div>-->
+<!--    </el-dialog>-->
+
+
     <el-dialog
-      title="选择用户"
-      :visible.sync="selectTableShow"
-      width="50%"
-      top="10vh"
-      class="select-table-dialog"
       :close-on-click-modal="false"
+      :visible.sync="editMemberVisible"
       append-to-body
+      class="select-table-dialog"
+      title="修改角色"
+      top="10vh"
+      width="400px"
     >
-      <select-table-wrap
-        v-if="selectTableShow"
-        :tableOption="tableSelectOption.tableOpt"
-        :queryOption="tableSelectOption.queryOpt"
-        :tableList="tableSelectOption.tableList"
-        @parentGetList="childGetList($event)"
-        :otherOption="tableSelectOption.otherOption"
-        @returnEvent="returnEvent($event)"
-      />
+      <el-form ref="editForm" :model="editForm" :rules="editRules" class="phone-box" label-width="120px">
+        <el-form-item label="用户手机号">
+          <div slot="label" >
+            用户昵称
+          </div>
+          {{editForm.nickName}}
+        </el-form-item>
+        <el-form-item label="权限" prop="role">
+          <el-select v-model="editForm.role" placeholder="请选择权限">
+            <el-option
+              v-for="item in roleList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button size="mini" type="primary" @click="handleEdit">确 定</el-button>
+        <el-button size="mini" @click="() =>{editMemberVisible = false}">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog
+      :close-on-click-modal="false"
+      :visible.sync="selectTableShow"
+      append-to-body
+      class="select-table-dialog"
+      title="添加成员"
+      top="10vh"
+      width="600px"
+    >
+      <el-form ref="form" :model="form" :rules="rules" class="phone-box" label-width="120px">
+        <el-form-item label="用户手机号" prop="phone">
+          <div slot="label" style="display: inline-block">
+            用户手机号
+            <el-tooltip content="用户需在小程序端先注册" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </div>
+          <el-input v-model="form.phone" ></el-input>
+        </el-form-item>
+<!--        <el-form-item label="权限" prop="role">-->
+<!--          <el-select v-model="form.role" placeholder="请选择权限">-->
+<!--            <el-option label="运维成员" value="shanghai"></el-option>-->
+<!--            <el-option label="成员" value="beijing"></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+      </el-form>
 
       <div slot="footer" class="dialog-footer">
-        <el-button size="mini" type="primary" @click="submitForm">确 定</el-button>
-        <el-button size="mini" @click="() =>{selectTableShow = false}">取 消</el-button>
+        <el-button type="primary" @click="submitForm"
+        >确 定</el-button
+        >
+        <el-button
+          @click="
+            () => {
+              selectTableShow = false;
+            }
+          "
+        >取 消</el-button
+        >
       </div>
     </el-dialog>
   </div>
@@ -104,8 +202,11 @@ import {
   listProjectUser,
   delProjectUser,
   addProjectUser,
+  listProjectMember,
+  addProjectMember,
+  delProjectMember,
   exportProjectUser,
-  listProjectNotUsed
+  listProjectNotUsed, transferProjectMember, editProjectMemberRole
 } from "@/api/tenant/projectUser";
 import SelectTableWrap from "@/components/SelectTable/index";
 export default {
@@ -117,6 +218,7 @@ export default {
   data() {
     return {
       selectTableShow: false,
+      editMemberVisible:false,
       tableSelectOption: {},
       selectResult: {},
       // 遮罩层
@@ -142,12 +244,41 @@ export default {
         pageNum: 1,
         pageSize: 10,
         orderByColumn: "createTime",
-        isAsc: "desc"
+        isAsc: "desc",
+        phoneNumber:'',
       },
       // 表单参数
-      form: {},
+      form: {
+        projectId: null,
+        phone: null,
+      },
       // 表单校验
-      rules: {},
+      rules: {
+        phone: [
+          { required: true, message: "用户手机号不能为空", trigger: "blur" },
+        ],
+      },
+      editForm: {
+        projectId: null,
+        nickName: null,
+        userId: null,
+        role: null
+      },
+      editRules: {
+        role: [
+          { required: true, message: "用户手机号不能为空", trigger: "change" },
+        ],
+      },
+      roleList: [
+        {
+          value: 'personal',
+          label: '普通成员'
+        },
+        {
+          value: 'operator',
+          label: '设备运维员'
+        }
+      ],
       // 用户状态
       statusOptions: [],
       tenantTypeOptions: []
@@ -176,6 +307,85 @@ export default {
         val + 1 + (this.queryParams.pageNum - 1) * this.queryParams.pageSize
       );
     },
+    childGetList(data) {
+      listProjectNotUsed(Object.assign(data.page, data.param)).then(
+        response => {
+          this.tableSelectOption.tableList = response.rows;
+          this.tableSelectOption.queryOpt.page.total = Number(response.total);
+        }
+      );
+    },
+    returnEvent(data) {
+      if (data.type === "dblclick") {
+        this.form.userId = data.value.userId;
+        this.form.tenantId = data.value.tenantId;
+        this.submitForm();
+      } else if (data.type === "click") {
+        this.form.userId = data.value.userId;
+        this.form.tenantId = data.value.tenantId;
+      }
+    },
+    // 用户状态字典翻译
+    statusFormat(row, column) {
+      var rulesStr = "";
+      this.statusOptions.forEach(v => {
+        if (v.dictValue === row.status) {
+          rulesStr = v.dictLabel;
+        }
+      });
+      return rulesStr;
+    },
+    tenantTypeFormat(row, column) {
+      var rulesStr = "";
+      this.tenantTypeOptions.forEach(v => {
+        if (v.dictValue === row.status) {
+          rulesStr = v.dictLabel;
+        }
+      });
+      return rulesStr;
+    },
+    /** 查询项目用户关系列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.projectId = this.projectId;
+      // let params = {
+      //   projectId: this.projectId,
+      //   phoneNumber: this.queryParams.phoneNumber,
+      // };
+      listProjectMember(this.queryParams).then(response => {
+        this.project_tenantList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        projectId: this.projectId,
+        phone: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.handleDetails();
+    },
     // 打开厂商选择窗口 ——表格
     handleDetails() {
       this.selectResult = {};
@@ -264,101 +474,68 @@ export default {
       };
       this.selectTableShow = true;
     },
-    childGetList(data) {
-      listProjectNotUsed(Object.assign(data.page, data.param)).then(
-        response => {
-          this.tableSelectOption.tableList = response.rows;
-          this.tableSelectOption.queryOpt.page.total = Number(response.total);
-        }
-      );
-    },
-    returnEvent(data) {
-      if (data.type === "dblclick") {
-        this.form.userId = data.value.userId;
-        this.form.tenantId = data.value.tenantId;
-        this.submitForm();
-      } else if (data.type === "click") {
-        this.form.userId = data.value.userId;
-        this.form.tenantId = data.value.tenantId;
-      }
-    },
-    // 用户状态字典翻译
-    statusFormat(row, column) {
-      var rulesStr = "";
-      this.statusOptions.forEach(v => {
-        if (v.dictValue === row.status) {
-          rulesStr = v.dictLabel;
-        }
-      });
-      return rulesStr;
-    },
-    tenantTypeFormat(row, column) {
-      var rulesStr = "";
-      this.tenantTypeOptions.forEach(v => {
-        if (v.dictValue === row.status) {
-          rulesStr = v.dictLabel;
-        }
-      });
-      return rulesStr;
-    },
-    /** 查询项目用户关系列表 */
-    getList() {
-      this.loading = true;
-      this.queryParams.projectId = this.projectId;
-      listProjectUser(this.queryParams).then(response => {
-        this.project_tenantList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        projectId: this.projectId,
-        userId: null,
-        tenantId: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.handleDetails();
-    },
     /** 提交按钮 */
     submitForm() {
-      addProjectUser(this.form).then(response => {
-        this.msgSuccess("新增成功");
-        this.selectTableShow = false;
-        this.getList();
+      // addProjectUser(this.form).then(response => {
+      //   this.msgSuccess("新增成功");
+      //   this.selectTableShow = false;
+      //   this.getList();
+      // });
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          // alert('submit!');
+          addProjectMember(this.form).then(response => {
+            this.msgSuccess("新增成功");
+            this.selectTableShow = false;
+            this.getList();
+            });
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
       });
     },
+    //项目移交
+    handleTransfer(row){
+      const projectIds = this.projectId;
+      const userId = row.userId;
+      transferProjectMember({projectIds,userId}).then(res=>{
+        this.msgSuccess(res.msg);
+      }).catch(err=>{
+        this.msgError(err.msg);
+      })
+    },
+    //修改角色
+    handleEdit(){
+      editProjectMemberRole(this.editForm.projectId,this.editForm.userId,this.editForm.role).then(res=>{
+        this.msgSuccess(res.msg);
+        this.editMemberVisible = false;
+        this.getList();
+      }).catch(err=>{
+        this.msgError(err.msg);
+      })
+    },
+    openEdit(row) {
+      console.log("row",row)
+      this.editForm = {
+        projectId: this.projectId,
+        nickName: row.nickName,
+        userId: row.userId,
+        role: row.roleKey
+      }
+      this.editMemberVisible = true;
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const projectIds = this.projectId;
       const userId = row.userId;
-      this.$confirm("是否确认解除当前人员?", "警告", {
+      this.$confirm("是否确认删除当前成员?", "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       })
         .then(function() {
-          return delProjectUser(projectIds, userId);
+          return delProjectMember(projectIds, userId);
         })
         .then(() => {
           this.getList();
diff --git a/src/views/login-blue-black.vue b/src/views/login-blue-black.vue
index 11246246..1863be61 100644
--- a/src/views/login-blue-black.vue
+++ b/src/views/login-blue-black.vue
@@ -10,19 +10,24 @@
         <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
           <div class="title-tags-wrap">
             <div
-              @click="userTypeClick('system')"
-              :class="formTitleType === 'system' ? 'tags-div tags-checked' : 'tags-div'"
+              class="tags-div tags-checked"
             >
-              <h3>运营登录</h3>
-              <span></span>
-            </div>
-            <div
-              @click="userTypeClick('enter')"
-              :class="formTitleType === 'enter' ? 'tags-div tags-checked' : 'tags-div'"
-            >
-              <h3>用户登录</h3>
-              <span></span>
+              <h3>{{ formTitleType === 'system'?'运营登录':'用户登录' }}</h3>
             </div>
+<!--            <div-->
+<!--              @click="userTypeClick('system')"-->
+<!--              :class="formTitleType === 'system' ? 'tags-div tags-checked' : 'tags-div'"-->
+<!--            >-->
+<!--              <h3>运营登录</h3>-->
+<!--              <span></span>-->
+<!--            </div>-->
+<!--            <div-->
+<!--              @click="userTypeClick('enter')"-->
+<!--              :class="formTitleType === 'enter' ? 'tags-div tags-checked' : 'tags-div'"-->
+<!--            >-->
+<!--              <h3>用户登录</h3>-->
+<!--              <span></span>-->
+<!--            </div>-->
             <!--          <div-->
             <!--            @click="userTypeClick('personal')"-->
             <!--            :class="formTitleType === 'personal' ? 'tags-div tags-checked' : 'tags-div'"-->
@@ -32,50 +37,66 @@
             <!--          </div>-->
           </div>
           <el-form-item prop="username">
-            <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号" clearable>
-              <svg-icon slot="prefix" icon-class="A_loginUser" class="el-input__icon input-icon" />
+            <el-input v-model="loginForm.username" auto-complete="off" clearable placeholder="账号" type="text">
+              <svg-icon slot="prefix" class="el-input__icon input-icon" icon-class="A_loginUser" />
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
             <el-input
               v-model="loginForm.password"
-              type="password"
               auto-complete="off"
               placeholder="密码"
-              @keyup.enter.native="handleLogin"
               show-password
-            >
-              <svg-icon slot="prefix" icon-class="A_loginPassword" class="el-input__icon input-icon" />
-            </el-input>
-          </el-form-item>
-          <el-form-item prop="code" class="code-box">
-            <el-input
-              v-model="loginForm.code"
-              auto-complete="off"
-              placeholder="验证码"
-              style="width: 63%"
+              type="password"
               @keyup.enter.native="handleLogin"
-              clearable
             >
-              <svg-icon slot="prefix" icon-class="A_loginCode" class="el-input__icon input-icon" />
+              <svg-icon slot="prefix" class="el-input__icon input-icon" icon-class="A_loginPassword" />
             </el-input>
-            <div class="login-code">
-              <img :src="codeUrl" @click="getCode" class="login-code-img" />
-            </div>
           </el-form-item>
+<!--          <el-form-item class="code-box" prop="code">-->
+<!--            <el-input-->
+<!--              v-model="loginForm.code"-->
+<!--              auto-complete="off"-->
+<!--              clearable-->
+<!--              placeholder="验证码"-->
+<!--              style="width: 63%"-->
+<!--              @keyup.enter.native="handleLogin"-->
+<!--            >-->
+<!--              <svg-icon slot="prefix" class="el-input__icon input-icon" icon-class="A_loginCode" />-->
+<!--            </el-input>-->
+<!--            <div class="login-code">-->
+<!--              <img :src="codeUrl" class="login-code-img" @click="getCode" />-->
+<!--            </div>-->
+<!--          </el-form-item>-->
           <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px; margin-left: 25px;color: #5E6B82;">记住密码</el-checkbox>
           <el-form-item style="width:100%;">
             <el-button
               :loading="loading"
               size="medium"
-              type="primary"
               style="width:100%; height: 46px;background: linear-gradient(87deg, #09ADF9 0%, #4650FB 100%);border-radius: 23px;border: none;font-size: 18px;font-weight: 500;"
+              type="primary"
               @click.native.prevent="handleLogin"
             >
               <span v-if="!loading">登 录</span>
               <span v-else>登 录 中...</span>
             </el-button>
           </el-form-item>
+          <el-form-item style="width:100%;text-align: right">
+            <el-button
+              v-if="formTitleType === 'enter'"
+              type="text"
+              @click.native.prevent="userTypeClick('system')"
+            >
+              <span>运营登录</span>
+            </el-button>
+            <el-button
+              v-else
+              type="text"
+              @click.native.prevent="userTypeClick('enter')"
+            >
+              <span>用户登录</span>
+            </el-button>
+          </el-form-item>
         </el-form>
       </div>
     </div>
@@ -142,7 +163,7 @@ export default {
     this.systemName = process.env.VUE_APP_SYSTEM_NAME;
     this.recordNumber = process.env.VUE_APP_RECORD_NUMBER;
 
-    this.getCode();
+    // this.getCode();
     this.getCookie();
   },
   methods: {
@@ -203,7 +224,7 @@ export default {
             })
             .catch(() => {
               this.loading = false;
-              this.getCode();
+              // this.getCode();
             });
         }
       });
@@ -212,7 +233,7 @@ export default {
 };
 </script>
 
-<style rel="stylesheet/scss" lang="scss">
+<style lang="scss" rel="stylesheet/scss">
 .login-blue-black {
   display: flex;
   flex-direction: column;
@@ -285,7 +306,7 @@ export default {
       font-size: 18px;
       display: flex;
       width: 100%;
-      height: 70px;
+      height: 80px;
       justify-content: center;
       align-items: baseline;
       cursor: default;
@@ -296,7 +317,7 @@ export default {
         height: 100%;
         font-family: "Source Han Sans CN";
         font-weight: 500;
-        font-size: 18px;
+        font-size: 24px;
         line-height: 46px;
         flex-wrap: wrap;
         justify-content: center;
diff --git a/src/views/login-blue-white.vue b/src/views/login-blue-white.vue
index f2e0ce3e..20cf5a45 100644
--- a/src/views/login-blue-white.vue
+++ b/src/views/login-blue-white.vue
@@ -12,19 +12,24 @@
         <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
           <div class="title-tags-wrap">
             <div
-              @click="userTypeClick('system')"
-              :class="formTitleType === 'system' ? 'tags-div tags-checked' : 'tags-div'"
+              class="tags-div tags-checked"
             >
-              <h3>运营登录</h3>
-              <span></span>
-            </div>
-            <div
-              @click="userTypeClick('enter')"
-              :class="formTitleType === 'enter' ? 'tags-div tags-checked' : 'tags-div'"
-            >
-              <h3>用户登录</h3>
-              <span></span>
+              <h3>{{ formTitleType === 'system'?'运营登录':'用户登录' }}</h3>
             </div>
+<!--            <div-->
+<!--              @click="userTypeClick('system')"-->
+<!--              :class="formTitleType === 'system' ? 'tags-div tags-checked' : 'tags-div'"-->
+<!--            >-->
+<!--              <h3>运营登录</h3>-->
+<!--              <span></span>-->
+<!--            </div>-->
+<!--            <div-->
+<!--              @click="userTypeClick('enter')"-->
+<!--              :class="formTitleType === 'enter' ? 'tags-div tags-checked' : 'tags-div'"-->
+<!--            >-->
+<!--              <h3>用户登录</h3>-->
+<!--              <span></span>-->
+<!--            </div>-->
             <!--          <div-->
             <!--            @click="userTypeClick('personal')"-->
             <!--            :class="formTitleType === 'personal' ? 'tags-div tags-checked' : 'tags-div'"-->
@@ -34,50 +39,66 @@
             <!--          </div>-->
           </div>
           <el-form-item prop="username">
-            <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号" clearable>
-              <svg-icon slot="prefix" icon-class="A_loginUser" class="el-input__icon input-icon" />
+            <el-input v-model="loginForm.username" auto-complete="off" clearable placeholder="账号" type="text">
+              <svg-icon slot="prefix" class="el-input__icon input-icon" icon-class="A_loginUser" />
             </el-input>
           </el-form-item>
           <el-form-item prop="password">
             <el-input
               v-model="loginForm.password"
-              type="password"
               auto-complete="off"
               placeholder="密码"
-              @keyup.enter.native="handleLogin"
               show-password
-            >
-              <svg-icon slot="prefix" icon-class="A_loginPassword" class="el-input__icon input-icon" />
-            </el-input>
-          </el-form-item>
-          <el-form-item prop="code" class="code-box">
-            <el-input
-              v-model="loginForm.code"
-              auto-complete="off"
-              placeholder="验证码"
-              style="width: 63%"
+              type="password"
               @keyup.enter.native="handleLogin"
-              clearable
             >
-              <svg-icon slot="prefix" icon-class="A_loginCode" class="el-input__icon input-icon" />
+              <svg-icon slot="prefix" class="el-input__icon input-icon" icon-class="A_loginPassword" />
             </el-input>
-            <div class="login-code">
-              <img :src="codeUrl" @click="getCode" class="login-code-img" />
-            </div>
           </el-form-item>
+<!--          <el-form-item class="code-box" prop="code">-->
+<!--            <el-input-->
+<!--              v-model="loginForm.code"-->
+<!--              auto-complete="off"-->
+<!--              clearable-->
+<!--              placeholder="验证码"-->
+<!--              style="width: 63%"-->
+<!--              @keyup.enter.native="handleLogin"-->
+<!--            >-->
+<!--              <svg-icon slot="prefix" class="el-input__icon input-icon" icon-class="A_loginCode" />-->
+<!--            </el-input>-->
+<!--            <div class="login-code">-->
+<!--              <img :src="codeUrl" class="login-code-img" @click="getCode" />-->
+<!--            </div>-->
+<!--          </el-form-item>-->
           <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px; margin-left: 25px;color: #5E6B82;">记住密码</el-checkbox>
           <el-form-item style="width:100%;">
             <el-button
               :loading="loading"
               size="medium"
-              type="primary"
               style="width:100%; height: 46px;background: linear-gradient(87deg, #09ADF9 0%, #4650FB 100%);border-radius: 23px;border: none;font-size: 18px;font-weight: 500;"
+              type="primary"
               @click.native.prevent="handleLogin"
             >
               <span v-if="!loading">登 录</span>
               <span v-else>登 录 中...</span>
             </el-button>
           </el-form-item>
+          <el-form-item style="width:100%;text-align: right">
+          <el-button
+            v-if="formTitleType === 'enter'"
+            type="text"
+            @click.native.prevent="userTypeClick('system')"
+          >
+            <span>运营登录</span>
+          </el-button>
+          <el-button
+            v-else
+            type="text"
+            @click.native.prevent="userTypeClick('enter')"
+          >
+            <span>用户登录</span>
+          </el-button>
+        </el-form-item>
         </el-form>
       </div>
     </div>
@@ -146,7 +167,7 @@ export default {
     this.systemName = process.env.VUE_APP_SYSTEM_NAME;
     this.recordNumber = process.env.VUE_APP_RECORD_NUMBER;
 
-    this.getCode();
+    // this.getCode();
     this.getCookie();
   },
   methods: {
@@ -207,7 +228,7 @@ export default {
             })
             .catch(() => {
               this.loading = false;
-              this.getCode();
+              // this.getCode();
             });
         }
       });
@@ -216,7 +237,7 @@ export default {
 };
 </script>
 
-<style rel="stylesheet/scss" lang="scss">
+<style lang="scss" rel="stylesheet/scss">
 .login-blue-white {
   display: flex;
   //flex-direction: column;
@@ -292,7 +313,7 @@ export default {
       font-size: 18px;
       display: flex;
       width: 100%;
-      height: 70px;
+      height: 80px;
       justify-content: center;
       align-items: baseline;
       cursor: default;
@@ -303,7 +324,7 @@ export default {
         height: 100%;
         font-family: "Source Han Sans CN";
         font-weight: 500;
-        font-size: 18px;
+        font-size: 24px;
         line-height: 46px;
         flex-wrap: wrap;
         justify-content: center;
diff --git a/src/views/login-green.vue b/src/views/login-green.vue
index cbe5e1a6..6dd1c385 100644
--- a/src/views/login-green.vue
+++ b/src/views/login-green.vue
@@ -8,20 +8,25 @@
       <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
         <div class="title-tags-wrap">
           <div
-            @click="userTypeClick('system')"
-            :class="formTitleType === 'system' ? 'tags-div tags-checked' : 'tags-div'"
+            class="tags-div tags-checked"
           >
-            <h3>运营登录</h3>
-            <span></span>
-          </div>
-          <div
-            @click="userTypeClick('enter')"
-            :class="formTitleType === 'enter' ? 'tags-div tags-checked' : 'tags-div'"
-          >
-            <h3>用户登录</h3>
-            <span></span>
+            <h3>{{ formTitleType === 'system'?'运营登录':'用户登录' }}</h3>
           </div>
 <!--          <div-->
+<!--            @click="userTypeClick('system')"-->
+<!--            :class="formTitleType === 'system' ? 'tags-div tags-checked' : 'tags-div'"-->
+<!--          >-->
+<!--            <h3>运营登录</h3>-->
+<!--            <span></span>-->
+<!--          </div>-->
+<!--          <div-->
+<!--            @click="userTypeClick('enter')"-->
+<!--            :class="formTitleType === 'enter' ? 'tags-div tags-checked' : 'tags-div'"-->
+<!--          >-->
+<!--            <h3>用户登录</h3>-->
+<!--            <span></span>-->
+<!--          </div>-->
+<!--          <div-->
 <!--            @click="userTypeClick('personal')"-->
 <!--            :class="formTitleType === 'personal' ? 'tags-div tags-checked' : 'tags-div'"-->
 <!--          >-->
@@ -30,50 +35,66 @@
 <!--          </div>-->
         </div>
         <el-form-item prop="username">
-          <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号" clearable>
-            <svg-icon slot="prefix" icon-class="A_loginUser" class="el-input__icon input-icon" />
+          <el-input v-model="loginForm.username" auto-complete="off" clearable placeholder="账号" type="text">
+            <svg-icon slot="prefix" class="el-input__icon input-icon" icon-class="A_loginUser" />
           </el-input>
         </el-form-item>
         <el-form-item prop="password">
           <el-input
             v-model="loginForm.password"
-            type="password"
             auto-complete="off"
             placeholder="密码"
-            @keyup.enter.native="handleLogin"
             show-password
-          >
-            <svg-icon slot="prefix" icon-class="A_loginPassword" class="el-input__icon input-icon" />
-          </el-input>
-        </el-form-item>
-        <el-form-item prop="code" class="code-box">
-          <el-input
-            v-model="loginForm.code"
-            auto-complete="off"
-            placeholder="验证码"
-            style="width: 63%"
+            type="password"
             @keyup.enter.native="handleLogin"
-            clearable
           >
-            <svg-icon slot="prefix" icon-class="A_loginCode" class="el-input__icon input-icon" />
+            <svg-icon slot="prefix" class="el-input__icon input-icon" icon-class="A_loginPassword" />
           </el-input>
-          <div class="login-code">
-            <img :src="codeUrl" @click="getCode" class="login-code-img" />
-          </div>
         </el-form-item>
+<!--        <el-form-item class="code-box" prop="code">-->
+<!--          <el-input-->
+<!--            v-model="loginForm.code"-->
+<!--            auto-complete="off"-->
+<!--            clearable-->
+<!--            placeholder="验证码"-->
+<!--            style="width: 63%"-->
+<!--            @keyup.enter.native="handleLogin"-->
+<!--          >-->
+<!--            <svg-icon slot="prefix" class="el-input__icon input-icon" icon-class="A_loginCode" />-->
+<!--          </el-input>-->
+<!--          <div class="login-code">-->
+<!--            <img :src="codeUrl" class="login-code-img" @click="getCode" />-->
+<!--          </div>-->
+<!--        </el-form-item>-->
         <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px; margin-left: 25px;color: #5E6B82;">记住密码</el-checkbox>
         <el-form-item style="width:100%;">
           <el-button
             :loading="loading"
             size="medium"
-            type="primary"
             style="width:100%; height: 46px;background: linear-gradient(87deg, #0CDFE1 1%, #00B5B7 100%);border-radius: 23px;border: none"
+            type="primary"
             @click.native.prevent="handleLogin"
           >
             <span v-if="!loading">登 录</span>
             <span v-else>登 录 中...</span>
           </el-button>
         </el-form-item>
+        <el-form-item style="width:100%;text-align: right;">
+          <el-button
+            v-if="formTitleType === 'enter'"
+            type="text"
+            @click.native.prevent="userTypeClick('system')"
+          >
+            <span style="color: #00A9AB;">运营登录</span>
+          </el-button>
+          <el-button
+            v-else
+            type="text"
+            @click.native.prevent="userTypeClick('enter')"
+          >
+            <span style="color: #00A9AB;">用户登录</span>
+          </el-button>
+        </el-form-item>
       </el-form>
     </div>
     <!--  底部  -->
@@ -139,7 +160,7 @@ export default {
     this.systemName = process.env.VUE_APP_SYSTEM_NAME;
     this.recordNumber = process.env.VUE_APP_RECORD_NUMBER;
 
-    this.getCode();
+    // this.getCode();
     this.getCookie();
   },
   methods: {
@@ -200,7 +221,7 @@ export default {
             })
             .catch(() => {
               this.loading = false;
-              this.getCode();
+              // this.getCode();
             });
         }
       });
@@ -209,7 +230,7 @@ export default {
 };
 </script>
 
-<style rel="stylesheet/scss" lang="scss">
+<style lang="scss" rel="stylesheet/scss">
 .login-green {
   display: flex;
   flex-direction: column;
@@ -270,7 +291,7 @@ export default {
       font-size: 18px;
       display: flex;
       width: 100%;
-      height: 70px;
+      height: 80px;
       justify-content: center;
       align-items: baseline;
       cursor: default;
@@ -281,7 +302,7 @@ export default {
         height: 100%;
         font-family: "Source Han Sans CN";
         font-weight: 500;
-        font-size: 18px;
+        font-size: 24px;
         line-height: 46px;
         flex-wrap: wrap;
         justify-content: center;