对接故障定义页面，删除无用大文件资源

wangyanshen

2023-02-06 433e4993ca64d01205c682ec214736ce00883397

对接故障定义页面，删除无用大文件资源

 src/api/fault.js

@@ -166,3 +166,150 @@
  }


   /**
 * åˆ é™¤ æ•…障树组 
 *
 * @params {
  "ID": 0,
  "CorpID": 0,
}
 * @author wys
 * @date 2023/02/03 09:20
 */

export function DeleteFaultTreeGroup(parameter) {
    return axios({
      url: basicurl+'Fault/Tree/Group/DeleteByID@V1.0',
      method: 'delete',
      params: parameter
    })
  }


    /**
 * åˆ é™¤ æ•…障树 
 *
 * @params {
  "ID": 0,
  "CorpID": 0,
}
 * @author wys
 * @date 2023/02/03 09:20
 */

export function DeleteFaultTreeList(parameter) {
    return axios({
      url: basicurl+'Fault/Tree/DeleteByID@V1.0',
      method: 'delete',
      params: parameter
    })
  }


   /**
 * ç¼–辑 æ•…障树列表 æŽ’序码
 *
 * @params {
  "ID": 1,
  "SortCode": 0,
  "CorpID": 1
}
 * @author wys
 * @date 2023/02/02 15:10
 */

export function EditFaultTreeSortCode(parameter) {
    return axios({
      url: basicurl+'Fault/Tree/UpdateSortCode@V1.0',
      method: 'put',
      data: parameter
    })
  }
  
  /**
 * ç¼–辑 æ•…障树组 æŽ’序码
 *
 * @params {
  "ID": 1,
  "SortCode": 0,
  "CorpID": 1
}
 * @author wys
 * @date 2023/02/02 16:10
 */

export function EditFaultTreeGroupSortCode(parameter) {
    return axios({
      url: basicurl+'Fault/Tree/Group/UpdateSortCode@V1.0',
      method: 'put',
      data: parameter
    })
  }




  /**
 * åˆ¤æ–­ TagName æ˜¯å¦å­˜åœ¨ æ•…障树组 
 *
 * @params {
  "TagName": '',
  "CorpID": 1
}
 * @author wys
 * @date 2023/02/02 16:10
 */

export function FaultTreeGroupIsExistTagName(parameter) {
    return axios({
      url: basicurl+'Fault/Tree/Group/IsExistTagName@V1.0',
      method: 'get',
      params: parameter
    })
  }



    /**
 * åˆ¤æ–­ TagName æ˜¯å¦å­˜åœ¨ æ•…障树 
 *
 * @params {
  "TagName": '',
  "CorpID": 1
}
 * @author wys
 * @date 2023/02/03 16:10
 */

export function FaultTreeIsExistTagName(parameter) {
    return axios({
      url: basicurl+'Fault/Tree/IsExistTagName@V1.0',
      method: 'get',
      params: parameter
    })
  }

 /**
 * åˆ¤æ–­ Code æ˜¯å¦å­˜åœ¨ æ•…障树
 *
 * @params {
  "Code": '',
  "CorpID": 1
}
 * @author wys
 * @date 2023/02/03 16:10
 */

export function FaultTreeIsExistCode(parameter) {
    return axios({
      url: basicurl+'Fault/Tree/IsExistCode@V1.0',
      method: 'get',
      params: parameter
    })
  }

  





 src/assets/fonts/PingFang-Bold.ttf

Binary files differ

 src/assets/fonts/PingFang-JC.ttf

Binary files differ

 src/assets/fonts/PingFang-JT.ttf

Binary files differ

 src/assets/fonts/PingFang-Light.ttf

Binary files differ

 src/assets/fonts/PingFang-SC-Regular.otf

Binary files differ

 src/assets/fonts/PingFang-SC-Semibold.ttf

Binary files differ

 src/assets/fonts/PingFang-SC.ttf

Binary files differ

 src/assets/fonts/STSong_Regular.json

ÎļþÒÑɾ³ý

 src/assets/fonts/led.ttf

Binary files differ

 src/assets/gismap/border/anhui.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/aomen.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/beijing.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/china.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/chongqing.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/fujian.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/gansu.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/guangdong.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/guangxi.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/guizhou.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/hainan.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/hebei.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/heilongjiang.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/henan.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/hubei.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/hunan.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/jiangsu.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/jiangxi.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/jilin.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/liaoning.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/neimenggu.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/ningxia.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/qinghai.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/shandong.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/shanghai.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/shanxi.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/shanxi2.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/sichuan.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/taiwan.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/tianjin.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/world.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/xianggang.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/xinjiang.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/xizang.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/yunnan.json

ÎļþÒÑɾ³ý

 src/assets/gismap/border/zhejiang.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/anhui.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/aomen.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/beijing.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/china.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/chongqing.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/fujian.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/gansu.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/guangdong.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/guangxi.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/guizhou.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/hainan.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/hebei.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/heilongjiang.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/henan.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/hubei.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/hunan.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/jiangsu.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/jiangxi.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/jilin.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/liaoning.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/neimenggu.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/ningxia.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/qinghai.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/shandong.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/shanghai.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/shanxi.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/shanxi2.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/sichuan.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/taiwan.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/tianjin.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/world.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/xianggang.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/xinjiang.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/xizang.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/yunnan.json

ÎļþÒÑɾ³ý

 src/assets/gismap/full/zhejiang.json

ÎļþÒÑɾ³ý

 src/assets/js/ThreeMap.v2.impl.js

ÎļþÒÑɾ³ý

 src/assets/js/ThreeMap.v2.js

ÎļþÒÑɾ³ý

 src/components/GlobalHeader/GlobalHeader.vue

@@ -129,15 +129,16 @@
              setTimeout(() => {}, 16);
            })
            .catch((err) => {
              this.$message.error({
                title: "错误",
                description: err.message,
              this.$message({
                type: "error",
                message: err.message,
              });
            });
        })
        .catch((err) => {
          this.$message.error({
            title: "错误",
          this.$message({
            type: 'info',
            message: "已取消注销登录",
            description: err.message,
          });
        });

 src/components/HelloWorld.vue

ÎļþÒÑɾ³ý

 src/testData/testData.js

ÎļþÌ«´ó

 src/utils/istation/common.js

@@ -327,3 +327,14 @@
  })
}

/*最大值*/
export function maxInArray(arr) {
  return Math.max.apply(null, arr);
}

/*最小值*/
export function minInArray(arr) {
  return Math.min.apply(null, arr);
}



 src/views/main/components/leftTreeOrTreeSelectByData.vue

@@ -21,7 +21,7 @@
      placeholder="请选择"
    >
    </tree-select>
    

    <fks-tree
      ref="tree"
      :data="treedata"
@@ -30,18 +30,30 @@
      :node-key="defaultProps.id"
      :current-node-key="currentNodeKey1"
      :default-expanded-keys="defaultExpandedKeys"
      :expand-on-click-node="expandOnClickNode"
      :highlight-current="true"
      :filter-node-method="filterNode"
      @node-click="handleNodeClick"
      @node-drag-end="handleDragEnd"
      draggable
    >
      <span class="custom-tree-node" slot-scope="{ node, data }">
        <span>{{ node.label }}</span>
        <span v-if="node.isLeaf && isShowRightIcon">
        <span>
          <fks-button
            v-if="isShowEditIcon"
            type="text"
            size="mini"
            icon="fks-icon-edit"
            @click.stop="() => edit(data, node)"
          >
          </fks-button>
          <fks-button
            v-if="isShowDeleteIcon"
            type="text"
            size="mini"
            icon="fks-icon-delete"
            @click.stop="() => Delete(data, node)"
          >
          </fks-button>
        </span>
@@ -51,7 +63,6 @@
</template>

<script>
import { number } from 'echarts';
import titleBoxVue from "./titleBox.vue";
import treeSelect from "./treeSelect2.vue";

@@ -79,6 +90,10 @@
    selectIsShow: {
      type: Boolean,
      default: false,
    },
    expandOnClickNode: {
      type: Boolean,
      default: true,
    },
    /**树 é»˜è®¤å±žæ€§é…ç½® */
    defaultProps: {
@@ -109,7 +124,7 @@
    },
    /**下拉 é»˜è®¤é€‰ä¸­å€¼ */
    defaultSelectValue: {
      type: String|Number,
      type: String | Number,
      default: "",
    },
    /**树 é»˜è®¤å±•å¼€èŠ‚点keys */
@@ -124,8 +139,13 @@
      type: String,
      default: "功能位置",
    },
    /**是否显示右侧操作图标 */
    isShowRightIcon: {
    /**是否显示右侧编辑操作图标 */
    isShowEditIcon: {
      type: Boolean,
      default: false,
    },
    /**是否显示右侧删除操作图标 */
    isShowDeleteIcon: {
      type: Boolean,
      default: false,
    },
@@ -140,7 +160,7 @@
      default: false,
    },
    /**是否点击叶子才关闭下拉框 */
    isleafclose:{
    isleafclose: {
      type: Boolean,
      default: false,
    },
@@ -149,16 +169,12 @@
    return {
      filterText: "",
      selectvalue: "",
      currentNodeKey1:'',
      currentNodeKey1: "",
    };
  },
  created() {},
  mounted() {
    this.selectvalue = this.defaultSelectValue;
  },
  computed: {
   
  },
  mounted() {},
  computed: {},
  watch: {
    filterText(val) {
      this.$refs.tree.filter(val);
@@ -168,20 +184,30 @@
      if (this.treedata.length && key === "") {
        key = this.treedata[0][this.defaultProps.id];
      }
      this.currentNodeKey1=key
      this.currentNodeKey1 = key;
      this.$nextTick(() => {
            this.$refs.tree.setCurrentKey(this.currentNodeKey1); // è®¾ç½®é»˜è®¤é€‰ä¸­
          });
        this.$refs.tree.setCurrentKey(this.currentNodeKey1); // è®¾ç½®é»˜è®¤é€‰ä¸­
      });
    },
    defaultSelectValue(val) {
      this.selectvalue = val;
    },
  },
  methods: {
    
    /**拖动树结束事件 */
    handleDragEnd(draggingNode, dropNode, dropType, ev) {
        console.log('tree drag end: ',draggingNode, dropNode , dropType,ev);
      },
    edit(data, node) {
      // console.log(data, node, 122);
      this.$emit("treeEdit", data, node);
    },
    Delete(data, node) {
      // console.log(data, node, 122);
      this.$emit("treeDelete", data, node);
    },
    selectChange(label, node) {
      console.log(label, node,177)
      console.log(label, node, 177);
      this.$emit("selectchange", label, node);
    },
    handleNodeClick(data) {

 src/views/main/istation/fault/faultSet.vue

@@ -10,10 +10,13 @@
      :selectIsShow="true"
      :defaultExpandedKeys="defaultExpandedKeys"
      :currentNodeKey="currentNodeKey"
      :isShowRightIcon="true"
      :isShowEditIcon="true"
      :isShowDeleteIcon="true"
      :expand-on-click-node="false"
      @selectchange="selectchange"
      @click="handleNodeClick"
      @treeEdit="treeEdit"
      @treeDelete="treeDelete"
    >
      <template v-slot:titleright>
        <div class="titleSlotRight">
@@ -30,7 +33,10 @@
      <titleBoxVue style="background-color: #fff" :title="titleName">
        <template v-slot:right>
          <div class="titleSlotRight">
            <fks-button icon="fks-icon-plus" type="primary" @click="addFaultFormVisible = true"
            <fks-button
              icon="fks-icon-plus"
              type="primary"
              @click="addFaultTreeFormVisible"
              >添加</fks-button
            >
          </div>
@@ -58,6 +64,9 @@
            <fks-button @click="editFault(scope.row)" type="text" size="small"
              >编辑</fks-button
            >
            <fks-button @click="deleteFault(scope.row)" type="text" size="small"
              >删除</fks-button
            >
          </template>
        </fks-table-column>
      </fks-table>
@@ -80,24 +89,48 @@
        >
          <fks-form-item label="故障名称" prop="name">
            <fks-input
              placeholder="请输入故障名称"
              v-model="addFaultForm.name"
              autocomplete="off"
            ></fks-input>
          </fks-form-item>
          <fks-form-item label="故障编码" prop="code">
            <fks-input
              placeholder="请输入唯一故障编码"
              v-model="addFaultForm.code"
              autocomplete="off"
            ></fks-input>
          </fks-form-item>
          <fks-form-item label="标签名称">
          <fks-form-item label="标签名称" prop="tagname">
            <fks-input
              v-model="addFaultForm.labelName"
              placeholder="请输入唯一标签名称"
              v-model="addFaultForm.tagname"
              autocomplete="off"
            ></fks-input>
          </fks-form-item>
          <fks-form-item label="标签列表">
            <fks-select
              style="width: 100%"
              v-model="addFaultForm.flags"
              multiple
              filterable
              allow-create
              default-first-option
              placeholder="请选择或输入标签"
            >
              <fks-option
                v-for="item in addFaultForm.options"
                :key="item.value"
                :label="item.label"
                :value="item.value"
              >
              </fks-option>
            </fks-select>
          </fks-form-item>

          <fks-form-item label="详细说明">
            <fks-input
              placeholder="请输入详细说明"
              type="textarea"
              :rows="3"
              autocomplete="off"
@@ -132,24 +165,47 @@
        >
          <fks-form-item label="故障名称" prop="name">
            <fks-input
              placeholder="请输入故障名称"
              v-model="editFaultForm.name"
              autocomplete="off"
            ></fks-input>
          </fks-form-item>
          <fks-form-item label="故障编码" prop="code">
            <fks-input
              placeholder="请输入唯一故障编码"
              v-model="editFaultForm.code"
              autocomplete="off"
            ></fks-input>
          </fks-form-item>
          <fks-form-item label="标签名称">
            <fks-input
              v-model="editFaultForm.labelName"
              placeholder="请输入唯一标签名称"
              v-model="editFaultForm.tagname"
              autocomplete="off"
            ></fks-input>
          </fks-form-item>
          <fks-form-item label="标签列表">
            <fks-select
              style="width: 100%"
              v-model="editFaultForm.flags"
              multiple
              filterable
              allow-create
              default-first-option
              placeholder="请选择或输入标签"
            >
              <fks-option
                v-for="item in editFaultForm.options"
                :key="item.value"
                :label="item.label"
                :value="item.value"
              >
              </fks-option>
            </fks-select>
          </fks-form-item>
          <fks-form-item label="详细说明">
            <fks-input
              placeholder="请输入详细说明"
              type="textarea"
              :rows="3"
              autocomplete="off"
@@ -184,39 +240,41 @@
        >
          <fks-form-item label="名称" prop="name">
            <fks-input
              placeholder="请输入名称"
              v-model="addFaultGroupForm.name"
              autocomplete="off"
            ></fks-input>
          </fks-form-item>
          <fks-form-item label="父节点">
            <treeSelect
              :treeProps="selectProps"
              :options="treeData"
              v-model="addFaultGroupTreeSelectID"
              :clearable="true"
              :accordion="false"
              :expandNode="false"
              :isleafclose="false"
              size="small"
              width="100%"
              @getValue="addFaultGroupChange"
            ></treeSelect>
          </fks-form-item>

          <fks-form-item label="排序">
          <fks-form-item label="标签名称" prop="tagname">
            <fks-input
              v-model="addFaultGroupForm.sort"
              autocomplete="off"
            ></fks-input>
          </fks-form-item>
          <fks-form-item label="标识">
            <fks-input
              placeholder="请输入唯一标签名称"
              v-model="addFaultGroupForm.tagname"
              autocomplete="off"
            ></fks-input>
          </fks-form-item>
          <fks-form-item label="标签列表">
            <fks-select
              style="width: 100%"
              v-model="addFaultGroupForm.flags"
              multiple
              filterable
              allow-create
              default-first-option
              placeholder="请选择或输入标签"
            >
              <fks-option
                v-for="item in addFaultGroupForm.options"
                :key="item.value"
                :label="item.label"
                :value="item.value"
              >
              </fks-option>
            </fks-select>
          </fks-form-item>
          <fks-form-item label="说明">
            <fks-input
              placeholder="请输入说明"
              type="textarea"
              :rows="3"
              autocomplete="off"
@@ -252,19 +310,43 @@
        >
          <fks-form-item label="名称" prop="name">
            <fks-input
              placeholder="请输入名称"
              v-model="editFaultGroupForm.name"
              autocomplete="off"
            ></fks-input>
          </fks-form-item>

          <fks-form-item label="标识">
          <fks-form-item label="标签名称" prop="tagname">
            <fks-input
              placeholder="请输入唯一标签名称"
              v-model="editFaultGroupForm.tagname"
              autocomplete="off"
            ></fks-input>
          </fks-form-item>

          <fks-form-item label="标签列表">
            <fks-select
              style="width: 100%"
              v-model="editFaultGroupForm.flags"
              multiple
              filterable
              allow-create
              default-first-option
              placeholder="请选择或输入标签"
            >
              <fks-option
                v-for="item in editFaultGroupForm.options"
                :key="item.value"
                :label="item.label"
                :value="item.value"
              >
              </fks-option>
            </fks-select>
          </fks-form-item>

          <fks-form-item label="说明">
            <fks-input
              placeholder="请输入说明"
              type="textarea"
              :rows="3"
              autocomplete="off"
@@ -289,7 +371,7 @@
</template>
  
  <script>
import { getDay } from "@/utils/istation/common";
import { getDay, maxInArray } from "@/utils/istation/common";
import titleBoxVue from "@/views/main/components/titleBox.vue";
import treeSelect from "@/views/main/components/treeSelect2.vue";

@@ -302,6 +384,13 @@
  GetFaultTreeListByGroupID,
  AddFaultTreeList,
  EditFaultTreeList,
  EditFaultTreeSortCode,
  EditFaultTreeGroupSortCode,
  DeleteFaultTreeGroup,
  FaultTreeGroupIsExistTagName,
  FaultTreeIsExistTagName,
  FaultTreeIsExistCode,
  DeleteFaultTreeList,
} from "@/api/fault";
import FileSaver from "file-saver";
import XLSX from "xlsx";
@@ -329,27 +418,6 @@
    code: "FAULT_PUMP_004",
    labelName: "",
    note: "",
  },
];

const treeData = [
  {
    label: "æ³µ",
    id: "s1",
    children: [
      {
        id: "1",
        label: "振动故障",
      },
      {
        id: "2",
        label: "噪音故障",
      },
      {
        id: "3",
        label: "运行故障",
      },
    ],
  },
];

@@ -401,23 +469,26 @@
/* æ ¹æ®id获取树id  ç”¨äºŽèŽ·å–默认选中高亮  */
function getTreeIdById(list, ID) {
  let obj = [];
  if (list.length === 0) {
    return obj;
  }
  const getDtreeId = (obj, list, ID) => {
    if (ID != null && +ID > 0) {
    if (ID) {
      for (var i = 0; i < list.length; i++) {
        var item = list[i];
        if (item.Children == null) {
        if (!item.Children) {
          item.Children = [];
        }
        if (item.ID == ID && item.Children.length == 0) {
        if (item.ID == ID) {
          obj.push(item);
          break;
          // break;
        }
        if (item.Children.length != 0) {
          getDtreeId(obj, item.Children, ID);
        }
      }
    } else {
      if (list[0].Children == null) {
      if (!list[0].Children) {
        list[0].Children = [];
      }
      if (list[0].Children.length == 0) {
@@ -440,84 +511,155 @@
    treeSelect,
  },
  data() {
    var validateFaultGroupTagName = async (rule, value, callback) => {
      if (value !== "") {
        let bool = await this.faultTreeGroupIsExistTagName(value);
        if (!bool) {
          callback();
        } else {
          callback(new Error("标签名称已存在"));
        }
      }
      callback();
    };
    var validateFaultTagName = async (rule, value, callback) => {
      if (value !== "") {
        let bool = await this.faultTreeIsExistTagName(value);
        if (!bool) {
          callback();
        } else {
          callback(new Error("标签名称已存在"));
        }
      }
      callback();
    };
    var validateFaultCode = async (rule, value, callback) => {
      if (value !== "") {
        let bool = await this.faultTreeIsExistCode(value);
        if (!bool) {
          callback();
        } else {
          callback(new Error("故障编码已存在"));
        }
      }
      callback();
    };
    var validateFaultGroupTagNameEdit = async (rule, value, callback) => {
      if (value !== this.editFaultGroupForm.data.TagName) {
        console.log(value, this.editFaultGroupForm.data, 481);
        let bool = await this.faultTreeGroupIsExistTagName(value);
        if (!bool) {
          callback();
        } else {
          callback(new Error("标签名称已存在"));
        }
        // this.$refs.ruleForm.validateField('checkPass');
      }
      callback();
    };
    var validateFaultTagNameEdit = async (rule, value, callback) => {
      if (value !== this.editFaultForm.data.TagName) {
        console.log(value, this.editFaultForm.data, 481);
        let bool = await this.faultTreeIsExistTagName(value);
        if (!bool) {
          callback();
        } else {
          callback(new Error("标签名称已存在"));
        }
        // this.$refs.ruleForm.validateField('checkPass');
      }
      callback();
    };
    var validateFaultCodeEdit = async (rule, value, callback) => {
      if (value !== this.editFaultForm.data.Code) {
        let bool = await this.faultTreeIsExistCode(value);
        if (!bool) {
          callback();
        } else {
          callback(new Error("故障编码已存在"));
        }
      }
      callback();
    };
    return {
      titleName: "运行故障",
      tableData: tableData,
      tableData: [],
      multipleSelection: [],
      addFaultFormVisible: false,
      editFaultFormVisible: false,
      addFaultGroupFormVisible: false,
      editFaultGroupFormVisible: false,
      treeData: treeData,
      treeData: [],
      /**tree当前选中节点key */
      currentNodeKey: "",
      defaultExpandedKeys: ["s1"],
      defaultSelectValue: "1",
      /**tree默认展开节点keys */
      defaultExpandedKeys: [""],
      /**treeselect é»˜è®¤é€‰ä¸­å€¼ */
      defaultSelectValue: "",
      selectData: [],
      gridData: [
        {
          date: "2016-05-02",
          name: "王小虎",
          address: "上海市普陀区金沙江路 1518 å¼„",
        },
        {
          date: "2016-05-04",
          name: "王小虎",
          address: "上海市普陀区金沙江路 1518 å¼„",
        },
        {
          date: "2016-05-01",
          name: "王小虎",
          address: "上海市普陀区金沙江路 1518 å¼„",
        },
        {
          date: "2016-05-03",
          name: "王小虎",
          address: "上海市普陀区金沙江路 1518 å¼„",
        },
      ],
      /**添加故障树表单 */
      addFaultForm: {
        name: "",
        code: "",
        labelName: "",
        tagname: "",
        note: "",
        sort: 0,
        flags: [],
        options: [{ label: "振动", value: "振动" }],
      },
      /**添加故障树表单验证规则  */
      addFaultFormRules: {
        name: [{ required: true, message: "请输入名称", trigger: "change" }],
        code: [{ required: true, message: "请输入名称", trigger: "change" }],
        labelName: [
          { required: true, message: "请输入名称", trigger: "change" },
        ],
        code: [{ validator: validateFaultCode, trigger: "blur" }],
        tagname: [{ validator: validateFaultTagName, trigger: "blur" }],
      },
      /**编辑故障树表单 */
      editFaultForm: {
        name: "",
        code: "",
        labelName: "",
        tagname: "",
        note: "",
        sort: "",
        flags: [],
        options: [{ label: "振动", value: "振动" }],
      },
      /**编辑故障树表单验证规则 */
      editFaultFormRules: {
        name: [{ required: true, message: "请输入名称", trigger: "change" }],
        code: [{ required: true, message: "请输入名称", trigger: "change" }],
        labelName: [
          { required: true, message: "请输入名称", trigger: "change" },
        ],
        code: [{ validator: validateFaultCodeEdit, trigger: "blur" }],
        tagname: [{ validator: validateFaultTagNameEdit, trigger: "blur" }],
      },
      /**添加故障树组表单 */
      addFaultGroupForm: {
        name: "",
        sort: 0,
        parentid: "",
        note: "",
        tagname: "",
        customvalue: "",
        flags: [],
        options: [{ label: "振动", value: "振动" }],
      },
      /**添加故障树组表单验证规则 */
      addFaultGroupFormRules: {
        name: [{ required: true, message: "请输入名称", trigger: "change" }],
        tagname: [{ validator: validateFaultGroupTagName, trigger: "blur" }],
      },
      /**编辑故障树组表单 */
      editFaultGroupForm: {
        name: "",
        tagname: "",
        note: "",
        sort: "",
        flags: [],
        options: [{ label: "振动", value: "振动" }],
      },
      /**编辑故障树组表单验证规则 */
      editFaultGroupFormRules: {
        name: [{ required: true, message: "请输入名称", trigger: "change" }],
        tagname: [
          { validator: validateFaultGroupTagNameEdit, trigger: "blur" },
        ],
      },
      /**下拉树 é»˜è®¤å±žæ€§é…ç½® */
      selectProps: {
@@ -531,13 +673,12 @@
        label: "Name",
        children: "Children",
      },
      /**公司ID */
      CorpID: 13,
      /**当前选中结构类型id */
      currentCatalogID: "",
      /**添加故障组 treeselect é€‰ä¸­id */
      addFaultGroupTreeSelectID: "",
      /**添加故障组 treeselect é€‰ä¸­node */
      addFaultGroupTreeSelectNode: null,
      /**故障树当前选中的节点 */
      currentFaultTreeNode: null,
    };
  },
  created() {},
@@ -547,11 +688,50 @@
  computed: {},
  watch: {},
  methods: {
    faultTreeGroupIsExistTagName(tagname) {
      return new Promise((r, e) => {
        let TagName = tagname;
        FaultTreeGroupIsExistTagName({ TagName: TagName, CorpID: this.CorpID })
          .then((res) => {
            // console.log(res, 655);
            r(res.Data);
          })
          .catch((e) => {
            e(e);
          });
      });
    },
    faultTreeIsExistTagName(tagname) {
      return new Promise((r, e) => {
        let TagName = tagname;
        FaultTreeIsExistTagName({ TagName: TagName, CorpID: this.CorpID })
          .then((res) => {
            console.log(res, 633);
            r(res.Data);
          })
          .catch((e) => {
            e(e);
          });
      });
    },
    faultTreeIsExistCode(code) {
      return new Promise((r, e) => {
        let Code = code;
        FaultTreeIsExistCode({ Code: Code, CorpID: this.CorpID })
          .then((res) => {
            console.log(res, 643);
            r(res.Data);
          })
          .catch((e) => {
            e(e);
          });
      });
    },
    /**获取下拉选择数据 */
    getLeftTreeSelectData() {
      GetTreeListByObjectType({ CorpID: this.CorpID, ObjectType: "设备" })
        .then((res) => {
          console.log(res, 433);
          // console.log(res, 433);
          let resdata = [];
          if (res && res.Data) {
            resdata = res.Data;
@@ -567,6 +747,7 @@
    getLeftTreeData() {
      let CatalogID = this.currentCatalogID;
      this.currentNodeKey = "";
      this.currentFaultTreeNode = null;
      if (!CatalogID) {
        this.treeData = [];
        return;
@@ -574,24 +755,25 @@
      GetFaultTreeGroupByCatalogID({
        CatalogID: CatalogID,
        CorpID: this.CorpID,
      }).then((res) => {
        console.log(res, 379);
      }).then(async (res) => {
        // console.log(res, 379);
        let resdata = [];
        if (res && res.Data) {
          resdata = res.Data;
        }
        let treedata = treeCorprationDataFormat(resdata);
        let treedata = await treeCorprationDataFormat(resdata);
        this.defaultExpandedKeys = [treedata[0]?.ID];
        let currentID = getTreeIdById(treedata, "");
        this.currentNodeKey = currentID[0]?.ID;
        this.titleName = currentID[0]?.Name;
        let currentnode = getTreeIdById(treedata, treedata[0]?.ID);
        this.currentNodeKey = currentnode[0]?.ID;
        this.currentFaultTreeNode = currentnode[0];
        this.titleName = currentnode[0]?.Name;
        this.treeData = treedata;
        this.getTableData();
      });
    },
    /**下拉选择变化 */
    selectchange(label, node) {
      console.log(label, node, 186);
      // console.log(label, node, 186);
      if (!node) {
        this.currentCatalogID = "";
        return;
@@ -602,22 +784,23 @@
    },
    /**树点击事件 */
    handleNodeClick(data) {
      console.log(data, 74);
      // console.log(data, 74);
      this.titleName = data.Name;
      this.currentNodeKey = data?.ID;
      this.currentFaultTreeNode = data;
      // console.log(this.currentFaultTreeNode,data,601)
      this.getTableData();
    },

    getTableData() {
      let GroupID = this.currentNodeKey;
      console.log(GroupID, 589);
      if (!GroupID) {
        this.tableData = [];
        return;
      }
      GetFaultTreeListByGroupID({ CorpID: this.CorpID, GroupID: GroupID }).then(
        (res) => {
          console.log(res, 581);
          // console.log(res, 581);
          let resdata = [];
          if (res && res.Data) {
            resdata = res.Data;
@@ -631,10 +814,9 @@
    handleSelectionChange(val) {
      this.multipleSelection = val;
    },
    
    /**添加故障组 ä¸‹æ‹‰æ ‘变化事件 */
    addFaultGroupChange(label, node) {
      this.addFaultGroupTreeSelectNode = node;

    addFaultTreeFormVisible() {
      this.addFaultFormVisible = true;
    },
    /**提交故障树组 */
    addFaultGroup(formName) {
@@ -644,9 +826,19 @@
          let formdata = this.addFaultGroupForm;

          let ParentIds = [];
          if (this.addFaultGroupTreeSelectNode) {
            ParentIds = this.addFaultGroupTreeSelectNode.ParentIds;
            ParentIds.push(this.addFaultGroupTreeSelectNode.ID);
          let sort = 0;
          if (this.currentFaultTreeNode) {
            ParentIds = JSON.parse(
              JSON.stringify(this.currentFaultTreeNode.ParentIds)
            );
            ParentIds.push(this.currentFaultTreeNode.ID);
            if (this.currentFaultTreeNode.Children.length > 0) {
              let sorts = this.currentFaultTreeNode.Children.map((x) => {
                return x.SortCode;
              });
              let maxSort = maxInArray(sorts);
              sort = this.currentFaultTreeNode.Children.length;
            }
          }

          let postdata = {
@@ -654,16 +846,16 @@
            CatalogID: this.currentCatalogID,
            ParentIds: ParentIds,
            Name: formdata.name,
            Flags: [""],
            Flags: formdata.flags,
            TagName: formdata.tagname,
            SortCode: formdata.sort,
            SortCode: sort,
            Description: formdata.note,
          };
          console.log(postdata, this.addFaultGroupTreeSelectNode, 489);
          console.log(postdata, formdata, 699);

          // return;
          AddFaultTreeGroup(postdata).then((res) => {
            console.log(res, 441);
            // console.log(res, 441);

            if (res.Data) {
              this.getLeftTreeData();
@@ -689,25 +881,27 @@
        if (valid) {
          this.addFaultFormVisible = false;
          let formdata = this.addFaultForm;
          let sort = this.tableData.length;

          let postdata = {
            CorpID: this.CorpID,
            GroupID: this.currentNodeKey,
            Code: formdata.code,
            Name: formdata.name,
            Flags: [],
            TagName: formdata.labelName,
            SortCode: 0,
            Flags: formdata.flags,
            TagName: formdata.tagname,
            SortCode: sort,
            Description: formdata.note,
          };
          console.log(postdata, 682);

          // return;
          AddFaultTreeList(postdata).then((res) => {
            console.log(res, 686);
            // console.log(res, 686);

            if (res.Data) {
              this.getTableData();
              this.addFaultForm.flags = [];
              this.$refs[formName].resetFields();
              this.$message({
                message: "添加成功",
                type: "success",
@@ -725,7 +919,7 @@
        }
      });
    },
    

    /**树节点编辑事件 */
    treeEdit(data, node) {
      console.log(data, node, 358);
@@ -733,7 +927,58 @@
      this.editFaultGroupForm.name = data.Name;
      this.editFaultGroupForm.tagname = data.TagName;
      this.editFaultGroupForm.note = data.Description;
      this.editFaultGroupForm.sort = data.SortCode;
      this.editFaultGroupForm.flags = data.Flags;
      this.editFaultGroupForm.data = data;
    },
    /**树节点编辑事件 */
    treeDelete(data, node) {
      console.log(data, node, 737);
      let ID = data?.ID;
      if (!ID) {
        this.$message({
          type: "error",
          message: "删除失败，删除元素ID不能为空",
        });
        return;
      }
      this.$confirm("此操作将永久删除, æ˜¯å¦ç»§ç»­?", "提示", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning",
      })
        .then(() => {
          DeleteFaultTreeGroup({ ID: ID, CorpID: this.CorpID }).then((res) => {
            // console.log(res, 733);
            if (res.Data) {
              if (res.Data.Success) {
                this.getLeftTreeData();
                this.$message({
                  message: "删除成功",
                  type: "success",
                });
              } else {
                let reason = res.Data?.Reason || "";
                this.$message({
                  message: "删除失败，原因：" + reason,
                  type: "error",
                });
              }
            } else {
              this.$message({
                message: res.Message,
                type: "error",
              });
            }
          });
        })
        .catch((err) => {
          this.$message({
            type: "info",
            message: "已取消删除",
            description: err.message,
          });
        });
    },
    editFaultGroup(formName) {
      this.$refs[formName].validate((valid) => {
@@ -741,20 +986,19 @@
          this.editFaultGroupFormVisible = false;
          let formdata = this.editFaultGroupForm;

          console.log(formdata, 653);
          // console.log(formdata, 653);
          let postdata = {
            ID: formdata.data.ID,
            CorpID: this.CorpID,
            Name: formdata.name,
            Flags: [""],
            Flags: formdata.flags,
            TagName: formdata.tagname,
            Description: formdata.note,
          };
          console.log(postdata, this.addFaultGroupTreeSelectNode, 489);

          // return;
          EditFaultTreeGroup(postdata).then((res) => {
            console.log(res, 666);
            // console.log(res, 666);

            if (res.Data) {
              this.getLeftTreeData();
@@ -780,9 +1024,53 @@
      this.editFaultFormVisible = true;
      this.editFaultForm.name = row.Name;
      this.editFaultForm.code = row.Code;
      this.editFaultForm.labelName = row.TagName;
      this.editFaultForm.tagname = row.TagName;
      this.editFaultForm.note = row.Description;
      this.editFaultForm.sort = row.SortCode;
      this.editFaultForm.flags = row.Flags;
      this.editFaultForm.data = row;
      // console.log(row, 771);
    },
    deleteFault(row) {
      console.log(row, 1025);
      let ID = row.ID;
      this.$confirm("此操作将永久删除, æ˜¯å¦ç»§ç»­?", "提示", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning",
      })
        .then(() => {
          DeleteFaultTreeList({ ID: ID, CorpID: this.CorpID }).then((res) => {
            console.log(res, 1020);
            if (res.Data) {
              if (res.Data.Success) {
                this.getTableData();
                this.$message({
                  message: "删除成功",
                  type: "success",
                });
              } else {
                let reason = res.Data?.Reason || "";
                this.$message({
                  message: "删除失败，原因：" + reason,
                  type: "error",
                });
              }
            } else {
              this.$message({
                message: "删除失败",
                type: "error",
              });
            }
          });
        })
        .catch((err) => {
          this.$message({
            type: "info",
            message: "已取消删除",
            description: err.message,
          });
        });
    },
    editFaultList(formName) {
      this.$refs[formName].validate((valid) => {
@@ -790,17 +1078,17 @@
          this.editFaultFormVisible = false;
          let formdata = this.editFaultForm;

          console.log(formdata, 653);
          // console.log(formdata, 653);
          let postdata = {
            ID: formdata.data.ID,
            CorpID: this.CorpID,
            Code: formdata.code,
            Name: formdata.name,
            Flags: [],
            TagName: formdata.labelName,
            Flags: formdata.flags,
            TagName: formdata.tagname,
            Description: formdata.note,
          };
          console.log(postdata,  809);
          console.log(postdata, 809);

          // return;
          EditFaultTreeList(postdata).then((res) => {
@@ -825,6 +1113,42 @@
        }
      });
    },
    updateFaultSortCode(postdata) {
      EditFaultTreeSortCode(postdata).then((res) => {
        // console.log(res, 823);

        if (res.Data) {
          this.getTableData();
          // this.$message({
          //   message: "编辑成功",
          //   type: "success",
          // });
        } else {
          // this.$message({
          //   message: "编辑失败",
          //   type: "error",
          // });
        }
      });
    },
    updateFaultGroupSortCode(postdata) {
      EditFaultTreeGroupSortCode(postdata).then((res) => {
        // console.log(res, 852);

        if (res.Data) {
          this.getLeftTreeData();
          // this.$message({
          //   message: "编辑成功",
          //   type: "success",
          // });
        } else {
          // this.$message({
          //   message: "编辑失败",
          //   type: "error",
          // });
        }
      });
    },
  },
};
</script>

 src/views/main/istation/health/compreEvaluate.vue

@@ -115,8 +115,7 @@
      </span>
      <fks-form ref="fromData" :model="fromData" label-width="80px">
        <fks-form-item label="评价方法" prop="settingEvaluationMethod">
          <fks-sele v-model="fromData.settingEvaluationMethod"></fks-sele>
          <fks-select
          <fks-select style="width:100%"
            v-model="fromData.settingEvaluationMethod"
            placeholder="评价方法"
          >
@@ -126,8 +125,7 @@
          </fks-select>
        </fks-form-item>
        <fks-form-item label="计划类型" prop="settingPlanType">
          <fks-sele v-model="fromData.settingPlanType"></fks-sele>
          <fks-select v-model="fromData.settingPlanType" placeholder="评价方法">
          <fks-select style="width:100%" v-model="fromData.settingPlanType" placeholder="评价方法">
            <fks-option label="实时" value="1"></fks-option>
            <fks-option label="定时" value="2"></fks-option>
          </fks-select>

 src/views/main/istation/health/evaluationModel.vue

@@ -67,7 +67,7 @@
          <fks-input v-model="evaluationModelFrom.name"></fks-input>
        </fks-form-item>
        <fks-form-item label="评价方法" prop="evaluationMethod">
          <fks-select
          <fks-select style="width:100%"
            v-model="evaluationModelFrom.evaluationMethod"
            placeholder="评价方法"
          >
@@ -113,7 +113,7 @@
          <fks-input v-model="evaluationModelFrom.name"></fks-input>
        </fks-form-item>
        <fks-form-item label="评价方法" prop="evaluationMethod">
          <fks-select
          <fks-select style="width:100%"
            v-model="evaluationModelFrom.evaluationMethod"
            placeholder="评价方法"
          >

 src/views/main/istation/health/evaluationModelBinding.vue

@@ -68,16 +68,14 @@
          <fks-input v-model="fromData.evaluationModel"></fks-input>
        </fks-form-item>
        <fks-form-item label="评价方法" prop="evaluationMethod">
          <fks-sele v-model="fromData.evaluationMethod"></fks-sele>
          <fks-select v-model="fromData.planType" placeholder="评价方法">
          <fks-select style="width:100%" v-model="fromData.planType" placeholder="评价方法">
            <fks-option label="严重程度低" value="1"></fks-option>
            <fks-option label="严重程度高" value="2"></fks-option>
            <fks-option label="加权平均" value="3"></fks-option>
          </fks-select>
        </fks-form-item>
        <fks-form-item label="计划类型" prop="planType">
          <fks-sele v-model="fromData.planType"></fks-sele>
          <fks-select v-model="fromData.planType" placeholder="评价方法">
          <fks-select style="width:100%" v-model="fromData.planType" placeholder="评价方法">
            <fks-option label="实时" value="1"></fks-option>
            <fks-option label="定时" value="2"></fks-option>
          </fks-select>