Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

build/utils.js

@@ -15,9 +15,12 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // ['index','appoint'，'configManager','homepage','inward','queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
-let devModules = ['all'];
-// let devModules = ['index','SporadicManage','inward','statisticalReport'];
-// let devModules = ['index','appoint','TMS'];
+// let devModules = ['all'];
+<<<<<<< HEAD
+let devModules = ['index','statisticalReport','appoint','RMS'];
+=======
+let devModules = ['index','queue','RMS'];
+>>>>>>> dev
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

config/index.js

@@ -56,16 +56,17 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    target: "http://172.16.33.166:8080",
+    // target: "http://172.16.33.166:8080",
     // target: "http://172.16.33.162:8019",
-    // target: "http://localhost:8080",
+    target: "http://192.168.1.102:8019",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"
     }
   },
   "/views/api/v1": {
-    target: "http://172.16.33.166:8080",
+    // target: "http://172.16.33.166:8080",
+    target: "http://192.168.1.102:8019",
     ws: true,
     pathRewrite: {
       "^/views/api/v1": "/api/v1"

src/components/DilCommonUI/packages/table/src/table.js

@@ -70,7 +70,6 @@ export default {
         }
         //判断是否是带分页查询
         if(this.isKuang){
-          console.log(11111111111111111111111111);
           // 发送请求
           this.axios
           .post(url, data, {
@@ -90,7 +89,6 @@ export default {
             this.isShow = true;
           });
         }else{
-          console.log(2222222222222222222222222);
           // 发送请求
           this.axios
             .post(url, data, {
@@ -107,7 +105,6 @@ export default {
               //执行成功的回调
               this.$emit('func',response.data.data);
               this.refreshColumnData(d.columnData);
-
               this.isShow = true;
               //若父组件存在要合计的值
               if(this.$parent.totalNumber>=0){

src/components/DilCommonUI/packages/table/src/table.vue

@@ -16,6 +16,9 @@
       @selection-change="selectionChange"
       @filter-change="filterChange"
       @row-click="rowClick"
+      v-loading="loading"
+      element-loading-text="玩命加载中"
+      element-loading-spinner="el-icon-loading"
     >
       <!-- 多选列 -->
       <el-table-column
@@ -200,7 +203,9 @@ export default {
         return ({ row, rowIndex }) => "";
       },
     },
-
+    loading:{
+      default:false,
+    },
     // 是否启用分页器
     isPagination: {
       default: true,

src/views/RMS/components/addOilPrice.vue

@@ -1,95 +1,179 @@
 <template>
   <!-- 添加油价信息 -->
   <div class="addWagonLoad">
-    <PageTitle>返回</PageTitle>
-    <div class="form-box" style="margin-right: 10rem">
-      <dil-form :formId="357" v-model="form1" ref="from1"></dil-form>
+    <page-title>返回</page-title>
+    <div class="form_you">
+      <span class="text">油品名称 </span>
+      <el-select v-model="oilNameId" filterable placeholder="请选择">
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      <el-button type="primary" @click="dialogVisible = true">新增油品名称</el-button>
     </div>
-    <div class="button-box">
+    <div class="form_box" style="margin-right: 10rem">
+      <dil-form :formId="357" v-model="form1" ref="from1" @change="onchang"></dil-form>
+    </div>
+    <div class="button_box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
     </div>
+    <el-dialog
+      title="新增油品名称"
+      :visible.sync="dialogVisible"
+      width="30%"
+    >
+      <span>注：<span style="color:red;">不能输入特殊符号('#')</span></span>
+      <el-input v-model="input" placeholder="请输入内容"></el-input>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogMakeSure">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { isNumber,sjTime } from '@/utils/sharedJsFile'
 export default {
   components: { PageTitle },
   data() {
     return {
-      form1: {},
-      value: undefined,
+      //下拉框选中的值
+      oilNameId:null,
+      //加载状态
+      loading:false,
+      //油品名称新增的值
+      input:null,
+      //是否显示添加油品名称的窗口
+      dialogVisible:false,
+      //下拉框的数据
+      options:[],
+      //表单的数据
+      form1: {
+        priceValue:'',
+        priceDate:new Date(),
+        priceStatus:false,
+      },
     };
   },
-  mounted() {},
+  created(){
+    this.initialization();
+  },
   methods: {
+    initialization(){
+      this.axios.post('/api/v1/rms/oilNameSelect').then((res)=>{
+        if(res.data.code == "200"){
+          this.options = res.data.data;
+        }
+      })
+    },
+    onchang(val){
+      if(val.priceStatus){
+        this.$message.warning('确认启用后将会停用正在执行的油品价格')
+      }
+    },
+    dialogMakeSure(){
+      this.loading = true;
+      if(this.input){
+        this.axios.post('/api/v1/rms/addOilType?oilTypeName='+this.input).then((res)=>{
+          if(res.data.code == "200"){
+            this.loading = false;
+            this.$message.success('新增成功')
+            this.dialogVisible = false;
+            this.initialization();
+          }
+        })
+      }else{
+        this.$message.warning('请输入油品名称')
+      } 
+    },
     makeSure() {
-      console.log(this.form1);
-      let RmsOilPrice = {
-        priceOilName:this.form1.priceOilName,
-        priceId:this.form1.priceId,
-        priceDate:this.form1.priceDate,
-        priceValue:this.form1.priceValue,
-      };
-      if(
-        RmsOilPrice.priceOilName ==null ||
-        RmsOilPrice.priceDate ==null ||
-         RmsOilPrice.priceValue ==null
-      )this.$message.error("存在空值！");
-      else
-      this.axios
-        .post(
-          "/api/v1/rms/insertOilPrice" , RmsOilPrice
-        )
+      this.loading = true;
+      let state = false;
+      if(!this.oilNameId){
+        this.$message.warning('请填写油品名称')
+      }else if(!this.form1.priceValue){
+        this.$message.warning('请填写油品价格')
+      }else if(!isNumber(this.form1.priceValue)){
+        this.$message.warning('油品价格必修为整数或者小数')
+      }else{
+        state = true;            
+      }
+      if(state){
+        let RmsOilPrice = {
+          oilNameId:this.oilNameId,
+          priceValue:this.form1.priceValue,
+          priceDate:sjTime(this.form1.priceDate),
+          priceStatus:this.form1.priceStatus
+        };
+        console.log(RmsOilPrice);
+        this.axios.post("/api/v1/rms/insertOilPrice" , RmsOilPrice)
         .then((res) => {
-          if (res.data.code == 200) {
-            this.$message({
-              type: "success",
-              message: "新增成功!",
-            });
-            // this.$refs.table.refreshData();
-            this.$router.go(-1);
-          } else {
-            this.$message.error("新增失败,可能存在重复！");
+          if (res.data.code == "200") {
+            this.loading = true;
+            this.$message.success('新增成功');
+            this.cancel();
           }
-        //  this.$refs['table'].resetField();
         });
+      }else{
+        this.loading = true;
+      }
     },
     // 取消
     cancel() {
-      this.$router.go(-1);
+      this.$router.push("/oilPrice");
     },
   },
 };
 </script>
-<style lang='scss' >
- .button-box{
-    display: flex;
-    justify-content: center;
-    .el-button{
-      width: 80px;
-      margin-right: 10px;
+<style lang='scss'>
+.addWagonLoad{
+  .form_you{
+    margin-left: 35%;
+    margin-top: 30px;
+    .text{
+      display: inline-block;
+      width: 55px;
+    }
+    .el-select{
+      width: 250px;
+      margin-right: 20px;
     }
   }
-.form-box{
-  display: flex;
-  justify-content: center;
-  .el-form-item{
+  .form_box{
+    margin-left: 35%;
+    padding-top: 10px;
+    width: 470px;
     display: flex;
-    justify-content: center;
-    .el-form-item__label{
-      display: flex;
-      align-items: center;
-    }
-    .el-form-item__content{
-      .el-input{
-        .el-input__inner{
-          width: 250px;
+    .el-form{
+      .el-form-item{
+        display: flex;
+        align-items: center;
+        .el-form-item__content{
+          .el-input{
+            width: 250px;
+          }
+          .el-switch{
+            margin-left: -250px;
+          }
         }
       }
     }
+    .addbtn{
+      margin-left: 30px;
+    }
+  }
+  .button_box{
+    margin-left: 40%;
+    padding-top: 30px;
+    width: 310px;
+    display: flex;
+    justify-content: center;
   }
 }
 </style>

src/views/RMS/components/oilPrice.vue

@@ -7,7 +7,7 @@
         v-model="textInput"
         clearable>
       </el-input>
-      <el-button type="primary" class="btn"  @click="onclick">
+      <el-button type="primary" class="btn1"  @click="onclick" :loading="selectLoading">
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-button type="primary" class="btn" @click="toInsert">
@@ -15,15 +15,29 @@
       </el-button>
     </div>
     <div class="table">
-      <dilTable v-bind.sync="options">
+      <dilTable 
+        v-bind.sync="options"
+        :isKuang="isKuang"
+        @func="func"
+        :loading="tableLoading"
+      >
         <el-table-column fixed="right" label="操作" width="100">
           <template slot-scope="scope">
             <el-button
               type="text"
               size="small"
-              @click="updateOilPrice(scope)"
+              @click="onEnable(scope)"
+              v-if="scope.row.priceStatus !== '启用'"
             >
-              修改
+              启用
+            </el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click="onDeactivate(scope)"
+              v-else
+            >
+              停用
             </el-button>
             <el-button
               type="text"
@@ -43,6 +57,11 @@ export default {
   name:"homeworkPath",
   data(){
     return{
+      tableLoading:false,
+      selectLoading:false,
+      isKuang:false,
+      //切换是否启用按钮和停用按钮
+      enableStatus:true,
       textInput: "" ,
       restaurants: [],
       options:{
@@ -52,64 +71,61 @@ export default {
     }
   },
   methods:{
+    func(res){
+      if(this.selectLoading){
+        this.selectLoading = false;
+      }
+      this.isKuang = false;
+      this.tableLoading = false;
+    },
     onclick(){
-      this.options.requestUrl = "/api/v1/rms/getOilPriceResultList?apiId=380&con=" +this.textInput;
+      this.isKuang = true;
+      this.selectLoading = true;
+      this.tableLoading = true;
+      if(this.textInput){
+        this.options.requestUrl = "/api/v1/rms/getOilPriceResultList?apiId=380&con=" +this.textInput+"&i="+ new Date();
+      }else{
+        this.options.requestUrl = "/api/v1/rms/getOilPriceResultList?apiId=380&i="+ new Date();
+      }
     },
-
+    //跳转到新增页面
     toInsert() {
       this.$router.push("/addOilPrice");
-
-    },
-    /*这里要改一改*/
-    updateOilPrice(scope){
-      console.log(scope.row.priceId)
-      this.$router.push("/editOilPrice/"+scope.row.priceId)
     },
     deleteOilPrice(scope){
-      this.$confirm("是否删除", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        center: true,
-      })
-        .then(() => {
-          this.axios
-            .post("/api/v1/rms/deleteOilPrice/" + scope.row.priceId)
-            .then((res) => {
-              if (res.data.code == 200) {
-                this.$message({
-                  type: "success",
-                  message: "删除成功!",
-                });
-                this.$router.go(0);
-              } else {
-                this.$message({
-                  message: "删除失败",
-                  type: "warning",
-                });
-              }
-            });
+     this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.tableLoading = true;
+        this.axios.post('/api/v1/rms/deleteOilPrice/'+scope.row.priceId).then((res)=>{
+          if(res.data.code == "200"){
+            this.$message.success('删除成功')
+            this.options.requestUrl = "/api/v1/rms/getOilPriceResultList?apiId=380&i="+ new Date();
+          }
         })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "删除操作已取消!",
-          });
-        });
+      }).catch(() => {
+        this.$message.info('已取消删除');       
+      });
     },
   },
-
 }
-
 </script>
 
 <style lang="scss" scode>
 .steel_inbound{
   .sache{
-    padding: 1.25rem 0.375rem;
+    width: 100%;height: 100px;
+    display: flex;
+    align-items: center;
     .el-input {
-      width: 20%;
-      margin-right: 1.25rem;
+      width: 250px;
+      margin-left: 50px;
+      margin-right: 30px;
+    }
+    .btn1{
+      margin-right: 30px;
     }
   }
   }

src/views/RMS/components/transitRoute.vue

@@ -3,12 +3,12 @@
   <div class="steel_inbound">
     <div class="top">
       <!-- 框计算 -->
-      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+      <el-input placeholder="请输入内容" class="input" v-model="inputText" clearable>
       </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button type="primary" class="btn" @click="AddClick">
+      <el-button type="primary" class="btn1" @click="AddClick">
         <i class="el-icon-plus"></i>新增
       </el-button>
     </div>
@@ -117,24 +117,20 @@ export default {
   },
 };
 </script>
-
-<style lang="scss" scoped>
-.transitRoute {
-  .top {
+<style lang="scss">
+.steel_inbound{
+  .top{
     width: 100%;
     height: 100px;
     display: flex;
     align-items: center;
-    padding-left: 60px;
-  }
-}
-</style>
-
-<style lang="scss" scode>
-.steel_inbound{
-  .top{
-    display: flex;
-    width: 30%;
+    padding-left: 30px;
+    .input{
+      width: 250px;
+    }
+    .btn{
+      margin: 20px;
+    }
   }
 }
 

src/views/RMS/components/transitRouteAdd.vue

@@ -5,12 +5,17 @@
     <div class="form_top">
       <div class="link_name" v-if="state > 0">
         <span>线路编号：</span>
-        <el-input placeholder="请输入内容" v-model="lineNo" disabled>
+        <el-input placeholder="请输入内容" class="el_input_suffix" v-model="lineNo" disabled>
         </el-input>
       </div>
       <div class="link_name">
         <span>线路名称：</span>
-        <el-input placeholder="请输入内容" v-model="line_name" class="el_input_suffix" clearable>
+        <el-input
+          placeholder="请输入内容"
+          v-model="line_name"
+          class="el_input_suffix"
+          clearable
+        >
         </el-input>
       </div>
       <div class="link_type">
@@ -27,46 +32,54 @@
       </div>
       <div class="spellNumber">
         <span class="text">拼数：</span>
-        <el-input placeholder="请输入内容" v-model="spellNumber" clearable>
+        <el-input placeholder="请输入内容" class="input" v-model="spellNumber" clearable>
         </el-input>
       </div>
       <div class="link_zi_list">
         <span>环节：</span>
-          <el-button
-            type="primary"
-            :key="index"
-            v-for="(item,index) in btnList"
-            :disable-transitions="false"
-            @click="addClick(item)"
-            class="link_zi_list_btn"
-          >
-            {{item.linkName}}
-          </el-button>
-          <el-input
-            class="input-new-tag"
-            v-if="inputVisible"
-            v-model="inputValue"
-            ref="saveTagInput"
-            size="small"
-            @blur="onBlur"
-          >
-          </el-input>
-          <el-button v-else class="button-new-tag" size="small" @click="showInput"> + 新增</el-button>
+        <el-button
+          type="primary"
+          :key="index"
+          v-for="(item, index) in btnList"
+          :disable-transitions="false"
+          @click="addClick(item)"
+          class="link_zi_list_btn"
+        >
+          {{ item.linkName }}
+        </el-button>
+        <el-input
+          class="input-new-tag"
+          v-if="inputVisible"
+          v-model="inputValue"
+          ref="saveTagInput"
+          size="small"
+          @blur="onBlur"
+        >
+        </el-input>
+        <!-- <el-button
+          v-else
+          class="button-new-tag"
+          size="small"
+          @click="showInput"
+        >
+          + 新增</el-button
+        > -->
       </div>
-      
     </div>
     <div class="linkList">
-      <div class="link_list" id="tag">
-        <el-tag
-          class="tag"
-          size="small"
-          v-for="(item, i) in linkList"
-          :key="i"
-          @close="deleteClick(i)"
-          closable
-        >
-          {{ item.linkName }}
-        </el-tag>
+      <div class="link_list">
+        <div class="link_list_zi" v-for="(item,i) in linkList" :key="i">
+          <div class="xhNumber">
+            <span>{{i + 1}}</span>
+          </div>
+          <div class="link_list_name">
+            {{item.linkName}}
+          </div>
+          <div class="link_meng_qicheheng" v-if="item.gjName">
+            {{item.gjName}}
+          </div>
+          <i class="el-icon-delete" @click="deleteClick(i)"></i>
+        </div>
       </div>
     </div>
     <div class="btn">
@@ -75,18 +88,42 @@
         >确认</el-button
       >
     </div>
+    
+    <el-dialog
+      :title="title"
+      :visible.sync="dialogVisible"
+      width="30%"
+    >
+      <el-select v-model="gateGuard" multiple placeholder="请选择">
+        <el-option
+          v-for="(item,i) in gateGuardList"
+          :key="i"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="determine">确 定</el-button>
+      </span>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import Sortable from "sortablejs";
 export default {
   components: { PageTitle },
   data() {
     return {
-      inputVisible:false,
-      inputValue: '',
+      gateGuardList:[],
+      gateGuard:null,
+      title:"请选择门岗",
+      dialogVisible:false,
+      form:{},
+      inputVisible: false,
+      inputValue: "",
       lineNo: "",
       line_name: "",
       spellNumber: 1,
@@ -116,43 +153,40 @@ export default {
       btnList: [],
       linkList: [],
       state: 0,
+      linkItem:{},
     };
   },
   created() {
     this.initialization();
   },
-  mounted() {
-    this.drag();
-  },
   methods: {
-    A(){
- // 获取所有的作业环节
-            this.axios.post("/api/v1/rms/getLink").then((res) => {
-              if (res.data.code == "200") {
-                this.btnList = res.data.data;
-              }
-            });
-    },
-    //将新增变为输入框
-    showInput() {
-      this.inputVisible = true;
-    },
-    //当输入框失去焦点之后触发，新增作业环节
-    onBlur() {
-      console.log(this.inputValue);
-      if (this.inputValue) {
-        this.axios.post('/api/v1/rms/LinkInsertSelective',
-        {
-          linkName:this.inputValue,
-          userName:""
-        }).then((res)=>{
-          if(res.data.code == "200"){
-            this.A();
+    determine(){
+      let text = "";
+      this.gateGuardList.forEach((e)=>{
+        for(var i = 0;i < this.gateGuard.length;i++){
+          if(this.gateGuard[i] == e.value){
+            text += e.label + "/"
           }
-        })
-      }
-      this.inputVisible = false;
-      this.inputValue = '';
+        }
+      })
+      let index = text.lastIndexOf("/")
+      text =text.substring(0,index);
+      console.log(this.linkItem);
+      this.linkList.push({
+        linkId:this.linkItem.linkId,
+        linkName:this.linkItem.linkName,
+        gjName:text,
+        gateGuard:this.gateGuard
+      })
+      this.dialogVisible = false;
+    },
+    A() {
+      // 获取所有的作业环节
+      this.axios.post("/api/v1/rms/getLink").then((res) => {
+        if (res.data.code == "200") {
+          this.btnList = res.data.data;
+        }
+      });
     },
     // 初始化页面的数据
     initialization() {
@@ -181,8 +215,29 @@ export default {
     },
     // 将点击的对象添加到linkList的数组中
     addClick(item) {
-      console.log(item);
-      this.linkList.push(item);
+      if(item.linkId == 4 || item.linkId == 5 || item.linkId == 6){
+        this.linkList.push({
+          linkId:item.linkId,
+          linkName:item.linkName,
+          gjName:"",
+          gateGuard:[]
+        })
+      }else{
+        this.gateGuard = [];
+        this.gateGuardList = [];
+        if(item.linkId == 1 || item.linkId == 7){
+          this.axios.get('/api/v1/tms/getGatepost').then((res)=>{
+            this.gateGuardList = res.data.data
+          })
+          this.dialogVisible = true;
+        }else if(item.linkId == 2 || item.linkId == 3){
+          this.axios.get('/api/v1/uc/getAllCalculateMes').then((res)=>{
+            this.gateGuardList = res.data
+          })
+          this.dialogVisible = true;
+        }
+        this.linkItem = item;
+      }
     },
     // 删除被点击的对象
     deleteClick(index) {
@@ -207,6 +262,7 @@ export default {
     },
     // 点击确定按钮
     confirmClick() {
+      console.log("sdsd")
       // 判断是否存在空值
       if (this.line_name && this.value && this.linkList.length > 0) {
         var map = {
@@ -216,6 +272,7 @@ export default {
           line_type: parseInt(this.value),
           linkList: this.linkList,
         };
+        console.log(map)
         var URL = "";
         var messageText = "";
         // 若上一个页面传递的值为0则新增
@@ -245,32 +302,6 @@ export default {
         });
       }
     },
-    //拖动事件
-    drag() {
-      var _this = this;
-      var $ul = document.getElementById("tag");
-      new Sortable($ul, {
-        onUpdate: function (event) {
-          //修改items数据顺序
-          var newIndex = event.newIndex,
-            oldIndex = event.oldIndex,
-            $li = $ul.children[newIndex],
-            $oldLi = $ul.children[oldIndex];
-          // 先删除移动的节点
-          $ul.removeChild($li);
-          // 再插入移动的节点到原有节点，还原了移动的操作
-          if (newIndex > oldIndex) {
-            $ul.insertBefore($li, $oldLi);
-          } else {
-            $ul.insertBefore($li, $oldLi.nextSibling);
-          }
-          // 更新items数组
-          var item = _this.linkList.splice(oldIndex, 1);
-          _this.linkList.splice(newIndex, 0, item[0]);
-        },
-        animation: 150,
-      });
-    },
   },
 };
 </script>
@@ -279,76 +310,113 @@ export default {
 .transitRouteAdd {
   .form_top {
     width: 100%;
-    height: 10.625rem;
+    height: 170px;
     .link_name {
       display: flex;
       align-items: center;
       justify-content: center;
-      margin-top: 1.25rem;
-      .el_input_suffix{
-        widows: 50px;
-        
+      margin-top: 20px;
+      .el_input_suffix {
+        width: 220px;
       }
-      
     }
     .link_type {
       display: flex;
       align-items: center;
       justify-content: center;
-      margin-top: 1.25rem;
+      margin-top: 20px;
     }
     .spellNumber {
       display: flex;
       align-items: center;
       justify-content: center;
-      margin-top: 1.25rem;
+      margin-top: 20px;
       .text {
-        width: 80px;
+        width: 60px;
         text-align: right;
       }
+      .input{
+        width: 220px;
+      }
     }
     .link_zi_list {
       display: flex;
       align-items: center;
       justify-content: center;
-      margin-top: 1.25rem;
-      .link_zi_list_btn{
-        width: 3.125rem; height: 2rem;
+      margin-top: 20px;
+      .link_zi_list_btn {
+        width: 50px;
+        height: 32px;
         display: flex;
         align-items: center;
         justify-content: center;
-        margin-right: 0.625rem;
+        margin-right: 10px;
       }
       .input-new-tag {
-        width: 4.375rem;
-        margin-left: 0.625rem;
+        width: 70px;
+        margin-left: 10px;
         vertical-align: bottom;
       }
     }
   }
   .linkList {
-    margin-top: 5.625rem;
+    margin-top: 120px;
     display: flex;
     justify-content: center;
-    .link_list {
-      border: #8d8c8c 0.0625rem solid;
+    .link_list{
+      border: #8d8c8c 1px solid;
       width: 80%;
-      height: 12.5rem;
-      display: flex;
-      flex-wrap: wrap;
-      justify-content: flex-start;
-      overflow: hidden;
-      padding: 0.625rem;
-      .tag {
-        margin: 0.3125rem;
+      min-height: 200px;
+      .link_list_zi{
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        border-bottom: 1px #9b9898cc solid ;
+        height: 40px;
+        .xhNumber{
+          background-color: #006eff;
+          color: #fff;
+          width: 20px;height: 20px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          border-radius: 50%;
+          margin-right: 10px;
+        }
+        .link_list_name{
+          font-size: 18px;
+          font-weight: 700;
+          margin-right: 30px;
+        }
+        .link_meng_qicheheng{
+          font-size: 14px;
+          font-weight: 600;
+          margin-right: 50px;
+        }
+        i{
+          cursor: pointer;
+        }
       }
     }
+    // .link_list {
+    //   border: #8d8c8c 1px solid;
+    //   width: 80%;
+    //   height: 200px;
+    //   display: flex;
+    //   flex-wrap: wrap;
+    //   justify-content: flex-start;
+    //   overflow: hidden;
+    //   padding: 10px;
+    //   .tag {
+    //     margin: 5px;
+    //   }
+    // }
   }
   .btn {
     display: flex;
     width: 100%;
     justify-content: center;
-    margin-top: 20px;
+    margin-top: 1.25rem;
   }
 }
 </style>

src/views/TMS/components/importedFuel/transportReserveRanAdd.vue

@@ -130,7 +130,7 @@
           <i class="el-icon-search"></i>查询
         </el-button>
       </div>
-      <div v-if="onDrawerNumber == 1">
+      <div v-show="onDrawerNumber == 1">
         <dilTable
           v-bind.sync="frist"
           @radio-change="currentRadioChange1"
@@ -139,7 +139,7 @@
           :drawer="drawer"
         ></dilTable>
       </div>
-      <div v-else-if="onDrawerNumber == 2">
+      <div v-show="onDrawerNumber == 2">
         <dilTable
           v-bind.sync="secend"
           @radio-change="currentRadioChange2"
@@ -148,7 +148,7 @@
           :drawer="drawer"
         ></dilTable>
       </div>
-      <div v-else-if="onDrawerNumber == 3">
+      <div v-show="onDrawerNumber == 3">
         <dilTable
           v-bind.sync="third"
           @selection-change="currentRadioChange3"
@@ -157,7 +157,7 @@
           :drawer="drawer"
         ></dilTable>
       </div>
-      <div v-else-if="onDrawerNumber == 4">
+      <div v-show="onDrawerNumber == 4">
         <dilTable
           v-bind.sync="unloadPoint"
           @radio-change="currentRadioChange4"
@@ -166,7 +166,7 @@
           :drawer="drawer"
         ></dilTable>
       </div>
-      <div v-else-if="onDrawerNumber == 5">
+      <div v-show="onDrawerNumber == 5">
         <dilTable
           v-bind.sync="line"
           @radio-change="currentRadioChange5"
@@ -175,7 +175,7 @@
           :drawer="drawer"
         ></dilTable>
       </div>
-      <div v-else-if="onDrawerNumber == 6">
+      <div v-show="onDrawerNumber == 6">
         <dilTable
           v-bind.sync="purchaseOrder"
           @radio-change="currentRadioChange6"

src/views/appoint/components/saleContract/transportPrice.vue

@@ -3,17 +3,15 @@
   <div class="salePlan">
     <div class="top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
+      <el-button type="primary" class="btn" @click="onclick" :loading="loading">
         <i class="el-icon-search"></i>查询
       </el-button>
-      
-
       <el-button type="primary" @click="btnclick(0)">
         <i class="el-icon-plus"></i>新增
       </el-button>
        <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
     </div>
-    <dilTable ref="excelDom" v-bind.sync="option">
+    <dilTable ref="excelDom" v-bind.sync="option" :loading="loading" :isKuang="isKuang" @func="func">
       <el-table-column fixed="right" label="操作" width="200">
         <template slot-scope="scope">
           <el-button @click="click(scope.row.priceId)" type="text" size="small"
@@ -35,6 +33,8 @@ export default {
   name: "TransportPrice",
   data() {
     return {
+      isKuang:false,
+      loading:false,
       input: "",
       option: {
         // 表格请求数据的地址
@@ -45,10 +45,18 @@ export default {
     };
   },
   methods: {
+    func(){
+      this.loading = false;
+      this.isKuang = false;
+    },
     onclick() {
-      this.option.requestUrl =
-        "/api/v1/ams/getAmsContractTransportPrice?apiId=109&con=" +
-        this.input;
+      this.loading = true;
+      this.isKuang = true;
+      if(this.input){
+        this.option.requestUrl ="/api/v1/ams/getAmsContractTransportPrice1?apiId=109&con=" +this.input;
+      }else{
+        this.option.requestUrl ="/api/v1/ams/getAmsContractTransportPrice1?apiId=109&i="+new Date();
+      }
     },
     btnclick() {
       this.$router.push("/addTransportPrice");

src/views/queue/components/qmsEnFacotory/addqueueFCancel.vue

@@ -27,7 +27,7 @@
       </div>
     </div>
     <div class="btn">
-      <el-button>取消</el-button>
+      <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="onclick">确认</el-button>
     </div>
   </div>
@@ -53,9 +53,14 @@ export default {
     };
   },
   methods: {
+    cancel(){
+        this.$router.push({
+          path: "/queueFCancel",
+        });
+    },
     onChange(val) {
       this.option.requestUrl =
-        "/api/v1/qms/getAllQueueMes?apiId=184&gatepostId=" + val.gatepostId;
+        "/api/v1/qms/getAllQueueMes?apiId=184&gatepostId=" + val.gatepostId+"&i="+new Date();
     },
     selectionChange(row) {
       this.resultIdList = [];
@@ -71,9 +76,7 @@ export default {
       console.log(mapValue);
       this.axios.post("/api/v1/qms/queueCancel", mapValue).then((res) => {
         if (res.data.code == "200") {
-          this.$router.push({
-            path: "/qmsEnFacotory/queueFCancel",
-          });
+          this.cancel();
           this.$message({
             message: "取消排队成功!",
             type: "success",
@@ -84,21 +87,22 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
+<style lang="scss">
 .addqueueFCancel {
   .top {
     width: 100%;
-    height: 5rem;
-    padding-left: 3.125rem;
-    padding-top: 1.25rem;
+    height: 80px;
+    padding-left: 50px;
+    padding-top: 20px;
   }
   .tab {
     width: 100%;
-    max-height: 18.75rem;
+    max-height: 300px;
   }
   .reason {
     width: 100%;
-    height: 13.125rem;
+    margin-top: 30px;
+    margin-bottom: 30px;
     display: flex;
     align-items: center;
     justify-content: center;
@@ -106,13 +110,15 @@ export default {
       display: flex;
       width: 30%;
       .text {
-        width: 6.25rem;
+        width: 100px;
+        text-align: right;
+        margin-right: 10px;
       }
     }
   }
   .btn {
     width: 100%;
-    height: 5rem;
+    height: 80px;
     display: flex;
     align-items: center;
     justify-content: center;

src/views/queue/components/qmsEnFacotory/addqueueFJumpLine.vue

@@ -27,7 +27,7 @@
       </div>
     </div>
     <div class="btn">
-      <el-button>取消</el-button>
+      <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="onclick">确认</el-button>
     </div>
   </div>
@@ -51,9 +51,14 @@ export default {
     };
   },
   methods: {
+    cancel(){
+        this.$router.push({
+          path: "/queueFJumpLine",
+        });
+    },
     onChange(val) {
       this.option.requestUrl =
-        "/api/v1/qms/getAllQueueMes?apiId=184&gatepostId=" + val.gatepostId;
+        "/api/v1/qms/getAllQueueMes?apiId=184&gatepostId=" + val.gatepostId+"&i="+new Date();
     },
     currentRadioChange(row) {
         this.resultId = row.resultId;
@@ -66,9 +71,7 @@ export default {
       console.log(mapValue);
       this.axios.post("/api/v1/qms/queueCutInLine", mapValue).then((res) => {
         if (res.data.code == "200") {
-          this.$router.push({
-            path: "/qmsEnFacotory/queueFJumpLine",
-          });
+          this.cancel();
           this.$message({
             message: "插队排队成功！",
             type: "success",
@@ -83,17 +86,17 @@ export default {
 .addqueueFCancel {
   .top {
     width: 100%;
-    height: 5rem;
-    padding-left: 3.125rem;
-    padding-top: 1.25rem;
+    height: 80px;
+    padding-left: 50px;
+    padding-top: 20px;
   }
   .tab {
     width: 100%;
-    max-height: 18.75rem;
+    max-height: 300px;
   }
   .reason {
     width: 100%;
-    height: 13.125rem;
+    height: 210px;
     display: flex;
     align-items: center;
     justify-content: center;
@@ -101,13 +104,13 @@ export default {
       display: flex;
       width: 30%;
       .text {
-        width: 6.25rem;
+        width: 100px;
       }
     }
   }
   .btn {
     width: 100%;
-    height: 5rem;
+    height: 80px;
     display: flex;
     align-items: center;
     justify-content: center;

src/views/queue/components/qmsEnFacotory/addqueueFTransfer.vue

@@ -13,8 +13,17 @@
     <div class="reason">
       <dil-form :formId="248" v-model="form1" @change="onChange1"></dil-form>
     </div>
+    <div class="input_textarea">
+      <span>转移原因：</span>
+      <el-input
+        type="textarea"
+        :rows="2"
+        placeholder="请输入内容"
+        v-model="resultTransferReason">
+      </el-input>
+    </div>
     <div class="btn">
-      <el-button>取消</el-button>
+      <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="onclick">确认</el-button>
     </div>
   </div>
@@ -36,18 +45,21 @@ export default {
       // 排队实绩id
       resultId:0,
         //转移原因 
-        resultTransferReason:''  
+      resultTransferReason:''  
     };
   },
   methods: {
+    cancel(){
+        this.$router.push({
+          path: "/queueFTransfer",
+        });
+    },
     onChange(val) {
-       
       this.option.requestUrl =
-        "/api/v1/qms/getAllQueueMes?apiId=184&gatepostId=" + val.gatepostId;
+        "/api/v1/qms/getAllQueueMes?apiId=184&gatepostId=" + val.gatepostId+"&i="+new Date();
     },
     onChange1(val) {
       this.gatepostId = val.gatepostId;
-      this.resultTransferReason = val.resultTransferReason;
     },
     currentRadioChange(row) {
       this.resultId = row.resultId
@@ -58,12 +70,11 @@ export default {
         gatepostId:this.gatepostId,
         resultTransferReason: this.resultTransferReason,
       };
+      console.log(mapValue)
       if(mapValue.resultId !== 0 && mapValue.gatepostId !== 0 && mapValue.resultTransferReason !== ""){
         this.axios.post("/api/v1/qms/changeQueue",mapValue).then((res)=>{
           if(res.data.code == "200"){
-            this.$router.push({
-                path: "/qmsEnFacotory/queueFTransfer",
-            });
+            this.cancel();
             this.$message({
                 message: '转移成功！',
                 type: 'success'
@@ -100,24 +111,35 @@ export default {
 .addqueueFCancel {
   .top {
     width: 100%;
-    height: 5rem;
-    padding-left: 3.125rem;
-    padding-top: 1.25rem;
+    height: 80px;
+    padding-left: 50px;
+    padding-top: 20px;
   }
   .tab {
     width: 100%;
-    max-height: 18.75rem;
+    max-height: 300px;
   }
   .reason {
     width: 100%;
-    height: 13.125rem;
     display: flex;
     align-items: center;
     justify-content: center;
+    margin-top: 30px;
+    .el-form{
+      width: 400px;
+    }
+  }
+  .input_textarea{
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    .el-textarea{
+      width: 320px;
+    }
   }
   .btn {
     width: 100%;
-    height: 5rem;
+    height: 80px;
     display: flex;
     align-items: center;
     justify-content: center;

src/views/queue/components/qmsEnFacotory/queueFApply.vue

@@ -2,7 +2,7 @@
 <template>
     <div class="sale">
         <div class="top">
-            <!-- 框计算 -->
+            <span>车牌号：</span>
             <el-input
                 placeholder="请输入内容"
                 v-model="inputText"
@@ -32,7 +32,7 @@ export default {
     },
     methods:{
         onclick(){
-            this.option.requestUrl = "/api/v1/qms/getQueueApply?apiId=125&con="+this.inputText;
+            this.option.requestUrl = "/api/v1/qms/getQueueApply?apiId=125&con="+this.inputText+"&i="+new Date();
         }
     }
 }
@@ -40,10 +40,10 @@ export default {
 <style lang="scss">
     .sale{
         .top{
-            width: 100%;height: 5rem;
+            width: 100%;height: 80px;
             display: flex;
             align-items: center;
-            padding-left: 2.5rem;
+            padding-left: 40px;
         }
         .input{
             width: 250px;

src/views/queue/components/qmsEnFacotory/queueFCancel.vue

@@ -2,13 +2,13 @@
 <template>
   <div class="sale">
     <div class="top">
-      <!-- 框计算 -->
-      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+      <span>车牌号：</span>
+      <el-input placeholder="请输入内容" class="input" v-model="inputText" clearable>
       </el-input>
       <el-button type="primary" class="btn" @click="onclick(0)">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button type="primary" class="btn" @click="onclick(1)">
+      <el-button type="primary" class="btn1" @click="onclick(1)">
         <i class="el-icon-plus"></i>新增排队取消
       </el-button>
     </div>
@@ -32,24 +32,31 @@ export default {
     onclick(num) {
       if (num == 0) {
         this.option.requestUrl =
-          "/api/v1/qms/getQueueCancel?apiId=131&con=" + this.inputText;
+          "/api/v1/qms/getQueueCancel?apiId=131&con=" + this.inputText+"&i="+new Date();
       } else if (num == 1) {
         this.$router.push({
-          path: "/addqueueFCancel/",
+          path: "/addqueueFCancel",
         });
       }
     },
   },
 };
 </script>
-<style lang="scss" scoped>
+<style lang="scss">
 .sale {
   .top {
     width: 100%;
-    height: 5rem;
+    height: 80px;
     display: flex;
     align-items: center;
-    padding-left: 2.5rem;
+    padding-left: 40px;
+  }
+  .input{
+    width: 250px;
+    margin-right: 20px;
+  }
+  .btn1{
+    margin-left: 20px;
   }
 }
 </style>

src/views/queue/components/qmsEnFacotory/queueFDetails.vue

@@ -2,10 +2,11 @@
 <template>
     <div class="sale">
         <div class="top">
-            <!-- 框计算 -->
+            <span>车牌号：</span>
             <el-input
                 placeholder="请输入内容"
                 v-model="inputText"
+                class="input"
                 clearable>
             </el-input>
             <el-button type="primary" class="btn" @click="onclick">
@@ -30,7 +31,7 @@ export default {
     },
     methods:{
         onclick(){
-            this.option.requestUrl = "/api/v1/qms/getAllQueueMes?apiId=184&con="+this.inputText;
+            this.option.requestUrl = "/api/v1/qms/getAllQueueMes?apiId=184&con="+this.inputText+"&i="+new Date();
         }
     }
 }
@@ -38,10 +39,14 @@ export default {
 <style lang="scss" scoped>
     .sale{
         .top{
-            width: 100%;height: 5rem;
+            width: 100%;height: 80px;
             display: flex;
             align-items: center;
-            padding-left: 2.5rem;
+            padding-left: 40px;
+        }
+        .input{
+            width: 250px;
+            margin-right: 20px;
         }
     }
 </style>

src/views/queue/components/qmsEnFacotory/queueFEnd.vue

@@ -2,10 +2,11 @@
 <template>
     <div class="sale">
         <div class="top">
-            <!-- 框计算 -->
+            <span>车牌号：</span>
             <el-input
                 placeholder="请输入内容"
                 v-model="inputText"
+                class="input"
                 clearable>
             </el-input>
             <el-button type="primary" class="btn" @click="onclick">
@@ -30,7 +31,7 @@ export default {
     },
     methods:{
         onclick(){
-            this.option.requestUrl = "/api/v1/qms/getQueueEndResult?apiId=133&con="+this.inputText;
+            this.option.requestUrl = "/api/v1/qms/getQueueEndResult?apiId=133&con="+this.inputText+"&i="+new Date();
         }
     }
 }
@@ -38,10 +39,14 @@ export default {
 <style lang="scss" scoped>
     .sale{
         .top{
-            width: 100%;height: 5rem;
+            width: 100%;height: 80px;
             display: flex;
             align-items: center;
-            padding-left: 2.5rem;
+            padding-left: 40px;
+            .input{
+                width: 250px;
+                margin-right: 20px;
+            }
         }
     }
 </style>

src/views/queue/components/qmsEnFacotory/queueFInstructionReceive.vue

@@ -2,10 +2,11 @@
 <template>
     <div class="sale">
         <div class="top">
-            <!-- 框计算 -->
+            <span>车牌号：</span>
             <el-input
                 placeholder="请输入内容"
                 v-model="inputText"
+                class="input"
                 clearable>
             </el-input>
             <el-button type="primary" class="btn" @click="onclick">
@@ -30,7 +31,7 @@ export default {
     },
     methods:{
         onclick(){
-            this.option.requestUrl = "/api/v1/qms/orderReceive?apiId=130&queueType=1&con="+this.inputText;
+            this.option.requestUrl = "/api/v1/qms/orderReceive?apiId=130&queueType=1&con="+this.inputText+"&i="+new Date();
         }
     }
 }
@@ -38,10 +39,14 @@ export default {
 <style lang="scss" scoped>
     .sale{
         .top{
-            width: 100%;height: 5rem;
+            width: 100%;height: 80px;
             display: flex;
             align-items: center;
-            padding-left: 2.5rem;
+            padding-left: 40px;
+            .input{
+                width: 250px;
+                margin-right: 20px;
+            }
         }
     }
 </style>

src/views/queue/components/qmsEnFacotory/queueFIssue.vue

@@ -2,10 +2,11 @@
 <template>
     <div class="sale">
         <div class="top">
-            <!-- 框计算 -->
+            <span>车牌号：</span>
             <el-input
                 placeholder="请输入内容"
                 v-model="inputText"
+                class="input"
                 clearable>
             </el-input>
             <el-button type="primary" class="btn" @click="onclick">
@@ -30,7 +31,7 @@ export default {
     },
     methods:{
         onclick(){
-            this.option.requestUrl = "/api/v1/qms/getQueueApply?apiId=127&con="+this.inputText;
+            this.option.requestUrl = "/api/v1/qms/getQueueApply?apiId=127&con="+this.inputText+"&i="+new Date();
         }
     }
 }
@@ -38,10 +39,14 @@ export default {
 <style lang="scss" scoped>
     .sale{
         .top{
-            width: 100%;height: 5rem;
+            width: 100%;height: 80px;
             display: flex;
             align-items: center;
-            padding-left: 2.5rem;
+            padding-left: 40px;
+        }
+        .input{
+            width: 250px;
+            margin-right: 20px;
         }
     }
 </style>

src/views/queue/components/qmsEnFacotory/queueFJumpLine.vue

@@ -2,13 +2,13 @@
 <template>
   <div class="sale">
     <div class="top">
-      <!-- 框计算 -->
-      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+      <span>车牌号：</span>
+      <el-input placeholder="请输入内容" class="input" v-model="inputText" clearable>
       </el-input>
       <el-button type="primary" class="btn" @click="onclick(0)">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button type="primary" class="btn" @click="onclick(1)">
+      <el-button type="primary" class="bt" @click="onclick(1)">
         <i class="el-icon-plus"></i>新增排队插队
       </el-button>
     </div>
@@ -32,10 +32,10 @@ export default {
     onclick(num) {
       if (num == 0) {
         this.option.requestUrl =
-          "/api/v1/qms/getQueueInsert?apiId=132&con=" + this.inputText;
+          "/api/v1/qms/getQueueInsert?apiId=132&con=" + this.inputText+"&i="+new Date();
       } else if (num == 1) {
         this.$router.push({
-          path: "/addqueueFJumpLine/",
+          path: "/addqueueFJumpLine",
         });
       }
     },
@@ -46,10 +46,17 @@ export default {
 .sale {
   .top {
     width: 100%;
-    height: 5rem;
+    height: 80px;
     display: flex;
     align-items: center;
-    padding-left: 2.5rem;
+    padding-left: 40px;
+    .input{
+      width: 250px;
+      margin-right: 20px;
+    }
+    .bt{
+      margin-left: 20px;
+    }
   }
 }
 </style>

src/views/queue/components/qmsEnFacotory/queueFListMonitor.vue

@@ -2,8 +2,8 @@
 <template>
   <div class="sale">
     <div class="top">
-      <!-- 框计算 -->
-      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+      <span>门岗名称：</span>
+      <el-input placeholder="请输入内容" class="input" v-model="inputText" clearable>
       </el-input>
       <el-button type="primary" class="btn" @click="onclick(0)">
         <i class="el-icon-search"></i>查询
@@ -88,7 +88,7 @@ export default {
     onclick(num, row) {
       if (num == 0) {
         this.option.requestUrl =
-          "/api/v1/qms/listMonitor?apiId=134&con=" + this.inputText;
+          "/api/v1/qms/listMonitor?apiId=134&con=" + this.inputText+"&i="+new Date();
       } else if (num == 1) {
         console.log(row);
         // 记录重复点击次数
@@ -131,24 +131,28 @@ export default {
 .sale {
   .top {
     width: 100%;
-    height: 5rem;
+    height: 80px;
     display: flex;
     align-items: center;
-    padding-left: 2.5rem;
+    padding-left: 40px;
+    .input{
+        width: 250px;
+        margin-right: 20px;
+    }
   }
   .tab {
     .xq {
       display: flex;
       .box {
-        padding-right: 1.25rem;
+        padding-right: 20px;
         .index {
           display: flex;
           justify-content: center;
           span {
             background-color: #87ceeb;
             display: inline-block;
-            width: 1.25rem;
-            height: 1.25rem;
+            width: 20px;
+            height: 20px;
             display: flex;
             align-items: center;
             justify-content: center;
@@ -163,17 +167,17 @@ export default {
         .time {
           display: flex;
           color: #fff;
-          font-size: 0.75rem;
+          font-size: 12px;
           .carNumber {
             background-color: #7eb9ff;
-            height: 1.25rem;
+            height: 20px;
             display: flex;
             justify-content: center;
             align-items: center;
           }
           .loadTime {
-            background-color: #4b9eff;
-            height: 1.25rem;
+            background-color: #3e62d8;
+            height: 20px;
             display: flex;
             justify-content: center;
             align-items: center;

src/views/queue/components/qmsEnFacotory/queueFStart.vue

@@ -2,10 +2,11 @@
 <template>
     <div class="sale">
         <div class="top">
-            <!-- 框计算 -->
+            <span>车牌号：</span>
             <el-input
                 placeholder="请输入内容"
                 v-model="inputText"
+                class="input"
                 clearable>
             </el-input>
             <el-button type="primary" class="btn" @click="onclick">
@@ -30,7 +31,7 @@ export default {
     },
     methods:{
         onclick(){
-            this.option.requestUrl = "/api/v1/qms/getQueueListByQueueUp?apiId=128&con="+this.inputText;
+            this.option.requestUrl = "/api/v1/qms/getQueueListByQueueUp?apiId=128&con="+this.inputText+"&i="+new Date();
         }
     }
 }
@@ -38,10 +39,14 @@ export default {
 <style lang="scss" scoped>
     .sale{
         .top{
-            width: 100%;height: 5rem;
+            width: 100%;height: 80px;
             display: flex;
             align-items: center;
-            padding-left: 2.5rem;
+            padding-left: 40px;
+        }
+        .input{
+            width: 250px;
+            margin-right: 20px;
         }
     }
 </style>

src/views/queue/components/qmsEnFacotory/queueFTransfer.vue

@@ -2,13 +2,13 @@
 <template>
   <div class="sale">
     <div class="top">
-      <!-- 框计算 -->
-      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+      <span>车牌号：</span>
+      <el-input placeholder="请输入内容" class="input" v-model="inputText" clearable>
       </el-input>
       <el-button type="primary" class="btn" @click="onclick(0)">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button type="primary" class="btn" @click="onclick(1)">
+      <el-button type="primary" class="btn1" @click="onclick(1)">
         <i class="el-icon-plus"></i>新增排队转移
       </el-button>
     </div>
@@ -32,7 +32,7 @@ export default {
     onclick(num) {
       if (num == 0) {
         this.option.requestUrl =
-          "/api/v1/qms/getChangeQueue?apiId=124&con=" + this.inputText;
+          "/api/v1/qms/getChangeQueue?apiId=124&con=" + this.inputText+"&i="+new Date();
       } else if (num == 1) {
         this.$router.push({
           path: "/addqueueFTransfer/",
@@ -46,10 +46,17 @@ export default {
 .sale {
   .top {
     width: 100%;
-    height: 5rem;
+    height: 80px;
     display: flex;
     align-items: center;
-    padding-left: 2.5rem;
+    padding-left: 40px;
+  }
+  .input{
+      width: 250px;
+      margin-right: 20px;
+  }
+  .btn1{
+    margin-left: 20px;
   }
 }
 </style>

src/views/queue/components/qmsEnFacotory/queueFTruckMonitor.vue

@@ -2,10 +2,11 @@
 <template>
     <div class="sale">
         <div class="top">
-            <!-- 框计算 -->
+            <span>车牌号：</span>
             <el-input
                 placeholder="请输入内容"
                 v-model="inputText"
+                class="input"
                 clearable>
             </el-input>
             <el-button type="primary" class="btn" @click="onclick">
@@ -30,7 +31,7 @@ export default {
     },
     methods:{
         onclick(){
-            this.option.requestUrl = "/api/v1/qms/capacityMonitor?apiId=135&gridType=3&con="+this.inputText;
+            this.option.requestUrl = "/api/v1/qms/capacityMonitor?apiId=135&gridType=3&con="+this.inputText+"&i="+new Date();
         }
     }
 }
@@ -38,10 +39,14 @@ export default {
 <style lang="scss" scoped>
     .sale{
         .top{
-            width: 100%;height: 5rem;
+            width: 100%;height: 80px;
             display: flex;
             align-items: center;
-            padding-left: 2.5rem;
+            padding-left: 40px;
+            .input{
+                width: 250px;
+                margin-right: 20px;
+            }
         }
     }
 </style>