完成人员管理、角色管理优化，完成检验任务光纤配置

licp

2024-05-29 1f1f6b2f9c8b3614cc8c182b8c4a204cda0e0a9b

完成人员管理、角色管理优化，完成检验任务光纤配置

 src/components/do/b1-ins-order/fiberoptic-config.vue

@@ -635,6 +635,7 @@
          a.bushing = this.bushing
        })
        this.$message.success('已保存')
        console.log(11111111,this.bushing)
      }
    }
  }

 src/components/do/b1-inspect-order-plan/Inspection.vue

@@ -175,6 +175,9 @@
    <el-row class="title">
      <el-col :span="12" style="padding-left: 20px;">检验单详情</el-col>
      <el-col :span="12" style="text-align: right;">
        <el-button size="small" type="primary" @click="fiberOpticVisible=true" v-if="fiberOptic.length>0">光纤切换</el-button>
        <el-button size="small" type="primary" @click="fiberOpticTapeVisible=true" v-if="fiberOpticTape.length>0">光纤带切换</el-button>
        <el-button size="small" type="primary" @click="bushingVisible=true" v-if="bushing.length>0">套管切换</el-button>
        <el-button size="small" type="primary" @click="sampleVisible=true">样品切换</el-button>
        <el-button size="small" type="primary" @click="taskVisible=true">任务切换</el-button>
        <el-button size="small" type="primary" @click="addVerifyDia = true" v-show="state==1"
@@ -290,6 +293,43 @@
        </table>
      </div>
    </div>
    <el-drawer title="光纤切换" :visible.sync="fiberOpticVisible" :size="500">
      <el-table class="el-table" ref="fiberOpticTable" :data="fiberOptic" height="100%" tooltip-effect="dark" border
        highlight-current-row @row-click="handleChangeOptic" :row-class-name="tableRowClassName"
        :current-row-key="currentKey" :row-key="record=>record.index" v-if="fiberOpticVisible">
        <el-table-column type="index" align="center" label="序号" width="70px" :key="Math.random()">
        </el-table-column>
        <el-table-column prop="bushColor" label="管套色标" min-width="100px" show-overflow-tooltip></el-table-column>
        <el-table-column prop="color" label="光纤色标" min-width="100px" show-overflow-tooltip></el-table-column>
        <el-table-column prop="model" label="光纤规格" min-width="130px" show-overflow-tooltip
         ></el-table-column>
        <el-table-column prop="standard" label="参考标准" width="100px" show-overflow-tooltip></el-table-column>
      </el-table>
    </el-drawer>
    <el-drawer title="光纤带切换" :visible.sync="fiberOpticTapeVisible" :size="500">
      <el-table class="el-table" ref="fiberOpticTapeTable" :data="fiberOpticTape" height="100%" tooltip-effect="dark" border
        highlight-current-row @row-click="handleChangeTape" :row-class-name="tableRowClassName"
        :current-row-key="currentKey" :row-key="record=>record.index" v-if="fiberOpticTapeVisible">
        <el-table-column type="index" align="center" label="序号" width="70px" :key="Math.random()">
        </el-table-column>
        <el-table-column prop="code" label="光纤带编号" min-width="110px" show-overflow-tooltip></el-table-column>
        <el-table-column prop="model" label="光纤带规格" min-width="110px" show-overflow-tooltip></el-table-column>
        <el-table-column prop="standard" label="参考标准" width="90px" show-overflow-tooltip></el-table-column>
        <el-table-column prop="num" label="光纤检测量" min-width="110px" show-overflow-tooltip
          ></el-table-column>
      </el-table>
    </el-drawer>
    <el-drawer title="套管切换" :visible.sync="bushingVisible" :size="500">
      <el-table class="el-table" ref="bushingTable" :data="bushing" height="100%" tooltip-effect="dark" border
        highlight-current-row @row-click="handleChangeBushing" :row-class-name="tableRowClassName"
        :current-row-key="currentKey" :row-key="record=>record.index" v-if="bushingVisible">
        <el-table-column type="index" align="center" label="序号" width="70px" :key="Math.random()">
        </el-table-column>
        <el-table-column prop="color" label="管色标" min-width="110px" show-overflow-tooltip></el-table-column>
        <el-table-column prop="num2" label="标量" min-width="110px" show-overflow-tooltip></el-table-column>
        <el-table-column prop="num3" label="测试量" min-width="90px" show-overflow-tooltip></el-table-column>
      </el-table>
    </el-drawer>
    <el-drawer title="样品切换" :visible.sync="sampleVisible" :size="500">
      <el-table class="el-table" ref="productTable" :data="sampleProduct" height="100%" tooltip-effect="dark" border
        highlight-current-row @row-click="handleChangeSample" :row-class-name="tableRowClassName"
@@ -423,7 +463,16 @@
        addVerifyDia: false,
        verifyUser: null,
        personList: [],
        enumList: []
        enumList: [],
        fiberOpticVisible:false,
        fiberOpticTapeVisible:false,
        bushingVisible:false,
        fiberOpticTape:[],//光纤带列表
        fiberOptic:[],//光纤列表
        bushing:[],//套管列表
        currentFiberOpticTape:null,//当前光纤带
        currentFiberOptic:null,//当前光纤
        currentBushing:null,//当前套管
      }
    },
    created() {
@@ -469,6 +518,14 @@
          this.getTableLists();
          this.componentData.currentId = val;
          this.currentKey = 1;

          // 清空光纤配置相关数据
          this.fiberOpticTape = []
          this.currentFiberOpticTape = null;
          this.fiberOptic = []
          this.currentFiberOptic = null;
          this.bushing = []
          this.currentBushing = null;
        })
      },
      currentTable(val1, val0) {
@@ -484,9 +541,71 @@
      }
    },
    methods: {
      handleChangeBushing(row, column, event){
        this.currentBushing = row;
        this.fiberOpticTape = []
        this.currentFiberOpticTape = null;
        this.fiberOptic = []
        this.currentFiberOptic = null;
        if(row.fiber&&row.fiber.length>0){
          // 直接配置光纤
          this.fiberOptic = row.fiber;
        }else if(row.fibers&&row.fibers.length>0){
          // 配置光纤带后，再配置光纤
          this.fiberOpticTape = row.fibers;
        }
        this.bushingVisible = false;
      },
      handleChangeOptic(row, column, event){
        this.currentFiberOptic = row;
        this.currentFiberOptic.productList.forEach(a => {
          this.param[a.id] = {
            insValue: [],
            comValue: [],
            resValue: null,
            equipValue: [],
            equipName: [],
            insResult: null
          }
        })
        this.getTableLists0(row)
        this.fiberOpticVisible = false;
        this.currentKey = row.index
      },
      handleChangeTape(row, column, event){
        this.currentFiberOpticTape = row;
        this.param = {}
        this.fiberOptic = []
        this.currentFiberOptic = null;
        this.currentFiberOpticTape.productList.forEach(a => {
          this.param[a.id] = {
            insValue: [],
            comValue: [],
            resValue: null,
            equipValue: [],
            equipName: [],
            insResult: null
          }
        })
        this.getTableLists0(row)
        if(row.fiber&&row.fiber.length>0){
          // 配置光纤
          this.fiberOptic = row.fiber;
        }
        this.fiberOpticTapeVisible = false;
        this.currentKey = row.index
      },
      handleChangeSample(row, column, event) {
        this.currentSample = row;
        this.param = {}
        // 清空光纤配置相关数据
        this.fiberOpticTape = []
        this.currentFiberOpticTape = null;
        this.fiberOptic = []
        this.currentFiberOptic = null;
        this.bushing = []
        this.currentBushing = null;

        this.currentSample.insProduct.forEach(a => {
          this.param[a.id] = {
            insValue: [],
@@ -497,6 +616,10 @@
            insResult: null
          }
        })
        let bushing = this.currentSample.insProduct.bushing
        if(bushing&&bushing.length>0){
          this.bushing = bushing
        }
        // this.handleTableData()
        this.getTableLists();
        this.sampleVisible = false;
@@ -590,6 +713,29 @@
          this.handleTableData()
        }
      },
      // 光纤配置相关模板table列表
      getTableLists0(obj){
        const mySet1 = new Set();
        this.tableLists = obj.productList.filter(m => {
          let num0 = mySet1.size;
          if (m.templateId != null&&m.template != null) {
            mySet1.add(JSON.stringify({
              template: m.template,
              templateId: m.templateId
            }))
          }
          let num1 = mySet1.size;
          if (num1 > num0) {
            return m
          }
        });
        if (this.tableLists && this.tableLists.length > 0) {
          this.tableList = null;
          this.tableList = [this.tableLists[0]]
          this.currentTable = this.tableLists[0].templateId;
          this.handleTableData()
        }
      },
      handleTableData() {
        this.excelMethodList = []
        this.widthList = this.tableList[0].style.columnlen;

 src/components/view/b3-classes.vue

@@ -68,7 +68,7 @@
            </div>
          </div>
        </div>
        <div class="scroll-right">
        <div class="scroll-right" id="nav" style="cursor: move;">
          <div class="content">
            <div class="content-title content-title-right" style="border-bottom: 0;">
              <div class="content-title-item" v-for="(item,index) in weeks" :key="'b'+index">
@@ -324,6 +324,7 @@
    }
    this.monthList.reverse()
    // this.getPower()
    this.scrollInit()
  },
  methods: {
    refresh(){
@@ -634,6 +635,33 @@
        return obj.label
      }
      return '无'
    },
    scrollInit() {
      // 获取要绑定事件的元素
      const nav = document.getElementById("nav")
      var flag; // 鼠标按下
      var downX; // 鼠标点击的x下标
      var scrollLeft; // 当前元素滚动条的偏移量
      nav.addEventListener("mousedown", function(event) {
        flag = true;
        downX = event.clientX; // 获取到点击的x下标
        scrollLeft = this.scrollLeft; // 获取当前元素滚动条的偏移量
      });
      nav.addEventListener("mousemove", function(event) {
        if (flag) { // 判断是否是鼠标按下滚动元素区域
          var moveX = event.clientX; // 获取移动的x轴
          var scrollX = moveX - downX; // 当前移动的x轴下标减去刚点击下去的x轴下标得到鼠标滑动距离
          this.scrollLeft = scrollLeft - scrollX // 鼠标按下的滚动条偏移量减去当前鼠标的滑动距离
        }
      });
      // 鼠标抬起停止拖动
      nav.addEventListener("mouseup", function() {
        flag = false;
      });
      // 鼠标离开元素停止拖动
      nav.addEventListener("mouseleave", function(event) {
        flag = false;
      });
    }
  }
}
@@ -698,6 +726,8 @@
  min-height: calc(100% - 10px); /* 视口高度 */
  margin-left: 220px;
  overflow-x: scroll;
  /* overflow-x: hidden; */
  cursor: move;
}

.content {

 src/components/view/person-manage.vue

@@ -252,9 +252,6 @@
</template>

<script>
  import {
    compileToFunctions
  } from 'vue-template-compiler'
  import ValueTable from '../tool/value-table.vue'
  export default {
    components: {
@@ -438,6 +435,7 @@
        })
      },
      opeaAdd() {
        console.log(this.addOb.fatherId,this.selectTree)
        if (!this.addOb.fatherId || this.selectTree == '' || this.selectTree == '全部') {
          this.$message.error('请选择一个组织')
          return
@@ -538,7 +536,7 @@
      },
      getNodeParent(val) {
        if (val.parent != null) {
          this.selectTree += ' - ' + val.label
          this.selectTree += ' - ' + val.data.name
          this.getNodeParent(val.parent)
        }
      },
@@ -600,7 +598,7 @@
        })
      },
      nodeClick2(ob, node, el) {
        this.getNodeParent(node)
        this.getNodeParent0(node)
        if (ob.id !== 'SC21') {
          this.personLoad = true
          this.$axios.post(this.$api.companies.selectSimpleList, {
@@ -613,10 +611,10 @@
          })
        }
      },
      getNodeParent(val){
      getNodeParent0(val){
        this.currentCompaniesList[val.level-1] = val.data.id
        if(val.parent!=null){
          this.getNodeParent(val.parent)
          this.getNodeParent0(val.parent)
        }
      },
      handleSelectionChange(val) {

 src/components/view/role-manage.vue

@@ -76,8 +76,8 @@
            <template slot="title">
              <i class="el-icon-circle-plus-outline" style="margin-right: 10px;"></i>{{category}}
            </template>
            <div style="padding: 3px 30px;" v-for="(a, ai) in menu" :key="ai" v-if="a.type==category"><el-checkbox
                v-model="a.isClick" :disabled="type=='查看'">{{a.remark}}</el-checkbox></div>
            <div style="padding: 3px 30px;display: flex;align-items: center;justify-content: space-between;" v-for="(a, ai) in menu" :key="ai" v-if="a.type==category" ><el-checkbox
                v-model="a.isClick" :disabled="type=='查看'">{{a.remark}}</el-checkbox> <el-checkbox v-model="a.look" v-if="a.remark.includes('查询')||a.remark.includes('获取')" :disabled="type=='查看'">只看我</el-checkbox></div>
          </el-collapse-item>
          <!-- <el-collapse-item title="查询">
                        <el-row style="padding: 3px 30px;" v-for="(a, ai) in menu" :key="ai" v-if="a.type=='查询'">

 src/main.js

@@ -14,7 +14,7 @@
//本地
Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
const javaApi = 'http://192.168.11.200:8001';//李
// const javaApi = 'http://10.20.102.168:8001';//张
// const javaApi = 'http://192.168.11.249:8001';//张
// const javaApi = 'http://172.20.10.3:8001';//姜
// const javaApi = 'http://192.168.11.2:8001';//柴
//  const javaApi = 'http://127.0.0.1:8001';//晏