完成装备三级检验项修改

licp

2024-07-23 3200a6bea7a44154936f426a69d2596b4415c0aa

完成装备三级检验项修改

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

@@ -1653,6 +1653,7 @@
                  }
                }
              })
              console.log(1111,str)
              if (str != '') {
                let count2 = 0
                for (let i in this.currentSample.insProduct) {
@@ -1665,6 +1666,7 @@
                  .insProduct[i].inspectionItemSubclass==null||this.currentSample
                  .insProduct[i].inspectionItemSubclass==undefined?'':this.currentSample
                  .insProduct[i].inspectionItemSubclass
                  console.log(inspectionItemClass, inspectionItem, inspectionItemSubclass)
                  if (this.currentSample.insProduct[i].templateId === a.templateId && inspectionItemClass +inspectionItem+inspectionItemSubclass ===
                    str) {
                    ids.push({

 src/components/view/a6-device-overview.vue

@@ -152,7 +152,7 @@
            </div>
        </div>
        <div class="table" v-loading="loading">
      <scroll-pagination @load="refreshTable" :finishLoding="finishLoding" :list="list" v-if="list.length>1||loading">
      <scroll-pagination @load="refreshTable" :finishLoding="finishLoding" :list="list" v-if="list.length>0||loading">
        <ul class="card">
        <li v-for="(m,i) in list" :key="i">
          <el-image class="img" :src="javaApi+'/img/'+m.imageUpload">

 src/components/view/a6-personnel-overview.vue

@@ -91,7 +91,7 @@
            </div>
        </div>
        <div class="table" v-loading="loading">
      <scroll-pagination @load="refreshTable" :finishLoding="finishLoding" :list="list" v-if="list.length>1||loading">
      <scroll-pagination @load="refreshTable" :finishLoding="finishLoding" :list="list" v-if="list.length>0||loading">
        <ul class="card" style="margin-top: 10px;">
        <li v-for="(m,i) in list" :key="i">
          <el-image style="width: 80px;

 src/components/view/b1-inspect-order-plan.vue

@@ -233,9 +233,9 @@
                            font: '检验',
                            type: 'text',
                            method: 'handleInspection',
                            disabFun: (row, index) => {
                                return row.userId == null || row.insState == 3 || row.insState == 5||JSON.parse(localStorage.getItem("user")).name != row.userName
                            }
                            // disabFun: (row, index) => {
                            //     return row.userId == null || row.insState == 3 || row.insState == 5||JSON.parse(localStorage.getItem("user")).name != row.userName
                            // }
              // disabFun: (row, index) => {
                            //     return row.userId == null || row.insState == 3 || row.insState == 5
                            // }

 src/components/view/index-index.vue

@@ -378,7 +378,7 @@
            <div class="tab-item" style="cursor: pointer;" :class="{active:currentIndex==5}" @click="currentIndex=5">通知通告</div>
          </div>
          <div class="right-3-list" v-loading="listLoading">
            <scroll-pagination @load="getList" :finishLoding="finishLoding" :list="list" v-if="list.length>1||listLoading">
            <scroll-pagination @load="getList" :finishLoding="finishLoding" :list="list" v-if="list.length>0||listLoading">
              <div class="list3-item" v-for="(m,i) in list" :key="i">
              <div class="list3-item-title">
                <img src="../../../static/img/index-tip.svg" alt="">

 src/main.js

@@ -15,13 +15,13 @@
Vue.prototype.$Big = Big;

// 项目切换
Vue.prototype.PROJECT = '检测中心'
// Vue.prototype.PROJECT = '装备电缆'
// Vue.prototype.PROJECT = '检测中心'
Vue.prototype.PROJECT = '装备电缆'
//本地
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
// 张：192.168.45.249
const javaApi = 'http://172.20.10.4:8001';
// const javaApi = 'http://172.20.10.4:8001';

//云
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
@@ -33,7 +33,7 @@

//装备电缆测试库
// Vue.prototype.LOCATIONVUE = "http://10.16.173.59";
// const javaApi = 'http://10.16.173.59:8001';
const javaApi = 'http://10.16.173.59:8001';
// const javaApi = 'http://192.168.47.2:8001';

Vue.prototype.HaveJson = (val) => {

 src/view/notice.vue

@@ -7,7 +7,7 @@
  :before-close="handleClose" style="height: 100vh;z-index: 9999999;" size="450px">
    <div class="notice-content" v-loading="loading">
      <el-button size="small" type="primary" @click="handleDropdownAll(1)" style="margin-bottom: 10px;margin-left: 330px;">全部已读</el-button>
      <scroll-pagination @load="refresh" :finishLoding="finishLoding" :list="list" style="height: calc(100% - 50px);" v-if="list.length>1||loading">
      <scroll-pagination @load="refresh" :finishLoding="finishLoding" :list="list" style="height: calc(100% - 50px);" v-if="list.length>0||loading">
        <div
        class="notice-content-item"
        v-for="(m,i) in list"