修改角色

src/views/accountManagement/components/accountHome.vue

@@ -106,8 +106,8 @@
               <el-input v-model="ruleForm.user_comment" size="medium" type="textarea" :rows="3" placeholder="请输入角色描述" />
             </el-form-item>
             <el-form-item label="是否启用" prop="user_status">
-              <el-radio v-model="ruleForm.user_status" :label="1">是</el-radio>
-              <el-radio v-model="ruleForm.user_status" :label="2">否</el-radio>
+              <el-radio v-model="ruleForm.user_status" :label="2">是</el-radio>
+              <el-radio v-model="ruleForm.user_status" :label="0">否</el-radio>
             </el-form-item>
           </el-form>
         </div>

src/views/authorityManagement/components/authorityRoleEdit.vue

@@ -89,7 +89,7 @@ export default {
   name: "AuthorityRoleEdit",
   components: { Permissionlist, Rulesofcompetency, Permissiontree, Rolelist },
   mixins: [roleData],
-  data() {
+  data () {
     return {
       radio: 1,
       form: {
@@ -119,16 +119,19 @@ export default {
       type: null, //参数类型
       roleType: "",
       msgIndex: 0,
+      maxReq: 20,
+      proAll: [],
+      proNum: 0
     };
   },
-  created() {
+  created () {
     //this.getAuthTree();
     const { RoleId } = this.$route.query;
     this.roleId = RoleId;
     this.roleDetails(RoleId);
     this.roleAuths(RoleId);
   },
-  mounted() {
+  mounted () {
     this.roleType = "onlyRole";
   },
   computed: {
@@ -136,7 +139,7 @@ export default {
   },
   methods: {
     //角色明细
-    async roleDetails(id = "") {
+    async roleDetails (id = "") {
       try {
         this.loading = true;
         const res = await Query({
@@ -156,30 +159,30 @@ export default {
       }
     },
     //删除
-    removeRole() {
+    removeRole () {
       this.deleteRole(this.roleId);
     },
     //获取权限树回调
-    getTreeData(arr) {
+    getTreeData (arr) {
       this.treeData = arr;
       this.msgArrs.push(arr);
       const data1 = this.msgArrs[this.msgArrs.length - 1]; //最后一条数据
       const data2 = this.msgArrs[this.msgArrs.length - 2]; //倒数第二条数据
       if (data1.length > data2.length) {
-        this.checksBoxTs(arr, "add");
+        this.checksBoxTs(data1, data2, "add");
       } else {
-        this.checksBoxTs(arr, "del");
+        this.checksBoxTs(data2, data1, "del");
         // setTimeout(() => {
         //   location.reload();
         // }, 1500);
       }
     },
     //获取权限规则回调
-    getData(obj) {
+    getData (obj) {
       this.authTo = obj;
     },
     //互斥角色选中回调
-    checkChange(arr) {
+    checkChange (arr) {
       const arrs = [];
       arr.forEach((item) => {
         const obj = {
@@ -191,7 +194,7 @@ export default {
       });
       this.checkedBoxs = arrs;
     },
-    async roleAuths(id) {
+    async roleAuths (id) {
       try {
         const res = await Query({
           id: DATACONTENT_ID.roleAuthId,
@@ -221,7 +224,7 @@ export default {
       }
     },
     //保存
-    saveBtn(formName) {
+    saveBtn (formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           const data1 = this.msgArrs[this.msgArrs.length - 1]; //最后一条数据
@@ -237,8 +240,8 @@ export default {
         }
       });
     },
-    async checksBoxTs(res, type) {
-      // const res = [...datas, ...arr].filter((item) => !(datas.some((p) => item.auth_id == p.auth_id) && arr.some((c) => item.auth_id == c.auth_id)));
+    async checksBoxTs (datas, arr, type) {
+      const res = [...datas, ...arr].filter((item) => !(datas.some((p) => item.auth_id == p.auth_id) && arr.some((c) => item.auth_id == c.auth_id)));
       const [msg1, msg2] = [[], []];
       if (res && res.length) {
         for (let i = 0; i < res.length; i++) {
@@ -305,30 +308,62 @@ export default {
             }
           }
         });
-        GeneralDataReception({
-          serviceId: SERVICE_ID.roleMsgAuthId,
-          dataContent: JSON.stringify(msg2),
-        }).then((result) => {
-          if (result.code == 0) {
-            if (type == "add") {
-              this.$message.success("操作规则成功", res.message);
-            } else {
-              this.$message.success("操作规则成功", res.message);
-            }
-          } else {
-            if (type == "add") {
-              this.$message.error("操作规则成功", res.message);
+        if (msg2.length > this.maxReq) {
+          this.foxFunc(msg2);
+        } else {
+          GeneralDataReception({
+            serviceId: SERVICE_ID.roleMsgAuthId,
+            dataContent: JSON.stringify(msg2),
+          }).then((result) => {
+            if (result.code == 0) {
+              if (type == "add") {
+                this.$message.success("操作规则成功", res.message);
+              } else {
+                this.$message.success("操作规则成功", res.message);
+              }
             } else {
-              this.$message.error("操作规则成功", res.message);
+              if (type == "add") {
+                this.$message.error("操作规则成功", res.message);
+              } else {
+                this.$message.error("操作规则成功", res.message);
+              }
             }
-          }
-        });
+          });
+        }
       } else {
         // this.$message.error('未选中数据')
       }
     },
+    async foxFunc (arr) {
+      if (this.proAll.length == 0) {
+        this.proAll = _.cloneDeep(arr);
+      }
+      const limit = _.chunk(this.proAll, this.maxReq);
+      const reqUts = [];
+      limit.forEach((item, index) => {
+        const req = GeneralDataReception({
+          serviceId: SERVICE_ID.roleMsgAuthId,
+          dataContent: JSON.stringify(limit[index]),
+        })
+        reqUts.push(req);
+      })
+      const result = Promise.all(reqUts);
+      const resultLen = await result;
+      if (limit.length == resultLen.length) {
+        this.proAll = [];
+        this.proNum = 0;
+        this.$message.success("操作规则成功");
+      } else {
+        this.proNum += 1;
+        if (this.proNum == 4) {
+          this.$message.success('网络错误，请稍后重试');
+        } else {
+          this.foxFunc();
+        }
+      }
+    },
     //确认保存
-    async editRole() {
+    async editRole () {
       try {
         const datas = [];
         this.treeData.forEach((item) => {

src/views/systemSettings/views/serviceManagement/serviceEdit.vue

@@ -48,13 +48,13 @@
                 </div>
               </el-col>
               <el-col :span="4">
-                <el-form-item label="启动时间" prop="startTime">
-                  <el-date-picker v-model="serviceForm.startTime" type="datetime" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" placeholder="请选择启动时间" />
+                <el-form-item label="启动时间" prop="hasStartTime">
+                  <el-date-picker v-model="serviceForm.hasStartTime" type="datetime" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" placeholder="请选择启动时间" />
                 </el-form-item>
               </el-col>
               <el-col :span="4">
-                <el-form-item label="停止时间" prop="stopTime">
-                  <el-date-picker v-model="serviceForm.stopTime" type="datetime" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" placeholder="请选择停止时间" />
+                <el-form-item label="停止时间" prop="hasEndTime">
+                  <el-date-picker v-model="serviceForm.hasEndTime" type="datetime" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" placeholder="请选择停止时间" />
                 </el-form-item>
               </el-col>
               <el-col :span="4">
@@ -76,7 +76,12 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="17">
+              <el-col :span="7">
+                <el-form-item label="详细位置" label-width="100px" prop="dataSourceName">
+                  <el-input v-model="serviceForm.dataSourceName" placeholder="请输入描述" clearable />
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
                 <el-form-item label="服务描述" label-width="100px" prop="serviceDescribe">
                   <el-input v-model="serviceForm.serviceDescribe" placeholder="请输入描述" clearable />
                 </el-form-item>
@@ -124,32 +129,18 @@
             <el-row :gutter="48" type="flex">
               <el-col :span="12">
                 <el-form-item label="取值表达式" label-width="100px" prop="computingMethod">
-                  <el-input
-                    v-model="serviceForm.computingMethod"
-                    placeholder="请输入取值表达式"
-                    type="textarea"
-                    :autosize="{
+                  <el-input v-model="serviceForm.computingMethod" placeholder="请输入取值表达式" type="textarea" :autosize="{
                       minRows: 3,
                       maxRows: 3,
-                    }"
-                    resize="none"
-                    clearable
-                  />
+                    }" resize="none" clearable />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="检测表达式" label-width="100px" prop="validationExpression">
-                  <el-input
-                    v-model="serviceForm.validationExpression"
-                    placeholder="请输入检测表达式"
-                    type="textarea"
-                    :autosize="{
+                  <el-input v-model="serviceForm.validationExpression" placeholder="请输入检测表达式" type="textarea" :autosize="{
                       minRows: 3,
                       maxRows: 3,
-                    }"
-                    resize="none"
-                    clearable
-                  />
+                    }" resize="none" clearable />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -166,19 +157,9 @@
                   </div>
                 </div>
                 <div class="content-list-box-body">
-                  <DataTable
-                    ref="serviceOutputTable"
-                    :data-id="outId"
-                    :data-content="{
+                  <DataTable ref="serviceOutputTable" :data-id="outId" :data-content="{
                       serviceID: serviceID,
-                    }"
-                    :rows="12"
-                    table-height="auto"
-                    margin-top="0"
-                    :is-btn="false"
-                    :is-dialog="true"
-                    labelWidth="100px"
-                  />
+                    }" :rows="12" table-height="auto" margin-top="0" :is-btn="false" :is-dialog="true" labelWidth="100px" />
                 </div>
               </div>
             </el-col>
@@ -195,23 +176,16 @@
                       </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                      <el-form-item label="详细位置" label-width="110px" prop="serviceName">
-                        <el-input v-model="serviceForm.serviceName" placeholder="请输入服务名称" clearable />
+                      <el-form-item label="详细位置" label-width="110px" prop="logDataSourceName">
+                        <el-input v-model="serviceForm.logDataSourceName" placeholder="请输入服务名称" clearable />
                       </el-form-item>
                     </el-col>
                   </el-row>
                   <el-form-item label="日志输出条件" label-width="110px" prop="logList">
-                    <el-input
-                      v-model="serviceForm.logList"
-                      placeholder="请输入日志输出条件"
-                      type="textarea"
-                      :autosize="{
+                    <el-input v-model="serviceForm.logList" placeholder="请输入日志输出条件" type="textarea" :autosize="{
                         minRows: 3,
                         maxRows: 3,
-                      }"
-                      resize="none"
-                      clearable
-                    />
+                      }" resize="none" clearable />
                   </el-form-item>
                 </div>
               </div>
@@ -252,22 +226,9 @@
             <p class="manageTitle">插槽列表</p>
             <el-button size="small" type="primary" class="btn-white" @click="btnAddClickHandler(2)">新增</el-button>
           </div>
-          <DataTable
-            ref="serviceMachineTable"
-            :data-id="jqId"
-            :data-content="{
+          <DataTable ref="serviceMachineTable" :data-id="jqId" :data-content="{
               serviceID: serviceID,
-            }"
-            :isBody="true"
-            :rows="12"
-            table-height="350px"
-            margin-top="0"
-            :is-btn="false"
-            :is-dialog="true"
-            :selection-enable="true"
-            @selectionAll="selectionAll"
-            @selection-change="machineSelectionChangeHandler"
-          />
+            }" :isBody="true" :rows="12" table-height="350px" margin-top="0" :is-btn="false" :is-dialog="true" :selection-enable="true" @selectionAll="selectionAll" @selection-change="machineSelectionChangeHandler" />
         </div>
         <div class="foot mt24">
           <el-button size="medium" @click="slotQd" type="primary" class="r25 r26">确定</el-button>
@@ -298,14 +259,7 @@
               <el-button size="mini" style="margin-left: 16px" @click="handleOk" type="primary">查询</el-button>
             </div>
           </div>
-          <div
-            v-loading="loading"
-            element-loading-text="拼命加载中"
-            stripe
-            element-loading-spinner="el-icon-loading"
-            element-loading-background="rgba(0, 0, 0, 0.8)"
-            class="interfaceLog_content flex-wrap"
-          >
+          <div v-loading="loading" element-loading-text="拼命加载中" stripe element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="interfaceLog_content flex-wrap">
             <el-table :data="tableData" class="table" height="500px" border style="width: 100%; margin-top: 20px">
               <el-table-column prop="logTime" width="200" label="时间"> </el-table-column>
               <el-table-column prop="logType" width="100" label="类型"> </el-table-column>
@@ -368,7 +322,7 @@ export default {
     // query,
     operate,
   ],
-  data() {
+  data () {
     return {
       outId: DATACONTENT_ID.sysServiceOutTabId,
       jqId: DATACONTENT_ID.sysServiceJqTabId,
@@ -402,6 +356,10 @@ export default {
         frequencyUnit: null,
         logDataSourceID: null,
         logList: "",
+        logDataSourceName: null,
+        dataSourceName: null,
+        hasStartTime: null,
+        hasEndTime: null
       },
       computedTableHeight: "200px",
       targetList: [],
@@ -432,29 +390,29 @@ export default {
       input: "",
     };
   },
-  created() {
+  created () {
     this.slotVisible = true;
     setTimeout(() => {
       this.slotVisible = false;
     }, 0);
   },
-  mounted() {
+  mounted () {
     this.queryServiceByID(this.serviceID);
     this.getDataSourceList(DATACONTENT_ID.sysSourceId);
   },
   methods: {
-    selectionAll(arr) {
+    selectionAll (arr) {
       this.slotValue = arr.length;
       this.selAll = _.cloneDeep(arr);
     },
-    editSubmitHandler() {
+    editSubmitHandler () {
       this.$refs["serviceForm"].validate((valid) => {
         if (valid) {
           this.updateService();
         }
       });
     },
-    btnAddClickHandler(flag) {
+    btnAddClickHandler (flag) {
       switch (flag) {
         case 1:
           this.$refs["serviceOutputTable"].handleAdd();
@@ -466,11 +424,11 @@ export default {
           break;
       }
     },
-    addService() {
+    addService () {
       this.getDataSourceList(DATACONTENT_ID.sysServiceXyId);
       this.sourceFormVisible = true;
     },
-    slotQd() {
+    slotQd () {
       const arr = this.selDatas;
       const row = this.selObj;
       const datas = this.selAll;
@@ -490,26 +448,26 @@ export default {
       this.slotValue = arr.length;
       this.selAll = _.cloneDeep(arr);
     },
-    timeStartChange(val) {
+    timeStartChange (val) {
       if (val >= this.timeEnd) {
         this.timeStart = "";
         this.$message.error("开始时间不能大于结束时间，请重新选择");
       }
     },
-    timeEndChange(val) {
+    timeEndChange (val) {
       if (val <= this.timeEnd) {
         this.timeEnd = "";
         this.$message.error("结束时间不能小于开始时间，请重新选择");
       }
     },
-    handleLog() {
+    handleLog () {
       this.logVisible = true;
       this.getQuery();
     },
-    handleOk() {
+    handleOk () {
       this.getQuery();
     },
-    async getQuery() {
+    async getQuery () {
       try {
         this.loading = true;
         const { code, returnData } = await Query({
@@ -529,7 +487,7 @@ export default {
         console.log(error);
       }
     },
-    logCopy(index) {
+    logCopy (index) {
       const ele = document.getElementById("logId" + index);
       const val = ele.innerText;
       try {
@@ -549,11 +507,11 @@ export default {
         this.$message.error("复制失败");
       }
     },
-    machineSelectionChangeHandler(selection, row) {
+    machineSelectionChangeHandler (selection, row) {
       this.selDatas = selection;
       this.selObj = row;
     },
-    async getDataSourceList(id) {
+    async getDataSourceList (id) {
       const dataSourceList = await this.getSelectOption(id);
       if (id == DATACONTENT_ID.sysSourceId) {
         this.dataSourceList = dataSourceList.map((item) => {
@@ -569,7 +527,7 @@ export default {
         });
       }
     },
-    async getSelectOption(ID) {
+    async getSelectOption (ID) {
       try {
         const listValues = await myQuery(ID);
         return listValues;
@@ -578,13 +536,13 @@ export default {
         return [];
       }
     },
-    async queryServiceByID(serviceID) {
+    async queryServiceByID (serviceID) {
       const serviceInfo = await myQuery(DATACONTENT_ID.sysServiceEditId, serviceID);
       Object.entries(serviceInfo[0]).forEach(([key, value]) => {
         this.serviceForm[key] = value;
       });
     },
-    async formService() {
+    async formService () {
       this.sourceDatas.forEach((item) => {
         if (item.protocolID == this.formLabelAlign.protocolName) {
           this.formLabelAlign.protocolName = item.protocolName;