add deptTreeSelect

index.html

@@ -8,6 +8,12 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
   <link rel="icon" href="/favicon.ico">
   <title>若依管理系统</title>
+  <script type="text/javascript">
+    window._AMapSecurityConfig = {
+      securityJsCode: 'd9ded0c99c2545c9feb200da26b29fbf',
+    }
+  </script>
+  <script type="text/javascript" src="https://webapi.amap.com/maps?v=2.0&key=7891f1238368a895ff1967c79643102d"></script>
   <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
   <style>
     html,

src/api/file/file.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function uploadFile(data) {
+    return request({
+      url: '/common/upload',
+      method: 'post',
+      data: data
+    })
+}

src/api/system/dept.js

@@ -53,3 +53,11 @@ export function delDept(deptId) {
     }
   })
 }
+
+// 查询部门下拉树结构
+export function deptTreeSelect() {
+  return request({
+    url: '/system/dept/deptTree',
+    method: 'get'
+  })
+}

src/api/system/user.js

@@ -108,12 +108,15 @@ export function updateUserPwd(oldPassword, newPassword) {
 }
 
 // 用户头像上传
-export function uploadAvatar(data) {
+export function uploadAvatar(url) {
+  const data = {
+    url
+  }
   return request({
-    url: "/system/user/profile/avatar",
+    url: '/system/user/profile/uploadAvatar',
-    method: "post",
+    method: 'put',
-    data: data,
+    params: data
-  });
+  })
 }
 
 // 查询授权角色

src/components/ProcessDesigner/index.vue

@@ -81,8 +81,6 @@ function initModeler(modelerArgv) {
   }, 10);
 }
 function handlerEvent(eventName) {
-  console.log(eventName);
-
   if (eventName === "connection-added") {
     // 设置结束节点的默认名称
     nextTick(() => {

src/components/ProcessViewer/index.vue

@@ -184,7 +184,7 @@
   </div>
 </template>
 
-<script setup name="">
+<script setup name="ProcessViewer">
 import "@/plugins/package/theme/index.scss";
 import { parseTime } from "@/utils/ruoyi";
 import BpmnViewer from "bpmn-js/lib/Viewer";
@@ -362,8 +362,10 @@ function setProcessStatus(processNodeInfoArgv) {
   if (Array.isArray(finishedSequenceFlowSet)) {
     finishedSequenceFlowSet.forEach((item) => {
       if (item != null) {
-        canvas.addMarker(item, "success");
+        // FIXME:  TODO:
         let element = elementRegistry.get(item);
+        if (!element) return;
+        canvas.addMarker(item, "success");
         const conditionExpression = element.businessObject.conditionExpression;
         if (conditionExpression) {
           canvas.addMarker(item, "condition-expression");

src/plugins/package/designer/ProcessDesigner.vue

@@ -426,13 +426,15 @@ function onSave() {
   if (bpmnModeler) {
     const elementRegistry = bpmnModeler.get("elementRegistry");
     const userTaskEle = elementRegistry?.find(
-      (el) => el.type === "bpmn:UserTask"
+      (el) => el.type === "bpmn:UserTask" && !el.businessObject.name
     );
-    if (!userTaskEle.businessObject.name) {
+    if (userTaskEle) {
-      console.log(userTaskEle.businessObject.name);
       ElMessage.warning("用户任务节点名称必填");
       const EventBus = bpmnModeler.get("eventBus");
+      const activeEle = window?.bpmnInstances?.bpmnElement;
+      if (activeEle.id != userTaskEle.id) {
         EventBus.fire("element.click", { element: userTaskEle });
+      }
       return;
     }
   }

src/plugins/package/designer/plugins/content-pad/contentPadProvider.js

@@ -49,19 +49,17 @@ export default function ContextPadProvider(
   }
 
   eventBus.on("create.end", 250, function (event) {
-    console.log(
+    // TODO:设置通过左面板创建的开始、结束节点的默认名称
-      "create.end,contentPadProvider.js",
-      window.bpmnInstances.bpmnElement
-    );
-
-    // TODO:设置开始节点默认名称
     const bpmnElement = window.bpmnInstances.bpmnElement;
     if (bpmnElement.type === "bpmn:StartEvent") {
       window.bpmnInstances.modeling.updateProperties(bpmnElement, {
         name: "开始",
       });
+    } else if (bpmnElement.type === "bpmn:EndEvent") {
+      window.bpmnInstances.modeling.updateProperties(bpmnElement, {
+        name: "结束",
+      });
     }
-
     var context = event.context,
       shape = context.shape;
 

src/plugins/package/penal/listeners/utilSelf.js

@@ -14,13 +14,11 @@ export function initListenerForm(listener) {
     if (listener.eventDefinitions.length) {
       let k = "";
       for (let key in listener.eventDefinitions[0]) {
-        console.log(listener.eventDefinitions, key);
         if (key.indexOf("time") !== -1) {
           k = key;
           self.eventDefinitionType = key.replace("time", "").toLowerCase();
         }
       }
-      console.log(k);
       self.eventTimeDefinitions = listener.eventDefinitions[0][k].body;
     }
   }
@@ -28,7 +26,6 @@ export function initListenerForm(listener) {
 }
 
 export function initListenerType(listener) {
-  // debugger;
   let listenerType;
   if (listener.class) listenerType = "classListener";
   if (listener.expression) listenerType = "expressionListener";

src/plugins/package/penal/task/task-components/UserTask.vue

@@ -181,10 +181,10 @@
 import { listUser, deptTreeSelect } from "@/api/system/user";
 import { listRole } from "@/api/system/role";
 import { addDateRange } from "@/utils/ruoyi";
-import TreeSelect from "@/components/TreeSelect";
+// import TreeSelect from "@/components/TreeSelect";
 import { ref, reactive, watch } from "vue";
 import { ElMessage } from "element-plus";
-const testResult = ref([]);
+// const testResult = ref([]);
 const userTaskForm = {
   dataType: "",
   assignee: "",
@@ -296,7 +296,7 @@ function clearOptionsData() {
   deptIds.value = [];
 }
 /**
- * 跟新节点数据
+ * 更新节点数据
  */
 function updateElementTask() {
   const taskAttr = Object.create(null);

src/utils/generator/js.js

@@ -40,15 +40,7 @@ export function makeUpJs(formConfig, type) {
       created
     );
   });
-  console.log(
+
-    dataList,
-    ruleList,
-    optionsList,
-    methodList,
-    propsList,
-    uploadVarList,
-    created
-  );
   const script = buildexport(
     formConfig,
     type,
@@ -303,7 +295,6 @@ function buildexport(
   methods,
   created
 ) {
-  console.log(selectOptions);
   const newStr = `
 import { ref, reactive, toRefs } from "vue";
 

src/utils/generator/parser.jsx

@@ -18,10 +18,9 @@ const ruleTrigger = {
 };
 
 const layouts = {
-  colFormItem(h, scheme) {
+  colFormItem(h, scheme, disabled) {
     const config = scheme.__config__;
     const listeners = buildListeners.call(this, scheme);
-    console.log(listeners, "28");
     let labelWidth = config.labelWidth ? `${config.labelWidth}px` : null;
     if (config.showLabel === false) labelWidth = "0";
     return (
@@ -31,13 +30,13 @@ const layouts = {
           prop={scheme.__vModel__}
           label={config.showLabel ? config.label : ""}
         >
-          <render conf={scheme} on={listeners} />
+          <render conf={{ ...scheme, noedit: disabled }} on={listeners} />
         </el-form-item>
       </el-col>
     );
   },
-  rowFormItem(h, scheme) {
+  rowFormItem(h, scheme, disabled) {
-    let child = renderChildren.apply(this, arguments);
+    let child = renderChildren.apply(this, arguments, disabled);
     if (scheme.type === "flex") {
       child = (
         <el-row
@@ -73,7 +72,12 @@ function renderFrom(h) {
         props={{ model: this[formConfCopy.formModel] }}
         rules={this[formConfCopy.formRules]}
       >
-        {renderFormItem.call(this, h, formConfCopy.fields)}
+        {renderFormItem.call(
+          this,
+          h,
+          formConfCopy.fields,
+          formConfCopy.disabled
+        )}
         {formConfCopy.formBtns && formBtns.call(this, h)}
       </el-form>
     </el-row>
@@ -93,27 +97,25 @@ function formBtns(h) {
   );
 }
 
-function renderFormItem(h, elementList) {
+function renderFormItem(h, elementList, disabled) {
   return elementList.map((scheme) => {
     const config = scheme.__config__;
     const layout = layouts[config.layout];
 
     if (layout) {
-      console.log(layout);
+      return layout.call(this, h, scheme, disabled);
-      return layout.call(this, h, scheme);
     }
     throw new Error(`没有与${config.layout}匹配的layout`);
   });
 }
 
-function renderChildren(h, scheme) {
+function renderChildren(h, scheme, disabled) {
   const config = scheme.__config__;
   if (!Array.isArray(config.children)) return null;
-  return renderFormItem.call(this, h, config.children);
+  return renderFormItem.call(this, h, config.children, disabled);
 }
 
 function setValue(event, config, scheme) {
-  console.log(event, config, scheme, "serval");
   config.defaultValue = event;
   this[this.formConf.formModel][scheme.__vModel__] = event;
 }

src/utils/generator/render.jsx

@@ -17,7 +17,7 @@ import {
   ElCheckboxGroup,
 } from "element-plus";
 import Editor from "@/components/Editor";
-import { h, defineComponent } from "vue";
+import { h, defineComponent, readonly } from "vue";
 
 const formComponentsMap = {
   "el-row": ElRow,
@@ -171,6 +171,9 @@ export default defineComponent({
       type: Object,
       required: true,
     },
+    // noedit: {
+    //   type: Boolean,
+    // },
   },
   data() {
     return {
@@ -237,6 +240,11 @@ export default defineComponent({
         ) : (
           <Tag
             {...dataObject.attrs}
+            {...(this.$props.conf.__config__.tag === "editor"
+              ? {
+                  readOnly: dataObject.attrs.noedit,
+                }
+              : {})}
             on={dataObject.on}
             modelValue={this.$props.conf.__config__.defaultValue}
           ></Tag>

src/views/office/detail.vue

@@ -393,6 +393,8 @@ const commentType = computed(() => {
         return "委派";
       case "5":
         return "转办";
+      case "6":
+        return "撤回";
     }
   };
 });
@@ -409,6 +411,8 @@ const approveTypeTag = computed(() => {
         return "primary";
       case "5":
         return "success";
+      case "6":
+        return "warning";
     }
   };
 });

src/views/system/user/index.vue

@@ -28,26 +28,29 @@
          </el-col>
          <!--用户数据-->
          <el-col :span="20" :xs="24">
-        <el-form
+            <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-          :model="queryParams"
+               <el-form-item label="登录账号" prop="userName">
-          ref="queryRef"
-          :inline="true"
-          v-show="showSearch"
-          label-width="68px"
-        >
-          <el-form-item label="用户名称" prop="userName">
                   <el-input
                      v-model="queryParams.userName"
-              placeholder="请输入用户名称"
+                     placeholder="请输入登录账号"
                      clearable
                      style="width: 240px"
                      @keyup.enter="handleQuery"
                   />
                </el-form-item>
-          <el-form-item label="手机号码" prop="phone">
+               <el-form-item label="姓名" prop="nickName">
+                  <el-input
+                     v-model="queryParams.nickName"
+                     placeholder="请输入姓名"
+                     clearable
+                     style="width: 240px"
+                     @keyup.enter="handleQuery"
+                  />
+               </el-form-item>
+               <el-form-item label="手机号" prop="phone">
                   <el-input
                      v-model="queryParams.phone"
-              placeholder="请输入手机号码"
+                     placeholder="请输入手机号"
                      clearable
                      style="width: 240px"
                      @keyup.enter="handleQuery"
@@ -68,7 +71,7 @@
                      />
                   </el-select>
                </el-form-item>
-          <el-form-item label="创建时间" style="width: 308px">
+               <el-form-item label="创建时间" style="width: 308px;">
                   <el-date-picker
                      v-model="dateRange"
                      value-format="YYYY-MM-DD"
@@ -79,9 +82,7 @@
                   ></el-date-picker>
                </el-form-item>
                <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery"
+                  <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-              >搜索</el-button
-            >
                   <el-button icon="Refresh" @click="resetQuery">重置</el-button>
                </el-form-item>
             </el-form>
@@ -94,8 +95,7 @@
                      icon="Plus"
                      @click="handleAdd"
                      v-hasPermi="['system:user:add']"
-              >新增</el-button
+                  >新增</el-button>
-            >
                </el-col>
                <el-col :span="1.5">
                   <el-button
@@ -105,8 +105,7 @@
                      :disabled="single"
                      @click="handleUpdate"
                      v-hasPermi="['system:user:edit']"
-              >修改</el-button
+                  >修改</el-button>
-            >
                </el-col>
                <el-col :span="1.5">
                   <el-button
@@ -116,8 +115,7 @@
                      :disabled="multiple"
                      @click="handleDelete"
                      v-hasPermi="['system:user:remove']"
-              >删除</el-button
+                  >删除</el-button>
-            >
                </el-col>
                <el-col :span="1.5">
                   <el-button
@@ -126,8 +124,7 @@
                      icon="Upload"
                      @click="handleImport"
                      v-hasPermi="['system:user:import']"
-              >导入</el-button
+                  >导入</el-button>
-            >
                </el-col>
                <el-col :span="1.5">
                   <el-button
@@ -136,67 +133,19 @@
                      icon="Download"
                      @click="handleExport"
                      v-hasPermi="['system:user:export']"
-              >导出</el-button
+                  >导出</el-button>
-            >
                </el-col>
-          <right-toolbar
+               <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-            v-model:showSearch="showSearch"
-            @queryTable="getList"
-            :columns="columns"
-          ></right-toolbar>
             </el-row>
 
-        <el-table
+            <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
-          v-loading="loading"
-          :data="userList"
-          @selection-change="handleSelectionChange"
-        >
                <el-table-column type="selection" width="50" align="center" />
-          <el-table-column
+               <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-            label="用户编号"
+               <el-table-column label="登录账号" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-            align="center"
+               <el-table-column label="姓名" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-            key="userId"
+               <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-            prop="userId"
+               <el-table-column label="手机号" align="center" key="phone" prop="phone" v-if="columns[4].visible" width="120" />
-            v-if="columns[0].visible"
+               <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
-          />
-          <el-table-column
-            label="用户名称"
-            align="center"
-            key="userName"
-            prop="userName"
-            v-if="columns[1].visible"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="用户昵称"
-            align="center"
-            key="nickName"
-            prop="nickName"
-            v-if="columns[2].visible"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="部门"
-            align="center"
-            key="deptName"
-            prop="dept.deptName"
-            v-if="columns[3].visible"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="手机号码"
-            align="center"
-            key="phone"
-            prop="phone"
-            v-if="columns[4].visible"
-            width="120"
-          />
-          <el-table-column
-            label="状态"
-            align="center"
-            key="status"
-            v-if="columns[5].visible"
-          >
                   <template #default="scope">
                      <el-switch
                         v-model="scope.row.status"
@@ -206,75 +155,24 @@
                      ></el-switch>
                   </template>
                </el-table-column>
-          <el-table-column
+               <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
-            label="创建时间"
-            align="center"
-            prop="createTime"
-            v-if="columns[6].visible"
-            width="160"
-          >
                   <template #default="scope">
                      <span>{{ parseTime(scope.row.createTime) }}</span>
                   </template>
                </el-table-column>
-          <el-table-column
+               <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
-            label="操作"
-            align="center"
-            width="150"
-            class-name="small-padding fixed-width"
-          >
                   <template #default="scope">
-              <el-tooltip
+                     <el-tooltip content="修改" placement="top">
-                content="修改"
+                        <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
-                placement="top"
-                v-if="scope.row.userId !== 1"
-              >
-                <el-button
-                  link
-                  type="primary"
-                  icon="Edit"
-                  @click="handleUpdate(scope.row)"
-                  v-hasPermi="['system:user:edit']"
-                ></el-button>
                      </el-tooltip>
-              <el-tooltip
+                     <el-tooltip content="删除" placement="top">
-                content="删除"
+                        <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']"></el-button>
-                placement="top"
-                v-if="scope.row.userId !== 1"
-              >
-                <el-button
-                  link
-                  type="primary"
-                  icon="Delete"
-                  @click="handleDelete(scope.row)"
-                  v-hasPermi="['system:user:remove']"
-                ></el-button>
                      </el-tooltip>
-              <el-tooltip
+                     <el-tooltip content="重置密码" placement="top">
-                content="重置密码"
+                         <el-button link type="primary" icon="Key" @click="handleResetPwd(scope.row)" v-hasPermi="['system:user:resetPwd']"></el-button>
-                placement="top"
-                v-if="scope.row.userId !== 1"
-              >
-                <el-button
-                  link
-                  type="primary"
-                  icon="Key"
-                  @click="handleResetPwd(scope.row)"
-                  v-hasPermi="['system:user:resetPwd']"
-                ></el-button>
                      </el-tooltip>
-              <el-tooltip
+                     <el-tooltip content="分配角色" placement="top">
-                content="分配角色"
+                        <el-button link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
-                placement="top"
-                v-if="scope.row.userId !== 1"
-              >
-                <el-button
-                  link
-                  type="primary"
-                  icon="CircleCheck"
-                  @click="handleAuthRole(scope.row)"
-                  v-hasPermi="['system:user:edit']"
-                ></el-button>
                      </el-tooltip>
                   </template>
                </el-table-column>
@@ -294,81 +192,38 @@
          <el-form :model="form" :rules="rules" ref="userRef" label-width="80px">
             <el-row>
                <el-col :span="12">
-            <el-form-item label="用户昵称" prop="nickName">
+                  <el-form-item label="姓名" prop="nickName">
-              <el-input
+                     <el-input v-model="form.nickName" placeholder="请输入姓名" maxlength="30" />
-                v-model="form.nickName"
-                placeholder="请输入用户昵称"
-                maxlength="30"
-              />
                   </el-form-item>
                </el-col>
                <el-col :span="12">
-            <el-form-item label="归属部门" prop="deptId">
+                  <el-form-item label="部门" prop="deptId">
                      <el-tree-select
                         v-model="form.deptId"
                         :data="deptOptions"
                         :props="{ value: 'id', label: 'label', children: 'children' }"
                         value-key="id"
-                placeholder="请选择归属部门"
+                        placeholder="请选择部门"
                         check-strictly
-                :render-after-expand="false"
                      />
                   </el-form-item>
                </el-col>
             </el-row>
             <el-row>
                <el-col :span="12">
-            <el-form-item label="手机号码" prop="phone">
+                  <el-form-item label="手机号" prop="phone">
-              <el-input
+                     <el-input v-model="form.phone" placeholder="请输入手机号" maxlength="11" />
-                v-model="form.phone"
-                placeholder="请输入手机号码"
-                maxlength="11"
-              />
                   </el-form-item>
                </el-col>
                <el-col :span="12">
                   <el-form-item label="邮箱" prop="email">
-              <el-input
+                     <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
-                v-model="form.email"
-                placeholder="请输入邮箱"
-                maxlength="50"
-              />
                   </el-form-item>
                </el-col>
             </el-row>
             <el-row>
                <el-col :span="12">
-            <el-form-item
+                  <el-form-item label="性别">
-              v-if="form.userId == undefined"
-              label="用户名称"
-              prop="userName"
-            >
-              <el-input
-                v-model="form.userName"
-                placeholder="请输入用户名称"
-                maxlength="30"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item
-              v-if="form.userId == undefined"
-              label="用户密码"
-              prop="password"
-            >
-              <el-input
-                v-model="form.password"
-                placeholder="请输入用户密码"
-                type="password"
-                maxlength="20"
-                show-password
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="用户性别">
                      <el-select v-model="form.sex" placeholder="请选择">
                         <el-option
                            v-for="dict in sys_user_sex"
@@ -386,8 +241,7 @@
                            v-for="dict in sys_normal_disable"
                            :key="dict.value"
                            :label="dict.value"
-                  >{{ dict.label }}</el-radio
+                        >{{ dict.label }}</el-radio>
-                >
                      </el-radio-group>
                   </el-form-item>
                </el-col>
@@ -420,14 +274,22 @@
                   </el-form-item>
                </el-col>
             </el-row>
+            <el-row>
+               <el-col :span="12">
+                  <el-form-item v-if="form.userId == undefined" label="登录账号" prop="userName">
+                     <el-input autocomplete="off" v-model="form.userName" placeholder="请输入登录账号" maxlength="30" />
+                  </el-form-item>
+               </el-col>
+               <el-col :span="12">
+                  <el-form-item v-if="form.userId == undefined" label="登录密码" prop="password">
+                     <el-input autocomplete="off" v-model="form.password" placeholder="请输入登录密码" type="password" maxlength="20" show-password />
+                  </el-form-item>
+               </el-col>
+            </el-row>
             <el-row>
                <el-col :span="24">
                   <el-form-item label="备注">
-              <el-input
+                     <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
-                v-model="form.remark"
-                type="textarea"
-                placeholder="请输入内容"
-              ></el-input>
                   </el-form-item>
                </el-col>
             </el-row>
@@ -441,12 +303,7 @@
       </el-dialog>
 
       <!-- 用户导入对话框 -->
-    <el-dialog
+      <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
-      :title="upload.title"
-      v-model="upload.open"
-      width="400px"
-      append-to-body
-    >
          <el-upload
             ref="uploadRef"
             :limit="1"
@@ -464,18 +321,10 @@
             <template #tip>
                <div class="el-upload__tip text-center">
                   <div class="el-upload__tip">
-              <el-checkbox
+                     <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                v-model="upload.updateSupport"
-              />是否更新已经存在的用户数据
                   </div>
                   <span>仅允许导入xls、xlsx格式文件。</span>
-            <el-link
+                  <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
-              type="primary"
-              :underline="false"
-              style="font-size: 12px; vertical-align: baseline"
-              @click="importTemplate"
-              >下载模板</el-link
-            >
                </div>
             </template>
          </el-upload>
@@ -491,23 +340,11 @@
 
 <script setup name="User">
 import { getToken } from "@/utils/auth";
-import {
+import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser } from "@/api/system/user";
-  changeUserStatus,
+import { deptTreeSelect} from "@/api/system/dept";
-  listUser,
-  resetUserPwd,
-  delUser,
-  getUser,
-  updateUser,
-  addUser,
-  deptTreeSelect,
-} from "@/api/system/user";
-
 const router = useRouter();
 const { proxy } = getCurrentInstance();
-const { sys_normal_disable, sys_user_sex } = proxy.useDict(
+const { sys_normal_disable, sys_user_sex } = proxy.useDict("sys_normal_disable", "sys_user_sex");
-  "sys_normal_disable",
-  "sys_user_sex"
-);
 
 const userList = ref([]);
 const open = ref(false);
@@ -537,17 +374,17 @@ const upload = reactive({
   // 设置上传的请求头部
   headers: { Authorization: "Bearer " + getToken() },
   // 上传的地址
-  url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData",
+  url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData"
 });
 // 列显隐信息
 const columns = ref([
   { key: 0, label: `用户编号`, visible: true },
-  { key: 1, label: `用户名称`, visible: true },
+  { key: 1, label: `登录账号`, visible: true },
-  { key: 2, label: `用户昵称`, visible: true },
+  { key: 2, label: `姓名`, visible: true },
   { key: 3, label: `部门`, visible: true },
-  { key: 4, label: `手机号码`, visible: true },
+  { key: 4, label: `手机号`, visible: true },
   { key: 5, label: `状态`, visible: true },
-  { key: 6, label: `创建时间`, visible: true },
+  { key: 6, label: `创建时间`, visible: true }
 ]);
 
 const data = reactive({
@@ -558,48 +395,15 @@ const data = reactive({
     userName: undefined,
     phone: undefined,
     status: undefined,
-    deptId: undefined,
+    deptId: undefined
   },
   rules: {
-    deptId: [
+    userName: [{ required: true, message: "登录账号不能为空", trigger: "blur" }, { min: 2, max: 20, message: "登录账号长度必须介于 2 和 20 之间", trigger: "blur" }],
-      { required: true, message: "归属部门不能为空", trigger: "change" },
+    nickName: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
-    ],
+    password: [{ required: true, message: "登录密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "登录密码长度必须介于 5 和 20 之间", trigger: "blur" }],
-    userName: [
+    email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
-      { required: true, message: "用户名称不能为空", trigger: "blur" },
+    phone: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号", trigger: "blur" }]
-      {
+  }
-        min: 2,
-        max: 20,
-        message: "用户名称长度必须介于 2 和 20 之间",
-        trigger: "blur",
-      },
-    ],
-    nickName: [
-      { required: true, message: "用户昵称不能为空", trigger: "blur" },
-    ],
-    password: [
-      { required: true, message: "用户密码不能为空", trigger: "blur" },
-      {
-        min: 5,
-        max: 20,
-        message: "用户密码长度必须介于 5 和 20 之间",
-        trigger: "blur",
-      },
-    ],
-    email: [
-      {
-        type: "email",
-        message: "请输入正确的邮箱地址",
-        trigger: ["blur", "change"],
-      },
-    ],
-    phone: [
-      {
-        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-        message: "请输入正确的手机号码",
-        trigger: "blur",
-      },
-    ],
-  },
 });
 
 const { queryParams, form, rules } = toRefs(data);
@@ -610,83 +414,69 @@ const filterNode = (value, data) => {
   return data.label.indexOf(value) !== -1;
 };
 /** 根据名称筛选部门树 */
-watch(deptName, (val) => {
+watch(deptName, val => {
   proxy.$refs["deptTreeRef"].filter(val);
 });
 /** 查询部门下拉树结构 */
 function getDeptTree() {
-  deptTreeSelect().then((response) => {
+  deptTreeSelect().then(response => {
     deptOptions.value = response.data;
   });
-}
+};
 /** 查询用户列表 */
 function getList() {
   loading.value = true;
-  listUser(proxy.addDateRange(queryParams.value, dateRange.value)).then(
+  listUser(proxy.addDateRange(queryParams.value, dateRange.value)).then(res => {
-    (res) => {
     loading.value = false;
     userList.value = res.rows;
     total.value = res.total;
-    }
+  });
-  );
+};
-}
 /** 节点单击事件 */
 function handleNodeClick(data) {
   queryParams.value.deptId = data.id;
   handleQuery();
-}
+};
 /** 搜索按钮操作 */
 function handleQuery() {
   queryParams.value.pageNum = 1;
   getList();
-}
+};
 /** 重置按钮操作 */
 function resetQuery() {
   dateRange.value = [];
   proxy.resetForm("queryRef");
   queryParams.value.deptId = undefined;
-  proxy.$refs.tree.setCurrentKey(null);
+  proxy.$refs.deptTreeRef.setCurrentKey(null);
   handleQuery();
-}
+};
 /** 删除按钮操作 */
 function handleDelete(row) {
   const userIds = row.userId || ids.value;
-  proxy.$modal
+  proxy.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function () {
-    .confirm('是否确认删除用户编号为"' + userIds + '"的数据项？')
-    .then(function () {
     return delUser(userIds);
-    })
+  }).then(() => {
-    .then(() => {
     getList();
     proxy.$modal.msgSuccess("删除成功");
-    })
+  }).catch(() => {});
-    .catch(() => {});
+};
-}
 /** 导出按钮操作 */
 function handleExport() {
-  proxy.download(
+  proxy.download("system/user/export", {
-    "system/user/export",
-    {
     ...queryParams.value,
-    },
+  },`user_${new Date().getTime()}.xlsx`);
-    `user_${new Date().getTime()}.xlsx`
+};
-  );
-}
 /** 用户状态修改  */
 function handleStatusChange(row) {
   let text = row.status === "0" ? "启用" : "停用";
-  proxy.$modal
+  proxy.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗?').then(function () {
-    .confirm('确认要"' + text + '""' + row.userName + '"用户吗?')
-    .then(function () {
     return changeUserStatus(row.userId, row.status);
-    })
+  }).then(() => {
-    .then(() => {
     proxy.$modal.msgSuccess(text + "成功");
-    })
+  }).catch(function () {
-    .catch(function () {
     row.status = row.status === "0" ? "1" : "0";
   });
-}
+};
 /** 更多操作 */
 function handleCommand(command, row) {
   switch (command) {
@@ -699,48 +489,42 @@ function handleCommand(command, row) {
     default:
       break;
   }
-}
+};
 /** 跳转角色分配 */
 function handleAuthRole(row) {
   const userId = row.userId;
   router.push("/system/user-auth/role/" + userId);
-}
+};
 /** 重置密码按钮操作 */
 function handleResetPwd(row) {
-  proxy
+  proxy.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
-    .$prompt('请输入"' + row.userName + '"的新密码', "提示", {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
     closeOnClickModal: false,
     inputPattern: /^.{5,20}$/,
-      inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
+    inputErrorMessage: "登录密码长度必须介于 5 和 20 之间",
-    })
+  }).then(({ value }) => {
-    .then(({ value }) => {
+    resetUserPwd(row.userId, value).then(response => {
-      resetUserPwd(row.userId, value).then((response) => {
       proxy.$modal.msgSuccess("修改成功，新密码是：" + value);
     });
-    })
+  }).catch(() => {});
-    .catch(() => {});
+};
-}
 /** 选择条数  */
 function handleSelectionChange(selection) {
-  ids.value = selection.map((item) => item.userId);
+  ids.value = selection.map(item => item.userId);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
-}
+};
 /** 导入按钮操作 */
 function handleImport() {
   upload.title = "用户导入";
   upload.open = true;
-}
+};
 /** 下载模板操作 */
 function importTemplate() {
-  proxy.download(
+  proxy.download("system/user/importTemplate", {
-    "system/user/importTemplate",
+  }, `user_template_${new Date().getTime()}.xlsx`);
-    {},
+};
-    `user_template_${new Date().getTime()}.xlsx`
-  );
-}
 /**文件上传中处理 */
 const handleFileUploadProgress = (event, file, fileList) => {
   upload.isUploading = true;
@@ -750,19 +534,13 @@ const handleFileSuccess = (response, file, fileList) => {
   upload.open = false;
   upload.isUploading = false;
   proxy.$refs["uploadRef"].handleRemove(file);
-  proxy.$alert(
+  proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
-    "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-      response.msg +
-      "</div>",
-    "导入结果",
-    { dangerouslyUseHTMLString: true }
-  );
   getList();
 };
 /** 提交上传文件 */
 function submitFileForm() {
   proxy.$refs["uploadRef"].submit();
-}
+};
 /** 重置操作表单 */
 function reset() {
   form.value = {
@@ -777,31 +555,31 @@ function reset() {
     status: "0",
     remark: undefined,
     postIds: [],
-    roleIds: [],
+    roleIds: []
   };
   proxy.resetForm("userRef");
-}
+};
 /** 取消按钮 */
 function cancel() {
   open.value = false;
   reset();
-}
+};
 /** 新增按钮操作 */
 function handleAdd() {
   reset();
-  getUser().then((response) => {
+  getUser().then(response => {
     postOptions.value = response.posts;
     roleOptions.value = response.roles;
     open.value = true;
     title.value = "添加用户";
     form.value.password = initPassword.value;
   });
-}
+};
 /** 修改按钮操作 */
 function handleUpdate(row) {
   reset();
   const userId = row.userId || ids.value;
-  getUser(userId).then((response) => {
+  getUser(userId).then(response => {
     form.value = response.data;
     postOptions.value = response.posts;
     roleOptions.value = response.roles;
@@ -811,19 +589,19 @@ function handleUpdate(row) {
     title.value = "修改用户";
     form.password = "";
   });
-}
+};
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs["userRef"].validate((valid) => {
+  proxy.$refs["userRef"].validate(valid => {
     if (valid) {
       if (form.value.userId != undefined) {
-        updateUser(form.value).then((response) => {
+        updateUser(form.value).then(response => {
           proxy.$modal.msgSuccess("修改成功");
           open.value = false;
           getList();
         });
       } else {
-        addUser(form.value).then((response) => {
+        addUser(form.value).then(response => {
           proxy.$modal.msgSuccess("新增成功");
           open.value = false;
           getList();
@@ -831,7 +609,7 @@ function submitForm() {
       }
     }
   });
-}
+};
 
 getDeptTree();
 getList();

src/views/system/user/profile/userAvatar.vue

@@ -61,6 +61,7 @@
 <script setup>
 import "vue-cropper/dist/index.css";
 import { VueCropper } from "vue-cropper";
+import { uploadFile } from "@/api/file/file";
 import { uploadAvatar } from "@/api/system/user";
 import useUserStore from "@/store/modules/user";
 
@@ -119,18 +120,23 @@ function beforeUpload(file) {
 }
 /** 上传图片 */
 function uploadImg() {
+  
   proxy.$refs.cropper.getCropBlob(data => {
     let formData = new FormData();
-    formData.append("avatarfile", data);
+    formData.append("file", data);
-    uploadAvatar(formData).then(response => {
+    uploadFile(formData).then(response => {
       open.value = false;
-      options.img = import.meta.env.VITE_APP_BASE_API + response.imgUrl;
+      options.img = import.meta.env.VITE_APP_BASE_API + response.url;
       userStore.avatar = options.img;
+      uploadAvatar(response.url);
       proxy.$modal.msgSuccess("修改成功");
       visible.value = false;
     });
   });
 }
+
+
+
 /** 实时预览 */
 function realTime(data) {
   options.previews = data;

src/views/tool/build/DraggableItem.jsx

@@ -138,7 +138,6 @@ const layouts = {
             {{
               item: ({ element, index }) => {
                 const layout = layouts[element.__config__.layout];
-                console.log(element, "element");
                 if (layout) {
                   return layout.call(this, element, index, config.children);
                 }

src/views/tool/build/RightPanel.vue

@@ -577,7 +577,8 @@
               <template #item="{ element, index }">
                 <div class="select-item">
                   <div class="select-line-icon option-drag">
-                    <i class="el-icon-s-operation" />
+                    <!-- <i class="el-icon-s-operation" /> -->
+                    <el-icon><Operation /></el-icon>
                   </div>
                   <el-input
                     v-model="element.label"
@@ -594,7 +595,10 @@
                     class="close-btn select-line-icon"
                     @click="activeData.__slot__.options.splice(index, 1)"
                   >
-                    <i class="el-icon-remove-outline" />
+                    <!-- <i class="el-icon-remove-outline" /> -->
+                    <el-icon>
+                      <Remove />
+                    </el-icon>
                   </div>
                 </div>
               </template>
@@ -602,8 +606,9 @@
             <div style="margin-left: 20px">
               <el-button
                 style="padding-bottom: 0"
-                icon="el-icon-circle-plus-outline"
+                icon="circle-plus"
                 link
+                type="primary"
                 @click="addSelectItem"
               >
                 添加选项
@@ -703,6 +708,7 @@
               <el-button
                 style="padding-bottom: 0"
                 icon="circle-plus"
+                type="primary"
                 link
                 @click="addTreeItem"
               >
@@ -951,7 +957,9 @@
                 class="close-btn"
                 @click="activeData.__config__.regList.splice(index, 1)"
               >
-                <i class="el-icon-close" />
+                <el-icon>
+                  <Close />
+                </el-icon>
               </span>
               <el-form-item label="表达式">
                 <el-input v-model="item.pattern" placeholder="请输入正则" />
@@ -961,11 +969,7 @@
               </el-form-item>
             </div>
             <div style="margin-left: 20px">
-              <el-button
+              <el-button icon="circle-plus" type="primary" link @click="addReg">
-                icon="el-icon-circle-plus-outline"
-                link
-                @click="addReg"
-              >
                 添加规则
               </el-button>
             </div>
@@ -1045,7 +1049,7 @@
   </div>
 </template>
 <script setup>
-import { Link, Menu, Plus } from "@element-plus/icons-vue";
+import { Link, Plus, Remove, Operation, Close } from "@element-plus/icons-vue";
 import TreeNodeDialog from "./TreeNodeDialog.vue";
 import { isNumberStr } from "@/utils/index";
 import IconsDialog from "./IconsDialog.vue";

src/views/tool/build/index.vue

@@ -713,6 +713,9 @@ textarea {
     z-index: 1;
     cursor: pointer;
     font-size: 12px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
     &:hover {
       background: rgba(210, 23, 23, 0.5);
     }

vite.config.js

@@ -33,7 +33,7 @@ export default defineConfig(({ mode, command }) => {
         // https://cn.vitejs.dev/config/#server-proxy
         "/dev-api": {
           // target: 'http://localhost:8080',
-          target: "http://192.168.110.10:1616",
+          target: "http://192.168.1.16:1616",
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, ""),
         },