zhaoke 2 years ago
parent
commit
f586d9fd30

+ 0 - 2
public/demo.js

@@ -228,8 +228,6 @@ const SERVICE_ID = {
   sysServiceOutputEdit: 2, // 系统设置-服务管理-编辑服务-输出
   sysServiceEdit: 3, //系统设置-服务管理-新增/编辑
   sysServiceMachineEdit: 4, //系统设置-服务管理-编辑服务-部署机器-多选框
-  sysServiceEdit: 3, //系统设置-服务管理-新增服务-提交/编辑服务-保存
-  sysServiceEditBoxId: 4, //系统设置-服务管理-编辑服务-部署机器-多选框
   sysQueryTabId: 5, //系统设置-查询模板-表格-增删改
   sysDataTabId: 9, //系统设置-数据结构-数据项-表格-增删改
   sysServiceAddXyId: 10, //系统设置-服务管理-新增服务-新增数据源-提交

File diff suppressed because it is too large
+ 533 - 246
src/views/systemSettings/serviceManagement/serviceEdit.vue


+ 22 - 0
src/views/userManagement/account/index.vue

@@ -24,6 +24,11 @@
         <el-form-item label="账号密码" prop="user_pwd">
           <el-input v-model="ruleForm.user_pwd" type="password" show-password size="default" placeholder="请输入账号名称" />
         </el-form-item>
+        <el-form-item label="账号组关联" prop="user_gropu_id">
+          <el-select size="default" style="width: 100%" v-model="ruleForm.user_group_id" placeholder="请选择">
+            <el-option v-for="item in options" :key="item.v" :label="item.k" :value="item.v"> </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="账号描述" prop="user_comment">
           <el-input v-model="ruleForm.user_comment" size="default" type="textarea" :rows="3" placeholder="请输入账号描述" />
         </el-form-item>
@@ -80,9 +85,11 @@ const ruleForm = ref<any>({
   user_comment: "",
   user_status: "",
   user_pwd: "",
+  user_group_id: "",
 });
 const rowIndex = ref<any>({});
 const data = ref<any>([]);
+const options = ref<any>([]);
 const msgId = ref(null);
 const msgType = ref("all");
 const PageIndex = ref(1);
@@ -165,9 +172,24 @@ const dataChange = async (event, data) => {
   }
 };
 
+//获取账号组
+const getGroupSelect = async () => {
+  const res = await Query({
+    id: DATACONTENT_ID.accountGroupSelId,
+    dataContent: [],
+  });
+  if (res.code == 0) {
+    const { listValues } = res.returnData;
+    options.value = listValues;
+  } else {
+    ElMessage.error(res.message);
+  }
+};
+
 onBeforeMount(() => {
   getGroup();
   accountList();
+  getGroupSelect();
 });
 
 const handleNodeClick = (data) => {

Some files were not shown because too many files changed in this diff