sfms3.0
/
sfms3.0-uniapp3
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/pages.json
master
gaojs 7 months ago
parent
6cdcea5ca1 a47ec97f54
commit
5c1a57f5b3
5 changed files with 23 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/pages.json
  2. 4
      src/pages/login/index.vue
  3. 14
      src/pages/mes/workOrder/processReport.vue
  4. 1
      src/static/menus/mes/backline.svg
  5. 1
      src/static/menus/mes/offline.svg

8
src/pages.json
View File

@ -1907,7 +1907,13 @@
"navigationBarTitleText": "日计划查询明细",
"enablePullDownRefresh": true
}
}
},{
"path": "pages/mes/workOrder/processReport",
"style": {
"navigationBarTitleText": "工序报工",
"enablePullDownRefresh": true
}
}
],

4
src/pages/login/index.vue
View File

@ -94,10 +94,6 @@
import {
getCaptchaImage
} from '@/api/request2.js';
import {
mapState,
mapMutations
} from 'vuex'
import {
useCountStore
} from '@/store'

14
src/pages/mes/workOrder/processReport.vue
View File

@ -0,0 +1,14 @@
<template>
<view>
</view>
</template>
<script setup lang="ts">
</script>
<style scoped lang="scss">
</style>

1
src/static/menus/mes/backline.svg
View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1703503429043" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6043" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M768 848H224a16 16 0 0 1-16-16 16 16 0 0 1 16-16h544a16 16 0 0 1 16 16 16 16 0 0 1-16 16zM496 720V192a16 16 0 0 1 16-16 16 16 0 0 1 16 16v528a16 16 0 0 1-16 16 16 16 0 0 1-16-16z" fill="#3c9cff" p-id="6044"></path><path d="M502.24 756.64l-135.68-135.68a16 16 0 0 1 0-22.72 16 16 0 0 1 22.56 0l124.48 124.48 124.48-124.48a16 16 0 0 1 22.56 0 16 16 0 0 1 0 22.72l-135.68 135.68a16 16 0 0 1-22.72 0z" fill="#3c9cff" p-id="6045"></path><path d="M896 112a16 16 0 0 1 16 16v768a16 16 0 0 1-16 16H128a16 16 0 0 1-16-16V128a16 16 0 0 1 16-16z m0-48H128a64 64 0 0 0-64 64v768a64 64 0 0 0 64 64h768a64 64 0 0 0 64-64V128a64 64 0 0 0-64-64z" fill="#3c9cff" p-id="6046"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1004 B

1
src/static/menus/mes/offline.svg
View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1703503377666" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5766" width="128" height="128" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M896 112a16 16 0 0 1 16 16v768a16 16 0 0 1-16 16H128a16 16 0 0 1-16-16V128a16 16 0 0 1 16-16z m0-48H128a64 64 0 0 0-64 64v768a64 64 0 0 0 64 64h768a64 64 0 0 0 64-64V128a64 64 0 0 0-64-64z" fill="#3c9cff" p-id="5767"></path><path d="M240 176h544a16 16 0 0 1 16 16 16 16 0 0 1-16 16H240a16 16 0 0 1-16-16 16 16 0 0 1 16-16zM512 304v528a16 16 0 0 1-16 16 16 16 0 0 1-16-16V304a16 16 0 0 1 16-16 16 16 0 0 1 16 16z" fill="#3c9cff" p-id="5768"></path><path d="M505.76 267.36l135.68 135.68a16 16 0 0 1 0 22.72 16 16 0 0 1-22.56 0l-124.48-124.48-124.48 124.48a16 16 0 0 1-22.56 0 16 16 0 0 1 0-22.72l135.68-135.68a16 16 0 0 1 22.72 0z" fill="#3c9cff" p-id="5769"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1003 B

Write Preview
Loading…
Cancel
Save