合并冲突

licp

2024-05-27 798db047afc6346e96460f00b6fb30576bcfd328

合并冲突

 src/components/view/b1-inspection-order.vue

@@ -121,7 +121,7 @@
            <div class="search_thing" style="width: 20%;" v-if="more">
              <div class="search_label">下单人：</div>
              <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                  v-model="componentData.entity.value1" @keyup.enter.native="refreshTable()"></el-input></div>
                  v-model="componentData.entity.name" @keyup.enter.native="refreshTable()"></el-input></div>
            </div>
            <div class="search_thing" style="width: 20%;" v-if="more">
              <div class="search_label">工程名称：</div>
@@ -273,7 +273,7 @@
            sampleModel: null,
            sampleCode: null,
                        state: 0,
            value1:null,
            name:null,
            engineering:null,
            production:null,
                        orderBy: {

 src/main.js

@@ -17,8 +17,8 @@
// const javaApi = 'http://10.20.102.168: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';//晏
const javaApi = 'http://114.132.189.42:1234';//测试服
 const javaApi = 'http://127.0.0.1:8001';//晏
// const javaApi = 'http://114.132.189.42:1234';//测试服
//胜云服务器
// Vue.prototype.LOCATIONVUE = "http://syxt.shxiao2.cn";
// const javaApi = 'http://122.114.52.69:8001';