fzq #31

Closed
fanzhiqin wants to merge 215 commits from fzq into test
43 changed files with 37 additions and 37 deletions
Showing only changes of commit ee27a93181 - Show all commits

View File

@ -106,6 +106,7 @@ router.beforeEach((to, from, next) => {
Vue.prototype.$message.error(res.msg) Vue.prototype.$message.error(res.msg)
return next({ name: 'login' }) return next({ name: 'login' })
} }
console.log('menulist: ', res.data)
window.SITE_CONFIG['menuList'] = res.data window.SITE_CONFIG['menuList'] = res.data
fnAddDynamicMenuRoutes(window.SITE_CONFIG['menuList']) fnAddDynamicMenuRoutes(window.SITE_CONFIG['menuList'])
next({ ...to, replace: true }) next({ ...to, replace: true })

View File

@ -102,7 +102,6 @@ export default {
key: this.dataForm.key key: this.dataForm.key
}) })
}).then(({ data }) => { }).then(({ data }) => {
console.log('===', data)
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.data.list this.dataList = data.data.list
this.totalPage = data.data.total this.totalPage = data.data.total

View File

@ -49,7 +49,7 @@
</template> </template>
<script> <script>
import AddOrUpdate from './equipmenalarmlog-add-or-update' import AddOrUpdate from './equipmentAlarmLog-add-or-update'
export default { export default {
data() { data() {
return { return {

View File

@ -52,7 +52,7 @@
</template> </template>
<script> <script>
import AddOrUpdate from './equipmenfile-add-or-update' import AddOrUpdate from './equipmentFile-add-or-update'
export default { export default {
data() { data() {
return { return {

View File

@ -49,7 +49,7 @@
</template> </template>
<script> <script>
import AddOrUpdate from './equipmengroup-add-or-update' import AddOrUpdate from './equipmentGroup-add-or-update'
export default { export default {
data() { data() {
return { return {

View File

@ -55,7 +55,7 @@
</template> </template>
<script> <script>
import AddOrUpdate from './equipmengroupalarm-add-or-update' import AddOrUpdate from './equipmentGroupAlarm-add-or-update'
export default { export default {
data() { data() {
return { return {

View File

@ -57,7 +57,7 @@
</template> </template>
<script> <script>
import AddOrUpdate from './equipmenplc-add-or-update' import AddOrUpdate from './equipmentPlc-add-or-update'
export default { export default {
data() { data() {
return { return {

View File

@ -50,7 +50,7 @@
</template> </template>
<script> <script>
import AddOrUpdate from './equipmenplcconnect-add-or-update' import AddOrUpdate from './equipmentPlcConnect-add-or-update'
export default { export default {
data() { data() {
return { return {

View File

@ -62,7 +62,7 @@
</template> </template>
<script> <script>
import AddOrUpdate from './equipmenplcparam-add-or-update' import AddOrUpdate from './equipmentPlcParam-add-or-update'
export default { export default {
data() { data() {
return { return {

View File

@ -53,7 +53,7 @@
</template> </template>
<script> <script>
import AddOrUpdate from './equipmenquantity-add-or-update' import AddOrUpdate from './equipmentQuantity-add-or-update'
export default { export default {
data() { data() {
return { return {
@ -80,7 +80,7 @@ export default {
getDataList() { getDataList() {
this.dataListLoading = true this.dataListLoading = true
this.$http({ this.$http({
url: this.$http.adornUrl('/monitoring/equipmentQuanity/page'), url: this.$http.adornUrl('/monitoring/equipmentQuantity/page'),
method: 'get', method: 'get',
params: this.$http.adornParams({ params: this.$http.adornParams({
page: this.pageIndex, page: this.pageIndex,
@ -133,7 +133,7 @@ export default {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({
url: this.$http.adornUrl('/monitoring/equipmentQuanity'), url: this.$http.adornUrl('/monitoring/equipmentQuantity'),
method: 'delete', method: 'delete',
data: this.$http.adornData(ids, false) data: this.$http.adornData(ids, false)
}).then(({ data }) => { }).then(({ data }) => {

View File

@ -54,7 +54,7 @@
</template> </template>
<script> <script>
import AddOrUpdate from './equipmenstatuslog-add-or-update' import AddOrUpdate from './equipmentStatusLog-add-or-update'
export default { export default {
data() { data() {
return { return {
@ -81,7 +81,7 @@ export default {
getDataList() { getDataList() {
this.dataListLoading = true this.dataListLoading = true
this.$http({ this.$http({
url: this.$http.adornUrl('/monitoring/equipmenStatusLog/page'), url: this.$http.adornUrl('/monitoring/equipmentStatusLog/page'),
method: 'get', method: 'get',
params: this.$http.adornParams({ params: this.$http.adornParams({
page: this.pageIndex, page: this.pageIndex,
@ -134,7 +134,7 @@ export default {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({
url: this.$http.adornUrl('/monitoring/equipmenStatusLog'), url: this.$http.adornUrl('/monitoring/equipmentStatusLog'),
method: 'delete', method: 'delete',
data: this.$http.adornData(ids, false) data: this.$http.adornData(ids, false)
}).then(({ data }) => { }).then(({ data }) => {

View File

@ -51,7 +51,7 @@
</template> </template>
<script> <script>
import AddOrUpdate from './equipmentype-add-or-update' import AddOrUpdate from './equipmentType-add-or-update'
export default { export default {
data() { data() {
return { return {

View File

@ -52,7 +52,7 @@
</template> </template>
<script> <script>
import AddOrUpdate from './equipmentypefile-add-or-update' import AddOrUpdate from './equipmentTypeFile-add-or-update'
export default { export default {
data() { data() {
return { return {

View File

@ -48,7 +48,7 @@
</template> </template>
<script> <script>
import AddOrUpdate from './equipmenattr-add-or-update' import AddOrUpdate from './equipmentAttr-add-or-update'
export default { export default {
data() { data() {
return { return {

View File

@ -52,7 +52,7 @@
</template> </template>
<script> <script>
import AddOrUpdate from './producarrt-add-or-update' import AddOrUpdate from './productArrt-add-or-update'
export default { export default {
data() { data() {
return { return {

View File

@ -53,7 +53,7 @@
</template> </template>
<script> <script>
import AddOrUpdate from './productionline-add-or-update' import AddOrUpdate from './productionLine-add-or-update'
export default { export default {
data() { data() {
return { return {

View File

@ -45,7 +45,7 @@
</template> </template>
<script> <script>
import AddOrUpdate from './productionlinerecsch-add-or-update' import AddOrUpdate from './productionLineRecSch-add-or-update'
export default { export default {
data() { data() {
return { return {

View File

@ -50,7 +50,7 @@
</template> </template>
<script> <script>
import AddOrUpdate from './qualityinspectiondet-add-or-update' import AddOrUpdate from './qualityInspectionDet-add-or-update'
export default { export default {
data() { data() {
return { return {

View File

@ -55,7 +55,7 @@
</template> </template>
<script> <script>
import AddOrUpdate from './qualityinspectionrecord-add-or-update' import AddOrUpdate from './qualityInspectionRecord-add-or-update'
export default { export default {
data() { data() {
return { return {

View File

@ -49,7 +49,7 @@
</template> </template>
<script> <script>
import AddOrUpdate from './qualityinspectiontype-add-or-update' import AddOrUpdate from './qualityInspectionType-add-or-update'
export default { export default {
data() { data() {
return { return {

View File

@ -53,7 +53,7 @@
</template> </template>
<script> <script>
import AddOrUpdate from './reporsheet-add-or-update' import AddOrUpdate from './reportSheet-add-or-update'
export default { export default {
data() { data() {
return { return {

View File

@ -52,7 +52,7 @@
</template> </template>
<script> <script>
import AddOrUpdate from './reporsheecategory-add-or-update' import AddOrUpdate from './reportSheetCategory-add-or-update'
export default { export default {
data() { data() {
return { return {

View File

@ -49,7 +49,7 @@
</template> </template>
<script> <script>
import AddOrUpdate from './sysfile-add-or-update' import AddOrUpdate from './sysFile-add-or-update'
export default { export default {
data() { data() {
return { return {

View File

@ -47,7 +47,7 @@
</template> </template>
<script> <script>
import AddOrUpdate from './sysfiletype-add-or-update' import AddOrUpdate from './sysFileType-add-or-update'
export default { export default {
data() { data() {
return { return {

View File

@ -52,7 +52,7 @@
</template> </template>
<script> <script>
import AddOrUpdate from './workshopsection-add-or-update' import AddOrUpdate from './workshopSection-add-or-update'
export default { export default {
data() { data() {
return { return {
@ -79,7 +79,7 @@ export default {
getDataList() { getDataList() {
this.dataListLoading = true this.dataListLoading = true
this.$http({ this.$http({
url: this.$http.adornUrl('/monitoring/workShopSection/page'), url: this.$http.adornUrl('/monitoring/workshopSection/page'),
method: 'get', method: 'get',
params: this.$http.adornParams({ params: this.$http.adornParams({
page: this.pageIndex, page: this.pageIndex,
@ -132,7 +132,7 @@ export default {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({
url: this.$http.adornUrl('/monitoring/workShopSection'), url: this.$http.adornUrl('/monitoring/workshopSection'),
method: 'delete', method: 'delete',
data: this.$http.adornData(ids, false) data: this.$http.adornData(ids, false)
}).then(({ data }) => { }).then(({ data }) => {

View File

@ -50,7 +50,7 @@
</template> </template>
<script> <script>
import AddOrUpdate from './workshopsectionequipment-add-or-update' import AddOrUpdate from './workshopSectionEquipment-add-or-update'
export default { export default {
data() { data() {
return { return {
@ -77,7 +77,7 @@ export default {
getDataList() { getDataList() {
this.dataListLoading = true this.dataListLoading = true
this.$http({ this.$http({
url: this.$http.adornUrl('/monitoring/workShopSectionEquipment/page'), url: this.$http.adornUrl('/monitoring/workshopSectionEquipment/page'),
method: 'get', method: 'get',
params: this.$http.adornParams({ params: this.$http.adornParams({
page: this.pageIndex, page: this.pageIndex,
@ -130,7 +130,7 @@ export default {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({
url: this.$http.adornUrl('/monitoring/workShopSectionEquipment'), url: this.$http.adornUrl('/monitoring/workshopSectionEquipment'),
method: 'delete', method: 'delete',
data: this.$http.adornData(ids, false) data: this.$http.adornData(ids, false)
}).then(({ data }) => { }).then(({ data }) => {

View File

@ -109,7 +109,7 @@ export default {
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
if (this.dataForm.id) { if (this.dataForm.id) {
this.$http({ this.$http({
url: this.$http.adornUrl(`/monitoring/workShopSection/${this.dataForm.id}`), url: this.$http.adornUrl(`/monitoring/workshopSection/${this.dataForm.id}`),
method: 'get', method: 'get',
params: this.$http.adornParams() params: this.$http.adornParams()
}).then(({ data }) => { }).then(({ data }) => {
@ -140,7 +140,7 @@ export default {
this.$refs['dataForm'].validate(valid => { this.$refs['dataForm'].validate(valid => {
if (valid) { if (valid) {
this.$http({ this.$http({
url: this.$http.adornUrl(`/monitoring/workShopSection/${!this.dataForm.id ? '' : this.dataForm.id}`), url: this.$http.adornUrl(`/monitoring/workshopSection/${!this.dataForm.id ? '' : this.dataForm.id}`),
method: this.dataForm.id ? 'put' : 'post', method: this.dataForm.id ? 'put' : 'post',
data: this.$http.adornData({ data: this.$http.adornData({
id: this.dataForm.id || undefined, id: this.dataForm.id || undefined,

View File

@ -89,7 +89,7 @@ export default {
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
if (this.dataForm.id) { if (this.dataForm.id) {
this.$http({ this.$http({
url: this.$http.adornUrl(`/monitoring/workShopSectionEquipment/${this.dataForm.id}`), url: this.$http.adornUrl(`/monitoring/workshopSectionEquipment/${this.dataForm.id}`),
method: 'get', method: 'get',
params: this.$http.adornParams() params: this.$http.adornParams()
}).then(({ data }) => { }).then(({ data }) => {
@ -116,7 +116,7 @@ export default {
this.$refs['dataForm'].validate(valid => { this.$refs['dataForm'].validate(valid => {
if (valid) { if (valid) {
this.$http({ this.$http({
url: this.$http.adornUrl(`/monitoring/workShopSectionEquipment/${!this.dataForm.id ? '' : this.dataForm.id}`), url: this.$http.adornUrl(`/monitoring/workshopSectionEquipment/${!this.dataForm.id ? '' : this.dataForm.id}`),
method: this.dataForm.id ? 'put' : 'post', method: this.dataForm.id ? 'put' : 'post',
data: this.$http.adornData({ data: this.$http.adornData({
id: this.dataForm.id || undefined, id: this.dataForm.id || undefined,