优化

licp

2024-07-15 f265469d0504f7888fab731a6b9cb295e26f7adf

优化

 src/assets/api/controller.js

@@ -166,6 +166,7 @@
  delInsOrderTemplate: "/insOrder/delInsOrderTemplate", //删除检验单模板
  selectSampleAndProductByOrderId: "/insOrder/selectSampleAndProductByOrderId", //通过检验单查询检验数据（数据查看）
  costStatistics: "/insOrder/costStatistics", //费用统计
  costStatistics2: "/insOrder/costStatistics2", //费用统计
  selectSampleDefects: "/insOrder/selectSampleDefects", //样品缺陷指标
  updateStatus: "/insOrder/updateStatus", //将待审核更新成撤销状态
  updateInspected: "/insOrder/updateInspected", //将待检验的的撤销进行更改

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

@@ -1708,7 +1708,6 @@
              this.$nextTick(()=>{
                this.tableList = this.result.value.tableList
                this.param = this.result.value.param
                console.log(11111,this.param)
                this.saveInsContext()
              })
              break;

 src/components/do/b6-device-management/b6-data-acquisition-config.vue

@@ -71,7 +71,7 @@
          </el-form-item>
        </div>
        <div class="fomItem1">
          <el-form-item class="fomItemInput" label="公式:" prop="formula">
          <el-form-item class="fomItemInput" label="公式:">
            <el-input v-model="configForm.formula" @change="evalResult"></el-input>
          </el-form-item>
        </div>

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

@@ -410,7 +410,7 @@
                        v-model="configForm.y"></el-input>
            </div>
      <div class="search_thing">
                <div class="search_label"><span style="color:red;margin-right: 4px;">*</span>公式：</div>
                <div class="search_label">公式：</div>
                <el-input size="small" placeholder="请输入" clearable
                        v-model="configForm.formula"></el-input>
            </div>
@@ -663,6 +663,23 @@
            this.componentData.selectField.insProductIds.select = [...this.componentData.selectField.insProductIds.select,...children]
            return m
          })
          this.options.forEach(item=>{
            if(item.children.length==0){
              item.children = null;
            }else{
              item.children.forEach(m=>{
                if(m.children.length==0){
                  m.children = null;
                }else{
                  m.children.forEach(n=>{
                    if(n.children&&n.children.length==0){
                      n.children = null;
                    }
                  })
                }
              })
            }
          })
                })
      },
            handleClose() {
@@ -887,10 +904,6 @@
        }
        if(!this.configForm.y){
          this.$message.error('请填写Y');
          return
        }
        if(!this.configForm.formula){
          this.$message.error('请填写公式');
          return
        }


 src/components/view/b1-expenses.vue

@@ -74,6 +74,7 @@
          <el-button size="small" @click="refresh()">重 置</el-button>
          <el-button size="small" type="primary" @click="refreshTable()">查 询</el-button>
        </div>
        <div class="search_thing" style="padding-left: 70px;">总价：{{total}}</div>
      </div>
      <div class="table">
        <ValueTable ref="ValueTable" :url="$api.insOrder.costStatistics" :componentData="componentData" :key="upIndex"
@@ -185,7 +186,8 @@
        upIndex: 0,
        claimVisible: false,
        dates: [],
        index2: 0
        index2: 0,
        total: 0
      }
    },
    mounted() {
@@ -195,6 +197,17 @@
      this.getPower()
    },
    methods: {
      getTotal(){
        this.$axios.post(this.$api.insOrder.costStatistics2, {
          entity:this.componentData.entity
        }, {
          headers: {
            'Content-Type': 'application/json'
          }
        }).then(res => {
          this.total = res.data.total
        })
      },
      getDates(){
        //当前月第一天
        var y = new Date().getFullYear(); //获取年份
@@ -215,11 +228,13 @@
      },
      refreshTable() {
        this.$refs['ValueTable'].selectList()
        this.getTotal()
      },
      refresh() {
        this.componentData.entity = this.HaveJson(this.entityCopy)
        this.componentData.init = true
        this.getDates()
        this.getTotal()
        this.upIndex++
      },
      handleWeave() {
@@ -255,6 +270,7 @@
        }
        this.componentData.entity.dates = JSON.stringify(val)
        this.$refs['ValueTable'].selectList()
        this.getTotal()
      }
    }
  }

 src/main.js

@@ -18,9 +18,9 @@
Vue.prototype.PROJECT = '检测中心'
// Vue.prototype.PROJECT = '装备电缆'
//本地
Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
const javaApi = 'http://192.168.15.249:8001';
const javaApi = 'http://172.20.10.5:8001';

//云
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";