Merge branch 'master' of http://120.26.64.82:3000/BFFE/CABaggageData2.0

.prettierrc

@@ -0,0 +1,4 @@
+{
+  "printWidth": 200,
+  "tabWidth": 2
+}

public/config.js

@@ -1,11 +1,11 @@
 window.PLATFROM_CONFIG = {
-  baseNewUrl: 'http://10.211.67.163:16300', //登录前的http请求地址
-  baseUrl: 'http://10.211.67.163:16300', // 4A-http请求地址
-  appSecret: '9inu7zpllz1folzsljm498dcpi0lsog1', //appSecret
-  appId: 'q7kdjmmaf0kerwpf', //appid
-  baseURLCA: 'http://10.211.67.163:16300', // 登录后的http请求地址-测试
-  baggageMessageURL: '/openApi/query'
-}
+  baseNewUrl: "http://10.211.67.163:16300", //登录前的http请求地址
+  baseUrl: "http://10.211.67.163:16300", // 4A-http请求地址
+  appSecret: "9inu7zpllz1folzsljm498dcpi0lsog1", //appSecret
+  appId: "q7kdjmmaf0kerwpf", //appid
+  baseURLCA: "http://10.211.67.163:16300", // 登录后的http请求地址-测试
+  baggageMessageURL: "/openApi/query",
+};
 
 window.DATACONTENT_ID = {
   /***-----登录------***/
@@ -22,11 +22,13 @@ window.DATACONTENT_ID = {
 
   /***-----角色管理------***/
   roleTableId: 59, //角色管理-首页-列表
+  roleTableNewId: 91, //角色管理-首页-列表
   roleDetailsId: 62, //角色管理-根据id查详情
   roleAuthId: 42, //角色管理-根据id查权限
 
   /***-----权限管理------***/
   authTreeId: 40, //权限管理-权限树
+  authTreeNewId: 92, //权限管理-权限树
 
   /***-----系统设置------***/
   sysSourceId: 13, //系统设置-数据源-id
@@ -81,10 +83,6 @@ window.DATACONTENT_ID = {
   baggageDetails: 44, // 行李-详情列表
   baggageMessage: 3066, // 行李-原始报文
 
-  /***-----容器视图------***/
-  containerHistory: 18026,
-  containerBaggage: 18027,
-
   /***-----基础数据------***/
   deployNodeId: 54, //基础数据-节点信息维护-获取二级节点(表格)-id
   deployNodeteoId: 60, //基础数据-节点信息维护-二级页面-id
@@ -105,9 +103,11 @@ window.DATACONTENT_ID = {
   stMapId: 18018,
   stCountryId: 18019,
   stTerminalId: 18020,
+  stBrsId: 18028,
 
   // 数据统计
   airlineOptions: 1806, // 航线下拉
+  termSeleid: 1156, //航站选择下拉
   areaOptions: 1807, // 大区/基地分公司下拉
   AirportId: 1808, // 航站下拉
   TerminalId: 1809, // 航站楼下拉
@@ -153,8 +153,8 @@ window.DATACONTENT_ID = {
   nodeOut: 1804, // 节点统计雷达图-离港
   nodeExportAirline: 1805, // 节点统计导出-航线
   nodeExportAirport: 1805, // 节点统计导出-航站
-  nodeAxisDesc: 90 // 节点统计指示器名称解释
-}
+  nodeAxisDesc: 90, // 节点统计指示器名称解释
+};
 
 window.SERVICE_ID = {
   /***-----账号管理------***/
@@ -174,8 +174,8 @@ window.SERVICE_ID = {
   sysServiceEditBoxId: 4, //系统设置-服务管理-编辑服务-部署机器-多选框
   sysQueryTabId: 5, //系统设置-查询模板-表格-增删改
   sysServiceAddXyId: 10, //系统设置-服务管理-新增服务-新增数据源-提交
-  sysDataTabId: 9 //系统设置-数据结构-数据项-表格-增删改
-}
+  sysDataTabId: 9, //系统设置-数据结构-数据项-表格-增删改
+};
 
 /* 轮询间隔 */
 window.LOOP_INTERVAL = {
@@ -185,5 +185,5 @@ window.LOOP_INTERVAL = {
   transferDepartureTable: 5 * 1000, // 中转离港表格
   baggageTrack: 5 * 1000, // 行李跟踪节点信息
   baggageDetails: 5 * 1000, // 行李详情表格
-  baggageMessage: 15 * 1000 // 行李原始报文
-}
+  baggageMessage: 15 * 1000, // 行李原始报文
+};

src/components/Table/index.vue

@@ -8,21 +8,11 @@
       element-loading-background="rgba(0, 0, 0, 0.8)"
       class="data-table-content"
     >
-      <div
-        :class="isStatus || isStatuser ? 'flex' : 'flex-end'"
-        class="data-table-btn"
-      >
+      <div :class="isStatus || isStatuser ? 'flex' : 'flex-end'" class="data-table-btn">
         <div v-if="isStatus || isStatuser" class="vStatus">
           <slot name="header" />
         </div>
-        <el-button
-          v-if="isBtn"
-          size="small"
-          @click="handleAdd"
-          plain
-          type="primary"
-          >新增</el-button
-        >
+        <el-button v-if="isBtn" size="small" @click="handleAdd" plain type="primary">新增</el-button>
       </div>
       <template v-if="tableData.length">
         <div>
@@ -42,26 +32,14 @@
             style="width: 100%; overflow: auto"
             @select="selectHandler"
           >
-            <el-table-column
-              v-if="selectionEnable"
-              type="selection"
-              width="35"
-            />
+            <el-table-column v-if="selectionEnable" type="selection" width="35" />
             <el-table-column v-if="isStatus" width="55">
               <template slot-scope="scope">
                 <div class="tableStatus">
-                  <div
-                    v-if="filteredTableData[scope.$index].nodeState == '运行'"
-                    class="status0"
-                  >
+                  <div v-if="filteredTableData[scope.$index].nodeState == '运行'" class="status0">
                     <span class="icon"></span>
                   </div>
-                  <div
-                    v-else-if="
-                      filteredTableData[scope.$index].nodeState == '停止'
-                    "
-                    class="status1"
-                  >
+                  <div v-else-if="filteredTableData[scope.$index].nodeState == '停止'" class="status1">
                     <span class="icon"></span>
                   </div>
                   <div v-else class="status2"><span class="icon"></span></div>
@@ -83,38 +61,12 @@
                   </el-tooltip>
                 </span>
                 <span v-if="item.needFilters">
-                  <el-popover
-                    placement="bottom"
-                    trigger="click"
-                    @show="popoverShowHandler(item.columnName)"
-                    @hide="popoverHideHandler"
-                  >
-                    <i
-                      slot="reference"
-                      :class="[
-                        'filter-arrow',
-                        'el-icon-arrow-down',
-                        arrowClass(item.columnName),
-                      ]"
-                    />
+                  <el-popover placement="bottom" trigger="click" @show="popoverShowHandler(item.columnName)" @hide="popoverHideHandler">
+                    <i slot="reference" :class="['filter-arrow', 'el-icon-arrow-down', arrowClass(item.columnName)]" />
                     <el-form>
                       <el-form-item :label="item.columnLabel">
-                        <el-select
-                          v-model="filterValues[item.columnName]"
-                          size="small"
-                          placeholder="筛选"
-                          default-first-option
-                          filterable
-                          clearable
-                        >
-                          <el-option
-                            v-for="(option, optionIndex) in tableDataFilters[
-                              item.columnName
-                            ]"
-                            :key="option.value + optionIndex"
-                            :value="option.value"
-                            :label="option.text"
-                          />
+                        <el-select v-model="filterValues[item.columnName]" size="small" placeholder="筛选" default-first-option filterable clearable>
+                          <el-option v-for="(option, optionIndex) in tableDataFilters[item.columnName]" :key="option.value + optionIndex" :value="option.value" :label="option.text" />
                         </el-select>
                       </el-form-item>
                     </el-form>
@@ -127,84 +79,19 @@
                 <div class="hd-td">
                   <div class="hd-tr">
                     <template v-if="isStatus">
-                      <el-button
-                        type="text"
-                        @click="handleLook(scope.row)"
-                        size="small"
-                        class="rmScs"
-                        >查看</el-button
-                      >
-                      <template
-                        v-if="
-                          scope.row.serviceTypeCode == 2 ||
-                          scope.row.serviceTypeCode == 4
-                        "
-                      >
-                        <el-button
-                          type="text"
-                          v-if="scope.row.nodeState == '停止'"
-                          @click="stateChangeHandler(scope.row)"
-                          size="small"
-                          class="rmScs"
-                          >启动</el-button
-                        >
-                        <el-button
-                          type="text"
-                          v-if="scope.row.nodeState == '运行'"
-                          @click="stateChangeHandler(scope.row)"
-                          size="small"
-                          class="rmScs"
-                          >停止</el-button
-                        >
+                      <el-button type="text" @click="handleLook(scope.row)" size="small" class="rmScs">查看</el-button>
+                      <template v-if="scope.row.serviceTypeCode == 2 || scope.row.serviceTypeCode == 4">
+                        <el-button type="text" v-if="scope.row.nodeState == '停止'" @click="stateChangeHandler(scope.row)" size="small" class="rmScs">启动</el-button>
+                        <el-button type="text" v-if="scope.row.nodeState == '运行'" @click="stateChangeHandler(scope.row)" size="small" class="rmScs">停止</el-button>
                       </template>
                     </template>
                     <!-- <el-button class="hrefBtn" type="text" @click="handleHerf(scope.row)" size="small">跳转</el-button> -->
-                    <el-button
-                      type="text"
-                      @click="handleEdit(scope.row)"
-                      size="small"
-                      class="rmScs"
-                      >编辑</el-button
-                    >
-                    <el-button
-                      class="rmSc"
-                      type="text"
-                      @click="handleRemove(scope.row)"
-                      size="small"
-                      >删除</el-button
-                    >
-                    <el-button
-                      class="rmScs"
-                      v-if="withColumnSet"
-                      type="text"
-                      size="small"
-                      @click="handleColumnSet(scope.row)"
-                      >列设置</el-button
-                    >
-                    <el-button
-                      class="rmScs"
-                      v-if="withItemSet"
-                      type="text"
-                      size="small"
-                      @click="handleItemSet(scope.row)"
-                      >数据项</el-button
-                    >
-                    <el-button
-                      class="rmScser"
-                      v-if="withlodSet"
-                      type="text"
-                      size="small"
-                      @click="handlelodSet(scope.row)"
-                      >航站设置</el-button
-                    >
-                    <el-button
-                      class="rmScser"
-                      v-if="withnodeSet"
-                      type="text"
-                      size="small"
-                      @click="handlenodeSet(scope.row)"
-                      >位置设置</el-button
-                    >
+                    <el-button type="text" @click="handleEdit(scope.row)" size="small" class="rmScs">编辑</el-button>
+                    <el-button class="rmSc" type="text" @click="handleRemove(scope.row)" size="small">删除</el-button>
+                    <el-button class="rmScs" v-if="withColumnSet" type="text" size="small" @click="handleColumnSet(scope.row)">列设置</el-button>
+                    <el-button class="rmScs" v-if="withItemSet" type="text" size="small" @click="handleItemSet(scope.row)">数据项</el-button>
+                    <el-button class="rmScser" v-if="withlodSet" type="text" size="small" @click="handlelodSet(scope.row)">航站设置</el-button>
+                    <el-button class="rmScser" v-if="withnodeSet" type="text" size="small" @click="handlenodeSet(scope.row)">位置设置</el-button>
                   </div>
                 </div>
               </template>
@@ -219,60 +106,24 @@
     </div>
     <div class="data-table-dialog">
       <!--新增/编辑-->
-      <Dialog :width="width" :flag="flag">
+      <Dialog :width="width" :isBody="isBody" :flag="flag">
         <div class="dialog-content">
           <div class="title">{{ tableTitle }}</div>
           <div class="contents">
-            <el-form
-              ref="ruleForm"
-              :model="tableForm"
-              :label-width="labelWidth"
-            >
+            <el-form ref="ruleForm" :model="tableForm" :label-width="labelWidth">
               <el-row :gutter="20">
-                <el-col
-                  v-for="(item, index) in tableColsCopy"
-                  :key="index"
-                  :span="rows"
-                >
+                <el-col v-for="(item, index) in tableColsCopy" :key="index" :span="rows">
                   <el-form-item :label="item.columnLabel">
-                    <template
-                      v-if="
-                        item.listqueryTemplateID ||
-                        item.listqueryTemplateID == 0
-                      "
-                    >
-                      <el-select
-                        size="small"
-                        clearable
-                        style="width: 100%"
-                        v-model="tableForm[item.columnName]"
-                        @change="changeSelect(item.columnName)"
-                        placeholder="请选择"
-                      >
-                        <el-option
-                          v-for="item in tableOptions[item.columnName]"
-                          :key="item.v"
-                          :label="item.k"
-                          :value="item.v"
-                        >
-                        </el-option>
+                    <template v-if="item.listqueryTemplateID || item.listqueryTemplateID == 0">
+                      <el-select size="small" clearable style="width: 100%" v-model="tableForm[item.columnName]" @change="changeSelect(item.columnName)" placeholder="请选择">
+                        <el-option v-for="item in tableOptions[item.columnName]" :key="item.v" :label="item.k" :value="item.v"> </el-option>
                       </el-select>
                     </template>
                     <template v-else-if="item.dataType == 'longtext'">
-                      <el-input
-                        size="small"
-                        :rows="1"
-                        type="textarea"
-                        @change="inputChangeHandler(item.columnName)"
-                        v-model="tableForm[item.columnName]"
-                      ></el-input>
+                      <el-input size="small" :rows="1" type="textarea" @change="inputChangeHandler(item.columnName)" v-model="tableForm[item.columnName]"></el-input>
                     </template>
                     <template v-else>
-                      <el-input
-                        size="small"
-                        v-model="tableForm[item.columnName]"
-                        @change="inputChangeHandler(item.columnName)"
-                      ></el-input>
+                      <el-input size="small" v-model="tableForm[item.columnName]" @change="inputChangeHandler(item.columnName)"></el-input>
                     </template>
                   </el-form-item>
                 </el-col>
@@ -280,13 +131,7 @@
             </el-form>
           </div>
           <div class="foot right">
-            <el-button
-              size="medium"
-              @click="handleOk"
-              class="r24"
-              type="primary"
-              >确定</el-button
-            >
+            <el-button size="medium" @click="handleOk" class="r24" type="primary">确定</el-button>
             <el-button @click="flag = false" size="medium">取消</el-button>
           </div>
         </div>
@@ -295,20 +140,11 @@
         <div class="airportInfoDialog">
           <div class="title del-title">删除</div>
           <div class="content del-content">
-            <span class="el-icon-error error r10"></span>您是否确认删除<span
-              class="error l10"
-              >{{ rmTitle }}</span
-            >
+            <span class="el-icon-error error r10"></span>您是否确认删除<span class="error l10">{{ rmTitle }}</span>
             ？
           </div>
           <div class="foot right Delfoot">
-            <el-button
-              size="medium"
-              class="r24"
-              @click="tableRemove"
-              type="danger"
-              >删除</el-button
-            >
+            <el-button size="medium" class="r24" @click="tableRemove" type="danger">删除</el-button>
             <el-button size="medium" @click="rmFlag = false">取消</el-button>
           </div>
         </div>
@@ -323,12 +159,7 @@ import { setTableFilters } from "@/utils/table";
 import Dialog from "@/layout/components/Dialog/index.vue";
 import NoData from "@/components/nodata";
 import { translateDataToTreeAllTreeMsg } from "@/utils/validate";
-import {
-  Query,
-  GeneralDataReception,
-  Start,
-  Stop,
-} from "@/api/dataIntegration";
+import { Query, GeneralDataReception, Start, Stop } from "@/api/dataIntegration";
 export default {
   name: "DataTable",
   props: {
@@ -454,6 +285,10 @@ export default {
       type: String,
       default: "180px",
     },
+    isBody: {
+      type: Boolean,
+      default: false,
+    },
   },
   components: { Dialog, NoData },
   data() {
@@ -503,11 +338,7 @@ export default {
         if (this.colShowFilter === prop) {
           return "arrow-active";
         }
-        if (
-          Object.entries(this.tableDataFilters).find(
-            ([key, arr]) => this.filterValues[prop]
-          )
-        ) {
+        if (Object.entries(this.tableDataFilters).find(([key, arr]) => this.filterValues[prop])) {
           classString += "arrow-blue";
         }
         return classString;
@@ -516,11 +347,7 @@ export default {
     //设置表头-下拉-选中数据
     filteredTableData() {
       if (this.isTree) {
-        this.tableData = translateDataToTreeAllTreeMsg(
-          this.tableData,
-          "parentID",
-          "companyID"
-        );
+        this.tableData = translateDataToTreeAllTreeMsg(this.tableData, "parentID", "companyID");
       }
       return this.tableData.filter((item) => {
         let flag = true;
@@ -581,8 +408,7 @@ export default {
       if (this.tableForm[data] === "") {
         this.tableForm[data] = null;
       }
-      this.tableForm[this.tableOptions[data][0].setvalue] =
-        this.tableForm[data];
+      this.tableForm[this.tableOptions[data][0].setvalue] = this.tableForm[data];
       // console.log(this.tableForm)
     },
     inputChangeHandler(data) {
@@ -605,9 +431,7 @@ export default {
             this.noMore = true;
             this.loading = false;
           }
-          const titleColumn = returnData.columnSet.find(
-            (item) => item.needShow === 1
-          );
+          const titleColumn = returnData.columnSet.find((item) => item.needShow === 1);
           if (titleColumn) {
             this.rowTitle = titleColumn.columnName;
           }
@@ -672,6 +496,7 @@ export default {
       tableData.forEach((row) => {
         this.$refs["table"].toggleRowSelection(row, !!row[selectFlagName]);
       });
+      this.$emit("selectionAll", this.$refs.table.selection);
     },
     //初始化表格
     initTableData() {
@@ -691,9 +516,7 @@ export default {
           // const reqUt = this.getSelectData(item.listqueryTemplateID)
           // reqUts.push(reqUt)
           if (!this.tableOptions[item.columnName]) {
-            this.tableOptions[item.columnName] = await this.getSelectData(
-              item.listqueryTemplateID
-            );
+            this.tableOptions[item.columnName] = await this.getSelectData(item.listqueryTemplateID);
           }
           // console.log(this.tableOptions[item.columnName])
         }
@@ -836,10 +659,7 @@ export default {
     async handleEdit(row) {
       if (this.isDialog) {
         if (this.editId) {
-          let data = await this.queryOriginRow(
-            this.editId,
-            row.queryTemplateColumnSetID
-          );
+          let data = await this.queryOriginRow(this.editId, row.queryTemplateColumnSetID);
           this.tableForm = JSON.parse(JSON.stringify(data));
           // this.tableForm =this.tableForm;
           // Object.entries(tableForm).forEach(([key, value]) => {

src/components/permissiontree/index.vue

@@ -41,22 +41,41 @@
       <div class="paren_cont">
         <el-scrollbar style="height: 100%">
           <!-- <el-tree :data="data" show-checkbox :check-strictly="true" @check-change="currentChange" @node-click="handleNodeClick" :defaultProps="defaultProps" :expand-on-click-node="false" node-key="AuthId" default-expand-all ref="tree" highlight-current> -->
-          <el-tree :data="data" show-checkbox @check="currentChange" :default-expanded-keys="defaultExpandedKeys" @node-click="handleNodeClick" :defaultProps="defaultProps" node-key="auth_id" ref="tree" highlight-current>
+          <el-tree
+            :data="data"
+            show-checkbox
+            @check="currentChange"
+            :default-expanded-keys="defaultExpandedKeys"
+            @node-click="handleNodeClick"
+            :defaultProps="defaultProps"
+            node-key="auth_id"
+            ref="tree"
+            highlight-current
+          >
             <span class="custom-tree-node" slot-scope="{ data }">
               {{ data.auth_name }}
               <div class="logup">
                 <!-- <div class="one" v-if="data.AuthList && data.AuthList.ValidBegin"></div>
                 <div class="two" v-if="data.AuthList && data.AuthList.Action == '1'"></div>
                 <div class="four" v-if="data.AuthList && data.AuthList.Action == '2'"></div> -->
-                <div class="three" v-if="
+                <div
+                  class="three"
+                  v-if="
                     data.AuthList &&
-                    (data.AuthList.edit_col_condition || data.edit_col_condition ||
-                      data.AuthList.delete_row_condition || data.delete_row_condition ||
-                      data.AuthList.edit_row_condition || data.edit_row_condition ||
-                      data.AuthList.new_col_condition || data.new_col_condition ||
-                      data.AuthList.query_col_conditon || data.query_col_conditon ||
-                      data.AuthList.query_row_condition || data.query_row_condition)
-                  "></div>
+                    (data.AuthList.edit_col_condition ||
+                      data.edit_col_condition ||
+                      data.AuthList.delete_row_condition ||
+                      data.delete_row_condition ||
+                      data.AuthList.edit_row_condition ||
+                      data.edit_row_condition ||
+                      data.AuthList.new_col_condition ||
+                      data.new_col_condition ||
+                      data.AuthList.query_col_conditon ||
+                      data.query_col_conditon ||
+                      data.AuthList.query_row_condition ||
+                      data.query_row_condition)
+                  "
+                ></div>
               </div>
             </span>
           </el-tree>
@@ -71,7 +90,7 @@ import { translateDataToTreeAll, deteleObject } from "@/utils/validate";
 import { GetAuthTree } from "@/api/apiAuthority";
 import { GetAuthTreeByGroup } from "@/api/AccountGroup";
 import { organizationUptree, postUptree } from "@/api/postInterface";
-import { GeneralDataReception, Query } from '@/api/dataIntegration';
+import { GeneralDataReception, Query } from "@/api/dataIntegration";
 export default {
   props: {
     title: {
@@ -95,7 +114,7 @@ export default {
     },
     queryIds: {
       type: Array,
-      default: () => []
+      default: () => [],
     },
     //要查询的查询ID
     isMainJob: {
@@ -103,7 +122,7 @@ export default {
       default: true,
     },
   },
-  data () {
+  data() {
     return {
       active: 0,
       data: [],
@@ -119,27 +138,27 @@ export default {
       checkedList: [], //选中的列表
       oldType: "",
       queryIdArr: [], //历史查询ID
-      MainJobId: "",//主岗ID
+      MainJobId: "", //主岗ID
       defaultExpandedKeys: [-1],
       treeChecks: [],
     };
   },
   watch: {
     checkedKeys: {
-      handler (val) {
+      handler(val) {
         this.checkedList = val;
-        this.treeChecks = val;
+        // this.treeChecks = val;
       },
       deep: true,
     },
     "$store.state.auth.authList": {
-      handler (val) {
+      handler(val) {
         if (val && val.length) {
           setTimeout(() => {
             this.AuthList = val;
             this.resetData();
             if (this.$store.getters.authId) {
-              this.defaultExpandedKeys = [this.$store.getters.authId]
+              this.defaultExpandedKeys = [this.$store.getters.authId];
             }
           }, 150);
         } else {
@@ -150,7 +169,7 @@ export default {
       deep: true,
     },
     queryId: {
-      handler (val) {
+      handler(val) {
         if (this.queryType == "job") {
           this.setDisabledAll();
           let ids = val.split(",");
@@ -179,26 +198,26 @@ export default {
       deep: true,
     },
     queryIds: {
-      handler () {
-        this.getDefaultDataList()
+      handler() {
+        this.getDefaultDataList();
       },
-      deep: true
+      deep: true,
     },
     treeChecks: {
-      handler (val) {
+      handler(val) {
         if (val && val.length) {
           this.$refs.tree.setCheckedKeys(val);
         }
       },
-      deep: true
-    }
+      deep: true,
+    },
   },
-  created () {
+  created() {
     this.getDataList();
     this.searchId = this.queryId;
   },
   methods: {
-    getAuthList () {
+    getAuthList() {
       let arr = [];
       setTimeout(() => {
         arr = this.$store.getters.authList;
@@ -206,7 +225,7 @@ export default {
           this.AuthList = arr;
           this.resetData();
           if (this.$store.getters.authId) {
-            this.defaultExpandedKeys = [this.$store.getters.authId]
+            this.defaultExpandedKeys = [this.$store.getters.authId];
           }
         } else {
           this.getAuthList();
@@ -214,22 +233,22 @@ export default {
       }, 100);
     },
     //获取权限列表
-    getDataList () {
+    getDataList() {
       Query({
         id: DATACONTENT_ID.authTreeId,
-        dataContent: ['']
+        dataContent: [""],
       }).then((result) => {
         // this.getDefaultDataList();
-        this.setUnDisabledData(result.returnData.listValues);
+        //this.setUnDisabledData(result.returnData.listValues);
         this.setData(result);
       });
     },
-    async getDefaultDataList () {
+    async getDefaultDataList() {
       if (this.queryType == "all" && this.searchId != "") {
         //获取全部权限树
         Query({
           id: DATACONTENT_ID.authTreeId,
-          dataContent: ['']
+          dataContent: [""],
         }).then((result) => {
           this.setUnDisabledData(result.returnData.listValues);
         });
@@ -241,7 +260,7 @@ export default {
       } else if (this.queryType == "origin") {
         //根据组织获取权限树
         this.AuthList = [];
-        this.$refs.tree.setCheckedKeys([])
+        this.$refs.tree.setCheckedKeys([]);
         organizationUptree({ OrganId: this.searchId }).then((result) => {
           this.setUnDisabledData(result.returnData.listValues);
         });
@@ -253,12 +272,12 @@ export default {
           });
         } else if (this.queryIds.length && this.queryIds[0] !== -1) {
           GetAuthTreeByGroup({ GroupIds: this.queryIds }).then((result) => {
-            this.setUnDisabledData(result.returnData.listValues)
-          })
+            this.setUnDisabledData(result.returnData.listValues);
+          });
         }
       }
     },
-    setData (result) {
+    setData(result) {
       if (result.code == 0 && result.returnData.listValues.length) {
         this.AuthArrList = [];
         result.returnData.listValues.forEach((item) => {
@@ -275,13 +294,11 @@ export default {
       }
     },
     //数据转树形
-    toTree () {
+    toTree() {
+      console.log(this.checkedKeys);
       this.data = [];
-      const arr = translateDataToTreeAll(
-        this.AuthArrList,
-        "up_auth_id",
-        "auth_id"
-      )
+      const chks = this.checkedKeys;
+      const arr = translateDataToTreeAll(this.AuthArrList, "up_auth_id", "auth_id");
       const items = {
         auth_id: -1,
         auth_name: "所有权限",
@@ -290,18 +307,37 @@ export default {
         auth_type: 0,
         children: arr,
       };
-      this.data = [items]
+      this.data = [items];
+      if (chks && chks.length) {
+        const datas = this.AuthArrList;
+        const caps = _.cloneDeep(datas);
+        const nots = [];
+        caps.forEach((item) => {
+          chks.some((p) => {
+            if (item.auth_id == p) {
+              nots.push(item);
+            }
+          });
+        });
+        const res = [...caps, ...nots].filter((item) => !(caps.some((p) => item.auth_id == p.auth_id) && nots.some((c) => item.auth_id == c.auth_id)));
+        this.$refs.tree.setCheckedKeys(chks);
+        setTimeout(() => {
+          res.forEach((item) => {
+            this.$refs.tree.setChecked(item.auth_id, false, false);
+          });
+        }, 150);
+      }
     },
     //数据切换
-    upActive (item, index) {
+    upActive(item, index) {
       this.active = index;
       this.decompose([this.dataObj], item.auth_id);
       this.$refs.tree.setCheckedKeys(this.checkedList);
     },
     // 树节点选中
-    currentChange () {
+    currentChange() {
       this.checkedList = [];
-      const datas = this.$refs.tree.getCheckedNodes();
+      const datas = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
       // const arr = this.$refs.tree.getCheckedNodes();
       // const half = this.$refs.tree.getHalfCheckedNodes();
       // const halfAll = half.filter(item => item.auth_id != -1 && item.auth_name != '所有权限');
@@ -322,15 +358,16 @@ export default {
       //   }, 100);
 
       // }
-      datas.forEach((item) => {
-        // if(item.disabled==false){
+      datas.forEach((item, index) => {
+        if (item.up_auth_id == -2) {
+          datas.splice(index, 1);
+        }
         this.checkedList.push(item.auth_id);
-        // }
       });
       this.setDataObj(datas);
     },
     // 选中后设置初始数据
-    setDataObj (arr) {
+    setDataObj(arr) {
       arr.forEach((item) => {
         if (!item.AuthList) {
           item.AuthList = {
@@ -339,14 +376,14 @@ export default {
             delete_row_condition: "",
             new_col_condition: "",
             edit_row_condition: "",
-            edit_col_condition: ""
+            edit_col_condition: "",
           };
         }
       });
       this.$emit("getTreeData", arr);
     },
     //获取指定数据
-    decompose (data, id) {
+    decompose(data, id) {
       for (let i = 0; i < data.length; i++) {
         if (data[i].auth_id == id) {
           this.data = [data[i]];
@@ -356,7 +393,7 @@ export default {
       }
     },
     //获取权限规则 从新组合数据
-    resetData () {
+    resetData() {
       if (this.AuthList) {
         this.AuthArrList.forEach((item1) => {
           item1["AuthList"] = null;
@@ -369,7 +406,7 @@ export default {
       }
       this.toTree();
     },
-    setUnDisabledData (data) {
+    setUnDisabledData(data) {
       const ArrData = _.cloneDeep(data);
       this.AuthArrList.forEach((item1) => {
         if (this.queryType != "job") {
@@ -384,7 +421,7 @@ export default {
       this.toTree();
     },
     //获取点击目标
-    handleNodeClick (data) {
+    handleNodeClick(data) {
       // this.toTree();
       const arr = this.$store.getters.authArrs;
       arr.push(data);
@@ -394,11 +431,11 @@ export default {
       this.$store.dispatch("auth/changeAuthArrs", datas);
       this.$store.dispatch("auth/changeAuthId", data.auth_id);
     },
-    async setDisabledAll () {
-      this.AuthArrList.forEach(item => {
+    async setDisabledAll() {
+      this.AuthArrList.forEach((item) => {
         item.disabled = true;
-      })
-    }
+      });
+    },
   },
 };
 </script>

src/components/rolelist/index.vue

@@ -52,56 +52,56 @@
   </div>
 </template>
 <script>
-import { GetAccountList } from '@/api/Account'
-import { GetRoleByGroup } from '@/api/AccountGroup'
-import { QueryRole } from '@/api/apiAuthority'
-import { GeneralDataReception, Query } from '@/api/dataIntegration'
-import NoData from "@/components/nodata"
+import { GetAccountList } from "@/api/Account";
+import { GetRoleByGroup } from "@/api/AccountGroup";
+import { QueryRole } from "@/api/apiAuthority";
+import { GeneralDataReception, Query } from "@/api/dataIntegration";
+import NoData from "@/components/nodata";
 export default {
   props: {
     title: {
       type: String,
-      default: ''
+      default: "",
     },
     type: {
       type: Boolean,
-      default: false
+      default: false,
     },
     number: {
       type: Number,
-      default: 3
+      default: 3,
     },
     active: {
       type: Boolean,
-      default: false
+      default: false,
     },
     checkBoxList: {
       type: Array,
-      default: () => []
+      default: () => [],
     },
     mainData: {
       type: Array,
-      default: () => []
+      default: () => [],
     },
     radioCheck: {
       type: Number,
-      default: 0
+      default: 0,
     },
     imageSize: {
       type: Number,
-      default: 200
+      default: 200,
     },
     roleType: {
       type: String,
-      default: ''
+      default: "",
     },
     GroupIds: {
       type: Array,
-      default: () => []
-    }
+      default: () => [],
+    },
   },
   components: { NoData },
-  data () {
+  data() {
     return {
       radio: null,
       checkList: [],
@@ -110,44 +110,44 @@ export default {
       msg: null,
       pageSize: 100,
       pageNum: 1,
-      total: '',
+      total: "",
       loading: false,
-      asyncData: []
-    }
+      asyncData: [],
+    };
   },
   watch: {
     radioCheck: {
-      handler (num) {
-        this.radio = num
+      handler(num) {
+        this.radio = num;
       },
-      deep: true
+      deep: true,
     },
     roleType: {
-      handler (msg) {
-        if (msg == 'account') {
-          this.getRoleData('account_id', 'account_name')
+      handler(msg) {
+        if (msg == "account") {
+          this.getRoleData("account_id", "account_name");
         }
-        if (msg == 'roleByUpId') {
-          this.getRoleDataByUpId('role_id')
+        if (msg == "roleByUpId") {
+          this.getRoleDataByUpId("role_id");
         }
-        if (msg == 'onlyRole') {
-          this.getRoleData('role_id', 'role_name')
+        if (msg == "onlyRole") {
+          this.getRoleData("role_id", "role_name");
         }
       },
-      deep: true
+      deep: true,
     },
     dataList: {
-      handler (arr) {
+      handler(arr) {
         if (arr && arr.length) {
-          this.asyncData.push(true)
+          this.asyncData.push(true);
         }
       },
-      deep: true
+      deep: true,
     },
     checkBoxList: {
-      handler (arr) {
+      handler(arr) {
         if (arr && arr.length) {
-          this.asyncData.push(true)
+          this.asyncData.push(true);
         }
         // if (this.roleType == "roleByUpId") {
         //   const datas = [];
@@ -161,183 +161,184 @@ export default {
         //   this.checkList = datas;
         // }
       },
-      deep: true
+      deep: true,
     },
     asyncData: {
-      handler (arr) {
+      handler(arr) {
         if (arr && arr.length == 2) {
-          if (this.roleType == 'account') {
-            this.checkBoxs('user_id')
+          if (this.roleType == "account") {
+            this.checkBoxs("user_id");
           }
-          if (this.roleType == 'onlyRole' || this.roleType == 'roleByUpId') {
-            this.checkBoxs('role_id')
+          if (this.roleType == "onlyRole" || this.roleType == "roleByUpId") {
+            this.checkBoxs("role_id");
           }
         }
       },
-      deep: true
+      deep: true,
     },
     GroupIds: {
-      handler () {
-        this.getRoleDataByUpId()
+      handler() {
+        this.getRoleDataByUpId();
       },
-      deep: true
-    }
+      deep: true,
+    },
   },
   computed: {
-    noMore () {
-      return this.pageNum >= this.total
+    noMore() {
+      return this.pageNum >= this.total;
+    },
+    disabled() {
+      return this.loading || this.noMore;
     },
-    disabled () {
-      return this.loading || this.noMore
-    }
   },
   methods: {
     // 选中
-    handleBg (item, i) {
-      this.msg = i
-      this.$emit('checkClick', item)
+    handleBg(item, i) {
+      this.msg = i;
+      this.$emit("checkClick", item);
     },
     //多选框
-    checkChange (arr) {
-      const datas = this.formatChecks(arr)
+    checkChange(arr) {
+      const datas = this.formatChecks(arr);
       // if (this.roleType == 'account') {
       //   datas = this.formatChecks(arr, 'UserId');
       // }
-      this.$emit('checkChange', datas)
+      this.$emit("checkChange", datas);
     },
     //单选框
-    radioChange (val) {
-      this.$emit('radioChange', val)
+    radioChange(val) {
+      this.$emit("radioChange", val);
     },
     //格式化选中回调
-    formatChecks (arr, key) {
-      const datas = []
+    formatChecks(arr, key) {
+      const datas = [];
       // const ids = []
       this.dataList.forEach((item, index) => {
-        arr.forEach(p => {
+        arr.forEach((p) => {
           if (index == p) {
-            datas.push(item)
+            datas.push(item);
           }
-        })
-      })
+        });
+      });
       // datas.forEach(item => {
       //   ids.push(item[key])
       // })
-      return datas
+      return datas;
     },
     //多选框默认选中
-    checkBoxs (ids) {
-      const datas = []
-      const type = typeof this.checkBoxList[0]
-      if (type == 'object') {
+    checkBoxs(ids) {
+      const datas = [];
+      const type = typeof this.checkBoxList[0];
+      if (type == "object") {
         this.dataList.forEach((item, index) => {
-          this.checkBoxList.forEach(p => {
+          this.checkBoxList.forEach((p) => {
             if (item[ids] == p[ids]) {
-              datas.push(index)
+              datas.push(index);
             }
-          })
-        })
+          });
+        });
       } else {
         this.dataList.forEach((item, index) => {
-          this.checkBoxList.forEach(p => {
+          this.checkBoxList.forEach((p) => {
             if (item[ids] == p) {
-              datas.push(index)
+              datas.push(index);
             }
-          })
-        })
+          });
+        });
       }
-      this.checkList = datas
+      this.checkList = datas;
     },
-    checkRole () {
-      const datas = []
+    checkRole() {
+      const datas = [];
       this.dataList.forEach((item, index) => {
-        this.checkBoxList.forEach(p => {
+        this.checkBoxList.forEach((p) => {
           if (item.RoleId == p.RoleId) {
-            datas.push(index)
+            datas.push(index);
           }
-        })
-      })
-      this.checkList = datas
+        });
+      });
+      this.checkList = datas;
     },
     //获取列表
-    async getRoleData (ids, names) {
+    async getRoleData(ids, names) {
       try {
-        this.loading = true
-        let result = null
-        if (this.roleType == 'account') {
+        this.loading = true;
+        let result = null;
+        const userId = sessionStorage.getItem("User_Id");
+        if (this.roleType == "account") {
           result = await Query({
             id: DATACONTENT_ID.accountTableId,
             needPage: this.pageNum,
-            dataContent: ['']
-          })
+            dataContent: [userId],
+          });
         }
-        if (this.roleType == 'onlyRole') {
+        if (this.roleType == "onlyRole") {
           result = await Query({
-            id: DATACONTENT_ID.roleTableId,
+            id: DATACONTENT_ID.roleTableNewId,
             needPage: this.pageNum,
-            dataContent: ['']
-          })
+            dataContent: [userId],
+          });
         }
         if (result.code == 0) {
-          const datas = result.returnData.listValues
-          const num = result.returnData.pages
-          this.arrsList.push(datas)
-          const arrs = this.arrsList.flat()
-          const msgs = _.unionBy(arrs, ids)
-          msgs.forEach(item => {
-            item.name = item[names]
-          })
-          this.dataList = msgs
-          this.total = num
-          this.$emit('roleListChange', msgs)
-          this.loading = false
+          const datas = result.returnData.listValues;
+          const num = result.returnData.pages;
+          this.arrsList.push(datas);
+          const arrs = this.arrsList.flat();
+          const msgs = _.unionBy(arrs, ids);
+          msgs.forEach((item) => {
+            item.name = item[names];
+          });
+          this.dataList = msgs;
+          this.total = num;
+          this.$emit("roleListChange", msgs);
+          this.loading = false;
         } else {
-          this.$message.error(result.message)
-          this.loading = false
+          this.$message.error(result.message);
+          this.loading = false;
         }
       } catch (error) {
-        console.log('出错了', error.message || error)
-        this.loading = false
+        console.log("出错了", error.message || error);
+        this.loading = false;
       }
     },
 
     //获取列表2
-    async getRoleDataByUpId () {
+    async getRoleDataByUpId() {
       try {
-        this.loading = true
+        this.loading = true;
         const obj = {
-          GroupIds: this.GroupIds
-        }
-        const result = await GetRoleByGroup(obj)
+          GroupIds: this.GroupIds,
+        };
+        const result = await GetRoleByGroup(obj);
         if (result.code === 0) {
-          const datas = result.returnData
-          const msgs = []
+          const datas = result.returnData;
+          const msgs = [];
           if (datas.length) {
-            datas.forEach(item => {
-              item.name = item.RoleName
+            datas.forEach((item) => {
+              item.name = item.RoleName;
               if (item.IsSelected) {
-                msgs.push(item)
+                msgs.push(item);
               }
-            })
-            this.dataList = msgs
+            });
+            this.dataList = msgs;
           } else {
-            this.dataList = msgs
+            this.dataList = msgs;
           }
-          this.$emit('roleListChange', msgs)
+          this.$emit("roleListChange", msgs);
           // this.checkBoxs(this.dataList, "RoleId");
-          this.loading = false
+          this.loading = false;
         } else {
-          this.$message.error(result.message)
-          this.loading = false
+          this.$message.error(result.message);
+          this.loading = false;
         }
       } catch (error) {
-        console.log('出错了', error.message || error)
-        this.loading = false
+        console.log("出错了", error.message || error);
+        this.loading = false;
       }
     },
 
     //滚动加载数据
-    load () {
+    load() {
       // this.pageNum += 1
       // if (this.roleType == 'account') {
       //   this.getRoleData('UserId', 'UserName')
@@ -345,9 +346,9 @@ export default {
       // if (this.roleType == 'onlyRole') {
       //   this.getRoleData('RoleId', 'RoleName')
       // }
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>

src/layout/components/Dialog/index.vue

@@ -8,12 +8,24 @@
 -->
 <template>
   <div class="dialog">
-    <el-dialog :visible.sync="flag" ref="dialogTk" :top="top" :custom-class="customClass" :lock-scroll="false" :modal="modal" :before-close="close" :width="width" :show-close="showFlag">
-      <div :style="{
-          height: child
-            ? this.$store.state.settings.dialogHeight - 96 + 'px'
-            : '',
-        }" class="dialog-content">
+    <el-dialog
+      :visible.sync="flag"
+      :append-to-body="isBody"
+      ref="dialogTk"
+      :top="top"
+      :custom-class="customClass"
+      :lock-scroll="false"
+      :modal="modal"
+      :before-close="close"
+      :width="width"
+      :show-close="showFlag"
+    >
+      <div
+        :style="{
+          height: child ? this.$store.state.settings.dialogHeight - 96 + 'px' : '',
+        }"
+        class="dialog-content"
+      >
         <slot />
       </div>
     </el-dialog>
@@ -58,11 +70,15 @@ export default {
       type: Boolean,
       default: false,
     },
+    isBody: {
+      type: Boolean,
+      default: false,
+    },
   },
   // 监听弹框开关
   watch: {
     flag: {
-      handler (val) {
+      handler(val) {
         if (val) {
           this.$nextTick(() => {
             // 获取弹框高度
@@ -81,7 +97,7 @@ export default {
   },
   methods: {
     // 弹框关闭
-    close () {
+    close() {
       this.$emit("closeDialog", false);
     },
   },

src/views/accountManagement/components/accountAuth.vue

@@ -11,7 +11,7 @@
     <!--新增权限项-->
     <div class="power-content flex-wrap">
       <div class="r24 flex1 part">
-        <div style="padding: 27px 24px;height: 100%;" class="addApp-form">
+        <div style="padding: 27px 24px; height: 100%" class="addApp-form">
           <div class="addApp-form-title flex">
             <div class="manageTitle">账号信息</div>
             <!-- <div class="title">
@@ -43,7 +43,19 @@
         </div>
       </div>
       <div class="flex1 r24 part">
-        <Rolelist v-loading="loading" element-loading-text="数据加载中" @checkChange="checkChange" @checkClick="checkClick" :roleType="roleType" :checkBoxList="radioCheck" :active="true" class="hucRole" :imageSize="80" :number="8" title="角色" />
+        <Rolelist
+          v-loading="loading"
+          element-loading-text="数据加载中"
+          @checkChange="checkChange"
+          @checkClick="checkClick"
+          :roleType="roleType"
+          :checkBoxList="radioCheck"
+          :active="true"
+          class="hucRole"
+          :imageSize="80"
+          :number="8"
+          title="角色"
+        />
       </div>
       <div class="flex1 part">
         <Permissionlist v-loading="permission" element-loading-text="数据加载中" :check="true" :imageSize="80" :RoleList="RoleList" class="hucPower" title="权限名称" />
@@ -58,11 +70,11 @@ import Rulesofcompetency from "@/components/rulesofcompetency";
 import Permissiontree from "@/components/permissiontree";
 import Rolelist from "@/components/rolelist";
 import { RoleDetails, EditRole, RoleAuths } from "@/api/apiAuthority";
-import { GeneralDataReception, Query } from '@/api/dataIntegration';
+import { GeneralDataReception, Query } from "@/api/dataIntegration";
 export default {
   name: "AuthorityRoleEdit",
   components: { Permissionlist, Rulesofcompetency, Permissiontree, Rolelist },
-  data () {
+  data() {
     return {
       radio: 1,
       form: {
@@ -93,42 +105,42 @@ export default {
       roleType: "",
     };
   },
-  created () {
+  created() {
     //this.getAuthTree();
     const { userId } = this.$route.query;
     this.roleId = userId;
     this.getAccountInfo();
-    this.roleDetails()
+    this.roleDetails();
   },
-  mounted () {
+  mounted() {
     this.roleType = "onlyRole";
   },
   methods: {
     // 获取当前账号信息
-    async getAccountInfo () {
+    async getAccountInfo() {
       const res = await Query({
         id: DATACONTENT_ID.accountDetailsId,
-        dataContent: [this.roleId]
-      })
+        dataContent: [this.roleId],
+      });
       if (res.code == 0) {
-        const { listValues } = res.returnData
-        const obj = listValues[0]
-        const { user_name, user_status, user_comment } = obj
-        this.form.name = user_name
-        this.form.app = user_comment
-        this.form.id = user_status
+        const { listValues } = res.returnData;
+        const obj = listValues[0];
+        const { user_name, user_status, user_comment } = obj;
+        this.form.name = user_name;
+        this.form.app = user_comment;
+        this.form.id = user_status;
       } else {
-        this.$message.error(res.message)
+        this.$message.error(res.message);
       }
     },
     //角色明细
-    async roleDetails () {
+    async roleDetails() {
       try {
         // this.loading = true;
         const res = await Query({
           id: DATACONTENT_ID.accountRoleId,
-          dataContent: [this.roleId]
-        })
+          dataContent: [this.roleId],
+        });
         if (res.code == 0) {
           const { listValues } = res.returnData;
           if (listValues && listValues.length) {
@@ -140,7 +152,7 @@ export default {
             this.radioCheck = listValues;
             this.roleAuths(listValues[0].role_id);
           }
-          this.checkedKeys.push(this.checkedBoxs)
+          this.checkedKeys.push(this.checkedBoxs);
           this.loading = false;
         } else {
           this.$message.error(res.message);
@@ -152,63 +164,63 @@ export default {
       }
     },
     //删除
-    removeRole () {
+    removeRole() {
       this.deleteRole(this.roleId);
     },
     //获取权限树回调
-    getTreeData (arr) {
+    getTreeData(arr) {
       this.treeData = arr;
     },
     //获取权限规则回调
-    getData (obj) {
+    getData(obj) {
       this.authTo = obj;
     },
     //互斥角色选中回调
-    async checkChange (arr) {
-      this.checkedKeys.push(arr)
-      const data1 = this.checkedKeys[this.checkedKeys.length - 1] //最后一条数据
-      const data2 = this.checkedKeys[this.checkedKeys.length - 2] //倒数第二条数据
+    async checkChange(arr) {
+      this.checkedKeys.push(arr);
+      const data1 = this.checkedKeys[this.checkedKeys.length - 1]; //最后一条数据
+      const data2 = this.checkedKeys[this.checkedKeys.length - 2]; //倒数第二条数据
       if (data1.length > data2.length) {
-        this.checksBoxTs(data1, data2, 'add')
+        this.checksBoxTs(data1, data2, "add");
       } else {
-        this.checksBoxTs(data2, data1, 'del')
+        this.checksBoxTs(data2, data1, "del");
       }
     },
-    async checksBoxTs (datas, arr, type) {
-      const res = datas.filter(item => !arr.some(p => item.role_id == p.role_id))
+    async checksBoxTs(datas, arr, type) {
+      const res = datas.filter((item) => !arr.some((p) => item.role_id == p.role_id));
       if (res && res.length) {
         let obj = {
           role_id: res[res.length - 1].role_id,
-          user_id: this.roleId
-        }
-        if (type == 'add') {
-          obj.event = 1
+          user_id: this.roleId,
+        };
+        if (type == "add") {
+          obj.event = 1;
         } else {
-          obj.event = 3
+          obj.event = 3;
         }
         const result = await GeneralDataReception({
           serviceId: SERVICE_ID.roleScId,
-          dataContent: JSON.stringify(obj)
-        })
+          dataContent: JSON.stringify(obj),
+        });
         if (result.code == 0) {
-          this.$message.success(result.message)
+          this.$message.success(result.message);
         } else {
-          this.$message.error(result.message)
+          this.$message.error(result.message);
         }
       } else {
-        this.$message.error('未选中数据')
+        this.$message.error("未选中数据");
       }
     },
     //互斥角色点击回调
-    checkClick (item) {
+    checkClick(item) {
       this.roleAuths(item.role_id);
     },
-    async roleAuths (id) {
+    async roleAuths(id) {
       try {
         this.permission = true;
         const res = await Query({
           id: DATACONTENT_ID.roleAuthId,
-          dataContent: [id]
+          dataContent: [id],
         });
         if (res.code == 0) {
           this.RoleList = res.returnData.listValues;
@@ -223,15 +235,15 @@ export default {
       }
     },
     //保存
-    saveBtn () {
+    saveBtn() {
       this.editRole();
     },
     //确认保存
-    async editRole () {
+    async editRole() {
       try {
         const res = await GeneralDataReception({
           serviceId: SERVICE_ID.roleScId,
-          dataContent: JSON.stringify(this.ruleFormObj)
+          dataContent: JSON.stringify(this.ruleFormObj),
         });
         if (res.code === 0) {
           this.$message.success(res.message);

src/views/accountManagement/components/accountEdit.vue

@@ -21,63 +21,22 @@
         </div> -->
         <div v-is="doesAccountExist ? ['userupdate_btn_save'] : []">
           <!-- <el-button size="small" type="primary" class="btn-delete" @click="delate">删除</el-button> -->
-          <el-button
-            size="small"
-            type="primary"
-            class="btn-save"
-            @click="handleClickSave('accountForm')"
-          >保存</el-button>
+          <el-button size="small" type="primary" class="btn-save" @click="handleClickSave('accountForm')">保存</el-button>
         </div>
       </div>
       <div class="title-content">
-        <el-form
-          ref="accountForm"
-          :inline="true"
-          :model="accountForm"
-          :rules="formRules"
-        >
-          <el-form-item
-            label="账号名称"
-            prop="name"
-          >
-            <el-input
-              v-model="accountForm.name"
-              maxlength="32"
-              placeholder="请输入名称"
-              size="small"
-            />
+        <el-form ref="accountForm" :inline="true" :model="accountForm" :rules="formRules">
+          <el-form-item label="账号名称" prop="name">
+            <el-input v-model="accountForm.name" maxlength="32" placeholder="请输入名称" size="small" />
           </el-form-item>
-          <el-form-item
-            label="登录密码"
-            prop="pwd"
-          >
-            <el-input
-              v-model="accountForm.pwd"
-              placeholder="*******"
-              size="small"
-              disabled
-            />
+          <el-form-item label="登录密码" prop="pwd">
+            <el-input v-model="accountForm.pwd" placeholder="*******" size="small" disabled />
           </el-form-item>
           <el-form-item>
-            <el-button
-              v-is="doesAccountExist ? ['userupdate_btn_re_pwd'] : []"
-              size="small"
-              type="primary"
-              class="btn-reset-pwd"
-              @click="resetPwd"
-            >重置密码</el-button>
+            <el-button v-is="doesAccountExist ? ['userupdate_btn_re_pwd'] : []" size="small" type="primary" class="btn-reset-pwd" @click="resetPwd">重置密码</el-button>
           </el-form-item>
-          <el-form-item
-            label="描述"
-            prop="desc"
-          >
-            <el-input
-              v-model="accountForm.desc"
-              class="desc"
-              maxlength="128"
-              placeholder="描述内容···"
-              size="small"
-            />
+          <el-form-item label="描述" prop="desc">
+            <el-input v-model="accountForm.desc" class="desc" maxlength="128" placeholder="描述内容···" size="small" />
           </el-form-item>
         </el-form>
       </div>
@@ -85,61 +44,31 @@
 
     <div class="account-edit-main">
       <!-- 用户组和角色未开启 -->
-      <el-row
-        v-if="!openGroup && !openRole"
-        :gutter="24"
-      >
+      <el-row v-if="!openGroup && !openRole" :gutter="24">
         <el-col :span="8">
           <div class="content-card">
-            <PermissionTree
-              title="权限树"
-              :query-type="queryType"
-              :checked-keys="permissionTreeChckedKeys"
-              @getTreeData="getPermissionTreeChecked"
-            />
+            <PermissionTree title="权限树" :query-type="queryType" :checked-keys="permissionTreeChckedKeys" @getTreeData="getPermissionTreeChecked" />
           </div>
         </el-col>
         <el-col :span="8">
           <div class="content-card">
-            <RulesOfCompetency
-              title="权限规则"
-              margin-b="20px"
-              @getData="getRulesOfCompetency"
-            />
+            <RulesOfCompetency title="权限规则" margin-b="20px" @getData="getRulesOfCompetency" />
           </div>
         </el-col>
-        <el-col
-          v-is=" doesAccountExist ? ['account_edit_login_setting'] : ['account_add_login_setting']"
-          :span="8"
-        >
+        <el-col v-is="doesAccountExist ? ['account_edit_login_setting'] : ['account_add_login_setting']" :span="8">
           <div class="content-card">
-            <LoginPolicy
-              :checked-list="loginPolicyCheckedList"
-              @getCheckedList="getLoginPolicyChecked"
-            />
+            <LoginPolicy :checked-list="loginPolicyCheckedList" @getCheckedList="getLoginPolicyChecked" />
           </div>
         </el-col>
       </el-row>
       <!-- 角色和用户组都开启 -->
-      <el-row
-        v-if="openGroup && openRole"
-        :gutter="24"
-      >
+      <el-row v-if="openGroup && openRole" :gutter="24">
         <el-col :span="8">
           <div class="content-card">
-            <AccountGroupTree
-              title="所属账号组"
-              nodekey="GroupId"
-              :default-props="accountGroupTreeProps"
-              :checked-keys="accountGroupTreeCheckedList"
-              @getTreeData="getAccountGroupChecked"
-            />
+            <AccountGroupTree title="所属账号组" nodekey="GroupId" :default-props="accountGroupTreeProps" :checked-keys="accountGroupTreeCheckedList" @getTreeData="getAccountGroupChecked" />
           </div>
         </el-col>
-        <el-col
-          v-is="doesAccountExist ? ['account_edit_role_list'] : ['account_add_role_list']"
-          :span="8"
-        >
+        <el-col v-is="doesAccountExist ? ['account_edit_role_list'] : ['account_add_role_list']" :span="8">
           <div class="content-card">
             <RoleList
               title="角色列表"
@@ -154,90 +83,39 @@
             />
           </div>
         </el-col>
-        <el-col
-          v-is="doesAccountExist
-            ? ['account_edit_auth_list','account_edit_login_setting']
-            : ['account_add_auth_list','account_add_login_setting']"
-          :span="8"
-        >
-          <div
-            v-is="doesAccountExist ? ['account_edit_auth_list'] : ['account_add_auth_list']"
-            class="content-card"
-          >
-            <PermissionList
-              title="权限列表"
-              class="permission-list"
-              :role-list="checkedRoles"
-              :check="true"
-              @Competen="Competen"
-            />
+        <el-col v-is="doesAccountExist ? ['account_edit_auth_list', 'account_edit_login_setting'] : ['account_add_auth_list', 'account_add_login_setting']" :span="8">
+          <div v-is="doesAccountExist ? ['account_edit_auth_list'] : ['account_add_auth_list']" class="content-card">
+            <PermissionList title="权限列表" class="permission-list" :role-list="checkedRoles" :check="true" @Competen="Competen" />
           </div>
-          <div
-            v-is="doesAccountExist ? ['account_edit_login_setting'] : ['account_add_login_setting']"
-            class="content-card"
-          >
-            <LoginPolicy
-              :checked-list="loginPolicyCheckedList"
-              @getCheckedList="getLoginPolicyChecked"
-            />
+          <div v-is="doesAccountExist ? ['account_edit_login_setting'] : ['account_add_login_setting']" class="content-card">
+            <LoginPolicy :checked-list="loginPolicyCheckedList" @getCheckedList="getLoginPolicyChecked" />
           </div>
         </el-col>
       </el-row>
       <!-- 只开启用户组 -->
-      <el-row
-        v-if="openGroup && !openRole"
-        :gutter="24"
-      >
+      <el-row v-if="openGroup && !openRole" :gutter="24">
         <el-col :span="8">
           <div class="content-card">
-            <AccountGroupTree
-              title="所属账号组"
-              nodekey="GroupId"
-              :default-props="accountGroupTreeProps"
-              :checked-keys="accountGroupTreeCheckedList"
-              @getTreeData="getAccountGroupChecked"
-            />
+            <AccountGroupTree title="所属账号组" nodekey="GroupId" :default-props="accountGroupTreeProps" :checked-keys="accountGroupTreeCheckedList" @getTreeData="getAccountGroupChecked" />
           </div>
         </el-col>
         <el-col :span="8">
           <div class="content-card">
-            <PermissionTree
-              title="权限树"
-              :query-type="queryType"
-              :query-ids="queryIds"
-              :checked-keys="permissionTreeChckedKeys"
-              @getTreeData="getPermissionTreeChecked"
-            />
+            <PermissionTree title="权限树" :query-type="queryType" :query-ids="queryIds" :checked-keys="permissionTreeChckedKeys" @getTreeData="getPermissionTreeChecked" />
           </div>
         </el-col>
         <el-col :span="8">
           <div class="content-card">
-            <RulesOfCompetency
-              title="权限规则"
-              margin-b="20px"
-              @getData="getRulesOfCompetency"
-            />
+            <RulesOfCompetency title="权限规则" margin-b="20px" @getData="getRulesOfCompetency" />
           </div>
-          <div
-            v-is="doesAccountExist ? ['account_edit_login_setting'] : ['account_add_login_setting']"
-            class="content-card"
-          >
-            <LoginPolicy
-              :checked-list="loginPolicyCheckedList"
-              @getCheckedList="getLoginPolicyChecked"
-            />
+          <div v-is="doesAccountExist ? ['account_edit_login_setting'] : ['account_add_login_setting']" class="content-card">
+            <LoginPolicy :checked-list="loginPolicyCheckedList" @getCheckedList="getLoginPolicyChecked" />
           </div>
         </el-col>
       </el-row>
       <!-- 只开启角色 -->
-      <el-row
-        v-if="!openGroup && openRole"
-        :gutter="24"
-      >
-        <el-col
-          v-is="doesAccountExist ? ['account_edit_role_list'] : ['account_add_role_list']"
-          :span="12"
-        >
+      <el-row v-if="!openGroup && openRole" :gutter="24">
+        <el-col v-is="doesAccountExist ? ['account_edit_role_list'] : ['account_add_role_list']" :span="12">
           <div class="content-card">
             <RoleList
               title="角色列表"
@@ -251,18 +129,9 @@
             />
           </div>
         </el-col>
-        <el-col
-          v-is="doesAccountExist ? ['account_edit_auth_list'] : ['account_add_auth_list']"
-          :span="12"
-        >
+        <el-col v-is="doesAccountExist ? ['account_edit_auth_list'] : ['account_add_auth_list']" :span="12">
           <div class="content-card">
-            <PermissionList
-              title="权限列表"
-              :role-list="checkedRoles"
-              :check="true"
-              class="permission-list"
-              @Competen="Competen"
-            />
+            <PermissionList title="权限列表" :role-list="checkedRoles" :check="true" class="permission-list" @Competen="Competen" />
           </div>
         </el-col>
         <!-- <el-col
@@ -296,18 +165,18 @@
 </template>
 
 <script>
-import AccountGroupTree from '@/components/usergrouptree/index.vue'
-import PermissionTree from '@/components/permissiontree/index.vue'
-import RulesOfCompetency from '@/components/rulesofcompetency/index.vue'
-import LoginPolicy from '@/components/loginpolicy/index.vue'
-import RoleList from '@/components/rolelist/index.vue'
-import PermissionList from '@/components/permissionlist/index.vue'
+import AccountGroupTree from "@/components/usergrouptree/index.vue";
+import PermissionTree from "@/components/permissiontree/index.vue";
+import RulesOfCompetency from "@/components/rulesofcompetency/index.vue";
+import LoginPolicy from "@/components/loginpolicy/index.vue";
+import RoleList from "@/components/rolelist/index.vue";
+import PermissionList from "@/components/permissionlist/index.vue";
 // import Dialog from '@/layout/components/Dialog'
 
-import { RoleAuths } from '@/api/apiAuthority'
-import { getAccountDetails, editAccount, addAccount } from '@/api/Account.js'
-import { pwdProduce } from '@/utils/validate'
-import { mapGetters } from 'vuex'
+import { RoleAuths } from "@/api/apiAuthority";
+import { getAccountDetails, editAccount, addAccount } from "@/api/Account.js";
+import { pwdProduce } from "@/utils/validate";
+import { mapGetters } from "vuex";
 
 export default {
   components: {
@@ -316,16 +185,16 @@ export default {
     RulesOfCompetency,
     LoginPolicy,
     RoleList,
-    PermissionList
+    PermissionList,
     // Dialog
   },
   data() {
     return {
       doesAccountExist: this.$route.meta.doesAccountExist, // 控制账号新增/编辑
-      userId: '',
+      userId: "",
       openRole: 0,
       openGroup: 0,
-      pwdStruc: '',
+      pwdStruc: "",
       pwdLengthBegin: 0,
       pwdLengthEnd: 0,
       permissionTreeChckedKeys: [], // 权限树初始勾选项
@@ -337,8 +206,8 @@ export default {
       accountGroupTreeCheckedTemp: [], // 账号组树当前勾选项
       roleListCheckedList: [], // 角色列表初始勾选项
       roleListCheckedTemp: [], // 角色列表当前勾选项
-      roleType: '',
-      queryType: '',
+      roleType: "",
+      queryType: "",
       checkedRoles: [],
       currentSelectedRoleId: 0,
       groupIds: [],
@@ -346,53 +215,53 @@ export default {
       // dialogVisible: false,
       formRules: {
         name: [
-          { required: true, message: '请输入账号名称', trigger: 'blur' },
-          { min: 1, max: 32, message: '长度在 1到 32 个字符', trigger: 'blur' }
+          { required: true, message: "请输入账号名称", trigger: "blur" },
+          { min: 1, max: 32, message: "长度在 1到 32 个字符", trigger: "blur" },
         ],
-        desc: [{ min: 1, max: 128, message: '长度最多128个字符', trigger: 'blur' }]
+        desc: [{ min: 1, max: 128, message: "长度最多128个字符", trigger: "blur" }],
       },
       accountForm: {
         name: null,
         pwd: null,
         desc: null,
-        status: 0
+        status: 0,
       },
       accountGroupTreeProps: {
-        children: 'children',
-        label: 'GroupName'
-      }
-    }
+        children: "children",
+        label: "GroupName",
+      },
+    };
   },
   computed: {
-    ...mapGetters(['systemSet']),
+    ...mapGetters(["systemSet"]),
     pageTitle() {
-      return this.doesAccountExist ? '编辑账号' : '新增账号'
-    }
+      return this.doesAccountExist ? "编辑账号" : "新增账号";
+    },
   },
   created() {
     // 获取系统配置
-    let obj
-    if (typeof this.systemSet === 'string') {
-      obj = JSON.parse(this.systemSet)
+    let obj;
+    if (typeof this.systemSet === "string") {
+      obj = JSON.parse(this.systemSet);
     } else {
-      obj = this.systemSet
+      obj = this.systemSet;
     }
     // console.log(obj)
-    const { OpenRole, OpenGroup, PwdStruc, PwdLengthBegin, PwdLengthEnd } = obj
-    this.openRole = OpenRole
-    this.openGroup = OpenGroup
-    this.pwdStruc = PwdStruc
-    this.pwdLengthBegin = PwdLengthBegin
-    this.pwdLengthEnd = PwdLengthEnd
+    const { OpenRole, OpenGroup, PwdStruc, PwdLengthBegin, PwdLengthEnd } = obj;
+    this.openRole = OpenRole;
+    this.openGroup = OpenGroup;
+    this.pwdStruc = PwdStruc;
+    this.pwdLengthBegin = PwdLengthBegin;
+    this.pwdLengthEnd = PwdLengthEnd;
   },
   mounted() {
     if (this.doesAccountExist) {
-      this.userId = this.$route.query.userId
-      this.getAccountInfo()
+      this.userId = this.$route.query.userId;
+      this.getAccountInfo();
     } else {
-      this.resetPwd()
-      this.roleType = 'onlyRole'
-      this.queryType = 'all'
+      this.resetPwd();
+      this.roleType = "onlyRole";
+      this.queryType = "all";
     }
   },
   methods: {
@@ -400,182 +269,182 @@ export default {
     async getAccountInfo() {
       try {
         const res = await getAccountDetails({
-          UserId: this.userId
-        })
+          UserId: this.userId,
+        });
         if (res.code === 0) {
           // console.log(res.returnData)
-          const { UserDesc, UserName, GroupList, TacList, AuthList, RoleList, Status } = res.returnData
-          this.accountForm.name = UserName
-          this.accountForm.desc = UserDesc
-          this.accountForm.status = Status ?? 1
+          const { UserDesc, UserName, GroupList, TacList, AuthList, RoleList, Status } = res.returnData;
+          this.accountForm.name = UserName;
+          this.accountForm.desc = UserDesc;
+          this.accountForm.status = Status ?? 1;
 
           AuthList &&
             AuthList.length &&
-            AuthList.forEach(auth => {
-              this.permissionTreeChckedKeys.push(auth.AuthId)
-              this.permissionTreeChckedTemp.push(auth)
-            })
+            AuthList.forEach((auth) => {
+              this.permissionTreeChckedKeys.push(auth.AuthId);
+              this.permissionTreeChckedTemp.push(auth);
+            });
           if (GroupList && GroupList.length && GroupList[0] !== -1) {
-            this.roleType = this.openGroup ? 'roleByUpId' : 'onlyRole'
-            this.queryType = this.openGroup ? 'group' : 'all'
-            GroupList.forEach(group => {
-              this.accountGroupTreeCheckedList.push(group.GroupId)
-              this.accountGroupTreeCheckedTemp.push(group.GroupId)
-              this.groupIds.push(group.GroupId)
-              this.queryIds.push(group.GroupId)
-            })
+            this.roleType = this.openGroup ? "roleByUpId" : "onlyRole";
+            this.queryType = this.openGroup ? "group" : "all";
+            GroupList.forEach((group) => {
+              this.accountGroupTreeCheckedList.push(group.GroupId);
+              this.accountGroupTreeCheckedTemp.push(group.GroupId);
+              this.groupIds.push(group.GroupId);
+              this.queryIds.push(group.GroupId);
+            });
           } else {
-            this.roleType = 'onlyRole'
-            this.queryType = 'all'
-            this.accountGroupTreeCheckedTemp.push(-1)
+            this.roleType = "onlyRole";
+            this.queryType = "all";
+            this.accountGroupTreeCheckedTemp.push(-1);
           }
 
           RoleList &&
             RoleList.length &&
-            RoleList.forEach(role => {
-              role.IsSelected && this.roleListCheckedTemp.push(role)
-            })
+            RoleList.forEach((role) => {
+              role.IsSelected && this.roleListCheckedTemp.push(role);
+            });
           TacList &&
             TacList &&
-            TacList.forEach(tac => {
-              tac.IsSelected && this.loginPolicyCheckedList.push(tac)
-              tac.IsSelected && this.loginPolicyCheckedTemp.push(tac)
-            })
+            TacList.forEach((tac) => {
+              tac.IsSelected && this.loginPolicyCheckedList.push(tac);
+              tac.IsSelected && this.loginPolicyCheckedTemp.push(tac);
+            });
         } else {
-          this.$message.error(res.message)
+          this.$message.error(res.message);
         }
       } catch (error) {
-        console.log('出错了', error.message || error)
+        console.log("出错了", error.message || error);
       }
     },
     // 随机生成密码
     resetPwd() {
-      this.accountForm.pwd = pwdProduce(this.pwdLengthBegin, this.pwdLengthEnd, this.pwdStruc)
+      this.accountForm.pwd = pwdProduce(this.pwdLengthBegin, this.pwdLengthEnd, this.pwdStruc);
     },
     // 获取当前权限树勾选项
     getPermissionTreeChecked(arr) {
-      this.permissionTreeChckedTemp = arr.map(auth => auth.AuthList)
+      this.permissionTreeChckedTemp = arr.map((auth) => auth.AuthList);
     },
     // 获取当前编辑的权限规则
     getRulesOfCompetency(obj) {
-      this.rulesOfCompetency = obj
+      this.rulesOfCompetency = obj;
     },
     // 获取当前勾选的登录策略
     getLoginPolicyChecked(arr) {
-      this.loginPolicyCheckedTemp = arr
+      this.loginPolicyCheckedTemp = arr;
     },
     // 获取当前勾选的账号组
     getAccountGroupChecked(arr) {
       if (arr && arr.length && arr[0] !== -1) {
-        const GroupIds = arr.map(item => item.GroupId)
-        this.accountGroupTreeCheckedTemp = GroupIds
-        this.roleType = 'roleByUpId'
-        this.groupIds = GroupIds
-        this.queryType = 'group'
-        this.queryIds = GroupIds
+        const GroupIds = arr.map((item) => item.GroupId);
+        this.accountGroupTreeCheckedTemp = GroupIds;
+        this.roleType = "roleByUpId";
+        this.groupIds = GroupIds;
+        this.queryType = "group";
+        this.queryIds = GroupIds;
       } else {
-        this.accountGroupTreeCheckedTemp = [-1]
-        this.roleType = 'onlyRole'
-        this.queryType = 'all'
+        this.accountGroupTreeCheckedTemp = [-1];
+        this.roleType = "onlyRole";
+        this.queryType = "all";
       }
     },
     // 获取当前勾选的角色列表
     getRoleListChecked(arr) {
-      this.roleListCheckedTemp = arr
+      this.roleListCheckedTemp = arr;
     },
     roleListCheckedChange(arr) {
-      this.roleListCheckedTemp = this.roleListCheckedTemp.filter(role => arr.some(data => data.RoleId === role.RoleId))
-      this.roleListCheckedList = this.roleListCheckedTemp.map(role => role.RoleId)
+      this.roleListCheckedTemp = this.roleListCheckedTemp.filter((role) => arr.some((data) => data.RoleId === role.RoleId));
+      this.roleListCheckedList = this.roleListCheckedTemp.map((role) => role.RoleId);
     },
     // 点击角色后显示对应权限列表
     async selectRole(data) {
-      if (this.currentSelectedRoleId === data.RoleId) return
+      if (this.currentSelectedRoleId === data.RoleId) return;
       try {
         const params = {
-          RoleId: data.RoleId
-        }
-        const result = await RoleAuths(params)
+          RoleId: data.RoleId,
+        };
+        const result = await RoleAuths(params);
         if (result.code === 0) {
-          this.checkedRoles = result.returnData
-          this.currentSelectedRoleId = data.RoleId
+          this.checkedRoles = result.returnData;
+          this.currentSelectedRoleId = data.RoleId;
         } else {
-          this.$message.error(result.message)
+          this.$message.error(result.message);
         }
       } catch (error) {
-        console.log('出错了', error.message || error)
+        console.log("出错了", error.message || error);
       }
     },
     // 修改权限规则
     Competen(data) {
-      console.log(data)
+      console.log(data);
     },
     // 账号编辑保存
     handleClickSave(formName) {
-      this.$refs[formName].validate(valid => {
+      this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.handleSaveEdit()
+          this.handleSaveEdit();
         } else {
-          console.log('error submit!!')
-          return false
+          console.log("error submit!!");
+          return false;
         }
-      })
+      });
     },
     handleSaveEdit() {
       const params = {
         AuthList: this.permissionTreeChckedTemp,
-        GroupList: this.accountGroupTreeCheckedTemp.map(groupId => ({ GroupId: groupId })),
+        GroupList: this.accountGroupTreeCheckedTemp.map((groupId) => ({ GroupId: groupId })),
         RoleList: this.roleListCheckedTemp,
         TacList: this.loginPolicyCheckedTemp,
         UserDesc: this.accountForm.desc,
         UserName: this.accountForm.name,
-        UserPwd: this.accountForm.pwd
-      }
+        UserPwd: this.accountForm.pwd,
+      };
       if (this.doesAccountExist) {
         this.saveEditAccount({
           ...params,
           UserId: this.userId,
-          Status: this.accountForm.status
-        })
+          Status: this.accountForm.status,
+        });
       } else {
-        this.saveAddAccount(params)
+        this.saveAddAccount(params);
       }
     },
     // 编辑账号
     async saveEditAccount(params) {
       try {
-        const res = await editAccount(params)
+        const res = await editAccount(params);
         if (res.code === 0) {
-          this.$message.success(res.message)
+          this.$message.success(res.message);
           setTimeout(() => {
-            this.$store.dispatch('tagsView/delView', this.$route)
-            this.$router.push('/account')
-          }, 1000)
+            this.$store.dispatch("tagsView/delView", this.$route);
+            this.$router.push("/account");
+          }, 1000);
         } else {
-          this.$message.error(res.message)
+          this.$message.error(res.message);
         }
       } catch (error) {
-        console.log('出错了', error.message || error)
+        console.log("出错了", error.message || error);
       }
     },
     // 新增账号
     async saveAddAccount(params) {
       try {
-        const res = await addAccount(params)
+        const res = await addAccount(params);
         if (res.code === 0) {
-          this.$message.success(res.message)
+          this.$message.success(res.message);
           setTimeout(() => {
-            this.$store.dispatch('tagsView/delView', this.$route)
-            this.$router.push('/account')
-          }, 1000)
+            this.$store.dispatch("tagsView/delView", this.$route);
+            this.$router.push("/account");
+          }, 1000);
         } else {
-          this.$message.error(res.message)
+          this.$message.error(res.message);
         }
       } catch (error) {
-        console.log('出错了', error.message || error)
+        console.log("出错了", error.message || error);
       }
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>

src/views/authorityManagement/components/authorityRoleEdit.vue

@@ -11,7 +11,7 @@
     <!--新增权限项-->
     <div class="power-content flex-wrap">
       <div class="r24 flex1 part">
-        <div style="padding: 27px 24px;height: 100%;" class="addApp-form">
+        <div style="padding: 27px 24px; height: 100%" class="addApp-form">
           <div class="addApp-form-title flex">
             <div class="manageTitle">角色授权</div>
             <!-- <div class="title">
@@ -84,12 +84,12 @@ import Rolelist from "@/components/rolelist";
 import { RoleDetails, EditRole, RoleAuths } from "@/api/apiAuthority";
 import { Query, GeneralDataReception } from "@/api/dataIntegration";
 import roleData from "../minixs/roleData";
-import { mapGetters } from 'vuex'
+import { mapGetters } from "vuex";
 export default {
   name: "AuthorityRoleEdit",
   components: { Permissionlist, Rulesofcompetency, Permissiontree, Rolelist },
   mixins: [roleData],
-  data () {
+  data() {
     return {
       radio: 1,
       form: {
@@ -118,30 +118,30 @@ export default {
       msgArrs: [],
       type: null, //参数类型
       roleType: "",
-      msgIndex: 0
+      msgIndex: 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: {
-    ...mapGetters['authArrs']
+    ...mapGetters["authArrs"],
   },
   methods: {
     //角色明细
-    async roleDetails (id = '') {
+    async roleDetails(id = "") {
       try {
         this.loading = true;
         const res = await Query({
           id: DATACONTENT_ID.roleDetailsId,
-          dataContent: [id]
+          dataContent: [id],
         });
         if (res.code == 0) {
           this.form = res.returnData.listValues[0];
@@ -156,30 +156,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] //倒数第二条数据
+      const data1 = this.msgArrs[this.msgArrs.length - 1]; //最后一条数据
+      const data2 = this.msgArrs[this.msgArrs.length - 2]; //倒数第二条数据
       if (data1.length >= data2.length) {
-        this.checksBoxTs(data1, data2, 'add')
+        this.checksBoxTs(arr, "add");
       } else {
-        this.checksBoxTs(data2, data1, 'del')
-        setTimeout(() => {
-          location.reload()
-        }, 1500);
+        this.checksBoxTs(arr, "del");
+        // setTimeout(() => {
+        //   location.reload();
+        // }, 1500);
       }
     },
     //获取权限规则回调
-    getData (obj) {
+    getData(obj) {
       this.authTo = obj;
     },
     //互斥角色选中回调
-    checkChange (arr) {
+    checkChange(arr) {
       const arrs = [];
       arr.forEach((item) => {
         const obj = {
@@ -191,27 +191,27 @@ export default {
       });
       this.checkedBoxs = arrs;
     },
-    async roleAuths (id) {
+    async roleAuths(id) {
       try {
         const res = await Query({
           id: DATACONTENT_ID.roleAuthId,
-          dataContent: [id]
+          dataContent: [id],
         });
         if (res.code == 0) {
           this.checkedKeys = [];
-          const { listValues } = res.returnData
+          const { listValues } = res.returnData;
           if (listValues && listValues.length) {
             this.authList = listValues;
             this.authTo = listValues[0];
             listValues.forEach((item) => {
-              const obj = item
-              obj.auth_id = item.auth_id
-              this.checkedBoxs.push(item)
-              this.checkedKeys.push(item.auth_id)
+              const obj = item;
+              obj.auth_id = item.auth_id;
+              this.checkedBoxs.push(item);
+              this.checkedKeys.push(item.auth_id);
             });
             // this.msgArrs.push([])
           }
-          this.msgArrs.push(this.checkedBoxs)
+          this.msgArrs.push(this.checkedBoxs);
         } else {
           this.$message.error(res.message);
           this.loading = false;
@@ -221,15 +221,15 @@ export default {
       }
     },
     //保存
-    saveBtn (formName) {
+    saveBtn(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          const data1 = this.msgArrs[this.msgArrs.length - 1] //最后一条数据
-          const data2 = this.msgArrs[this.msgArrs.length - 2] //倒数第二条数据
+          const data1 = this.msgArrs[this.msgArrs.length - 1]; //最后一条数据
+          const data2 = this.msgArrs[this.msgArrs.length - 2]; //倒数第二条数据
           if (data1.length > data2.length) {
-            this.checksBoxTs(data1, data2, 'add')
+            this.checksBoxTs(data1, data2, "add");
           } else {
-            this.checksBoxTs(data2, data1, 'del')
+            this.checksBoxTs(data2, data1, "del");
           }
         } else {
           console.log("error submit!!");
@@ -237,44 +237,44 @@ export default {
         }
       });
     },
-    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] = [[], []]
+    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)));
+      const [msg1, msg2] = [[], []];
       if (res && res.length) {
         for (let i = 0; i < res.length; i++) {
           let obj = {
             auth_id: res[i].auth_id || res[i].AuthId,
-            role_id: this.roleId
-          }
-          let authObj = res[i].AuthList ? Object.assign(_.cloneDeep(obj), res[i].AuthList) : Object.assign(_.cloneDeep(obj), res[i])
-          if (type == 'add') {
+            role_id: this.roleId,
+          };
+          let authObj = res[i].AuthList ? Object.assign(_.cloneDeep(obj), res[i].AuthList) : Object.assign(_.cloneDeep(obj), res[i]);
+          if (type == "add") {
             if (authObj.QueryRow) {
-              authObj.query_row_condition = authObj.QueryRow
+              authObj.query_row_condition = authObj.QueryRow;
             }
             if (authObj.QueryCol) {
-              authObj.query_col_conditon = authObj.QueryCol
+              authObj.query_col_conditon = authObj.QueryCol;
             }
             if (authObj.NewCol) {
-              authObj.new_col_condition = authObj.NewCol
+              authObj.new_col_condition = authObj.NewCol;
             }
             if (authObj.EditCol) {
-              authObj.edit_col_condition = authObj.EditCol
+              authObj.edit_col_condition = authObj.EditCol;
             }
             if (authObj.EditRow) {
-              authObj.edit_row_condition = authObj.EditRow
+              authObj.edit_row_condition = authObj.EditRow;
             }
             if (authObj.DeleteRow) {
-              authObj.delete_row_condition = authObj.DeleteRow
+              authObj.delete_row_condition = authObj.DeleteRow;
             }
-            obj.event = 1
-            authObj.event = 1
-            msg1.push(obj)
-            msg2.push(authObj)
+            obj.event = 1;
+            authObj.event = 1;
+            msg1.push(obj);
+            msg2.push(authObj);
           } else {
-            obj.event = 3
-            authObj.event = 3
-            msg1.push(obj)
-            msg2.push(authObj)
+            obj.event = 3;
+            authObj.event = 3;
+            msg1.push(obj);
+            msg2.push(authObj);
             // const authList = this.$store.getters.authList;
             // authList.forEach((item, index) => {
             //   msg2.forEach(p => {
@@ -289,46 +289,46 @@ export default {
         }
         GeneralDataReception({
           serviceId: SERVICE_ID.roleMsgTreeId,
-          dataContent: JSON.stringify(msg1)
-        }).then(result => {
+          dataContent: JSON.stringify(msg1),
+        }).then((result) => {
           if (result.code == 0) {
-            if (type == 'add') {
-              this.$message.success('添加权限', res.message)
+            if (type == "add") {
+              this.$message.success("添加权限", res.message);
             } else {
-              this.$message.success('取消权限', res.message)
+              this.$message.success("取消权限", res.message);
             }
           } else {
-            if (type == 'add') {
-              this.$message.error('添加权限', res.message)
+            if (type == "add") {
+              this.$message.error("添加权限", res.message);
             } else {
-              this.$message.error('取消权限', res.message)
+              this.$message.error("取消权限", res.message);
             }
           }
-        })
+        });
         GeneralDataReception({
           serviceId: SERVICE_ID.roleMsgAuthId,
-          dataContent: JSON.stringify(msg2)
-        }).then(result => {
+          dataContent: JSON.stringify(msg2),
+        }).then((result) => {
           if (result.code == 0) {
-            if (type == 'add') {
-              this.$message.success('添加规则', res.message)
+            if (type == "add") {
+              this.$message.success("添加规则", res.message);
             } else {
-              this.$message.success('取消规则', res.message)
+              this.$message.success("取消规则", res.message);
             }
           } else {
-            if (type == 'add') {
-              this.$message.error('添加规则', res.message)
+            if (type == "add") {
+              this.$message.error("添加规则", res.message);
             } else {
-              this.$message.error('取消规则', res.message)
+              this.$message.error("取消规则", res.message);
             }
           }
-        })
+        });
       } else {
         // this.$message.error('未选中数据')
       }
     },
     //确认保存
-    async editRole () {
+    async editRole() {
       try {
         const datas = [];
         this.treeData.forEach((item) => {

src/views/authorityManagement/components/authorityRoleHome.vue

@@ -110,13 +110,13 @@
 import Search from "@/layout/components/Search";
 import Dialog from "@/layout/components/Dialog";
 import roleData from "../minixs/roleData";
-import NoData from '@/components/nodata';
+import NoData from "@/components/nodata";
 import { Query, GeneralDataReception } from "@/api/dataIntegration";
 export default {
   name: "AuthorityRole",
   components: { Search, Dialog, NoData },
   mixins: [roleData],
-  data () {
+  data() {
     return {
       arrs: [], //卡片数据
       arr: [],
@@ -148,7 +148,7 @@ export default {
       needPage: 1,
     };
   },
-  created () {
+  created() {
     if (this.$route.query.keyWords) {
       keyWords = this.$route.query.keyWords;
       this.keyWords = keyWords;
@@ -156,15 +156,15 @@ export default {
     this.queryData();
   },
   computed: {
-    noMore () {
+    noMore() {
       return this.pageNum >= this.total;
     },
-    disabled () {
+    disabled() {
       return this.loading || this.noMore;
     },
   },
   methods: {
-    queryData () {
+    queryData() {
       let data = {
         id: DATACONTENT_ID.roleTableId,
         dataContent: [this.keyWords],
@@ -173,39 +173,39 @@ export default {
       this.gueryRole(data);
     },
     //删除
-    checkRemove (item, index) {
+    checkRemove(item, index) {
       this.flag = true;
       this.index = item;
       this.title = item.role_name;
       this.num = index;
     },
     //确认删除
-    remove () {
+    remove() {
       this.index.event = 3;
       this.editRoles(this.index);
     },
     //角色新增
-    addRole () {
+    addRole() {
       this.editDialogTitle = "新增角色";
       this.editDialogVisible = true;
       this.editType = "add";
       // this.$router.push('/role/addRole')
     },
     //角色编辑
-    editRole (item) {
+    editRole(item) {
       this.editDialogVisible = true;
       this.editType = "edit";
       this.editDialogTitle = "编辑角色";
       this.roleId = item.role_id;
       this.ruleForm = _.cloneDeep(item);
     },
-    pageInit () {
-      this.needPage = 1
-      this.arrs = []
-      this.queryData()
+    pageInit() {
+      this.needPage = 1;
+      this.arrs = [];
+      this.queryData();
     },
     //新增角色
-    async editRoles (params) {
+    async editRoles(params) {
       try {
         const res = await GeneralDataReception({
           serviceId: SERVICE_ID.roleMsgId,
@@ -225,28 +225,28 @@ export default {
       }
     },
     // 角色授权
-    authRole (item) {
+    authRole(item) {
       this.$router.push({
         path: "/role/editRole",
         query: { RoleId: item.role_id },
       });
     },
     //查询
-    getSearchData (val) {
+    getSearchData(val) {
       this.arrs = [];
       this.needPage = 1;
       this.keyWords = val;
-      this.queryData()
+      this.queryData();
     },
     //清除查询
-    clearSearchData () {
+    clearSearchData() {
       this.arrs = [];
       this.needPage = 1;
       this.keyWords = "";
-      this.queryData()
+      this.queryData();
     },
     // 新增/编辑-确认
-    submitClickHandler () {
+    submitClickHandler() {
       this.$refs["ruleForm"].validate((valid) => {
         if (valid) {
           if (this.editType == "add") {
@@ -263,15 +263,15 @@ export default {
       });
     },
     // 重置
-    resetForm (formName) {
+    resetForm(formName) {
       this.ruleForm = {};
       this.$refs[formName].resetFields();
       this.editDialogVisible = false;
     },
     //滚动加载数据
-    load () {
-      this.needPage += 1
-      this.queryData()
+    load() {
+      this.needPage += 1;
+      this.queryData();
     },
   },
 };

src/views/authorityManagement/minixs/treeData.js

@@ -6,26 +6,26 @@
  * @Description: 获取权限树
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\minixs\treeData.js
  */
-import { translateDataToTreeAll } from '@/utils/validate'
-import { GetAuthTree } from '@/api/apiAuthority'
-import { Query } from '@/api/dataIntegration'
+import { translateDataToTreeAll } from "@/utils/validate";
+import { GetAuthTree } from "@/api/apiAuthority";
+import { Query } from "@/api/dataIntegration";
 export default {
-  data () {
+  data() {
     return {
       dataList: {},
-      searchinfo: ''
-    }
+      searchinfo: "",
+    };
   },
-  created () {
+  created() {
     // this.getAuthTree()
   },
   methods: {
-    async getAuthTree () {
+    async getAuthTree() {
       try {
         const result = await Query({
           id: DATACONTENT_ID.authTreeId,
-          dataContent: [this.searchinfo]
-        })
+          dataContent: [this.searchinfo],
+        });
         if (result.code == 0 && result.returnData.listValues) {
           const obj = {
             auth_id: -1,
@@ -34,9 +34,9 @@ export default {
             up_auth_id: -1,
             auth_type: 0,
             disabled: true,
-            children: translateDataToTreeAll(result.returnData.listValues, 'up_auth_id', 'auth_id')
-          }
-          this.dataList = obj
+            children: translateDataToTreeAll(result.returnData.listValues, "up_auth_id", "auth_id"),
+          };
+          this.dataList = obj;
           this.dataArr = result.returnData.listValues;
           this.dataArr.push({
             auth_id: -1,
@@ -45,9 +45,8 @@ export default {
             up_auth_id: -1,
             auth_type: 0,
             disabled: true,
-            children: []
-          }
-          )
+            children: [],
+          });
         } else {
           const obj = {
             auth_id: -1,
@@ -56,9 +55,9 @@ export default {
             up_auth_id: -1,
             auth_type: 0,
             disabled: true,
-            children: []
-          }
-          this.dataList = obj
+            children: [],
+          };
+          this.dataList = obj;
           this.dataArr.push({
             auth_id: -1,
             auth_name: "所有权限",
@@ -66,9 +65,8 @@ export default {
             up_auth_id: -1,
             auth_type: 0,
             disabled: true,
-            children: []
-          }
-          )
+            children: [],
+          });
         }
       } catch (error) {
         const obj = {
@@ -78,9 +76,9 @@ export default {
           up_auth_id: -1,
           auth_type: 0,
           disabled: true,
-          children: []
-        }
-        this.dataList = obj
+          children: [],
+        };
+        this.dataList = obj;
         this.dataArr.push({
           auth_id: -1,
           auth_name: "所有权限",
@@ -88,10 +86,9 @@ export default {
           up_auth_id: -1,
           auth_type: 0,
           disabled: true,
-          children: []
-        }
-        )
+          children: [],
+        });
       }
-    }
-  }
-}
+    },
+  },
+};

src/views/statisticsCharts/components/tableform.vue

@@ -96,7 +96,14 @@
 </template>
 <script>
 import { setTableFilters } from "@/utils/table";
+import {
+  Query,
+  GeneralDataReception,
+  Start,
+  Stop,
+} from "@/api/dataIntegration";
 import NoData from "@/components/nodata";
+import { de } from "vis";
 export default {
   isDialog: {
     type: Boolean,
@@ -285,7 +292,8 @@ export default {
     },
   },
   mounted() {
-    this.initTableData();
+    // this.initTableData();
+    this.getQuery();
   },
   methods: {
     load() {

src/views/statisticsCharts/components/tableformbrs.vue

@@ -9,24 +9,27 @@
       class="data-table-content"
     >
       <template v-if="tableData.length">
-        <el-table :data="tableData" style="width: 100%">
-          <el-table-column prop="date" label="航站"> </el-table-column>
-          <el-table-column label="出港航班量">
-            <el-table-column prop="name" label="航班（架次）" width="240">
+        <el-table :data="tableData" style="width: 100%" ref="userTableData">
+          <el-table-column label="PEK国航行李BRS扫描数据统计表">
+            <el-table-column prop="A" label="航站"> </el-table-column>
+            <el-table-column label="出港航班量">
+              <el-table-column prop="flightno" label="航班（架次）" width="240">
+              </el-table-column>
+              <el-table-column prop="bagsno" label="行李（件数）" width="240">
+              </el-table-column>
             </el-table-column>
-            <el-table-column prop="province" label="行李（件数）" width="240">
+            <el-table-column label="扫描航班量">
+              <el-table-column prop="loadflightno" label="航班（架次）">
+              </el-table-column>
+              <el-table-column prop="loadbagsno" label="行李（件数）">
+              </el-table-column>
             </el-table-column>
-          </el-table-column>
-          <el-table-column label="扫描航班量">
-            <el-table-column prop="city" label="航班（架次）">
-            </el-table-column>
-            <el-table-column prop="address" label="行李（件数）">
+            <el-table-column label="扫描率">
+              <el-table-column prop="flightscan" label="航班">
+              </el-table-column>
+              <el-table-column prop="bagsscan" label="行李"> </el-table-column>
             </el-table-column>
           </el-table-column>
-          <el-table-column label="扫描率">
-            <el-table-column prop="zip" label="航班"> </el-table-column>
-            <el-table-column prop="cp" label="行李"> </el-table-column>
-          </el-table-column>
         </el-table>
       </template>
       <template v-else>
@@ -37,26 +40,64 @@
 </template>
 <script>
 import NoData from "@/components/nodata";
+import { Query } from "@/api/dataIntegration";
+import * as XLSX from "xlsx";
+import FileSaver from "file-saver";
+import { number } from "echarts";
+import { throttledExportToExcel } from "@/utils/table";
 export default {
+  props: {
+    //接口ID
+    dataId: {
+      type: [String, Number],
+      default: "",
+    },
+    isloadings: {
+      type: Number,
+    },
+    dataContent: {
+      type: Array,
+      default: () => [],
+    },
+  },
   data() {
     return {
       loading: false,
+      page: 0,
+      serviceId: null,
+      rowTitle: "",
+      tableCols: [], //表头数据
       tableData: [
-        {
-          date: "wnz（7月）",
-          name: "409",
-          province: "18946",
-          city: "409",
-          address: "18294",
-          zip: "100%",
-          cp: "96.56%",
-        },
+        // {
+        //   date: "wnz（7月）",
+        //   name: "409",
+        //   province: "18946",
+        //   city: "409",
+        //   address: "18294",
+        //   zip: "100%",
+        //   cp: "96.56%",
+        // },
       ],
     };
   },
   components: {
     NoData,
   },
+  watch: {
+    dataContent: {
+      handler(val) {
+        if (val) {
+          this.getQuery();
+        }
+      },
+      deep: true,
+    },
+    isloadings: {
+      handler(val) {
+        this.downFile();
+      },
+    },
+  },
   computed: {
     dataTableContentStyle() {
       const style = {};
@@ -69,6 +110,57 @@ export default {
       return style;
     },
   },
+  mounted() {
+    // this.getQuery();
+  },
+  methods: {
+    //获取表格数据
+    async getQuery() {
+      try {
+        this.loading = true;
+        const { code, returnData } = await Query({
+          id: this.dataId,
+          needPage: ++this.page,
+          dataContent: this.dataContent,
+        });
+        if (code == 0) {
+          if (returnData.listValues.length === 0) {
+            this.page--;
+            this.noMore = true;
+            this.loading = false;
+          }
+          const titleColumn = returnData.columnSet.find(
+            (item) => item.needShow === 1
+          );
+          if (titleColumn) {
+            this.rowTitle = titleColumn.columnName;
+          }
+          this.tableData.push(...returnData.listValues);
+          this.tableCols = returnData.columnSet;
+          this.serviceId = returnData.submitID;
+          this.loading = false;
+          // setTimeout(() => {
+          //   this.initTableData();
+          //   this.loading = false;
+          // }, 100);
+        } else {
+          this.page--;
+          this.loading = false;
+          this.$message.error("获取表格数据失败");
+        }
+      } catch (error) {
+        this.page--;
+        this.loading = false;
+        console.log(error);
+      }
+    },
+    downFile() {
+      let tableName = "PEK国航行李BRS扫描数据统计表";
+      const table = this.$refs["userTableData"].$el.cloneNode(true);
+      const fileName = `${tableName}.xlsx`;
+      throttledExportToExcel(table, tableName, fileName);
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/statisticsCharts/components/tableformcp.vue

@@ -10,6 +10,7 @@
     >
       <template v-if="tableData.length">
         <el-table
+          ref="userTableDatas"
           :data="tableData"
           style="width: 100%"
           :show-summary="true"
@@ -80,7 +81,13 @@
 </template>
 <script>
 import NoData from "@/components/nodata";
+import { throttledExportToExcel } from "@/utils/table";
 export default {
+  props: {
+    isloadings: {
+      type: Number,
+    },
+  },
   data() {
     return {
       loading: false,
@@ -389,6 +396,13 @@ export default {
       ],
     };
   },
+  watch: {
+    isloadings: {
+      handler(val) {
+        this.downFile();
+      },
+    },
+  },
   components: {
     NoData,
   },
@@ -494,6 +508,12 @@ export default {
       // },
       return arr;
     },
+    downFile() {
+      let tableName = "中转专项报表";
+      const table = this.$refs["userTableDatas"].$el.cloneNode(true);
+      const fileName = `${tableName}.xlsx`;
+      throttledExportToExcel(table, tableName, fileName);
+    },
   },
 };
 </script>

src/views/statisticsCharts/components/tableforms.vue

@@ -9,7 +9,7 @@
       class="data-table-content"
     >
       <template v-if="tableData.length">
-        <el-table :data="tableData" style="width: 100%">
+        <el-table :data="tableData" style="width: 100%" ref="userTableDatasr">
           <el-table-column prop="date" label="时间"> </el-table-column>
           <el-table-column label="行李平均运输时间">
             <el-table-column
@@ -55,7 +55,13 @@
 </template>
 <script>
 import NoData from "@/components/nodata";
+import { throttledExportToExcel } from "@/utils/table";
 export default {
+  props: {
+    isloadings: {
+      type: Number,
+    },
+  },
   data() {
     return {
       loading: false,
@@ -108,6 +114,13 @@ export default {
   components: {
     NoData,
   },
+  watch: {
+    isloadings: {
+      handler(val) {
+        this.downFile();
+      },
+    },
+  },
   computed: {
     dataTableContentStyle() {
       const style = {};
@@ -120,6 +133,14 @@ export default {
       return style;
     },
   },
+  methods: {
+    downFile() {
+      let tableName = "运送效率报表";
+      const table = this.$refs["userTableDatasr"].$el.cloneNode(true);
+      const fileName = `${tableName}.xlsx`;
+      throttledExportToExcel(table, tableName, fileName);
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/statisticsCharts/views/report/reportStatistics.vue

@@ -7,7 +7,7 @@
       :data="formData"
       with-setting
       :withSetting="false"
-      :withExport="false"
+      @export="exportup"
     />
     <Tableforms
       :rows="12"
@@ -15,6 +15,7 @@
       :min-height="70"
       width="800px"
       tableHeight="750"
+      :isloadings="isloadings"
     />
   </div>
 </template>
@@ -29,6 +30,7 @@ export default {
         airport: "",
         dateTime: "",
       },
+      isloadings: 1,
       formItems: [
         {
           prop: "airport",
@@ -56,6 +58,11 @@ export default {
     StatisticsHeader,
     Tableforms,
   },
+  methods: {
+    exportup() {
+      this.isloadings = this.isloadings += 1;
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/statisticsCharts/views/report/scanningStatistics.vue

@@ -7,9 +7,13 @@
       :data="formData"
       with-setting
       :withSetting="false"
-      :withExport="false"
+      @getFormData="getFormData"
+      @export="exportup"
     />
-    <tableformbrs
+    <Tableformbrs
+      :data-id="dataId"
+      :isloadings="isloadings"
+      :data-content="dataContent"
       :rows="12"
       label-width="140px"
       :min-height="70"
@@ -20,7 +24,7 @@
 </template>
 <script>
 import StatisticsHeader from "../../components/statisticsHeader.vue";
-import tableformbrs from "../../components/tableformbrs";
+import Tableformbrs from "../../components/tableformbrs";
 export default {
   name: "ReportStatistics",
   data() {
@@ -34,11 +38,11 @@ export default {
           prop: "airport",
           inputType: "select",
           placeholder: "航站选择",
-          filterable: true,
+          // filterable: true,
           clearable: true,
           // multiple: true,
-          disabled: true,
-          queryId: DATACONTENT_ID.nodeAirport,
+          // disabled: true,
+          queryId: DATACONTENT_ID.termSeleid,
           setKey: "a2",
           options: [],
         },
@@ -75,11 +79,28 @@ export default {
           options: [],
         },
       ],
+      dataId: DATACONTENT_ID.stBrsId,
+      dataContent: [],
+      isloadings: 1,
     };
   },
   components: {
     StatisticsHeader,
-    tableformbrs,
+    Tableformbrs,
+  },
+  methods: {
+    getFormData(data) {
+      this.dataContent = [];
+      this.dataContent.push(
+        data.interval,
+        data.airport,
+        data.dateTime[0] ? data.dateTime[0] : "",
+        data.dateTime[1] ? data.dateTime[1] : ""
+      );
+    },
+    exportup() {
+      this.isloadings = this.isloadings += 1;
+    },
   },
 };
 </script>

src/views/statisticsCharts/views/report/transitTable.vue

@@ -7,9 +7,10 @@
       :data="formData"
       with-setting
       :withSetting="false"
-      :withExport="false"
+      @export="exportup"
     />
     <Tableformcp
+      :isloadings="isloadings"
       :rows="12"
       label-width="140px"
       :min-height="70"
@@ -29,6 +30,7 @@ export default {
         airport: "",
         dateTime: "",
       },
+      isloadings: 1,
       formItems: [
         {
           prop: "airport",
@@ -56,6 +58,11 @@ export default {
     StatisticsHeader,
     Tableformcp,
   },
+  methods: {
+    exportup() {
+      this.isloadings = this.isloadings += 1;
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

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

@@ -0,0 +1,619 @@
+<!--
+ * @Date: 2022-03-24 09:55:13
+ * @LastEditTime: 2022-08-09 17:22:52
+ * @LastEditors: your name
+ * @Description: 服务管理-编辑服务
+ * have a nice day!
+-->
+
+<template>
+  <div class="service-edit">
+    <div class="scrollbar">
+      <el-form ref="serviceForm" class="service-form" :model="serviceForm" label-position="right" label-width="80px" size="mini">
+        <div class="content-list-box">
+          <div class="flex content-list-box-head">
+            <div class="manageTitle">
+              <span class="s1">当前服务ID：{{ serviceID }}</span>
+              <span class="s2">{{ serviceState }}</span>
+            </div>
+            <div class="manageBtns">
+              <el-button size="mini" @click="slotVisible = true" type="primary">1个插槽</el-button>
+              <el-button size="mini" class="btn-white" plain type="primary">查看日志</el-button>
+            </div>
+          </div>
+          <div class="content-list-box-body">
+            <el-row :gutter="48" type="flex">
+              <el-col :span="5">
+                <el-form-item label="服务名称" prop="serviceName">
+                  <el-input v-model="serviceForm.serviceName" placeholder="请输入服务名称" clearable />
+                </el-form-item>
+              </el-col>
+              <el-col :span="5">
+                <div class="flex-wrap">
+                  <el-form-item label="业务类型" prop="serviceType">
+                    <el-select v-model="serviceForm.serviceType" clearable>
+                      <el-option :value="1" label="管理前端" />
+                      <el-option :value="2" label="管理后端" />
+                      <el-option :value="3" label="业务前端" />
+                      <el-option :value="4" label="业务后端" />
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item class="isAsynchronous">
+                    <el-select v-model="serviceForm.isAsynchronous">
+                      <el-option :value="1" label="同步"></el-option>
+                      <el-option :value="0" label="异步"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </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>
+              </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>
+              </el-col>
+              <el-col :span="4">
+                <el-form-item label="前序输出编号" label-width="100px" prop="serviceOutputID">
+                  <el-input v-model="serviceForm.serviceOutputID" placeholder="请输入前序输出编号" clearable />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </div>
+        <div class="content-list-box">
+          <div class="manageTitle">主动采集配置</div>
+          <div class="content-list-box-body">
+            <el-row :gutter="48" type="flex">
+              <el-col :span="5">
+                <el-form-item label-width="100px" label="数据来源" prop="dataSourceID">
+                  <el-select v-model="serviceForm.dataSourceID" clearable>
+                    <el-option v-for="dataSource in dataSourceList" :key="dataSource.dataSourceID" :value="dataSource.dataSourceID" :label="dataSource.dataSourceName" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="17">
+                <el-form-item label="服务描述" label-width="100px" prop="serviceDescribe">
+                  <el-input v-model="serviceForm.serviceDescribe" placeholder="请输入描述" clearable />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row style="margin-top: 24px" :gutter="48" type="flex">
+              <el-col :span="5">
+                <el-form-item label="计划启动时间" label-width="100px" 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>
+              </el-col>
+              <el-col :span="5">
+                <el-form-item label="计划停止时间" label-width="100px" 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>
+              </el-col>
+              <el-col :span="4">
+                <el-form-item label="错误重试" prop="retryCount" label-width="100px">
+                  <el-input v-model="serviceForm.retryCount" placeholder="请输入重试次数" clearable />
+                </el-form-item>
+              </el-col>
+              <el-col :span="4">
+                <el-form-item label="循环次数" prop="loopCount">
+                  <el-input v-model="serviceForm.loopCount" placeholder="请输入循环次数" clearable />
+                </el-form-item>
+              </el-col>
+              <el-col :span="4">
+                <el-form-item label="循环频率" prop="frequencyCount">
+                  <el-input v-model="serviceForm.frequencyCount" placeholder="请输入循环频率" clearable />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </div>
+        <div class="content-list-box">
+          <div class="manageTitle">统一接收</div>
+          <div class="content-list-box-body">
+            <el-row style="margin-bottom: 24px" :gutter="48" type="flex">
+              <el-col :span="12">
+                <el-form-item label="生命周期编号" prop="lifeCycleCol" label-width="100px">
+                  <el-input v-model="serviceForm.lifeCycleCol" placeholder="请输入生命周期编号" clearable />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <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="{
+                      minRows: 3,
+                      maxRows: 3,
+                    }"
+                    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="{
+                      minRows: 3,
+                      maxRows: 3,
+                    }"
+                    resize="none"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </div>
+        <div class="content-list-tabs">
+          <el-row :gutter="16" type="flex">
+            <el-col :span="12">
+              <div class="content-list-box">
+                <div class="flex">
+                  <div class="manageTitle">输出</div>
+                  <div class="manageBtns">
+                    <el-button size="mini" class="btn-white" @click="btnAddClickHandler(1)" plain type="primary">新增</el-button>
+                  </div>
+                </div>
+                <div class="content-list-box-body">
+                  <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"
+                  />
+                </div>
+              </div>
+            </el-col>
+            <el-col :span="12">
+              <div class="content-list-box">
+                <div class="manageTitle">日志记录</div>
+                <div class="content-list-box-body">
+                  <el-row style="margin-bottom: 24px" :gutter="48" type="flex">
+                    <el-col :span="12">
+                      <el-form-item label="日志存储数据源" label-width="110px" prop="logDataSourceID">
+                        <el-select v-model="serviceForm.logDataSourceID">
+                          <el-option v-for="dataSource in dataSourceList" :key="dataSource.dataSourceID" :value="dataSource.dataSourceID" :label="dataSource.dataSourceName" />
+                        </el-select>
+                      </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>
+                    </el-col>
+                  </el-row>
+                  <el-form-item label="日志输出条件" label-width="110px" prop="logList">
+                    <el-input
+                      v-model="serviceForm.logList"
+                      placeholder="请输入日志输出条件"
+                      type="textarea"
+                      :autosize="{
+                        minRows: 3,
+                        maxRows: 3,
+                      }"
+                      resize="none"
+                      clearable
+                    />
+                  </el-form-item>
+                </div>
+              </div>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+    </div>
+    <Dialog :flag="sourceFormVisible" width="464px">
+      <div class="dialog-create">
+        <div class="title">新增数据来源</div>
+        <div class="content">
+          <el-form ref="sourceForm" label-width="100px" :model="formLabelAlign">
+            <el-form-item label="数据源名称">
+              <el-input size="small" v-model="formLabelAlign.dataSourceName"></el-input>
+            </el-form-item>
+            <el-form-item label="协议名称">
+              <el-select size="small" style="width: 100%" v-model="formLabelAlign.protocolName" placeholder="请选择活动区域">
+                <el-option v-for="item in sourceDatas" :key="item.protocolID" :label="item.protocolName" :value="item.protocolID"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="连接参数">
+              <el-input size="small" type="textarea" rows="3" v-model="formLabelAlign.connectConfig"></el-input>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="foot">
+          <el-button size="medium" type="primary" @click="formService" class="r25 r26">提交</el-button>
+          <el-button size="medium" class="r26" @click="sourceFormVisible = false">取消</el-button>
+        </div>
+      </div>
+    </Dialog>
+    <Dialog :flag="slotVisible" width="852px">
+      <div class="dialog-create">
+        <div class="title">插槽编辑</div>
+        <div style="padding: 0 24px 24px 24px" class="dialog-content">
+          <div class="flex">
+            <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="{
+              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"
+          />
+        </div>
+        <div class="foot mt24">
+          <el-button size="medium" type="primary" class="r25 r26">确定</el-button>
+          <el-button size="medium" class="r26" @click="slotVisible = false">取消</el-button>
+        </div>
+      </div>
+    </Dialog>
+  </div>
+</template>
+
+<script>
+// import NoData from '@/components/nodata'
+import Dialog from "@/layout/components/Dialog";
+import DataTable from "@/components/Table";
+import { myQuery, GeneralDataReception } from "@/api/dataIntegration";
+
+import operate from "./mixins/operate";
+
+export default {
+  components: {
+    // NoData,
+    Dialog,
+    DataTable,
+  },
+  mixins: [
+    // query,
+    operate,
+  ],
+  data() {
+    return {
+      outId: DATACONTENT_ID.sysServiceOutTabId,
+      jqId: DATACONTENT_ID.sysServiceJqTabId,
+      serviceID: Number(this.$route.query.serviceID),
+      serviceState: this.$route.query.runState,
+      operateDialogType: null,
+      delObj: {},
+      deleteDialogType: null,
+      sourceFormVisible: false,
+      slotVisible: false,
+      tempCheckedKeys: [],
+      serviceForm: {
+        serviceName: "",
+        serviceOutputID: null,
+        serviceType: null,
+        sourceObjectName: "",
+        lifeCycleCol: "",
+        serviceDescribe: "",
+        threads: null,
+        isAsynchronous: 1,
+        datatype: null,
+        dataSourceID: null,
+        computingMethod: "",
+        validationExpression: "",
+        startTime: null,
+        stopTime: null,
+        retryCount: null,
+        loopCount: null,
+        frequencyCount: null,
+        frequencyUnit: null,
+        logDataSourceID: null,
+        logList: "",
+      },
+      computedTableHeight: "200px",
+      targetList: [],
+      protocolList: [],
+      nodeList: [],
+      checkedNodeKeys: [],
+      serviceAndNodeList: [],
+      dataSourceList: [],
+      checkedSourceKeys: [],
+      serviceAndSourceList: [],
+      processList: [],
+      checkedProcessKeys: [],
+      outputList: [],
+      formLabelAlign: {
+        dataSourceName: "",
+        protocolName: "",
+        connectConfig: "",
+      },
+      sourceDatas: [],
+    };
+  },
+  mounted() {
+    this.queryServiceByID(this.serviceID);
+    this.getDataSourceList(DATACONTENT_ID.sysSourceId);
+  },
+  methods: {
+    selectionAll(arr) {
+      console.log(arr);
+    },
+    editSubmitHandler() {
+      this.$refs["serviceForm"].validate((valid) => {
+        if (valid) {
+          this.updateService();
+        }
+      });
+    },
+    btnAddClickHandler(flag) {
+      switch (flag) {
+        case 1:
+          this.$refs["serviceOutputTable"].handleAdd();
+          break;
+        case 2:
+          this.$refs["serviceMachineTable"].handleAdd();
+          break;
+        default:
+          break;
+      }
+    },
+    addService() {
+      this.getDataSourceList(DATACONTENT_ID.sysServiceXyId);
+      this.sourceFormVisible = true;
+    },
+    async machineSelectionChangeHandler(selection, row) {
+      const isSelected = selection.findIndex((item) => item.deployNodeID === row.deployNodeID) > -1;
+      const event = isSelected ? 1 : 3;
+      try {
+        const message = await this.updateServiceNode(event, row);
+        this.$message.success(message ?? "操作成功");
+      } catch (error) {
+        this.$message.error(error);
+        this.$refs["serviceMachineTable"].toggleRowSelection(row, !isSelected);
+      }
+    },
+    async getDataSourceList(id) {
+      const dataSourceList = await this.getSelectOption(id);
+      if (id == DATACONTENT_ID.sysSourceId) {
+        this.dataSourceList = dataSourceList.map((item) => {
+          item[item.setlabel] = item.k;
+          item[item.setvalue] = item.v;
+          return item;
+        });
+      } else {
+        this.sourceDatas = dataSourceList.map((item) => {
+          item[item.setlabel] = item.k;
+          item[item.setvalue] = item.v;
+          return item;
+        });
+      }
+    },
+    async getSelectOption(ID) {
+      try {
+        const listValues = await myQuery(ID);
+        return listValues;
+      } catch (error) {
+        this.$message.error(error);
+        return [];
+      }
+    },
+    async queryServiceByID(serviceID) {
+      const serviceInfo = await myQuery(DATACONTENT_ID.sysServiceEditId, serviceID);
+      Object.entries(serviceInfo[0]).forEach(([key, value]) => {
+        this.serviceForm[key] = value;
+      });
+    },
+    async formService() {
+      this.sourceDatas.forEach((item) => {
+        if (item.protocolID == this.formLabelAlign.protocolName) {
+          this.formLabelAlign.protocolName = item.protocolName;
+          this.formLabelAlign.protocolID = item.protocolID;
+        }
+      });
+      try {
+        this.formLabelAlign["event"] = 1;
+        const res = await GeneralDataReception({
+          serviceId: SERVICE_ID.sysServiceAddXyId,
+          dataContent: JSON.stringify(this.formLabelAlign),
+        });
+        if (Number(res.code) === 0) {
+          this.$message.success(res.message ?? "成功");
+          this.sourceFormVisible = false;
+          this.getDataSourceList(DATACONTENT_ID.sysSourceId);
+        } else {
+          this.$message.error(res.message ?? "失败");
+        }
+      } catch (error) {
+        console.log("出错了", error.message || error);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.service-edit {
+  margin: 0 -24px;
+  padding-bottom: 16px;
+  overflow: hidden;
+  .scrollbar {
+    height: calc(100vh - 120px);
+    padding: 0 24px;
+    overflow-x: hidden;
+    overflow-y: auto;
+    .service-edit-wrapper {
+      padding: 26px 24px 0 24px;
+      .title {
+        display: flex;
+        justify-content: space-between;
+        margin-bottom: 24px;
+        &:nth-of-type(2) {
+          margin-top: 10px;
+        }
+        .manageTitle {
+          height: 32px;
+          line-height: 30px;
+        }
+        .el-button {
+          width: 64px;
+          height: 32px;
+          border: none;
+          &.btn-white {
+            background-color: #ffffff;
+            border: 1px solid #92ace2;
+            color: #2d67e3;
+          }
+          &:hover {
+            background-color: #487be8;
+            color: #ffffff;
+          }
+        }
+      }
+      .content {
+        margin: 0;
+      }
+    }
+    ::v-deep .service-form-wrapper {
+      background: #ffffff;
+      box-shadow: 0px 3px 3px 0px rgba(0, 0, 0, 0.1);
+      border-radius: 4px;
+      .service-form {
+        > .el-row {
+          flex-wrap: wrap;
+          > .el-col {
+            .el-form-item {
+              margin-bottom: 25px;
+              .el-form-item__label {
+                padding-right: 16px;
+              }
+              .el-input,
+              .el-select {
+                width: 100%;
+                height: 32px;
+              }
+            }
+          }
+        }
+        label,
+        span,
+        button,
+        input,
+        optgroup,
+        select,
+        textarea {
+          font-family: Helvetica, Microsoft YaHei;
+          font-size: 14px;
+          font-weight: 400;
+        }
+        label {
+          color: #303133;
+        }
+        input {
+          color: #101116;
+          &::-webkit-outer-spin-button,
+          &::-webkit-inner-spin-button {
+            -webkit-appearance: none !important;
+          }
+          &[type="number"] {
+            -moz-appearance: textfield !important;
+          }
+        }
+        .el-radio {
+          font-weight: 400;
+        }
+      }
+    }
+    .service-tables {
+      width: 100%;
+      display: flex;
+      margin: 0 -12px;
+      .service-table-wrapper {
+        padding-left: 12px;
+        padding-right: 12px;
+        &:nth-child(1) {
+          flex: 1 1 624px;
+        }
+        &:nth-child(2) {
+          flex: 0 1 624px;
+          padding-right: 0px;
+        }
+      }
+    }
+  }
+  .dialog-checkbox {
+    .content {
+      margin-left: 16px;
+      .el-checkbox-group {
+        margin-right: 24px;
+        .el-checkbox {
+          margin-bottom: 24px;
+          font-family: Helvetica, Microsoft YaHei;
+          color: #303133;
+        }
+      }
+    }
+  }
+  ::v-deep #dialog-form .el-select .el-input__inner {
+    width: 100%;
+  }
+  ::v-deep .content-list-box {
+    background: #ffffff;
+    box-shadow: 0px 3px 3px 0px rgba(0, 0, 0, 0.1);
+    border-radius: 4px;
+    padding: 24px;
+    margin-bottom: 16px;
+    height: 100%;
+    .isAsynchronous {
+      .el-form-item__content {
+        margin-left: 8px !important;
+        width: 90px;
+      }
+    }
+    .el-date-editor {
+      width: 100%;
+    }
+    .el-form-item {
+      margin-bottom: 0;
+    }
+    .el-select {
+      width: 100%;
+    }
+    .manageTitle {
+      margin-bottom: 32px;
+      .s2 {
+        color: #53b074;
+        margin-left: 35px;
+      }
+    }
+    .btn-white {
+      background-color: #ffffff;
+      border: 1px solid #92ace2;
+      color: #2d67e3;
+    }
+    .data-table-btn {
+      margin-top: 0px;
+      line-height: 0px;
+      margin-bottom: 0px;
+    }
+  }
+}
+</style>

src/views/systemSettings/views/serviceManagement/serviceHome.vue

@@ -9,7 +9,20 @@
 <template>
   <div class="service-home">
     <div class="wrap">
-      <DataTable ref="serviceTable" tableHeight="680" :data-id="dataId" :rows="12" width="800px" label-width="110px" fixedWidth="280px" :min-height="70" :isStatus="true" :is-dialog="false" @handleAdd="showCreateDialog" @handleEdit="btnEditClickHandler">
+      <DataTable
+        ref="serviceTable"
+        tableHeight="680"
+        :data-id="dataId"
+        :rows="12"
+        width="800px"
+        label-width="110px"
+        fixedWidth="280px"
+        :min-height="70"
+        :isStatus="true"
+        :is-dialog="false"
+        @handleAdd="showCreateDialog"
+        @handleEdit="btnEditClickHandler"
+      >
         <template v-slot:header>
           <div class="status flex-wrap">
             <div class="manageTitle">服务管理</div>
@@ -199,7 +212,7 @@ export default {
     Dialog,
     DataTable,
   },
-  data () {
+  data() {
     return {
       serviceList: [],
       createDialogVisible: false,
@@ -210,7 +223,7 @@ export default {
         serviceOutputID: null,
         serviceType: null,
         dataSourceID: null,
-        sourceObjectName: '',
+        sourceObjectName: "",
         lifeCycleCol: "",
         isAsynchronous: 1,
         threads: null,
@@ -225,7 +238,7 @@ export default {
         frequencyUnit: null,
         serviceDescribe: "",
         logDataSourceID: null,
-        logList: '',
+        logList: "",
       },
       serviceFormRules: {
         serviceName: [
@@ -249,17 +262,17 @@ export default {
   },
   methods: {
     // 新增-弹框
-    showCreateDialog () {
+    showCreateDialog() {
       this.getDataSourceList(DATACONTENT_ID.sysSourceId);
       this.createDialogVisible = true;
     },
     //
-    addService () {
+    addService() {
       this.getDataSourceList(DATACONTENT_ID.sysServiceXyId);
       this.sourceFormVisible = true;
     },
     // 新增-提交
-    createSubmitHandler () {
+    createSubmitHandler() {
       this.$refs["serviceForm"].validate((valid) => {
         if (valid) {
           this.createService();
@@ -267,21 +280,21 @@ export default {
       });
     },
     // 新增-关闭
-    hideCreateDialog () {
+    hideCreateDialog() {
       this.$refs["serviceForm"].resetFields();
       this.createDialogVisible = false;
     },
     // 编辑-跳转
-    btnEditClickHandler (item) {
+    btnEditClickHandler(item) {
       this.$router.push({
         path: "/systemSettings/serviceEdit",
-        query: { serviceID: item.serviceID },
+        query: { serviceID: item.serviceID, runState: item.runState },
       });
     },
-    getServiceList () {
+    getServiceList() {
       this.$refs["serviceTable"].getQuery();
     },
-    async getDataSourceList (id) {
+    async getDataSourceList(id) {
       const dataSourceList = await this.getSelectOption(id);
       if (id == DATACONTENT_ID.sysSourceId) {
         this.dataSourceList = dataSourceList.map((item) => {
@@ -297,7 +310,7 @@ export default {
         });
       }
     },
-    async getSelectOption (id) {
+    async getSelectOption(id) {
       try {
         const { code, returnData, message } = await Query({
           id,
@@ -313,7 +326,7 @@ export default {
         console.log("出错了", error.message || error);
       }
     },
-    async createService () {
+    async createService() {
       if (!this.serviceForm.serviceOutputID) {
         this.serviceForm.serviceOutputID = null;
       }
@@ -337,7 +350,7 @@ export default {
         console.log("出错了", error.message || error);
       }
     },
-    async formService () {
+    async formService() {
       this.sourceDatas.forEach((item) => {
         if (item.protocolID == this.formLabelAlign.protocolName) {
           this.formLabelAlign.protocolName = item.protocolName;
@@ -411,16 +424,14 @@ export default {
             width: 14px;
             height: 14px;
             margin-left: 24px;
-            background: url("../../../../assets/status/ic_edit_default.png")
-              no-repeat;
+            background: url("../../../../assets/status/ic_edit_default.png") no-repeat;
             background-size: 100% 100%;
             cursor: pointer;
             position: relative;
             top: 2px;
           }
           .loger:hover {
-            background: url("../../../../assets/status/ic_edit_hovar.png")
-              no-repeat;
+            background: url("../../../../assets/status/ic_edit_hovar.png") no-repeat;
             background-size: 100% 100%;
           }
         }