zhulizhen1111 hace 4 años
padre
commit
e74423616e

+ 3 - 3
src/lib/GraphView.js

@@ -76,15 +76,15 @@ export class GraphView extends SCanvasView {
         canvas.pen.color = new SColor(this.strokecolor);
         canvas.brush.color = new SColor(this.bgcolor);
         if (this.type == 0) {
-            canvas.drawLine(80, 57, 120, 57);
+            canvas.drawLine(0, 14, 28, 14);
         }
         else if (this.type == 1) {
-            canvas.drawRect(50, 28, 100, 57);
+            canvas.drawRect(0, 0, 28, 28);
         }
         else if (this.type == 2) {
             if (this.img) {
                 console.log(this.img);
-                canvas.drawImage(this.img, 86, 43, 28, 28);
+                canvas.drawImage(this.img, 0, 0, 28, 28);
             }
         }
     }

+ 8 - 6
src/router/index.js

@@ -68,6 +68,8 @@ router.beforeEach(async (to, from, next) => {
     const token = query().token
     const ssoToken = store.getters['ssoToken']
     if (ssoToken) {
+         store.commit("SETSSOTOKEN", token)
+         await store.dispatch("getUserInfo")
         await store.dispatch('getFloors')
         await store.dispatch('getBrand')
         next()
@@ -83,12 +85,12 @@ router.beforeEach(async (to, from, next) => {
         }
         store.commit('SETLASTROUTER', lastRoute)
         let ssoServer = 'http://oauth.wanda-dev.cn'
-        let redirectUrl = window.location.protocol + '//' + window.location.host + '/'
-        let systemcode = 'CAD156',
-            signal = 'abcdefg',
-            version = '1.0.0',
-            returnurl = 'http://glsms.wanda-dev.cn/'
-        window.location.href = `${ssoServer}/login?systemcode=${systemcode}&signal=${signal}&version=${version}&returnurl=${returnurl}redirectUrl=${redirectUrl}`
+        let systemcode = "CAD156",
+            signal = new Date().getTime(),
+            version = "1.0.0",
+            // returnurl = 'http://glsms.wanda-dev.cn/'
+            returnurl = window.location.protocol + "//" + window.location.host + "/wandaBmGuide"
+        window.location.href = `${ssoServer}/login?token=${token}&systemcode=${systemcode}&signal=${signal}&version=${version}&returnurl=${returnurl}`
     }
 })
 export default router

+ 4 - 4
src/views/equipment/table/djspTable.vue

@@ -20,19 +20,19 @@
                 clearable
                 style='width:192px;margin-right:12px'
             ></el-input>
-            <Select @change='getList' v-model='floor' width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
+            <Select @change='getList' v-model='floor' width='180' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
         </div>
         <el-table :data='tableData' :span-method='objectSpanMethod' :border='true' style='width: 100%' @row-click='innerVisible = true'>
             <el-table-column prop='floor' label='楼层' width='50'>
                 <template slot-scope='{row}'>{{row.floor || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='welldes' label='电井间' width="120">
+            <el-table-column prop='welldes' label='电井间' width='120'>
                 <template slot-scope='{row}'>{{row.welldes || '--'}}</template>
             </el-table-column>
             <el-table-column prop='meterbox' label='商铺电表数' width='200'>
                 <template slot-scope='{row}'>{{row.meterbox || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='shopsnum' label='商铺编号' >
+            <el-table-column prop='shopsnum' label='商铺编号'>
                 <template slot-scope='{row}'>{{row.shopsnumList || '--'}}</template>
             </el-table-column>
         </el-table>
@@ -131,7 +131,7 @@ export default {
                 this.getList()
             }
         },
-        floor(){
+        floor() {
             this.getList()
         }
     },

+ 5 - 5
src/views/equipment/table/lookPageTable.vue

@@ -11,11 +11,11 @@
                 v-model='keyword'
                 style='width:192px;margin-right:12px'
             ></el-input>
-            <Select @change='getList' v-model='floor' style='margin-right:12px;' width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
-            <Select @change='getList' v-model='fileType' width='140' tipPlace='top' caption='文件类型 :' :selectdata='floorSelect'></Select>
+            <Select @change='getList' v-model='floor' style='margin-right:12px;' width='180' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
+            <Select @change='getList' v-model='fileType' width='180' tipPlace='top' caption='文件类型 :' :selectdata='floorSelect'></Select>
         </div>
         <el-table :data='tableData' style='width: 100%'>
-            <el-table-column type='index' label='序号' width='60' :index="indexMethod"></el-table-column>
+            <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
             <el-table-column prop='lb' label='分类' width='160'>
                 <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
             </el-table-column>
@@ -61,7 +61,7 @@ export default {
             size: 11,
             keyword: '',
             floor: '',
-            fileType:''
+            fileType: ''
         }
     },
     props: ['major'],
@@ -71,7 +71,7 @@ export default {
     methods: {
         //序号的方法
         indexMethod(index) {
-            return (this.currentPage - 1) * this.size + index +1
+            return (this.currentPage - 1) * this.size + index + 1
         },
         pageChanged(page, size) {
             this.currentPage = page