From a2ae35d75856018cb66f407ed1f88b5dd3d5f422 Mon Sep 17 00:00:00 2001 From: 李林 <z1292839451@163.com> Date: 星期五, 08 三月 2024 09:02:08 +0800 Subject: [PATCH] 功能调整 --- src/components/view/b2-standard.vue | 57 ++++ /dev/null | 0 src/components/view/a5-capacity-scope.vue | 15 + static/img/logo1.png | 0 static/js/menu.js | 234 +++++++++--------- src/components/view/b1-inspection-order.vue | 447 ++++++++++++++++------------------ src/App.vue | 4 src/view/index.vue | 5 8 files changed, 400 insertions(+), 362 deletions(-) diff --git a/build/logo.png b/build/logo.png deleted file mode 100644 index 5a922ec..0000000 --- a/build/logo.png +++ /dev/null Binary files differ diff --git a/src/App.vue b/src/App.vue index ddf8283..0c035f8 100644 --- a/src/App.vue +++ b/src/App.vue @@ -25,8 +25,8 @@ }; </script> <style> - @import url("../static/alifont/iconfont.css"); - /* @import url("//at.alicdn.com/t/c/font_4379269_2wteluxhkyd.css"); */ + /* @import url("../static/alifont/iconfont.css"); */ + @import url("//at.alicdn.com/t/c/font_4457508_5ubi3w3kng.css"); * { margin: 0; diff --git a/src/components/view/a5-capacity-scope.vue b/src/components/view/a5-capacity-scope.vue index f92c5c7..05a36fd 100644 --- a/src/components/view/a5-capacity-scope.vue +++ b/src/components/view/a5-capacity-scope.vue @@ -160,7 +160,8 @@ laboratory:{ select:[] }, - method:{select:[]} + method:{select:[]}, + deviceGroup:{select:[]} }, selectField: { inspectionItemType: { @@ -178,7 +179,8 @@ laboratory:{ select:[] }, - method:{select:[]} + method:{select:[]}, + deviceGroup:{select:[]} }, requiredAdd: ['inspectionItem', 'manHour', 'inspectionItemType','inspectionValueType','inspectionItemClassify','laboratory','unit','method','price','manDay','deviceGroup','checkoutNumber','valueType'], requiredUp: ['inspectionItem', 'manHour', 'inspectionItemType','inspectionValueType','inspectionItemClassify','laboratory','unit','method','price','manDay','deviceGroup','checkoutNumber','valueType'] @@ -228,6 +230,7 @@ this.selectEnumByCategoryForInspectionValueType() this.obtainItemParameterList() this.selectStandardMethods() + this.selectEnumByCategoryForDevice() this.getPower('0') }, methods: { @@ -296,6 +299,14 @@ this.itemParameterData.tagField.inspectionValueType.select = res.data }) }, + selectEnumByCategoryForDevice() { + this.$axios.post(this.$api.enums.selectEnumByCategory, { + category: "璁惧鍒嗙被" + }).then(res => { + this.itemParameterData.selectField.deviceGroup.select = res.data + this.itemParameterData.tagField.deviceGroup.select = res.data + }) + }, obtainItemParameterList() { this.$axios.get(this.$api.laboratoryScope.obtainItemParameterList).then(res => { let data = [] diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue index d46a9d4..491a0eb 100644 --- a/src/components/view/b1-inspection-order.vue +++ b/src/components/view/b1-inspection-order.vue @@ -34,33 +34,38 @@ height: calc(100% - 60px - 80px - 10px - 40px); padding: 20px; } - .tab{ - list-style-type: none; - display: flex; - margin-bottom: 12px; - } - .tab li{ - line-height: 24px; - padding: 6px 14px; - font-size: 14px; - color: #333333; - border: 1px solid #EEEEEE; - cursor: pointer; - } - .tab li:nth-child(1){ - border-radius: 8px 0 0 8px; - } - .tab li:nth-child(4){ - border-radius: 0 8px 8px 0; - } - .tab li.active{ - border-color: #3A7BFA; - color: #3A7BFA; - } - .el-form-item{ - margin-bottom: 16px; - } + .tab { + list-style-type: none; + display: flex; + margin-bottom: 12px; + } + + .tab li { + line-height: 24px; + padding: 6px 14px; + font-size: 14px; + color: #333333; + border: 1px solid #EEEEEE; + cursor: pointer; + } + + .tab li:nth-child(1) { + border-radius: 8px 0 0 8px; + } + + .tab li:nth-child(4) { + border-radius: 0 8px 8px 0; + } + + .tab li.active { + border-color: #3A7BFA; + color: #3A7BFA; + } + + .el-form-item { + margin-bottom: 16px; + } </style> <template> @@ -69,7 +74,7 @@ <el-row class="title"> <el-col :span="12" style="padding-left: 20px;">妫�楠屼笅鍗�</el-col> <el-col :span="12" style="text-align: right;"> - <el-button size="medium" type="primary" @click="playOrder">涓嬪崟</el-button> + <el-button size="medium" type="primary" @click="playOrder">涓嬪崟</el-button> </el-col> </el-row> </div> @@ -79,128 +84,94 @@ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="componentData.entity.deviceName" @keyup.enter.native="refreshTable()"></el-input></div> </div> - <div class="search_thing"> + <div class="search_thing"> <div class="search_label">鏍峰搧鍚嶇О锛�</div> <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="componentData.entity.specificationModel" @keyup.enter.native="refreshTable()"></el-input></div> </div> <div class="search_thing" style="padding-left: 30px;"> - <el-button size="small" @click="refresh()">閲� 缃�</el-button> + <el-button size="small" @click="refresh()">閲� 缃�</el-button> <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button> </div> </div> <div class="table"> - <ul class="tab"> - <li v-for="(m,i) in tabList" :key="i" :class="{active:i==tabIndex}" @click="handleTab(m,i)">{{m.label}}</li> - </ul> + <ul class="tab"> + <li v-for="(m,i) in tabList" :key="i" :class="{active:i==tabIndex}" @click="handleTab(m,i)">{{m.label}}</li> + </ul> <!-- 璇硶 瀛愮粍浠堕�氳繃 this.$emit +浼犲叆鏂规硶鍚� 璋冪敤鐖剁粍浠舵柟娉� 渚嬪 this.$emit锛坰electAllByOne锛� 灏遍渶鍦ㄧ埗缁勪欢澹版槑骞朵紶鍏� @selectAllByOne="selectAllByOne"--> - <ValueTable - ref="ValueTable" - :url="$api.deviceScope.selectDeviceParameter" - :componentData="componentData" - :key="upIndex" - style="height: calc(100% - 44px)" - @selectAllByOne="selectAllByOne" - @handleDataLook="handleDataLook" - @download="download" - @handleVerify="handleVerify" - @handlEquash="handlEquash" - @handleIssued="handleIssued" /> + <ValueTable ref="ValueTable" :url="$api.deviceScope.selectDeviceParameter" :componentData="componentData" + :key="upIndex" style="height: calc(100% - 44px)" @selectAllByOne="selectAllByOne" + @handleDataLook="handleDataLook" @download="download" @handleVerify="handleVerify" @handlEquash="handlEquash" + @handleIssued="handleIssued" /> </div> - <!-- 瀹℃牳 --> - <el-dialog - title="涓嬪崟瀹℃牳" - :visible.sync="verifyDialogVisible" - width="30%" - :before-close="handleClose"> - <p style="font-size:16px;color:#333333" v-if="!isPass">濮旀墭缂栧彿<span style="color:#34BD66">ZTMS2023071001</span>鐨勪俊鎭槸鍚﹂�氳繃</p> - <el-form :label-position="labelPosition" :model="formData" label-width="150px" ref="ruleForm" v-else> - <el-form-item label="璇疯緭鍏ユ牱鍝佸簱浣嶅彿锛�" > - <el-input v-model="formData.specificationModel" size="small" style="width:60%"></el-input> - </el-form-item> - </el-form> - <span slot="footer" class="dialog-footer"> - <el-row v-if="!isPass"> - <el-button @click="handleClose">閫� 鍥�</el-button> - <el-button type="primary" @click="submitForm" :loading="upLoad">閫� 杩�</el-button> - </el-row> - <el-row v-else> - <el-button @click="handleClose">杩� 鍥�</el-button> - <el-button type="primary" @click="submitForm" :loading="upLoad">纭� 瀹�</el-button> - </el-row> - </span> - </el-dialog> - <!-- 鎾ら攢 --> - <el-dialog - title="涓嬪崟鎾ら攢" - :visible.sync="quashDialogVisible" - width="30%" - :before-close="handleClose"> - <p style="font-size:16px;color:#333333" v-if="!isQuash">濮旀墭缂栧彿<span style="color:#34BD66">ZTMS2023071001</span>鐨勪俊鎭槸鍚︽挙閿�</p> - <el-form :label-position="labelPosition" :model="formData" label-width="150px" ref="ruleForm" v-else> - <el-form-item label="璇疯緭鍏ユ挙閿�鍘熷洜锛�" > - <el-input v-model="formData.specificationModel" size="small" style="width:60%"></el-input> - </el-form-item> - </el-form> - <span slot="footer" class="dialog-footer"> - <el-row v-if="!isQuash"> - <el-button @click="handleClose">鍙� 娑�</el-button> - <el-button type="primary" @click="submitForm" :loading="upLoad">纭� 瀹�</el-button> - </el-row> - <el-row v-else> - <el-button @click="handleClose">杩� 鍥�</el-button> - <el-button type="primary" @click="submitForm" :loading="upLoad">纭� 瀹�</el-button> - </el-row> - </span> - </el-dialog> - <!-- 涓嬪彂 --> - <el-dialog - title="妫�楠屼笅鍙�" - :visible.sync="issuedDialogVisible" - width="30%" - :before-close="handleClose"> - <el-form :label-position="labelPosition" :model="formData" label-width="150px" ref="ruleForm"> - <el-form-item label="绾﹀畾鏃堕棿锛�" > - <el-date-picker - style="width:100%" - format="yyyy-MM-dd" - value-format="yyyy-MM-dd" - v-model="formData.downTime" - type="date" - size="small" - placeholder="閫夋嫨鏃堕棿"> - </el-date-picker> - </el-form-item> - <el-form-item label="鎸囨淳浜哄憳锛�" > - <el-select v-model="formData.equipmentManager" placeholder="璇烽�夋嫨" size="small" style="width:100%"> - <el-option - v-for="item in personList" - :key="item.value" - :label="item.label" - :value="item.value" - > - </el-option> - </el-select> - </el-form-item> - </el-form> - <span slot="footer" class="dialog-footer"> - <el-row> - <el-button @click="handleClose">鍙� 娑�</el-button> - <el-button type="primary" @click="submitForm" :loading="upLoad">纭� 瀹�</el-button> - </el-row> - </span> - </el-dialog> - <el-dialog - title="鏁版嵁鏌ョ湅" - :visible.sync="dataDialogVisible" - width="70%" - :before-close="handleClose"> - <ValueTable - ref="ValueTableDataLook" - :url="$api.deviceScope.selectDeviceParameter" - :componentData="componentDataDataLook" - :key="upIndex" style="height: calc(100% - 44px)" /> - </el-dialog> + <!-- 瀹℃牳 --> + <el-dialog title="涓嬪崟瀹℃牳" :visible.sync="verifyDialogVisible" width="30%" :before-close="handleClose"> + <p style="font-size:16px;color:#333333" v-if="!isPass">濮旀墭缂栧彿<span + style="color:#34BD66">ZTMS2023071001</span>鐨勪俊鎭槸鍚﹂�氳繃</p> + <el-form :label-position="labelPosition" :model="formData" label-width="150px" ref="ruleForm" v-else> + <el-form-item label="璇疯緭鍏ユ牱鍝佸簱浣嶅彿锛�"> + <el-input v-model="formData.specificationModel" size="small" style="width:60%"></el-input> + </el-form-item> + </el-form> + <span slot="footer" class="dialog-footer"> + <el-row v-if="!isPass"> + <el-button @click="handleClose">閫� 鍥�</el-button> + <el-button type="primary" @click="submitForm" :loading="upLoad">閫� 杩�</el-button> + </el-row> + <el-row v-else> + <el-button @click="handleClose">杩� 鍥�</el-button> + <el-button type="primary" @click="submitForm" :loading="upLoad">纭� 瀹�</el-button> + </el-row> + </span> + </el-dialog> + <!-- 鎾ら攢 --> + <el-dialog title="涓嬪崟鎾ら攢" :visible.sync="quashDialogVisible" width="30%" :before-close="handleClose"> + <p style="font-size:16px;color:#333333" v-if="!isQuash">濮旀墭缂栧彿<span + style="color:#34BD66">ZTMS2023071001</span>鐨勪俊鎭槸鍚︽挙閿�</p> + <el-form :label-position="labelPosition" :model="formData" label-width="150px" ref="ruleForm" v-else> + <el-form-item label="璇疯緭鍏ユ挙閿�鍘熷洜锛�"> + <el-input v-model="formData.specificationModel" size="small" style="width:60%"></el-input> + </el-form-item> + </el-form> + <span slot="footer" class="dialog-footer"> + <el-row v-if="!isQuash"> + <el-button @click="handleClose">鍙� 娑�</el-button> + <el-button type="primary" @click="submitForm" :loading="upLoad">纭� 瀹�</el-button> + </el-row> + <el-row v-else> + <el-button @click="handleClose">杩� 鍥�</el-button> + <el-button type="primary" @click="submitForm" :loading="upLoad">纭� 瀹�</el-button> + </el-row> + </span> + </el-dialog> + <!-- 涓嬪彂 --> + <el-dialog title="妫�楠屼笅鍙�" :visible.sync="issuedDialogVisible" width="30%" :before-close="handleClose"> + <el-form :label-position="labelPosition" :model="formData" label-width="150px" ref="ruleForm"> + <el-form-item label="绾﹀畾鏃堕棿锛�"> + <el-date-picker style="width:100%" format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="formData.downTime" + type="date" size="small" placeholder="閫夋嫨鏃堕棿"> + </el-date-picker> + </el-form-item> + <el-form-item label="鎸囨淳浜哄憳锛�"> + <el-select v-model="formData.equipmentManager" placeholder="璇烽�夋嫨" size="small" style="width:100%"> + <el-option v-for="item in personList" :key="item.value" :label="item.label" :value="item.value"> + </el-option> + </el-select> + </el-form-item> + </el-form> + <span slot="footer" class="dialog-footer"> + <el-row> + <el-button @click="handleClose">鍙� 娑�</el-button> + <el-button type="primary" @click="submitForm" :loading="upLoad">纭� 瀹�</el-button> + </el-row> + </span> + </el-dialog> + <el-dialog title="鏁版嵁鏌ョ湅" :visible.sync="dataDialogVisible" width="70%" :before-close="handleClose"> + <div style="height: 70vh;overflow-y: auto;"> + <ValueTable ref="ValueTableDataLook" :url="$api.deviceScope.selectDeviceParameter" + :componentData="componentDataDataLook" :key="upIndex" /> + </div> + </el-dialog> </div> </template> @@ -214,15 +185,15 @@ return { //鏄惁瀹℃牳閫氳繃 true鏄� false涓嶆槸 isPass: false, - //鏄惁瀹℃牳鎾ら攢 true鏄� false涓嶆槸 - isQuash:false, - verifyDialogVisible: false, - quashDialogVisible:false, - issuedDialogVisible:false, - dataDialogVisible:false, + //鏄惁瀹℃牳鎾ら攢 true鏄� false涓嶆槸 + isQuash: false, + verifyDialogVisible: false, + quashDialogVisible: false, + issuedDialogVisible: false, + dataDialogVisible: false, formData: {}, - // 浜哄憳鍒楄〃 - personList:[], + // 浜哄憳鍒楄〃 + personList: [], labelPosition: 'right', componentData: { entity: { @@ -239,58 +210,59 @@ showSelect: false, select: false, do: [{ - id: 'details', - font: '璇︽儏', - type: 'text', - method: 'selectAllByOne' - }, { id: 'dataLook', font: '鏁版嵁鏌ョ湅', type: 'text', method: 'handleDataLook' - },{ + }, { id: 'download', font: '鎶ュ憡涓嬭浇', type: 'text', method: 'download' - },{ + }, { id: 'verify', font: '瀹℃牳', type: 'text', method: 'handleVerify' - },{ + }, { id: 'quash', font: '鎾ら攢', type: 'text', method: 'handlEquash' - },{ + }, { id: 'issued', font: '涓嬪彂', type: 'text', method: 'handleIssued' }], tagField: { - deviceStatus: { + deviceStatus: { select: [{ value: 0, type: 'success', label: '姝e父' - },{ + }, { value: 1, type: 'warning', label: '鎶ュ簾' - },{ + }, { value: 2, type: 'danger', label: '淇濅慨' }] } - }, + }, + linkEvent:{ + deviceName:{ + id: 'details', + method:'selectAllByOne', + } + }, selectField: {}, - requiredAdd:['largeCategory','subclass','deviceName','internalCode','specificationModel','manufacturer'], - requiredUp:['largeCategory','subclass','deviceName','internalCode','specificationModel','manufacturer'] + requiredAdd: ['largeCategory', 'subclass', 'deviceName', 'internalCode', 'specificationModel', 'manufacturer'], + requiredUp: ['largeCategory', 'subclass', 'deviceName', 'internalCode', 'specificationModel', 'manufacturer'] }, - componentDataDataLook:{ + componentDataDataLook: { entity: { orderBy: { field: 'id', @@ -302,49 +274,48 @@ select: false, do: [], tagField: { - deviceStatus: { + deviceStatus: { select: [{ value: 0, type: 'success', label: '姝e父' - },{ + }, { value: 1, type: 'warning', label: '鎶ュ簾' - },{ + }, { value: 2, type: 'danger', label: '淇濅慨' }] } - }, + }, selectField: {}, - requiredAdd:[], - requiredUp:[] + requiredAdd: [], + requiredUp: [] }, entityCopy: {}, upIndex: 0, addPower: true, - upLoad:false, - tabList:[ - { - label:'妫�楠屽鐞�', - value:0 - }, - { - label:'寰呭鏍�', - value:1 - }, - { - label:'閫�鍥�', - value:2 - }, - { - label:'鎾ら攢', - value:3 - }, - ], - tabIndex:0, + upLoad: false, + tabList: [{ + label: '妫�楠屽鐞�', + value: 0 + }, + { + label: '寰呭鏍�', + value: 1 + }, + { + label: '閫�鍥�', + value: 2 + }, + { + label: '鎾ら攢', + value: 3 + }, + ], + tabIndex: 0, } }, mounted() { @@ -366,68 +337,68 @@ let del = false let add = false for (var i = 0; i < power.length; i++) { - if(power[i].menuMethod=='upDeviceParameter'){ + if (power[i].menuMethod == 'upDeviceParameter') { up = true } - if(power[i].menuMethod=='delDeviceParameter'){ + if (power[i].menuMethod == 'delDeviceParameter') { del = true } - if(power[i].menuMethod=='addDeviceParameter'){ + if (power[i].menuMethod == 'addDeviceParameter') { add = true } } - if(!del){ + if (!del) { this.componentData.do.splice(1, 1) } - if(!up){ + if (!up) { this.componentData.do.splice(0, 1) } this.addPower = add }, - handleClose(){ + handleClose() { this.verifyDialogVisible = false; - this.quashDialogVisible = false; - this.issuedDialogVisible = false; - this.dataDialogVisible = false; - this.upLoad = false; + this.quashDialogVisible = false; + this.issuedDialogVisible = false; + this.dataDialogVisible = false; + this.upLoad = false; }, - // 璇︽儏 - selectAllByOne(row){ + // 璇︽儏 + selectAllByOne(row) { //鎵撳紑寮规 this.dialogVisible = true; //row = 鐐瑰嚮瀵瑰簲琛屽�� //澶嶅埗缁檉ormData - this.formData=this.HaveJson(row); + this.formData = this.HaveJson(row); }, - // 鏁版嵁鏌ョ湅 - handleDataLook(row){ - this.dataDialogVisible = true; - }, - // 涓嬭浇鎶ュ憡 - download(row){ + // 鏁版嵁鏌ョ湅 + handleDataLook(row) { + this.dataDialogVisible = true; + }, + // 涓嬭浇鎶ュ憡 + download(row) { - }, - // 瀹℃牳 - handleVerify(row){ - this.verifyDialogVisible = true; - }, - // 鎾ら攢 - handlEquash(row){ - this.quashDialogVisible = true; - }, - // 涓嬪彂 - handleIssued(row){ - this.issuedDialogVisible = true; - }, - submitForm(){ - this.upLoad = true; - let authorizedPerson = this.formData.authorizedPerson.length>0?this.formData.authorizedPerson.join(','):'' - delete this.formData.createTime - delete this.formData.updateTime - delete this.formData.createUser - delete this.formData.updateUser - this.formData.authorizedPerson = authorizedPerson - this.$axios.post(this.$api.deviceScope.upDeviceParameter, this.formData, { + }, + // 瀹℃牳 + handleVerify(row) { + this.verifyDialogVisible = true; + }, + // 鎾ら攢 + handlEquash(row) { + this.quashDialogVisible = true; + }, + // 涓嬪彂 + handleIssued(row) { + this.issuedDialogVisible = true; + }, + submitForm() { + this.upLoad = true; + let authorizedPerson = this.formData.authorizedPerson.length > 0 ? this.formData.authorizedPerson.join(',') : '' + delete this.formData.createTime + delete this.formData.updateTime + delete this.formData.createUser + delete this.formData.updateUser + this.formData.authorizedPerson = authorizedPerson + this.$axios.post(this.$api.deviceScope.upDeviceParameter, this.formData, { headers: { 'Content-Type': 'application/json' } @@ -437,20 +408,20 @@ return } this.$message.success('淇敼鎴愬姛') - this.upLoad = false + this.upLoad = false this.refreshTable() - this.dialogVisible = false + this.dialogVisible = false }).catch(e => { this.$message.error('淇敼澶辫触') this.dialogVisible = false this.upLoad = false }) - }, - // 涓嬪崟 - playOrder(){}, - handleTab(m,i){ - this.tabIndex = i; - } + }, + // 涓嬪崟 + playOrder() {}, + handleTab(m, i) { + this.tabIndex = i; + } } } -</script> +</script> \ No newline at end of file diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue index a67a3e0..42eb543 100644 --- a/src/components/view/b2-standard.vue +++ b/src/components/view/b2-standard.vue @@ -311,7 +311,21 @@ showSelect: true, select: true, do: [], - tagField: {}, + tagField: { + inspectionItemType: { + select: [] + }, + valueType: { + select: [] + }, + bsm:{ + select: [] + }, + inspectionValueType:{ + select:[] + }, + deviceGroup:{select:[]} + }, selectField: {}, } } @@ -324,6 +338,11 @@ this.selectEnumByCategoryForsampleType() this.selectTestObjectByName() this.selectStandardMethods() + this.selectEnumByCategoryForDevice() + this.selectEnumByCategory() + this.selectEnumByCategoryForValue() + this.selectEnumByCategoryForSpecial() + this.selectEnumByCategoryForInspectionValueType() }, methods: { filterNode(value, data) { @@ -400,6 +419,42 @@ this.sampleType = res.data }) }, + selectEnumByCategoryForDevice() { + this.$axios.post(this.$api.enums.selectEnumByCategory, { + category: "璁惧鍒嗙被" + }).then(res => { + this.componentData.tagField.deviceGroup.select = res.data + }) + }, + selectEnumByCategory() { + this.$axios.post(this.$api.enums.selectEnumByCategory, { + category: "妫�楠岄」绫诲瀷" + }).then(res => { + res.data[1].type = 'info' + this.componentData.tagField.inspectionItemType.select = res.data + }) + }, + selectEnumByCategoryForValue() { + this.$axios.post(this.$api.enums.selectEnumByCategory, { + category: "鍙栧�肩被鍨�" + }).then(res => { + this.componentData.tagField.valueType.select = res.data + }) + }, + selectEnumByCategoryForSpecial() { + this.$axios.post(this.$api.enums.selectEnumByCategory, { + category: "鐗规畩鏍囪瘑" + }).then(res => { + this.componentData.tagField.bsm.select = res.data + }) + }, + selectEnumByCategoryForInspectionValueType() { + this.$axios.post(this.$api.enums.selectEnumByCategory, { + category: "妫�楠屽�肩被鍨�" + }).then(res => { + this.componentData.tagField.inspectionValueType.select = res.data + }) + }, selectStandardTreeList() { this.treeLoad = true this.$axios.get(this.$api.standardTree.selectStandardTreeList).then(res => { diff --git a/src/view/index.vue b/src/view/index.vue index 83766bf..fcc83e2 100644 --- a/src/view/index.vue +++ b/src/view/index.vue @@ -12,11 +12,12 @@ height: 48px; display: flex; align-items: center; - padding: 0 30px; + padding: 0 24px; } .logo { width: 130px; + height: 40px; } .logo img { @@ -264,7 +265,7 @@ <div class="all" @click="closeRightKey"> <div class="title"> <div class="logo"> - <!-- <img src="../../static/img/logo 1.png" /> --> + <img src="../../static/img/logo1.png" /> </div> <div class="label">LIMS瀹為獙瀹ょ鐞嗙郴缁�</div> <div class="user"> diff --git a/static/img/logo1.png b/static/img/logo1.png new file mode 100644 index 0000000..b7d0787 --- /dev/null +++ b/static/img/logo1.png Binary files differ diff --git a/static/js/menu.js b/static/js/menu.js index 0181f46..6f55193 100644 --- a/static/js/menu.js +++ b/static/js/menu.js @@ -12,145 +12,145 @@ }, { v: "涓氬姟绠$悊", - i: "font icon-a-Group1118", + i: "font icon-kexueyanjiuheshiyankaifa", p: "", c: [{ v: "妫�楠屼笅鍗�", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "b1-inspection-order", p: "" }, { v: "妫�楠屼换鍔�", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", p: "" }, { v: "鎶ュ憡缂栧埗", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", p: "" }, { v: "璐圭敤缁熻", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", p: "" }, { v: "鏍峰搧绠$悊", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", p: "" }] }, { v: "鏍囧噯闆�", - i: "font icon-a-Group1120", + i: "font icon-biaozhunji", p: "", c: [{ v: "鏍囧噯搴�", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "b2-standard", p: "selectStandardTreeList" }, { v: "鏍囧噯妯℃澘", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", p: "" }] }, { v: "缁╂晥绠$悊", - i: "font icon-24gl-clipboardList", + i: "font icon-jixiaoguanli", p: "", c: [{ v: "宸ユ椂绠$悊", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "fans-submit", p: "" }, { v: "浜哄憳鑰冨嫟", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", p: "" }, { v: "浜哄憳鑰冭瘎", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", p: "" }, { v: "浜哄憳鑰冩牳", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", p: "" }, { v: "鎶�鑳界瓑绾�", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", p: "" }, { v: "宸ヨ祫缁撶畻", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", p: "" }, { v: "鐝", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", p: "" }] }, { v: "缁熻鍥捐〃", - i: "font icon-24gl-clipboardList", + i: "font icon-tongjitubiao", p: "", c: [{ v: "瀹為獙瀹よ绱�", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", p: "" }, { v: "姣忔棩涓氬姟缁熻", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", p: "" }, { v: "妫�娴嬮」鐩粺璁�", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", p: "" }, { v: "鏍峰搧缂洪櫡鎸囨暟", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", p: "" }, { v: "鑰楁潗缁熻", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", p: "" }, { v: "浜哄憳宸ヤ綔鎶ヨ〃", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", p: "" }] }, { v: "鐢靛瓙鐪嬫澘", - i: "font icon-a-Group1126", + i: "font icon-dianzikanban-fan", p: "", c: [{ v: "瀹㈡埛鎺ュ緟", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", p: "" }, { v: "浠诲姟灞曠ず", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", p: "" }, { v: "璁惧鐘舵�佸強楗卞拰搴�", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", p: "" }] @@ -188,25 +188,25 @@ }, { v: "4 閫氱敤瑕佹眰", - i: "el-icon-tickets", + i: "font icon-tongyongyaoqiu", p: "", c: [{ v: "閫氱敤瑕佹眰", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "4 閫氱敤瑕佹眰", p: "" }, { v: "鍏鎬�", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "4.1 鍏鎬�", p: "" }, { v: "淇濆瘑鎬�", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "4.2 淇濆瘑鎬�", p: "" @@ -215,310 +215,310 @@ }, { v: "5 缁撴瀯瑕佹眰", - i: "el-icon-tickets", + i: "font icon-jiegouyaoqiu", p: "", c: [{ v: "瀹為獙瀹ょ殑娉曞緥鍦颁綅", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "A瀹為獙瀹ょ殑娉曞緥鍦颁綅", p: "" }, { v: "鍏ㄦ潈璐熻矗鐨勭鐞嗗眰", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "B鍏ㄦ潈璐熻矗鐨勭鐞嗗眰", p: "" }, { v: "瀹為獙瀹よ祫璐�", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "C鑳藉姏鑼冨洿鍜岃祫璐�", p: "" }, { v: "鑳藉姏鑼冨洿", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "a5-capacity-scope", g: "C鑳藉姏鑼冨洿鍜岃祫璐�", p: "selectItemParameterList selectTestObjectList" }, { v: "鍦烘墍鎴栬鏂�", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "a5-laboratory-management", g: "D鍦烘墍鎴栬鏂�", p: "selectItemParameter" }, { v: "缁勭粐鐩稿叧鏂囦欢", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "E缁勭粐鐩稿叧鏂囦欢", p: "" }, { v: "浜哄憳宀椾綅浠昏亴", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "F浜哄憳宀椾綅浠昏亴", p: "" }, { v: "娌熼�氬拰瀹h疮", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "G娌熼�氬拰瀹h疮", p: "" }] }, { v: "6 璧勬簮瑕佹眰", - i: "el-icon-tickets", + i: "font icon-ziyuanyaoqiu", p: "", c: [{ v: "鎬诲垯", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.1 鎬诲垯", p: "" }, { v: "浜哄憳鎬昏", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.2 浜哄憳", p: "" }, { v: "浜哄憳鏄庣粏", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.2 浜哄憳", p: "" }, { v: "浜哄憳鍩硅", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.2 浜哄憳", p: "" }, { v: "浜哄憳鐩戠潱", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.2 浜哄憳", p: "" }, { v: "宀椾綅鑱岃矗", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.2 浜哄憳", p: "" }, { v: "浜哄憳鍩烘湰淇℃伅", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.2 浜哄憳", p: "" }, { v: "宸ヤ綔灞ュ巻", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.2 浜哄憳", p: "" }, { v: "濂栨儵璁板綍", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.2 浜哄憳", p: "" }, { v: "鍩硅璁板綍", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.2 浜哄憳", p: "" }, { v: "鐩戠潱璁板綍", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.2 浜哄憳", p: "" }, { v: "浠昏亴鎺堟潈璁板綍", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.2 浜哄憳", p: "" }, { v: "浜哄憳鑳藉姏鐩戞帶璁板綍", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.2 浜哄憳", p: "" }, { v: "娌熼�氳褰�", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.2 浜哄憳", p: "" }, { v: "澶栨潵浜哄憳绠$悊", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.3 璁炬柦鍜岀幆澧冩潯浠�", p: "" }, { v: "瀹為獙瀹よ鏂藉満鎵�淇℃伅", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.3 璁炬柦鍜岀幆澧冩潯浠�", p: "" }, { v: "璁炬柦鍜岀幆澧冩潯浠惰姹�", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.3 璁炬柦鍜岀幆澧冩潯浠�", p: "" }, { v: "鐜鏉′欢寮曠敤", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.3 璁炬柦鍜岀幆澧冩潯浠�", p: "" }, { v: "瀹夊叏鍖轰唬琛ㄦ鏌�", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.3 璁炬柦鍜岀幆澧冩潯浠�", p: "" }, { v: "瀹夊叏鍐呭姟", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.3 璁炬柦鍜岀幆澧冩潯浠�", p: "" }, { v: "搴熺墿澶勭悊浜ゆ帴璁板綍", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.3 璁炬柦鍜岀幆澧冩潯浠�", p: "" }, { v: "璁惧鎬昏", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "a6-device-overview", g: "6.4 璁惧", p: "selectDeviceParameter" }, { v: "璁惧宸ュ叿鏄庣粏", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "a6-device-management", g: "6.4 璁惧", p: "selectDeviceParameter" }, { v: "璧勬簮棰勫畾", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.4 璁惧", p: "" }, { v: "浣滀笟鎸囧涔�", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.4 璁惧", p: "" }, { v: "璁惧杩愯鎬昏", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.4 璁惧", p: "" }, { v: "璁惧妗f", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.4 璁惧", p: "" }, { v: "璁惧楠屾敹", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.4 璁惧", p: "" }, { v: "璁惧鏍″噯", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.4 璁惧", p: "" }, { v: "璁惧鏍告煡", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.4 璁惧", p: "" }, { v: "璁惧缁存姢", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.4 璁惧", p: "" }, { v: "璁惧鍊熺敤", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.4 璁惧", p: "" }, { v: "璁惧鏁呴殰", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.4 璁惧", p: "" }, { v: "浣跨敤璁板綍", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.4 璁惧", p: "" }, { v: "璁惧鍋滅敤/鍚敤", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.4 璁惧", p: "" }, { v: "閲忓�兼函婧愯鍒�", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.5 璁¢噺婧簮鎬�", p: "" }, { v: "鏍囧噯鐗╄川娓呭崟", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.5 璁¢噺婧簮鎬�", p: "" }, { v: "鏍囧噯鐗╄川楠屾敹", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.5 璁¢噺婧簮鎬�", p: "" }, { v: "鏍囧噯鐗╄川棰嗙敤", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.5 璁¢噺婧簮鎬�", p: "" }, { v: "杩囨湡鏍囨牱澶勭疆", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.5 璁¢噺婧簮鎬�", p: "" }, { v: "鏈嶅姟鍜屼緵搴斿搧閲囪喘", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.6 澶栭儴鎻愪緵鐨勪骇鍝佸拰鏈嶅姟", p: "" },{ v: "渚涘簲鍟嗙鐞�", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "6.6 澶栭儴鎻愪緵鐨勪骇鍝佸拰鏈嶅姟", p: "" @@ -526,107 +526,107 @@ }, { v: "7 杩囩▼瑕佹眰", - i: "el-icon-tickets", + i: "font icon-guochengyaoqiu", p: "", c: [{ v: "妫�楠屽鎵樺崟", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "7.1 瑕佹眰銆佹爣涔﹀拰鍚堝悓璇勫", p: "" }, { v: "鍚堝悓璇勫", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "7.1 瑕佹眰銆佹爣涔﹀拰鍚堝悓璇勫", p: "" }, { v: "瀹為獙瀹ょ殑妫�娴嬭兘鍔涙。妗�", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "standard_method", g: "7.2 鏂规硶鐨勯�夋嫨銆侀獙璇佸拰纭", p: "selectStandardMethodList" }, { v: "鏍囧噯鏌ユ柊", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "7.2 鏂规硶鐨勯�夋嫨銆侀獙璇佸拰纭", p: "" }, { v: "鏍囧噯鏂规硶鐨勫彉鏇�", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "7.2 鏂规硶鐨勯�夋嫨銆侀獙璇佸拰纭", p: "" }, { v: "鏂规硶楠岃瘉", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "7.2 鏂规硶鐨勯�夋嫨銆侀獙璇佸拰纭", p: "" }, { v: "鎶芥牱", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "7.3 鎶芥牱", p: "" }, { v: "妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "7.4 妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�", p: "" }, { v: "鎶�鏈褰�", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "7.5 鎶�鏈褰�", p: "" }, { v: "娴嬮噺涓嶇‘瀹氬害鐨勮瘎瀹�", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "7.6 娴嬮噺涓嶇‘瀹氬害鐨勮瘎瀹�", p: "" }, { v: "纭繚缁撴灉鏈夋晥鎬�", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "7.7 纭繚缁撴灉鏈夋晥鎬�", p: "" }, { v: "鎶ュ憡缁撴灉", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "7.8 鎶ュ憡缁撴灉", p: "" }, { v: "鎶曡瘔璇︽儏", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "7.9 鎶曡瘔", p: "" }, { v: "鎶曡瘔鎯呭喌姹囨�昏〃", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "7.9 鎶曡瘔", p: "" }, { v: "涓嶇鍚堥」", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "7.10 涓嶇鍚堝伐浣�", p: "" }, { v: "涓嶇鍚堥」鐨勫垎甯�", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "7.10 涓嶇鍚堝伐浣�", p: "" }, { v: "鏁版嵁鎺у埗鍜屼俊鎭鐞�", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "7.11 鏁版嵁鎺у埗鍜屼俊鎭鐞�", p: "" @@ -634,89 +634,89 @@ }, { v: "8 浣撶郴绠$悊瑕佹眰", - i: "el-icon-tickets", + i: "font icon-guanlitixiyaoqiu", p: "", c: [{ v: "鏂瑰紡", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "8.1 鏂瑰紡", p: "" }, { v: "绠$悊浣撶郴鏂囦欢", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "8.2 绠$悊浣撶郴鏂囦欢", p: "" }, { v: "鏂囦欢娓呭崟", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "8.3 绠$悊浣撶郴鏂囦欢鐨勬帶鍒�", p: "" }, { v: "鏂囦欢鍙楁帶", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "8.3 绠$悊浣撶郴鏂囦欢鐨勬帶鍒�", p: "" }, { v: "鏂囦欢鍙戞斁鍥炴敹", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "8.3 绠$悊浣撶郴鏂囦欢鐨勬帶鍒�", p: "" }, { v: "鏂囦欢鍙樻洿", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "8.3 绠$悊浣撶郴鏂囦欢鐨勬帶鍒�", p: "" }, { v: "鏂囦欢浣滃簾", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "8.3 绠$悊浣撶郴鏂囦欢鐨勬帶鍒�", p: "" }, { v: "璁板綍鐨勬帶鍒�", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "8.4 璁板綍鐨勬帶鍒�", p: "" }, { v: "搴斿椋庨櫓鍜屾満閬囩殑鎺柦", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "8.5 搴斿椋庨櫓鍜屾満閬囩殑鎺柦", p: "" }, { v: "瀹㈡埛鍩烘湰淇℃伅绠$悊", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "8.6 鏀硅繘", p: "" }, { v: "瀹㈡埛婊℃剰搴�", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "8.6 鏀硅繘", p: "" }, { v: "绾犳鎺柦", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "8.7 绾犳鎺柦", p: "" }, { v: "鍐呭绠$悊", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "8.8 鍐呭绠$悊", p: "" }, { v: "绠$悊璇勫", - i: "font icon-24gl-clipboardList", + i: "font icon-erjidaohang", u: "", g: "8.9 绠$悊璇勫", p: "" -- Gitblit v1.9.3