no message

src/api/agvTask.js

@@ -32,11 +32,11 @@ export function edit(data) {
   })
 }
 
-export function missionStateCallback(data) {
+export function missionStateCallback(id) {
   return request({
-    url: '/interfaces/api/amr/missionStateCallback',
+    url: 'api/amr/pickerSendAgvTasks',
     method: 'post',
-    data
+    data: id
   })
 }
 
@@ -56,7 +56,7 @@ export function sendReAgvTask(ids) {
 }
 export function closeAgvTask(id) {
   return request({
-    url: 'api/agvTask/closeAgvTask',
+    url: 'api/amr/cancelAgvTasks',
     method: 'post',
     data: id
   })

src/views/base-data/point/index.vue

@@ -37,7 +37,23 @@
             :value="area.name"
           />
         </el-select>
-
+        <label class="el-form-item-label">是否启用</label>
+        <el-select
+            v-model="query.enabled"
+            clearable
+            size="small"
+            placeholder="状态"
+            class="filter-item"
+            style="width: 100px"
+            @change="crud.toQuery"
+        >
+          <el-option
+              v-for="item in dict.base_staus"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+          />
+        </el-select>
         <label class="el-form-item-label" v-show="false">冷却区-小库区编号</label>
         <el-select
           v-show="false"

src/views/base-data/stock/index.vue

@@ -91,7 +91,6 @@
           <el-form-item label="状态">
             <el-select
               v-model="form.status"
-              clearable
               size="small"
               placeholder="状态"
               class="filter-item"
@@ -130,6 +129,7 @@
       <el-table ref="table" height="66vh" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;height: 90%" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
         <el-table-column prop="code" label="代码" />
+        <el-table-column prop="name" label="名称" />
         <el-table-column :show-overflow-tooltip="true" prop="stockType" label="类型">
           <template slot-scope="scope">
             <div>{{ scope.row.stockType.name }}</div>

src/views/business-data/businessTask/agvTask.vue

@@ -68,7 +68,7 @@
               :loading="crud.status.cu === 2"
               icon="el-icon-check"
               @click="sendReAgvTask(crud.selections)">
-            发送
+            重送
           </el-button>
         </template>
       </crudOperation>
@@ -178,7 +178,7 @@
                        align="center"
                        size="mini"
                        @click="closeAgvTask(scope.row)">
-              关闭
+              取消
             </el-button>
           </template>
         </el-table-column>
@@ -320,25 +320,12 @@ export default {
     closeAgvTask(row) {
 
       crudAgvTask.closeAgvTask(row.id).then(res => {
-        this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.notify("取消完成", CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.crud.toQuery()
       })
     },
     toAgvTaskFinish(data) {
-
+      crudAgvTask.missionStateCallback(data.id).then(res => {
-      this.MissionStateCallback.containerCode = data.stockCode
-      if (data.type === 'ASN') {
-        this.MissionStateCallback.missionCode = data.id
-        this.MissionStateCallback.missionStatus = 'COMPLETED'
-      } else if (data.type === 'PICK') {
-        if(data.jobForce == null||data.jobForce == undefined){
-         return this.crud.notify("该任务未下发!", CRUD.NOTIFICATION_TYPE.ERROR);
-        }
-        this.MissionStateCallback.missionCode = data.jobForce
-        this.MissionStateCallback.missionStatus = 'PICKER_RECEIVE'
-      }
-
-      crudAgvTask.missionStateCallback(this.MissionStateCallback).then(res => {
         if (res.code == 200) {
           this.crud.notify("任务完成!", CRUD.NOTIFICATION_TYPE.SUCCESS);
           this.crud.toQuery()

src/views/databigscreen/DeptData.vue

@@ -16,10 +16,13 @@
               物料名称：{{ div.code }}<br/>
               库存数量：{{ 0 }}
             </div>-->
-            <el-button style="background-color:#AFEEEE;height: 80px;width:180px;margin: 10px">
+            <el-button style="background-color:#AFEEEE;height: 90%;width:90%;margin: 10px">
 <!--              {{ div.code }}-->
               <div v-for="(d, index) in div" :key="index">
-                {{ d.pointCode }} 7000073<br/>
+                <div style="text-align: left;">
+                  <el-tag size="mini" style="display: inline-block;">{{ d.pointCode }}</el-tag>
+                  <div style="display: inline-block;">{{d.itemCode}}</div>
+                </div>
               </div>
             </el-button>
           </el-tooltip>
@@ -280,9 +283,9 @@ export default {
 
 .box10 {
   float: left;
-  height: 100px;
+  height: 23%;
-  width: 200px;
+  width: 20%;
-  margin: 5px;
+  margin: 1%;
   background-color: #E6E6FA;
 }
 

src/views/monitor/log/search.vue

@@ -1,5 +1,13 @@
 <template>
   <div v-if="crud.props.searchToggle">
+    <el-input
+        v-model="query.description"
+        clearable
+        size="small"
+        placeholder="描述"
+        style="width: 150px;"
+        class="filter-item"
+    />
     <el-input
       v-model="query.blurry"
       clearable

src/views/system/timing/log.vue

@@ -7,6 +7,7 @@
       <el-select v-model="query.isSuccess" placeholder="日志状态" clearable size="small" class="filter-item" style="width: 110px" @change="toQuery">
         <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
       </el-select>
+      <el-input v-model="query.errorDialog" clearable size="small" placeholder="异常信息" style="width: 400px;" class="filter-item" @keyup.enter.native="toQuery" />
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 导出 -->
       <div style="display: inline-block;">