5.18
This commit is contained in:
		
							
								
								
									
										1
									
								
								dist/css/299.450cca55.css
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								dist/css/299.450cca55.css
									
									
									
									
										vendored
									
									
								
							@@ -1 +0,0 @@
 | 
			
		||||
.box[data-v-6ad9120b]{padding:0 32px}
 | 
			
		||||
							
								
								
									
										1
									
								
								dist/css/5060.d800e106.css
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								dist/css/5060.d800e106.css
									
									
									
									
										vendored
									
									
										Normal file
									
								
							@@ -0,0 +1 @@
 | 
			
		||||
.box[data-v-353959df]{padding:0 32px}
 | 
			
		||||
@@ -1 +1 @@
 | 
			
		||||
.real-time-alarm[data-v-2529da08]{height:calc(100vh - 203px);padding:12px 16px;margin:0 16px;border-radius:8px;background-color:#fff}
 | 
			
		||||
.real-time-alarm[data-v-f97d1bf4]{height:calc(100vh - 203px);padding:12px 16px;margin:0 16px;border-radius:8px;background-color:#fff}
 | 
			
		||||
							
								
								
									
										2
									
								
								dist/index.html
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								dist/index.html
									
									
									
									
										vendored
									
									
								
							@@ -1 +1 @@
 | 
			
		||||
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>tft-mes</title><script defer="defer" src="/js/chunk-vendors.a42f8636.js"></script><script defer="defer" src="/js/app.8ddc6159.js"></script><link href="/css/app.68cbc19b.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but tft-mes doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
 | 
			
		||||
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>tft-mes</title><script defer="defer" src="/js/chunk-vendors.a42f8636.js"></script><script defer="defer" src="/js/app.50e71cdc.js"></script><link href="/css/app.68cbc19b.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but tft-mes doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
 | 
			
		||||
							
								
								
									
										1
									
								
								dist/js/2792.29278c33.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								dist/js/2792.29278c33.js
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										1
									
								
								dist/js/299.4bb8fb60.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								dist/js/299.4bb8fb60.js
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										1
									
								
								dist/js/5060.f685ef99.js
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								dist/js/5060.f685ef99.js
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										1
									
								
								dist/js/5633.cd27f4f8.js
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								dist/js/5633.cd27f4f8.js
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										1
									
								
								dist/js/5640.c5ff6e0f.js
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								dist/js/5640.c5ff6e0f.js
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										1
									
								
								dist/js/6831.95f35749.js
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								dist/js/6831.95f35749.js
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										1
									
								
								dist/js/8017.892d4e4c.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								dist/js/8017.892d4e4c.js
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										1
									
								
								dist/js/8995.16c3f5b4.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								dist/js/8995.16c3f5b4.js
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										1
									
								
								dist/js/app.50e71cdc.js
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								dist/js/app.50e71cdc.js
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										1
									
								
								dist/js/app.8ddc6159.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								dist/js/app.8ddc6159.js
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							@@ -53,7 +53,7 @@ import {
 | 
			
		||||
  getMaterialManagePage,
 | 
			
		||||
  outInRecordRecordExport
 | 
			
		||||
} from '@/api/consumablesManagement'
 | 
			
		||||
import { sideLibraryList, materialList } from '@/api/basicConfig'
 | 
			
		||||
import { sideLibraryList, getMaterialArr } from '@/api/basicConfig'
 | 
			
		||||
const tableProps = [
 | 
			
		||||
  {
 | 
			
		||||
    prop: 'line',
 | 
			
		||||
@@ -154,6 +154,7 @@ export default {
 | 
			
		||||
          labelField: 'name',
 | 
			
		||||
          valueField: 'name',
 | 
			
		||||
          defaultSelect: '',
 | 
			
		||||
          filterable: true,
 | 
			
		||||
          width: 150
 | 
			
		||||
        },
 | 
			
		||||
        {
 | 
			
		||||
@@ -230,7 +231,7 @@ export default {
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    getMaterialList() {
 | 
			
		||||
      materialList().then((res) => {
 | 
			
		||||
      getMaterialArr().then((res) => {
 | 
			
		||||
        console.log(res)
 | 
			
		||||
        if (res.code === 0) {
 | 
			
		||||
          this.formConfig[2].selectOptions = res.data
 | 
			
		||||
 
 | 
			
		||||
@@ -48,7 +48,7 @@ const tableProps = [
 | 
			
		||||
    label: '报警内容'
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    prop: 'startTime',
 | 
			
		||||
    prop: 'startAlertTime',
 | 
			
		||||
    label: '报警开始时间',
 | 
			
		||||
    filter: timeFormatter,
 | 
			
		||||
    minWidth: 160
 | 
			
		||||
 
 | 
			
		||||
@@ -22,6 +22,7 @@
 | 
			
		||||
          <el-select
 | 
			
		||||
            v-model="form.type"
 | 
			
		||||
            placeholder="备件类别"
 | 
			
		||||
            @change="selectName"
 | 
			
		||||
            style="width: 100%"
 | 
			
		||||
          >
 | 
			
		||||
            <el-option
 | 
			
		||||
@@ -170,6 +171,9 @@ export default {
 | 
			
		||||
        this.sparePartsSpecList = []
 | 
			
		||||
      })
 | 
			
		||||
    },
 | 
			
		||||
    selectName(val) {
 | 
			
		||||
      console.log(val)
 | 
			
		||||
    },
 | 
			
		||||
    selectModel(val) {
 | 
			
		||||
      getModelList({
 | 
			
		||||
        name: val
 | 
			
		||||
 
 | 
			
		||||
@@ -67,16 +67,13 @@ export default {
 | 
			
		||||
            zlevel: 2, // 层级
 | 
			
		||||
            radius: ['47%', '50%'],
 | 
			
		||||
            center: ['50%', '45%'],
 | 
			
		||||
            label: {
 | 
			
		||||
              show: false
 | 
			
		||||
            },
 | 
			
		||||
            itemStyle: {
 | 
			
		||||
              shadowBlur: 10,
 | 
			
		||||
              shadowColor: 'rgba(209, 204, 214, 0.64)',
 | 
			
		||||
              color: '#fff',
 | 
			
		||||
              label: {
 | 
			
		||||
                show: false
 | 
			
		||||
              },
 | 
			
		||||
              labelLine: {
 | 
			
		||||
                show: false
 | 
			
		||||
              }
 | 
			
		||||
              color: '#fff'
 | 
			
		||||
            },
 | 
			
		||||
            tooltip: {
 | 
			
		||||
              show: false
 | 
			
		||||
@@ -92,16 +89,13 @@ export default {
 | 
			
		||||
            radius: ['60%', '61%'],
 | 
			
		||||
            center: ['50%', '45%'],
 | 
			
		||||
            zlevel: 1, // 层级
 | 
			
		||||
            label: {
 | 
			
		||||
              show: false
 | 
			
		||||
            },
 | 
			
		||||
            itemStyle: {
 | 
			
		||||
              shadowBlur: 10,
 | 
			
		||||
              shadowColor: 'rgba(0,0,0,.5)',
 | 
			
		||||
              color: '#fff',
 | 
			
		||||
              label: {
 | 
			
		||||
                show: false
 | 
			
		||||
              },
 | 
			
		||||
              labelLine: {
 | 
			
		||||
                show: false
 | 
			
		||||
              }
 | 
			
		||||
              color: '#fff'
 | 
			
		||||
            },
 | 
			
		||||
            tooltip: {
 | 
			
		||||
              show: false
 | 
			
		||||
 
 | 
			
		||||
@@ -79,16 +79,13 @@ export default {
 | 
			
		||||
            zlevel: 1, // 层级
 | 
			
		||||
            radius: ['55%', '58%'],
 | 
			
		||||
            center: ['50%', '40%'],
 | 
			
		||||
            label: {
 | 
			
		||||
              show: false
 | 
			
		||||
            },
 | 
			
		||||
            itemStyle: {
 | 
			
		||||
              shadowBlur: 10,
 | 
			
		||||
              shadowColor: 'rgba(209, 204, 214, 0.64)',
 | 
			
		||||
              color: '#fff',
 | 
			
		||||
              label: {
 | 
			
		||||
                show: false
 | 
			
		||||
              },
 | 
			
		||||
              labelLine: {
 | 
			
		||||
                show: false
 | 
			
		||||
              }
 | 
			
		||||
              color: '#fff'
 | 
			
		||||
            },
 | 
			
		||||
            tooltip: {
 | 
			
		||||
              show: false
 | 
			
		||||
@@ -104,16 +101,13 @@ export default {
 | 
			
		||||
            radius: ['70%', '71%'],
 | 
			
		||||
            center: ['50%', '40%'],
 | 
			
		||||
            zlevel: 1, // 层级
 | 
			
		||||
            label: {
 | 
			
		||||
              show: false
 | 
			
		||||
            },
 | 
			
		||||
            itemStyle: {
 | 
			
		||||
              shadowBlur: 10,
 | 
			
		||||
              shadowColor: 'rgba(0,0,0,.5)',
 | 
			
		||||
              color: '#fff',
 | 
			
		||||
              label: {
 | 
			
		||||
                show: false
 | 
			
		||||
              },
 | 
			
		||||
              labelLine: {
 | 
			
		||||
                show: false
 | 
			
		||||
              }
 | 
			
		||||
              color: '#fff'
 | 
			
		||||
            },
 | 
			
		||||
            tooltip: {
 | 
			
		||||
              show: false
 | 
			
		||||
 
 | 
			
		||||
@@ -54,6 +54,7 @@
 | 
			
		||||
import { tableHeight } from '@/utils/index'
 | 
			
		||||
import { pageProcess } from '@/api/qualityManagement'
 | 
			
		||||
import { timeFormatter } from '@/utils'
 | 
			
		||||
import { getParamList } from '@/api/processManagement'
 | 
			
		||||
const tableProps = [
 | 
			
		||||
  {
 | 
			
		||||
    prop: 'unitName',
 | 
			
		||||
@@ -185,10 +186,16 @@ export default {
 | 
			
		||||
      console.log(val)
 | 
			
		||||
      if (val.type === 'processParameters') {
 | 
			
		||||
        this.processParametersVisible = true
 | 
			
		||||
        this.getProcess()
 | 
			
		||||
      } else if (val.type === 'deviceParameters') {
 | 
			
		||||
        this.deviceParametersVisible = true
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    getProcess() {
 | 
			
		||||
      getParamList().then((res) => {
 | 
			
		||||
        console.log(res)
 | 
			
		||||
      })
 | 
			
		||||
    },
 | 
			
		||||
    handleCloseProcess() {},
 | 
			
		||||
    handleCloseDevice() {}
 | 
			
		||||
  }
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user