Bladeren bron

修改作业票八大步骤不可点击 以及地图界面自适应岗位内容宽度

pm 7 maanden geleden
bovenliggende
commit
4c8a423549

+ 2 - 2
src/api/mes/job/job.js

@@ -103,11 +103,11 @@ export function getStepEight(data) {
     method: 'get',
   })
 }
-// 查看作业票-正在进行中的作业票
+// 查看作业票-正在进行中的作业票(getWorkstationTicketList这个是看指定人员作业票 getMapWorkstationTicketList这个是看全部人员作业票)
 
 export function getWorkstationTicketList(query) {
   return request({
-    url: '/iscs/ticket/getWorkstationTicketList',
+    url: '/iscs/ticket/getMapWorkstationTicketList',
     method: 'get',
     params: query
   })

+ 7 - 0
src/api/system/configuration.js

@@ -50,3 +50,10 @@ export function getIsSystemAttributeByKey(sysAttrKey) {
   })
 }
 
+//刷新缓存 /dev-api/iscs/attribute/refreshAttrCache
+export function refreshAttrCache() {
+  return request({
+    url: '/iscs/attribute/refreshAttrCache',
+    method: 'delete'
+  })
+}

+ 2 - 1
src/views/mes/job/jobm/NewMarsJob.vue

@@ -1463,7 +1463,7 @@ export default {
 <style scoped lang="scss">
 .deptGreen {
   position: absolute;
-  width: 65px;
+  min-width: 65px;
   height: 25px;
   background: #70b26f;
   line-height: 25px;
@@ -1471,6 +1471,7 @@ export default {
   border-radius: 5px;
   color: #fff;
   cursor: pointer;
+  padding:0 10px;
 }
 
 .box-cardStatus {

+ 18 - 1
src/views/system/configuration/index.vue

@@ -59,6 +59,16 @@
         >删除
         </el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button v-no-more-click
+                   type="danger"
+                   plain
+                   icon="el-icon-refresh"
+                   size="mini"
+                   @click="handleRefreshCache"
+                   v-hasPermi="['iscs:attribute:remove']"
+        >刷新缓存</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -196,9 +206,10 @@ import {
   deleteIsSystemAttributeByIds, getIsSystemAttributeByKey,
   getIsSystemAttributePage,
   insertIsSystemAttribute,
-  selectIsSystemAttributeById, updateIsSystemAttribute
+  selectIsSystemAttributeById, updateIsSystemAttribute,refreshAttrCache
 } from '@/api/system/configuration'
 
+
 export default {
   name: 'autoCodeRule',
   dicts: ['sys_yes_no','sys_type'],
@@ -252,6 +263,12 @@ export default {
     this.getList()
   },
   methods: {
+    /** 刷新缓存按钮操作 */
+    handleRefreshCache() {
+      refreshAttrCache().then(() => {
+        this.$modal.msgSuccess("刷新成功");
+      });
+    },
     /** 查询字典类型列表 */
     getList() {
       this.loading = true