fix:设备管理看板，物料位置删除

src/views/component/fwposition.vue

@@ -1,662 +0,0 @@
-<template>
-  <div class="sample-content">
-    <div @click="clickBtn" style="cursor: pointer">
-      <!-- <div>点击视图选择位置</div> -->
-      <el-input
-        placeholder="请输入内容"
-        :value="showValue"
-        id="valueDom"
-      ></el-input>
-    </div>
-    <!-- 表格組件 -->
-    <div class="selectArea" v-if="ifshow">
-      <div @click="close" class="close-content">
-        <i class="el-icon-close"></i
-        ><el-button class="closeBtn">关闭视图</el-button>
-      </div>
-      <div class="top-content">
-        <div class="top-title">仓库可视化</div>
-        <div class="query-content">
-          <el-form :inline="true" :model="formInline" class="demo-form-inline">
-            <el-form-item label="仓库名称：">
-              <el-select
-                v-model="formInline.cang_ku_ming_chen_value"
-                placeholder="请选择样品"
-              >
-                <el-option
-                  v-for="(item, index) in cangkuOption"
-                  :key="index"
-                  placeholder="区域"
-                  :label="item.cang_ku_ming_chen"
-                  :value="item.cang_ku_ming_chen"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item style="margin-left: 50px" label="区域名称：">
-              <el-select
-                v-model="formInline.qu_yu_value"
-                placeholder="请选择区域名称"
-              >
-                <el-option
-                  v-for="(item, index) in quyu_arr"
-                  :key="index"
-                  placeholder="区域"
-                  :label="item.qu_yu_"
-                  :value="item.qu_yu_"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item>
-              <button
-                type="button"
-                class="el-button el-button--primary el-button--mini"
-                @click="onSubmits"
-              >
-                <i class="ibps-icon-search"></i><span>查询</span>
-              </button>
-            </el-form-item>
-          </el-form>
-        </div>
-      </div>
-      <div class="test-quyu">
-        <div class="test-list">
-          <ul class="list-items">
-            <li
-              class="list-item quyu-item"
-              :style="{
-                background: quyuShow == item.qu_yu_ ? '#FF9900' : '#e5baba',
-              }"
-              @click="qu_yu_Event"
-              v-for="item in quyu_arr"
-              :key="item.qu_yu_"
-            >
-              <div v-if="item.qu_yu_.includes('冰箱')">
-                {{ item.qu_yu_ | freezerFilters }}({{ item.cun_chu_tiao_jian }})
-              </div>
-
-              <div v-if="!item.qu_yu_.includes('冰箱')">
-                {{ item.qu_yu_ | freezerFilters }}
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
-
-      <div class="body-content">
-        <div class="right-view">
-          <div class="goods-items">
-            <div
-              class="show-demo"
-              v-for="(item, index) in listData"
-              :key="index"
-            >
-              <div>
-                <div class="goods-level">
-                  <div class="level-dsc">
-                    第{{ index | indexfilter(listData) }}层
-                  </div>
-                  <div class="goods-list">
-                    <div
-                      v-for="(it, index) in listData[index]"
-                      :key="index"
-                      class="goods-dsc"
-                      :style="{
-                        background: !it.wu_liao_bian_ma_ ? '#67c23a' : '',
-                      }"
-                      @click="closeView(it)"
-                    >
-                      <div class="top-dsc">
-                        <div class="position">
-                          <p>名称：{{ it.wu_pin_ming_chen }}</p>
-                          <p>编码：{{ it.wu_liao_bian_ma_ || "空" }}</p>
-                          <p>位置：{{ it.cun_fang_wei_zhi_ || "空" }}</p>
-                          <p>货号:{{ it.huo_hao_ || "空" }}</p>
-                        </div>
-                        <div class="right-content">
-                          <p>入库批号:{{ it.ru_ku_pi_hao_ || "空" }}</p>
-                          <p>存储条件:{{ it.cun_chu_yao_qiu_ || "空" }}</p>
-                          <p>有效期:{{ it.you_xiao_qi_ || "空" }}</p>
-                          <p>库存量：{{ it.ku_cun_liang_ || "空" }}</p>
-                        </div>
-                        <!-- <div class="condition">{{ it.cun_chu_tiao_jian }}</div> -->
-                      </div>
-                      <div class="bottom-dsc">
-                        <!-- {{ it.wu_pin_ming_cheng | specimenFilters }} -->
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <!-- <div class="goodshelf-name" v-if="index == 1">
-                {{ desString }}
-              </div> -->
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-  
-  <script>
-import curdPost from "@/business/platform/form/utils/custom/joinCURD.js";
-export default {
-  data() {
-    return {
-      ifshow: false,
-      showValue: "点击选择位置",
-      cangkuOption: [],
-      formInline: {
-        cang_ku_ming_chen_value: " 次级仓库",
-        qu_yu_value: "6号冰箱",
-        huo_jia_value: "",
-      },
-      huojiaInfo: {
-        empty: "",
-        al: "",
-      },
-      listData: [],
-      desString: "",
-      warehouseOptions: [],
-      quyu_arr: [],
-      huo_jia_arr: [],
-      // qu_yu_value: "",
-      desShow: true,
-      quyuShow: "",
-      huojiashow: "",
-      firstLoadActive: "false",
-      selectActive: "",
-      cenghao: [],
-      warehouse: [],
-      loading: false,
-      pagination: {},
-      secondshow: false,
-    };
-  },
-  filters: {
-    indexfilter: function (value, data) {
-      if (data[0]) {
-        return value + 1;
-      } else {
-        return value;
-      }
-    },
-    laySlice: function (value) {
-      return value.split("-")[2];
-    },
-    freezerFilters: function (value) {
-      if (value.includes("冷藏柜")) {
-        return value.replace("冷藏柜", "冰箱");
-      } else if (value.includes("冷冻柜")) {
-        return value.replace("冷冻柜", "冰箱");
-      } else {
-        return value;
-      }
-    },
-    specimenFilters: function (value) {
-      if (value == "" || value == undefined) {
-        return "未占用";
-      } else {
-        return value;
-      }
-    },
-    bian_hao_Filters: function (value) {
-      if (!value || value == undefined || value == "") {
-        return "无";
-      } else {
-        return value;
-      }
-    },
-  },
-  mounted() {
-    this.loadQueryData();
-    this.firstLoadViewData();
-    this.firstLoadQuyu("次级仓库");
-    // let dom = document.getElementsByClassName("el-tooltip__popper");
-    // console.log(dom, dom[0].innerHTML, "dom");
-    // dom[0].remove();
-  },
-  methods: {
-    close() {
-      this.ifshow = !this.ifshow;
-    },
-    clickBtn() {
-
-      this.ifshow = !this.ifshow;
-      // let dom = document.getElementsByClassName("el-tooltip__popper");
-      // if (dom[0]) {
-      //   dom[0].innerHTML = "";
-      //   dom[0].style.background = "white";
-      // }
-    },
-    closeView(value) {
-      const name = "cunFangWeiZhi"; //其他字段属性
-      this.$emit("change-data", name, value.cun_fang_wei_zhi_);
-      const name2 = "cangKuMingCheng"; //其他字段属性
-      const value2 = this.formInline.cang_ku_ming_chen_value; //字段的值
-      // this.showValue = value2;
-      this.$emit("change-data", name2, value2);
-      this.ifshow = !this.ifshow;
-    },
-    firstLoadQuyu(cang_ku) {
-      let sqlString = `select DISTINCT subStr(wei_zhi_,1,4) as wei_zhi_,cun_chu_tiao_jian,qu_yu_ from t_ck where cang_ku_ming_chen = '${cang_ku}' order by wei_zhi_ asc`;
-
-      var this_ = this;
-
-      curdPost("sql", sqlString).then((response) => {
-        this_.quyu_arr = response.variables.data;
-        this_.quyu_arr.forEach((it) => {
-          it.wei_zhi_.includes("-")
-            ? ""
-            : (it.qu_yu_ = it.qu_yu_ + it.wei_zhi_.slice(3, 4));
-        });
-        if (!this.firstLoadActive) {
-          this_.formInline.qu_yu_value = "";
-        }
-      });
-    },
-    firstLoadViewData() {
-      //首次加载视图数据 默认中心仓库 耗材区
-      this.formInline.cang_ku_ming_chen_value = "次级仓库";
-      this.formInline.qu_yu_value = "6号冰箱";
-      this.selectActive = 1;
-      this.firstLoadActive = true;
-      this.quyuShow = "6号冰箱";
-      var sqlString =
-        "select * from t_mjwlgl where cun_fang_wei_zhi_ like" +
-        "'%" +
-        "BX6" +
-        "%'";
-      this.queryLoad(sqlString, "BX6");
-    },
-    sqlSlice(value, num) {
-      if (value.includes("冰箱")) {
-        if (
-          value.includes("T") ||
-          value.includes("B") ||
-          value.includes("L") ||
-          value.includes("R")
-        ) {
-          return "BX" + num + value.slice(4, 5);
-        } else {
-          return "BX" + num;
-        }
-      } else if (value.includes("货架")) {
-        return "HJ" + num;
-      } else if (value.includes("试剂柜")) {
-        return "SJG" + num;
-      }
-    },
-    loadQueryData() {
-      //查询选择仓库数据查询
-      var sqlString = "select distinct cang_ku_ming_chen from t_ck ";
-      var this_ = this;
-      curdPost("sql", sqlString).then((response) => {
-        this_.cangkuOption = response.variables.data;
-        this_.cangkuOption.forEach((item, index) => {
-          if (!item) {
-            this_.cangkuOption.splice(index, 1);
-          }
-        });
-      });
-    },
-    onSubmits() {
-      //头部按钮查询事
-      this.desShow = false;
-      let value = this.formInline.qu_yu_value;
-      let num = value.split("号")[0];
-      let type = this.sqlSlice(value, num);
-      var sqlString =
-        `select * from t_mjwlgl where cun_fang_wei_zhi_ like ` +
-        "'%" +
-        type +
-        "%'";
-      this.queryLoad(sqlString, type);
-      this.formInline.qu_yu_value = value;
-      this.quyuShow = value;
-    },
-    queryLoad(sql, py) {
-      var datas = [];
-      this.cenghao = [];
-      const labelsMap = {}; // map存储
-      let typeData = [];
-      var sqltype =
-        `select DISTINCT SUBSTR(wei_zhi_,1,6) as wei_zhi_ from t_ck where wei_zhi_ like ` +
-        "'%" +
-        py +
-        "%'" +
-        "ORDER BY wei_zhi_ ASC "; //
-      curdPost("sql", sqltype).then((res) => {
-        typeData = res.variables.data; //查询该位置具有多少层
-        curdPost("sql", sql).then((res) => {
-          //sql 查询该位置在物料管理库存信息的物料
-          datas = res.variables.data; // 该位置的库存信息
-          typeData.forEach((item) => {
-            //组件以货架分层的数据: {1:[],2:[],3:[],4:[],5:[],6}
-            let num = item.wei_zhi_.split("-")[1];
-            labelsMap[num] = [];
-          });
-          if (datas.length == 0) {
-            //没有物料存在该位置
-            for (var prop in labelsMap) {
-              typeData.forEach((item) => {
-                //组件以货架分层的数据: {1:[],2:[],3:[],4:[],5:[],6}
-                let num = item.wei_zhi_.split("-")[1];
-                if (num == prop) {
-                  labelsMap[prop].push({ cun_fang_wei_zhi_: item.wei_zhi_ });
-                }
-              });
-            }
-            this.listData = labelsMap;
-            return;
-          }
-          datas.forEach((item) => {
-            //有物料存在该区域
-            let props1 = item.cun_fang_wei_zhi_.split("-")[1];
-            for (var prop in labelsMap) {
-              if (labelsMap.hasOwnProperty(prop)) {
-                if (prop == props1) {
-                  labelsMap[prop].push(item);
-                }
-                if (prop != props1 && labelsMap[prop].length == 0) {
-                  typeData.forEach((item) => {
-                    //组件以货架分层的数据: {1:[],2:[],3:[],4:[],5:[],6}
-                    let num = item.wei_zhi_.split("-")[1];
-                    if (num == prop) {
-                      labelsMap[prop].push({
-                        cun_fang_wei_zhi_: item.wei_zhi_,
-                      });
-                      labelsMap[prop].push({ zhuangtai: "空" });
-                    }
-                  });
-                  // labelsMap[prop].push({ cun_fang_wei_zhi_: "空" });
-                }
-              }
-            }
-          });
-          let newarr = [];
-          for (var prop in labelsMap) {
-            if (labelsMap.hasOwnProperty(prop)) {
-              if (labelsMap[prop].length > 1) {
-                var item = labelsMap[prop].slice(1);
-                newarr.push(item);
-              } else {
-                newarr.push(labelsMap[prop]);
-              }
-            }
-          }
-          this.listData = newarr;
-        });
-      });
-    },
-    qu_yu_Event(e) {
-      //点击区域事件，加载可视化视图
-      let value = e.target.innerText;
-      let num = value.split("号")[0];
-      let type = this.sqlSlice(value, num);
-      var sqlString =
-        `select * from t_mjwlgl where cun_fang_wei_zhi_ like ` +
-        "'%" +
-        type +
-        "%'";
-
-      this.queryLoad(sqlString, type);
-      this.formInline.qu_yu_value = value;
-      this.quyuShow = value;
-    },
-    blackEvent() {
-      this.desShow = true;
-    },
-  },
-  watch: {
-    //监控仓库名称变化 触发第一次加载数据
-    "formInline.cang_ku_ming_chen_value": async function (newdata) {
-      this.firstLoadQuyu(newdata);
-    },
-    "formInline.qu_yu_value": function (newdata) {
-      this.qu_yu_value = newdata;
-      this.quyuShow = newdata;
-      this.firstLoadActive = false;
-    },
-  },
-};
-</script>
-  
-  <style lang="scss" scoped>
-ul {
-  margin: 0;
-}
-p {
-  padding: 0;
-  margin: 0;
-}
-.selectArea {
-  width: 100%;
-  height: 100%;
-  overflow: scroll;
-  position: fixed;
-  top: 0px;
-  left: 0px;
-  bottom: 0px;
-  right: 0px;
-  background: white;
-  z-index: 2147483647 !important;
-}
-.close-content {
-  position: absolute;
-  right: 100px;
-  top: 50px;
-  //
-  background: #f56c6c;
-  font-size: 16px;
-  padding: 0px 4px;
-  border-radius: 5px;
-  color: #ffffff;
-  .closeBtn {
-    background: #f56c6c;
-    border: none;
-    padding: 2px;
-    color: #ffffff;
-  }
-}
-.sample-content {
-  width: 100%;
-  .top-content {
-    width: 100%;
-    .top-title {
-      text-align: center;
-      font-weight: bold;
-      width: 100%;
-      font-size: 18px;
-      line-height: 40px;
-    }
-    .query-content {
-      display: flex;
-      margin-left: 25px;
-    }
-  }
-  .test-quyu,
-  .huojia {
-    width: 100%;
-    .list-items {
-      display: flex;
-      cursor: pointer;
-      .wDTianjian::after {
-        content: "2-6";
-      }
-      .quyu-item {
-        border: 1px solid #a172ab;
-        background: #0099cc;
-      }
-      .huojia-item {
-        background: #99ccff;
-      }
-      .list-item {
-        padding: 4px 14px;
-        height: 30px;
-        background-color: #cec6a4;
-        text-align: center;
-        line-height: 30px;
-        margin-left: 20px;
-        margin-bottom: 6px;
-        /* margin-top: 6px; */
-        border-radius: 10px;
-        position: relative;
-        .tiaojian {
-          // position: absolute;
-          // right: 0px;
-          // top: 0px;
-          // background-color: #f56c6c;
-          // border-radius: 10px;
-          // color: #fff;
-          // display: inline-block;
-          // font-size: 12px;
-          // height: 18px;
-          // line-height: 18px;
-          // padding: 0 6px;
-          // text-align: center;
-          // white-space: nowrap;
-          // border: 1px solid #fff;
-          font-size: 12px;
-        }
-      }
-    }
-    .cangku-mingchen {
-      width: 100%;
-      text-align: left;
-      margin-left: 50px;
-    }
-  }
-  .body-content {
-    margin-bottom: 70px;
-    display: flex;
-    box-sizing: border-box;
-    height:50vh;
-    // overflow-x: hidden;
-    // overflow-y: scroll;
-    .black {
-      position: fixed;
-      top: 300px;
-      right: 100px;
-      width: 100px;
-      height: 40px;
-      line-height: 40px;
-      text-align: center;
-      background-color: #e6a23c;
-      z-index: 99;
-    }
-    .left-table {
-      // width: 40%;
-      ::v-deep .el-table {
-        width: 40%;
-      }
-    }
-    .right-view {
-      z-index: 99;
-      width: 100%;
-      .goods-items {
-        width: 100%;
-        overflow-x: hidden;
-        border: solid 2px rgb(202, 236, 247);
-        display: flex;
-        flex-direction: column-reverse;
-        .show-demo {
-          width: 100%;
-          border-bottom: 1px solid bisque;
-          margin: 0 auto;
-          text-align: center;
-          // overflow-y: scroll;
-          .goods-level {
-            display: flex;
-            position: relative;
-            margin-bottom: 6px;
-          }
-          .level-dsc {
-            margin-top: 12px;
-            position: absolute;
-            bottom: 0;
-            left: 10px;
-          }
-          .goods-list {
-            display: flex;
-            // justify-content: flex-start;
-            flex-wrap: wrap-reverse;
-            align-content: flex-start;
-            margin-left: 50px;
-            margin-right: 15px;
-            .goods-dsc {
-              cursor: pointer;
-              // width: 170px;
-              // height: 80px;
-              padding: 6px 12px;
-              border-radius: 5px;
-              background: #e6a23c;
-              margin-left: 12px;
-              margin-top: 6px;
-              //   background-color: aliceblue;
-              box-sizing: border-box;
-              .top-dsc {
-                display: flex;
-                justify-content: space-between;
-                font-size: 12px;
-                height: 18px;
-                line-height: 18px;
-                .position > p {
-                  text-align: left;
-                  // color: #fbe8ff;
-                }
-                .right-content > p {
-                  margin-left: 15px;
-                  // color: #fbe8ff;
-                  text-align: left;
-                }
-                // .condition {
-                //   // color: #fbe8ff;
-                // }
-              }
-              .bottom-dsc {
-                width: 100%;
-                font-size: 18px;
-                height: 42px;
-                line-height: 60px;
-                margin-top: 20px;
-                // color: #fbe8ff;
-              }
-              .goods-demo {
-                display: block;
-                width: 70px;
-                height: 90px;
-                border: 1px solid rgb(10, 9, 8);
-                text-align: center;
-                margin: 0;
-              }
-              .goods-code {
-                text-align: center;
-                width: 100%;
-                height: 20px;
-                line-height: 20px;
-              }
-            }
-          }
-          .goodshelf-name {
-            margin-bottom: 49px;
-          }
-          .shelf {
-            width: 100%;
-            height: 40px;
-            line-height: 40px;
-            text-align: center;
-          }
-        }
-      }
-    }
-  }
-  .body-content::-webkit-scrollbar {
-    display: none; /*隐藏滚动条*/
-  }
-}
-
-::v-deep .el-tooltip__popper {
-  display: none;
-}
-</style>

src/views/component/zhuposition.vue

@@ -1,657 +0,0 @@
-<template>
-  <div class="sample-content">
-    <div @click="clickBtn" style="cursor: pointer">
-      <!-- <div>点击视图选择位置</div> -->
-      <el-input
-        placeholder="请输入内容"
-        :value="showValue"
-        id="valueDom"
-      ></el-input>
-    </div>
-    <!-- 表格組件 -->
-    <div class="selectArea" v-if="ifshow">
-      <div @click="close" class="close-content">
-        <i class="el-icon-close"></i
-        ><el-button class="closeBtn">关闭视图</el-button>
-      </div>
-      <div class="top-content">
-        <div class="top-title">仓库可视化</div>
-        <div class="query-content">
-          <el-form :inline="true" :model="formInline" class="demo-form-inline">
-            <el-form-item label="仓库名称：">
-              <el-select
-                v-model="formInline.cang_ku_ming_chen_value"
-                placeholder="请选择样品"
-              >
-                <el-option
-                  v-for="(item, index) in cangkuOption"
-                  :key="index"
-                  placeholder="区域"
-                  :label="item.cang_ku_ming_chen"
-                  :value="item.cang_ku_ming_chen"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item style="margin-left: 50px" label="区域名称：">
-              <el-select
-                v-model="formInline.qu_yu_value"
-                placeholder="请选择区域名称"
-              >
-                <el-option
-                  v-for="(item, index) in quyu_arr"
-                  :key="index"
-                  placeholder="区域"
-                  :label="item.qu_yu_"
-                  :value="item.qu_yu_"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item>
-              <button
-                type="button"
-                class="el-button el-button--primary el-button--mini"
-                @click="onSubmits"
-              >
-                <i class="ibps-icon-search"></i><span>查询</span>
-              </button>
-            </el-form-item>
-          </el-form>
-        </div>
-      </div>
-      <div class="test-quyu">
-        <div class="test-list">
-          <ul class="list-items">
-            <li
-              class="list-item quyu-item"
-              :style="{
-                background: quyuShow == item.qu_yu_ ? '#FF9900' : '#e5baba',
-              }"
-              @click="qu_yu_Event"
-              v-for="item in quyu_arr"
-              :key="item.qu_yu_"
-            >
-              <div v-if="item.qu_yu_.includes('冰箱')">
-                {{ item.qu_yu_ | freezerFilters }}({{ item.cun_chu_tiao_jian }})
-              </div>
-
-              <div v-if="!item.qu_yu_.includes('冰箱')">
-                {{ item.qu_yu_ | freezerFilters }}
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
-
-      <div class="body-content">
-        <div class="right-view">
-          <div class="goods-items">
-            <div
-              class="show-demo"
-              v-for="(item, index) in listData"
-              :key="index"
-            >
-              <div>
-                <div class="goods-level">
-                  <div class="level-dsc">
-                    第{{ index | indexfilter(listData) }}层
-                  </div>
-                  <div class="goods-list">
-                    <div
-                      v-for="(it, index) in listData[index]"
-                      :key="index"
-                      class="goods-dsc"
-                      :style="{
-                        background: !it.wu_liao_bian_ma_ ? '#67c23a' : '',
-                      }"
-                      @click="closeView(it)"
-                    >
-                      <div class="top-dsc">
-                        <div class="position">
-                          <p>名称：{{ it.wu_pin_ming_chen }}</p>
-                          <p>编码：{{ it.wu_liao_bian_ma_ || "空" }}</p>
-                          <p>位置：{{ it.cun_fang_wei_zhi_ || "空" }}</p>
-                          <p>货号:{{ it.huo_hao_ || "空" }}</p>
-                        </div>
-                        <div class="right-content">
-                          <p>入库批号:{{ it.ru_ku_pi_hao_ || "空" }}</p>
-                          <p>存储条件:{{ it.cun_chu_yao_qiu_ || "空" }}</p>
-                          <p>有效期:{{ it.you_xiao_qi_ || "空" }}</p>
-                          <p>库存量：{{ it.ku_cun_liang_ || "空" }}</p>
-                        </div>
-                        <!-- <div class="condition">{{ it.cun_chu_tiao_jian }}</div> -->
-                      </div>
-                      <div class="bottom-dsc">
-                        <!-- {{ it.wu_pin_ming_cheng | specimenFilters }} -->
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div class="goodshelf-name" v-if="index == 1">
-                {{ desString }}
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-  
-  <script>
-import curdPost from "@/business/platform/form/utils/custom/joinCURD.js";
-export default {
-  data() {
-    return {
-      ifshow: false,
-      showValue: "点击选择位置",
-      cangkuOption: [],
-      formInline: {
-        cang_ku_ming_chen_value: " 主仓库",
-        qu_yu_value: "1号冰箱",
-        huo_jia_value: "",
-      },
-      huojiaInfo: {
-        empty: "",
-        al: "",
-      },
-      listData: [],
-      desString: "",
-      warehouseOptions: [],
-      quyu_arr: [],
-      huo_jia_arr: [],
-      // qu_yu_value: "",
-      desShow: true,
-      quyuShow: "",
-      huojiashow: "",
-      firstLoadActive: "false",
-      selectActive: "",
-      cenghao: [],
-      warehouse: [],
-      loading: false,
-      pagination: {},
-      secondshow: false,
-    };
-  },
-  filters: {
-    indexfilter: function (value, data) {
-      console.log(value, data);
-      if (data[0]) {
-        return value + 1;
-      } else {
-        return value;
-      }
-    },
-    laySlice: function (value) {
-      return value.split("-")[2];
-    },
-    freezerFilters: function (value) {
-      if (value.includes("冷藏柜")) {
-        return value.replace("冷藏柜", "冰箱");
-      } else if (value.includes("冷冻柜")) {
-        return value.replace("冷冻柜", "冰箱");
-      } else {
-        return value;
-      }
-    },
-    specimenFilters: function (value) {
-      if (value == "" || value == undefined) {
-        return "未占用";
-      } else {
-        return value;
-      }
-    },
-    bian_hao_Filters: function (value) {
-      if (!value || value == undefined || value == "") {
-        return "无";
-      } else {
-        return value;
-      }
-    },
-  },
-  mounted() {
-    this.loadQueryData();
-    this.firstLoadViewData();
-    this.firstLoadQuyu("主仓库");
-  },
-  methods: {
-    close() {
-      this.ifshow = !this.ifshow;
-    },
-    clickBtn() {
-      this.ifshow = !this.ifshow;
-    },
-    closeView(value) {
-      let dom  = document.getElementById("el-tooltip-2390");
-      console.log(dom,"dom")
-      const name = "cunFangWeiZhi"; //其他字段属性
-      this.$emit("change-data", name, value.cun_fang_wei_zhi_);s
-      const name2 = "cangKuMingCheng"; //其他字段属性
-      const value2 = this.formInline.cang_ku_ming_chen_value; //字段的值
-      // this.showValue = value2;
-      this.$emit("change-data", name2, value2);
-      this.ifshow = !this.ifshow;
-    },
-    firstLoadQuyu(cang_ku) {
-      let sqlString = `select DISTINCT subStr(wei_zhi_,1,4) as wei_zhi_,cun_chu_tiao_jian,qu_yu_ from t_ck where cang_ku_ming_chen = '${cang_ku}' order by wei_zhi_ asc`;
-
-      var this_ = this;
-
-      curdPost("sql", sqlString).then((response) => {
-        this_.quyu_arr = response.variables.data;
-        console.log(this_.quyu_arr, "sqlqrr");
-        this_.quyu_arr.forEach((it) => {
-          it.wei_zhi_.includes("-")
-            ? ""
-            : (it.qu_yu_ = it.qu_yu_ + it.wei_zhi_.slice(3, 4));
-        });
-        if (!this.firstLoadActive) {
-          this_.formInline.qu_yu_value = "";
-        }
-      });
-    },
-    firstLoadViewData() {
-      //首次加载视图数据 默认中心仓库 耗材区
-      this.formInline.cang_ku_ming_chen_value = "主仓库";
-      this.formInline.qu_yu_value = "1号冰箱";
-      this.selectActive = 1;
-      this.firstLoadActive = true;
-      this.quyuShow = "1号冰箱";
-      var sqlString =
-        "select * from t_mjwlgl where cun_fang_wei_zhi_ like" +
-        "'%" +
-        "BX1T" +
-        "%'";
-      this.queryLoad(sqlString, "BX1T");
-    },
-    sqlSlice(value, num) {
-      if (value.includes("冰箱")) {
-        if (
-          value.includes("T") ||
-          value.includes("B") ||
-          value.includes("L") ||
-          value.includes("R")
-        ) {
-          return "BX" + num + value.slice(4, 5);
-        } else {
-          return "BX" + num;
-        }
-      } else if (value.includes("货架")) {
-        return "HJ" + num;
-      } else if (value.includes("试剂柜")) {
-        return "SJG" + num;
-      }
-    },
-    loadQueryData() {
-      //查询选择仓库数据查询
-      var sqlString = "select distinct cang_ku_ming_chen from t_ck ";
-      var this_ = this;
-      curdPost("sql", sqlString).then((response) => {
-        this_.cangkuOption = response.variables.data;
-        this_.cangkuOption.forEach((item, index) => {
-          if (!item) {
-            this_.cangkuOption.splice(index, 1);
-          }
-        });
-      });
-    },
-    onSubmits() {
-      //头部按钮查询事
-      this.desShow = false;
-      let value = this.formInline.qu_yu_value;
-      let num = value.split("号")[0];
-      let type = this.sqlSlice(value, num);
-      console.log(type);
-      var sqlString =
-        `select * from t_mjwlgl where cun_fang_wei_zhi_ like ` +
-        "'%" +
-        type +
-        "%'";
-      console.log(sqlString);
-      this.queryLoad(sqlString, type);
-      this.formInline.qu_yu_value = value;
-      this.quyuShow = value;
-    },
-    queryLoad(sql, py) {
-      var datas = [];
-      this.cenghao = [];
-      const labelsMap = {}; // map存储
-      let typeData = [];
-      var sqltype =
-        `select DISTINCT SUBSTR(wei_zhi_,1,6) as wei_zhi_ from t_ck where wei_zhi_ like ` +
-        "'%" +
-        py +
-        "%'" +
-        "ORDER BY wei_zhi_ ASC "; //
-      console.log(sqltype, sql, "传进来参数");
-      curdPost("sql", sqltype).then((res) => {
-        typeData = res.variables.data; //查询该位置具有多少层
-        curdPost("sql", sql).then((res) => {
-          //sql 查询该位置在物料管理库存信息的物料
-          datas = res.variables.data; // 该位置的库存信息
-          typeData.forEach((item) => {
-            //组件以货架分层的数据: {1:[],2:[],3:[],4:[],5:[],6}
-            let num = item.wei_zhi_.split("-")[1];
-            labelsMap[num] = [];
-          });
-          if (datas.length == 0) {
-            //没有物料存在该位置
-            for (var prop in labelsMap) {
-              typeData.forEach((item) => {
-                //组件以货架分层的数据: {1:[],2:[],3:[],4:[],5:[],6}
-                let num = item.wei_zhi_.split("-")[1];
-                if (num == prop) {
-                  labelsMap[prop].push({ cun_fang_wei_zhi_: item.wei_zhi_ });
-                }
-              });
-            }
-            this.listData = labelsMap;
-            return;
-          }
-          datas.forEach((item) => {
-            //有物料存在该区域
-            let props1 = item.cun_fang_wei_zhi_.split("-")[1];
-            for (var prop in labelsMap) {
-              if (labelsMap.hasOwnProperty(prop)) {
-                if (prop == props1) {
-                  labelsMap[prop].push(item);
-                }
-                if (prop != props1 && labelsMap[prop].length == 0) {
-                  typeData.forEach((item) => {
-                    //组件以货架分层的数据: {1:[],2:[],3:[],4:[],5:[],6}
-                    let num = item.wei_zhi_.split("-")[1];
-                    if (num == prop) {
-                      labelsMap[prop].push({
-                        cun_fang_wei_zhi_: item.wei_zhi_,
-                      });
-                      labelsMap[prop].push({ zhuangtai: "空" });
-                    }
-                  });
-                }
-              }
-            }
-          });
-          let newarr = [];
-          for (var prop in labelsMap) {
-            if (labelsMap.hasOwnProperty(prop)) {
-              if (labelsMap[prop].length > 1) {
-                var item = labelsMap[prop].slice(1);
-                console.log(item);
-                newarr.push(item);
-              } else {
-                console.log(labelsMap[prop]);
-                newarr.push(labelsMap[prop]);
-              }
-            }
-          }
-          this.listData = newarr;
-          console.log(this.listData, "listData");
-        });
-      });
-    },
-    qu_yu_Event(e) {
-      //点击区域事件，加载可视化视图
-      let value = e.target.innerText;
-      let num = value.split("号")[0];
-      let type = this.sqlSlice(value, num);
-      console.log(type);
-      var sqlString =
-        `select * from t_mjwlgl where cun_fang_wei_zhi_ like ` +
-        "'%" +
-        type +
-        "%'";
-      console.log(sqlString);
-      this.queryLoad(sqlString, type);
-      this.formInline.qu_yu_value = value;
-      this.quyuShow = value;
-    },
-    blackEvent() {
-      this.desShow = true;
-    },
-  },
-  watch: {
-    //监控仓库名称变化 触发第一次加载数据
-    "formInline.cang_ku_ming_chen_value": async function (newdata) {
-      this.firstLoadQuyu(newdata);
-    },
-    "formInline.qu_yu_value": function (newdata) {
-      this.qu_yu_value = newdata;
-      this.quyuShow = newdata;
-      this.firstLoadActive = false;
-    },
-  },
-};
-</script>
-  
-  <style lang="scss" scoped>
-ul {
-  margin: 0;
-}
-p {
-  padding: 0;
-  margin: 0;
-}
-.selectArea {
-  width: 100%;
-  height: 100%;
-  overflow: scroll;
-  position: fixed;
-  top: 0px;
-  left: 0px;
-  background: white;
-  z-index: 2147483647 !important;
-}
-.close-content {
-  position: absolute;
-  right: 100px;
-  top: 50px;
-  //
-  background: #f56c6c;
-  font-size: 16px;
-  padding: 0px 4px;
-  border-radius: 5px;
-  color: #ffffff;
-  .closeBtn {
-    background: #f56c6c;
-    border: none;
-    padding: 2px;
-    color: #ffffff;
-  }
-}
-.sample-content {
-  width: 100%;
-  .top-content {
-    width: 100%;
-    .top-title {
-      text-align: center;
-      font-weight: bold;
-      width: 100%;
-      font-size: 18px;
-      line-height: 40px;
-    }
-    .query-content {
-      display: flex;
-      margin-left: 25px;
-    }
-  }
-  .test-quyu,
-  .huojia {
-    width: 100%;
-    .list-items {
-      display: flex;
-      cursor: pointer;
-      .wDTianjian::after {
-        content: "2-6";
-      }
-      .quyu-item {
-        border: 1px solid #a172ab;
-        background: #0099cc;
-      }
-      .huojia-item {
-        background: #99ccff;
-      }
-      .list-item {
-        padding: 4px 14px;
-        height: 30px;
-        background-color: #cec6a4;
-        text-align: center;
-        line-height: 30px;
-        margin-left: 20px;
-        margin-bottom: 6px;
-        /* margin-top: 6px; */
-        border-radius: 10px;
-        position: relative;
-        .tiaojian {
-          // position: absolute;
-          // right: 0px;
-          // top: 0px;
-          // background-color: #f56c6c;
-          // border-radius: 10px;
-          // color: #fff;
-          // display: inline-block;
-          // font-size: 12px;
-          // height: 18px;
-          // line-height: 18px;
-          // padding: 0 6px;
-          // text-align: center;
-          // white-space: nowrap;
-          // border: 1px solid #fff;
-          font-size: 12px;
-        }
-      }
-    }
-    .cangku-mingchen {
-      width: 100%;
-      text-align: left;
-      margin-left: 50px;
-    }
-  }
-  .body-content {
-    margin-bottom: 70px;
-    display: flex;
-    box-sizing: border-box;
-    height: calc(100vh - 240px);
-    overflow-x: hidden;
-    overflow-y: scroll;
-    .black {
-      position: fixed;
-      top: 300px;
-      right: 100px;
-      width: 100px;
-      height: 40px;
-      line-height: 40px;
-      text-align: center;
-      background-color: #e6a23c;
-      z-index: 99;
-    }
-    .left-table {
-      // width: 40%;
-      ::v-deep .el-table {
-        width: 40%;
-      }
-    }
-    .right-view {
-      z-index: 99;
-      width: 100%;
-      .goods-items {
-        width: 100%;
-        overflow-x: hidden;
-        border: solid 2px rgb(202, 236, 247);
-        display: flex;
-        flex-direction: column-reverse;
-        .show-demo {
-          width: 100%;
-          border-bottom: 1px solid bisque;
-          margin: 0 auto;
-          text-align: center;
-          // overflow-y: scroll;
-          .goods-level {
-            display: flex;
-            position: relative;
-            margin-bottom: 6px;
-          }
-          .level-dsc {
-            margin-top: 12px;
-            position: absolute;
-            bottom: 0;
-            left: 10px;
-          }
-          .goods-list {
-            display: flex;
-            // justify-content: flex-start;
-            flex-wrap: wrap-reverse;
-            align-content: flex-start;
-            margin-left: 50px;
-            margin-right: 15px;
-            .goods-dsc {
-              cursor: pointer;
-              // width: 170px;
-              // height: 80px;
-              padding: 6px 12px;
-              border-radius: 5px;
-              background: #e6a23c;
-              margin-left: 12px;
-              margin-top: 6px;
-              //   background-color: aliceblue;
-              box-sizing: border-box;
-              .top-dsc {
-                display: flex;
-                justify-content: space-between;
-                font-size: 12px;
-                height: 18px;
-                line-height: 18px;
-                .position > p {
-                  text-align: left;
-                  // color: #fbe8ff;
-                }
-                .right-content > p {
-                  margin-left: 15px;
-                  // color: #fbe8ff;
-                  text-align: left;
-                }
-                // .condition {
-                //   // color: #fbe8ff;
-                // }
-              }
-              .bottom-dsc {
-                width: 100%;
-                font-size: 18px;
-                height: 42px;
-                line-height: 60px;
-                margin-top: 20px;
-                // color: #fbe8ff;
-              }
-              .goods-demo {
-                display: block;
-                width: 70px;
-                height: 90px;
-                border: 1px solid rgb(10, 9, 8);
-                text-align: center;
-                margin: 0;
-              }
-              .goods-code {
-                text-align: center;
-                width: 100%;
-                height: 20px;
-                line-height: 20px;
-              }
-            }
-          }
-          .goodshelf-name {
-            margin-bottom: 49px;
-          }
-          .shelf {
-            width: 100%;
-            height: 40px;
-            line-height: 40px;
-            text-align: center;
-          }
-        }
-      }
-    }
-  }
-  .body-content::-webkit-scrollbar {
-    display: none; /*隐藏滚动条*/
-  }
-}
-</style>

src/views/system/jbdHome/board/component/CarouselTabl.vue

@@ -1,8 +1,8 @@
 <template>
   <div :class="$style.pieView">
-    <div style="height: 30px;line-height: 30px;text-align: left;padding-left: 10px;width: calc(100% - 10px) ;background-color: #06163f;opacity: 0.5;">标题</div>   
+    <div style="height: 30px;line-height: 30px;text-align: left;padding-left: 10px;width: calc(100% - 10px) ;background-color: #06163f;opacity: 0.5;">停用/报废列表</div>   
     <div style="width:100%;display: inline-block;background-color: #06163f;">
-      <dv-scroll-board :config="info" style="width:50%;height:300px" />
+      <dv-scroll-board :config="info" style="width:100%;height:320px" />
     </div>
   </div>
 </template>
@@ -24,6 +24,6 @@ export default {
 <style lang="scss" module>
 .pieView{
   display: flex;
-  width: 100vw;
+  width: 100%;
 }
 </style>

src/views/system/jbdHome/board/component/equipmentBoardTopcard.vue

@@ -4,11 +4,12 @@
       <!-- <div class="title">设备信息情况</div> -->
       <div class="bar">
         <div v-for="(item, index) in topBarData" :key="index" class="item">
-          <div class="title">{{ item.title }}</div>
+          <!-- <div class="title">{{ item.title }}</div> -->
           <div v-for="(v, i) in item.children" :key="i" class="box">
             <div class="label">{{ v.label }}</div>
             <div class="count">
-              <dv-digital-flop :config="v.data" class="flop" />
+              <dv-digital-flop :config="v.data" class="flop"   v-if="v.unit !='元'"/>
+              <dv-digital-flop :config="v.data" class="flops"   v-else/>
               <div class="unit">{{ v.unit }}</div>
             </div>
           </div>
@@ -77,7 +78,6 @@ export default {
               fontWeight: "bold",
             },
           };
-          console.log(i)
           i.unit = i.danwei;
         });
       });
@@ -89,7 +89,7 @@ export default {
 <style lang="scss" scoped>
 .content{
   height: 90%;
-  background-color: rgba(6, 30, 93, 0.5);
+  // background-color: rgba(6, 30, 93, 0.5);
   // .title{
   //   // width: 100%;
   //   margin: 20px 2%;
@@ -120,7 +120,7 @@ export default {
       }
     }
     &:nth-child(2) {
-      width: 25%;
+      width: 10%;
       display: flex;
       justify-content: space-around;
       align-items: center;
@@ -129,7 +129,16 @@ export default {
       }
     }
     &:nth-child(3) {
-      width: 20%;
+      width: 10%;
+      display: flex;
+      justify-content: space-around;
+      align-items: center;
+      .box {
+        width: 150px;
+      }
+    }
+    &:nth-child(4) {
+      width: 10%;
       display: flex;
       justify-content: space-around;
       align-items: center;
@@ -138,7 +147,7 @@ export default {
       }
     }
     &:last-child {
-      width: 20%;
+      width: 24%;
       display: flex;
       justify-content: space-around;
       align-items: center;
@@ -168,6 +177,11 @@ export default {
           height: 40px;
           font-size: 18px;
         }
+        .flops{
+          width: 180px;
+          height: 40px;
+          font-size: 10px;
+        }
         .unit {
           margin-left: 10px;
           box-sizing: border-box;
@@ -182,7 +196,7 @@ export default {
 }
 .dv-decoration-10 {
   width: 96%;
-  margin: -7px 2% 0;
+  margin: 7px 2% 0;
   height: 5px;
 }
 </style>

src/views/system/jbdHome/board/component/getPieView.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="pieView">
-    <div style="height: 30px;line-height: 30px;text-align: left;padding-left: 10px;width: 390px;background-color: rgba(6,30,93,.5);">{{info.config.title||""}}</div>   
-    <div style="width:400px;height:300px;display: inline-block;background-color: rgba(6,30,93,.5);">
-      <div :id="info.config.idSelector" style="width:400px;height:300px;"> </div>
+    <div style="height: 30px;line-height: 30px;text-align: left;padding-left: 10px;">{{info.config.title||""}}</div>   
+    <div style="width:100%;height:320px;display: inline-block;">
+      <div :id="info.config.idSelector" style="width:100%;height:320px;"> </div>
     </div>
   </div>
 </template>
@@ -32,8 +32,8 @@ export default {
       let chartDom = document.getElementById(this.info.config.idSelector);
       const setEchartWH = {
         //设置控制图表大小变量
-        width: 400,
-        height: 300,
+        width: 350,
+        height: 320,
       };
       var myChart = echarts.init(chartDom, null, setEchartWH);
       var option;
@@ -80,6 +80,7 @@ export default {
 <style lang="scss" scoped>
 .pieView{
   display: flex;
-  width: 100vw;
+  width: 100%;
+  background-color: rgba(6,30,93,.5);
 }
 </style>

src/views/system/jbdHome/board/component/zhuzhuangtu.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="pieView">
-    <div style="height: 30px;line-height: 30px;text-align: left;padding-left: 10px;width: 190px;background-color: rgba(6,30,93,.5);">{{info.config.title}}</div>   
-    <div style="width:200px;height:300px;display: inline-block;background-color: rgba(6,30,93,.5);">
-      <div :id="info.config.idSelector" style="width:200px;height:300px;"> </div>
+    <div style="height: 30px;line-height: 30px;text-align: left;padding-left: 10px;width: 100%;">{{info.config.title}}</div>   
+    <div style="width:100%;height:320px;display: inline-block;">
+      <div :id="info.config.idSelector" style="width:100%;height:320px;"> </div>
     </div>
   </div>
 </template>
@@ -25,7 +25,7 @@ export default {
       var myChart = echarts.init(chartDom);
       const setEchartWH = {
         //设置控制图表大小变量
-        width: 200,
+        width: 250,
         height: 300,
       };
       var myChart = echarts.init(chartDom, null, setEchartWH);
@@ -49,11 +49,32 @@ export default {
             data: this.info.xData,
             interval: 1,
             axisTick: {
-              alignWithLabel: true,
+              alignWithLabel: false,
             },
             axisLabel: {
-              interval: 0,
-              rotate: 10
+              // rotate: -1,
+              // margin: 0,
+              fontSize: 12,
+              formatter:function(value){  
+                var str = ""; 
+                var num = 6; //每行显示字数 
+                var valLength = value.length; //该项x轴字数  
+                var rowNum = Math.ceil(valLength / num); // 行数  
+                if(rowNum > 1) {
+                    for(var i = 0; i < rowNum; i++) {
+                        var temp = "";
+                        var start = i * num;
+                        var end = start + num;
+                        
+                        temp = value.substring(start, end) + "\n";
+                        str += temp; 
+                    }
+                    return str;
+                } else {
+                    return value;
+                } 
+            
+            },
             },
             axisLine: {
             lineStyle: {
@@ -71,7 +92,8 @@ export default {
             lineStyle: {
               color: "#fff"
             }
-          }
+          },
+          interval:1
         },
         ],
         series: [
@@ -105,6 +127,6 @@ export default {
 .pieView {
   display: flex;
   width: 100%;
-  margin-left: 300px;
+  background-color: rgba(6,30,93,.5);
 }
 </style>

src/views/system/jbdHome/board/equipmentBoard.vue

@@ -20,45 +20,50 @@
         <div class="topCard">
           <top-bar v-if="topBarData.length" :info="topBarData" />
         </div>
-        <div class="middleCard">
+        <div class="middleCard" >
+          <div style="width:100%">
           <div class="middleCardLeft" >
             <middleCard v-if="MiddleLeftPieViewList.data.length" :info="MiddleLeftPieViewList" ref="middleCardLeft"/>
           </div>
-          <dv-decoration-2 :reverse="true" style="width:5px;height:330px;margin-left: 25px;" />
+          <dv-decoration-2 :reverse="true" style="width:5px;height:350px;margin:0 15px;" />
           <div class="middleCardCenter">
             <middleCard v-if="eBgRateData.data.length" :info="eBgRateData" ref="middleCardCenter"/>
           </div>
-          <dv-decoration-2 :reverse="true" style="width:5px;height:330px;margin-left: 25px;" />
+          <dv-decoration-2 :reverse="true" style="width:5px;height:350px;margin:0 15px;" />
           <div class="middleCardRight">
             <CarouselTabl v-if="config.data.length" :info="config"/>
           </div>
         </div>
+        </div>
         <dv-decoration-10 />
         <div class="bottomCard">
-          <div style="width:30%;display:flex;margin-left: 30px;">
+          <div style="width:31%;display:flex;">
             <div class="bottomCardLeft0">
               <middleCard v-if="weiHuSheBeiData.data.length" :info="weiHuSheBeiData" ref="sheBeiWeiHuRef"/>
             </div>
-            <div style="padding-left: 10px;">
+            <dv-decoration-2 :reverse="true" style="width:3%;height:330px;margin: 0 10px;" />
+            <div style="width:37%">
               <zhuzhuangtu v-if="sheBeiweiHuData.data.length" :info="sheBeiweiHuData"  ref="sheBeiWeiHuDataref"/>          
             </div>
           </div>
-          <dv-decoration-2 :reverse="true" style="width:5px;height:330px;margin-left: 15px;" />
-          <div style="width:30%;display:flex;margin-left: 15px;">
+          <dv-decoration-2 :reverse="true" style="width:5px;height:330px;margin: 0 10px;" />
+          <div style="width:31%;display:flex;">
             <div class="bottomCardLeft">
               <middleCard v-if="sheBeiHeChaData.data.length" :info="sheBeiHeChaData" ref="sheBeiHeChaRef"/>
             </div>
-            <div class="bottomCardCenter">
-              <zhuzhuangtu v-if="zhuantaiEData.data.length" :info="zhuantaiEData"  ref="zhuantaiEDataref"/>          
+            <dv-decoration-2 :reverse="true" style="width:5px;height:330px;margin: 0 10px;" />
+            <div style="width:37%">
+              <zhuzhuangtu v-if="bottomData.data.length" :info="bottomData"  ref="bottomCardLeft"/>          
             </div>
           </div>
-          <dv-decoration-2 :reverse="true" style="width:5px;height:330px;margin-left: 15px;" />
-          <div style="width:30%;display:flex;margin-left: 15px;">
+          <dv-decoration-2 :reverse="true" style="width:5px;height:330px;margin: 0 10px;" />
+          <div style="width:31%;display:flex;">
             <div class="bottomCardright">
               <middleCard v-if="jianDingjiaoZhunSheBeiData.data.length" :info="jianDingjiaoZhunSheBeiData" ref="jiandingRef"/>
             </div>
-            <div class="bottomCardright2">
-              <zhuzhuangtu v-if="bottomData.data.length" :info="bottomData"  ref="bottomCardLeft"/>
+            <dv-decoration-2 :reverse="true" style="width:3%;height:330px;margin: 0 10px;" />
+            <div style="width:40%">
+              <zhuzhuangtu v-if="zhuantaiEData.data.length" :info="zhuantaiEData"  ref="zhuantaiEDataref"/>
             </div>
           </div>
 
@@ -87,7 +92,7 @@ export default {
   data() {
     const d = new Date();
     return {
-      titleName: "设备信息查询",
+      titleName: "设备管理看板",
       year: d.toJSON().slice(0, 4),
       month: d.toJSON().slice(0, 7),
       today: d.toJSON().slice(0, 10),
@@ -117,7 +122,8 @@ export default {
       bottomData:{xData:[],data:[],config:{idSelector:""}},
       zhuantaiEData:{xData:[],data:[],config:{idSelector:""}},
       sheBeiweiHuData:{xData:[],data:[],config:{idSelector:""}},
-      config:{ header:['设备名称','设备编号','规格型号','最近检定/校准日期','设备状态'],data:[]}
+      config:{ header:['设备名称','设备编号','规格型号','最近检定/校准日期','设备状态'],data:[]},
+      zichan:0,
     };
   },
   created() {
@@ -139,6 +145,7 @@ export default {
       this.$router.back(-1);
     },
     updateAll(e) {
+      // this.getSheBeiMony();
       this.getTopBarData();
       this.getMiddleLeftPieView();
       this.getCarouselTable();
@@ -146,22 +153,24 @@ export default {
     },
     async getTopBarData(){
       let this_ = this;
-      let sql =`select a.Equipments,b.addEquipments,c.testEquipments,c1.testNoEquipments,d.checkEquipments,
+      let sql =`select a.Equipments,a1.mony,b.addEquipments,c.testEquipments,c1.testNoEquipments,d.checkEquipments,
       d1.checkNoEquipments,e.goodEquipments,f.scrapEquipments,g.limitedEquipments,h.weiHuNoEquipments,h1.weiHuEquipments
       from  
       (select count(*) as Equipments from t_sbdj) as a,
-      (select count(*) as addEquipments  from t_sbdj where gou_jin_ri_qi_ LIKE '%2022-12%') as b,
+      (select zi_chan_yuan_zhi_ as mony FROM t_sbdj) as a1,
+      (select count(*) as addEquipments  from t_sbdj where gou_jin_ri_qi_ LIKE '${this_.month}') as b,
       (select count(*) as testEquipments from t_sbjdxzqr where shi_fou_guo_shen_ ='1') as c,
       (select count(*) as testNoEquipments from t_sbjdxzqr) as c1,
-      (select count(*) as checkEquipments from t_sbhcjlb where create_time_ LIKE '%2022-12%' and shi_fou_guo_shen_ ='1') as d,
-      (select count(*) as checkNoEquipments from t_sbhcjlb where create_time_ LIKE '%2022-12%') as d1,
+      (select count(*) as checkEquipments from t_sbhcjlb where create_time_ LIKE '${this_.month}' and shi_fou_guo_shen_ ='1') as d,
+      (select count(*) as checkNoEquipments from t_sbhcjlb where create_time_ LIKE '${this_.month}') as d1,
       (select count(*) as goodEquipments  from t_sbdj where she_bei_zhuang_ta ='正常') as e,
       (select count(*) as scrapEquipments  from t_sbdj where she_bei_zhuang_ta ='停用' or she_bei_zhuang_ta ='报废/停用') as f,
       (select count(*) as limitedEquipments  from t_sbdj where she_bei_zhuang_ta ='限制使用') as g,
-      (select count(*) as weiHuNoEquipments  from t_mjsbwhjhzb where create_time_ LIKE '%2022-12%') as h,
-      (select count(*) as weiHuEquipments  from t_mjsbwhbyjlby where create_time_ LIKE '%2022-12%' and shi_fou_guo_shen_ ='1') as h1`;
+      (select count(*) as weiHuNoEquipments  from t_mjsbwhjhzb where create_time_ LIKE '${this_.month}') as h,
+      (select count(*) as weiHuEquipments  from t_mjsbwhbyjlby where create_time_ LIKE '${this_.month}' and shi_fou_guo_shen_ ='1') as h1`;
      await curdPost("sql",sql).then(res=>{
         const data = res.variables.data
+        let zichan = this_.getAllMonyInt(data);
         let eIntactnessRate = Number(((data[0].goodEquipments/data[0].Equipments).toFixed(3)+"").slice(2,4));
         let eBadRate = 100 - parseInt(eIntactnessRate);
         let obj ={};
@@ -169,14 +178,14 @@ export default {
         obj.name = "正常设备";
         this_.MiddleLeftPieViewList.data.push(obj);
         obj ={};
-        obj.value = data[0].scrapEquipments;
-        obj.name = "停用/报废";
+        obj.value = data[0].limitedEquipments;
+        obj.name = "备用设备";
         this_.MiddleLeftPieViewList.data.push(obj);
         obj ={};
-        obj.value = data[0].limitedEquipments;
-        obj.name = "限制使用";
+        obj.value = data[0].scrapEquipments;
+        obj.name = "停用/报废";
         this_.MiddleLeftPieViewList.data.push(obj);
-        this_.MiddleLeftPieViewList.color = ['#ff7070','#ffee00','#5c7bd9'];
+        this_.MiddleLeftPieViewList.color = ['#339933','#FFFF66','#FF0033'];
         this_.MiddleLeftPieViewList.config.title = "设备状态工作分布";
         this_.MiddleLeftPieViewList.config.idSelector = "main2";
         this_.$nextTick(()=>{
@@ -225,7 +234,7 @@ export default {
               danwei:'台'
             },
             {
-              label: '已维护设备数',
+              label: '本月已维护设备数',
               value: data[0].weiHuEquipments,
               danwei:'台'
             }
@@ -255,7 +264,7 @@ export default {
               danwei:'台'
             },
             {
-              label: '本月核查设备数',
+              label: '本月已核查设备数',
               value: data[0].checkEquipments,
               danwei:'件'
             }
@@ -270,13 +279,13 @@ export default {
               danwei:'%'
             },
             {
-              label: '设备损坏率',
+              label: '设备故障率',
               value: eBadRate,
               danwei:'%'
             },
             {
               label: '设备总值',
-              value:100,
+              value:zichan,
               danwei:'元'
             },
           ]
@@ -286,7 +295,7 @@ export default {
       this_.bottomData.xData =["计划核查设备数","已核查设备数"];
       this_.bottomData.data.push(data[0].checkNoEquipments);
       this_.bottomData.data.push(data[0].checkEquipments);
-      this_.bottomData.config.title ="核查设备数量";
+      this_.bottomData.config.title ="核查设备柱状图";
       this_.bottomData.config.idSelector ="main4";
       // this_.$nextTick(()=>{
       //   setTimeout(() => {
@@ -296,13 +305,13 @@ export default {
       this_.zhuantaiEData.xData =["计划检定/校准设备数","已完成检定/校准设备数",];
       this_.zhuantaiEData.data.push(data[0].testNoEquipments);
       this_.zhuantaiEData.data.push(data[0].testEquipments);
-      this_.zhuantaiEData.config.title ="设备检定/校准设备数量";
-      this_.zhuantaiEData.config.idSelector ="main3";
+      this_.zhuantaiEData.config.title ="设备检定/校准设备柱状图";
+      this_.zhuantaiEData.config.idSelector ="main3"; 
       //维护设备柱状图
-      this_.sheBeiweiHuData.xData =["计划维护设备数","已完成维护设备数",];
+      this_.sheBeiweiHuData.xData =["计划维护设备数","已完成设备数",];
       this_.sheBeiweiHuData.data.push(data[0].weiHuNoEquipments);
       this_.sheBeiweiHuData.data.push(data[0].weiHuEquipments);
-      this_.sheBeiweiHuData.config.title ="设备维护设备";
+      this_.sheBeiweiHuData.config.title ="设备维护柱状图";
       this_.sheBeiweiHuData.config.idSelector ="mainWeiHuZ";
       this_.$nextTick(()=>{
         setTimeout(() => {
@@ -318,9 +327,9 @@ export default {
       this_.eBgRateData.data.push(objRate);
       objRate ={};
       objRate.value = eBadRate;
-      objRate.name = "设备损坏率";
+      objRate.name = "设备故障率";
       this_.eBgRateData.data.push(objRate);
-      this_.eBgRateData.color = ['#0dcbd4','#5470c6'];
+      this_.eBgRateData.color = ['#339933','#FF0033'];
       this_.eBgRateData.config.title = "设备完好率分布";
       this_.eBgRateData.config.idSelector = "main1";
       //设备维护
@@ -332,8 +341,8 @@ export default {
       objweihu.value =  data[0].weiHuEquipments;
       objweihu.name = "已维护设备数";
       this_.weiHuSheBeiData.data.push(objweihu);
-      this_.weiHuSheBeiData.color = ['#0dcbd4','#5470c6'];
-      this_.weiHuSheBeiData.config.title = "设备核查分布";
+      this_.weiHuSheBeiData.color = ['#5470c6','#38a838'];
+      this_.weiHuSheBeiData.config.title = "设备维护分布";
       this_.weiHuSheBeiData.config.idSelector = "mainWeiHu";
       //设备核查
       let objHeCha ={};
@@ -344,7 +353,7 @@ export default {
       objHeCha.value =  data[0].checkEquipments;
       objHeCha.name = "已核查设备数";
       this_.sheBeiHeChaData.data.push(objHeCha);
-      this_.sheBeiHeChaData.color = ['#0dcbd4','#5470c6'];
+      this_.sheBeiHeChaData.color = ['#5470c6','#38a838'];
       this_.sheBeiHeChaData.config.title = "设备核查分布";
       this_.sheBeiHeChaData.config.idSelector = "mainHeCha";
       //设备检定校准
@@ -354,9 +363,9 @@ export default {
       this_.jianDingjiaoZhunSheBeiData.data.push(objJianding);
       objJianding ={};
       objJianding.value =  data[0].testEquipments;
-      objJianding.name = "已检定/校准设备数";
+      objJianding.name = "已完成设备数";
       this_.jianDingjiaoZhunSheBeiData.data.push(objJianding);
-      this_.jianDingjiaoZhunSheBeiData.color = ['#0dcbd4','#5470c6'];
+      this_.jianDingjiaoZhunSheBeiData.color = ['#5470c6','#38a838'];
       this_.jianDingjiaoZhunSheBeiData.config.title = "设备检定校准分布";
       this_.jianDingjiaoZhunSheBeiData.config.idSelector = "mainJianDing";
       this_.$nextTick(()=>{
@@ -388,7 +397,7 @@ export default {
             data1.push(item.she_bei_ming_cheng_);
             data1.push(item.she_bei_shi_bie_h);
             data1.push(item.gui_ge_xing_hao_);
-            data1.push(item.zhuang_tai_fen_xi || "asda");
+            data1.push(item.zhuang_tai_fen_xi || "");
             data1.push(item.she_bei_zhuang_ta);
             this_.config.data.push(data1);
           });
@@ -396,7 +405,32 @@ export default {
         .catch((err) => {
           console.log(err);
         });
-    }
+    },
+    getAllMonyInt (monyArr){
+      let mony = 0;
+      let filterMony
+      monyArr.forEach(item=>{
+        if(item.mony.includes("元")){
+           filterMony = item.mony.slice(0,item.mony.length-1)*1;
+           mony +=filterMony
+        }
+
+      })
+      // console.log(mony.toFixed(2))
+      // return mony.toFixed(2);
+      return mony;
+    },
+    // async getSheBeiMony (){
+    //   let this_=  this;
+    //   const sql = "select zi_chan_yuan_zhi_ as mony FROM t_sbdj";
+    //   await curdPost("sql",sql).then(res=>{
+    //     let data = res.variables.data;
+    //     this_.zichan=  this_.getAllMonyInt(data);
+    //     console.log(this_.zichan);
+    //   }).catch(err=>{
+    //     console.error(err)
+    //   })
+    // }
   },
 };
 </script>
@@ -492,22 +526,20 @@ export default {
     width: 100%;
   }
   .middleCard,.bottomCard{
-    width: 100vw;
+    width: 100%;
+    margin-left: 30px;
     // margin-top: 30px;
     div{
-      display: inline-block;
+      display: inline-block;                                                        
     }
     .middleCardLeft{
-      width: 20%;
-      margin-left: 30px;
+      width: 22%;
     }
     .middleCardCenter{
-      width: 20%;
-      margin-left: 15px;
+      width: 22%;
     }
     .middleCardRight{
-      margin-left: 30px;
-      width: 50%;
+      width: 48%;
     }
     padding: 10px;
   }
@@ -516,9 +548,9 @@ export default {
     div{
       display: inline-block;
     }
-    // .bottomCardLeft0{
-
-    // }
+    .bottomCardLeft0,.bottomCardLeft,.bottomCardright{
+      width: 70%;
+    }
     // .bottomCardCenter0{
 
     // }
@@ -541,7 +573,7 @@ export default {
 }
 .dv-decoration-10 {
   width: 96%;
-  margin: -7px 2% 0;
+  margin: 7px 2% 0;
   height: 5px;
 }
 </style>