openatc-components 0.3.98 → 0.3.100

package/src/views/patternConfig.vue

@@ -72,14 +72,14 @@ export default {
   // },
   data () {
     return {
-      tableColums: ['agentid', 'period', 'offset', 'cycle', 'pattern'], // greenWave, period
+      tableColums: ['agentid', 'name', 'period', 'pattern'], // greenWave, period
       // tableColums: ['no', 'id', 'period', 'name', 'isUsed', 'patternId', 'offset', 'cycle', 'pattern'], // greenWave, period
-      isShowSingle: true,
+      isShowSingle: false,
       isOnlyOneTab: false,
-      isSingleCrossMode: true,
+      isSingleCrossMode: false,
       isShowTableHeader: true,
-      // isAllowedExpand: false,
-      isAllowedExpand: true,
+      isAllowedExpand: false,
+      // isAllowedExpand: true,
       // agentids: ['gjnlgjxl'],
       agentids4: [
         'tjblxyl',
@@ -165,6 +165,7 @@ export default {
       agentId: '12008_835',
       // agentId: '0351-01',
       reqUrl: 'http://192.168.13.103:10003/openatc',
+      Token135: 'eyJraWQiOiIxNzIzMDgzMDcxMzIxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTk4NTQ0MzIwMCwiaWF0IjoxNzIyNDM4MDAwfQ.i-RVHcxmtgvD9boQECpBCz7T1fJ0TAjzO5BWin3VdoY',
       Token: 'eyJraWQiOiIxNzAwMjAwNDQ4MTA0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc2NzExMDQwMCwiaWF0IjoxNjk5Mjg2NDAwfQ.AyVJCGmVQVafdWBDQ7TMhVQ5Dvjy13NeuQ8rimTPgtc',
       // reqUrl: 'http://192.168.13.113:10003/openatc',
       // Token: 'eyJraWQiOiIxNjkxMzcxMTc5ODcxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxNDE0NzIwMCwiaWF0IjoxNjkwODE5MjAwfQ.AhUj9taw4_IpP77AmP5bvCE87dDQ4-ZdsEJzrlWXKF8',
@@ -197,8 +198,36 @@ export default {
         ]
       },
       agentids6: ['tjblsxl-ticp6'],
-      agentids5: ['cllytl'],
-      opt5: {},
+      agentids5: ['tjllybj', 'tjlzsdj', 'tjlhaj', 'tjlyhddj'],
+      opt5: {
+          'optPatternList': [
+              {
+                  'name': '仿真实例 1',
+                  'devs': [
+                      {
+                          'agentid': 'tjllybj',
+                          'patternid': 1,
+                          'isused': true
+                      },
+                      {
+                          'agentid': 'tjlzsdj',
+                          'patternid': 1,
+                          'isused': true
+                      },
+                      {
+                          'agentid': 'tjlhaj',
+                          'patternid': 1,
+                          'isused': true
+                      },
+                      {
+                          'agentid': 'tjlyhddj',
+                          'patternid': 1,
+                          'isused': true
+                      }
+                  ]
+              }
+          ]
+      },
       agentids: ['gjnlgjxl'],
       opt: {
         'optPatternList': [
@@ -14709,7 +14738,8 @@ export default {
     //   // _this.agentId = 'scats1'
     //   _this.agentids = ['gjnlahql', 'gjnlgjxl']
     // }, 5 * 1000)
-    this.setPropsToken(this.Token)
+    this.setPropsToken(this.Token135)
+    // this.setPropsToken(this.Token)
     window.onresize = () => {
       return (() => {
         // this.setDialogWidth()

package/src/views/schemeconfig.vue

@@ -61,9 +61,9 @@ export default {
       showWalk: [ 1, 2 ],
       sidewalkPhaseData: [{key: 'pedphase1653873194007699', phaseid: 1, id: 1, name: '东人行横道', isshow: false}],
       lockPhaseBtnName: this.$t('openatccomponents.overview.comfirm'),
-      agentId: '1511_207',
+      agentId: '32050101041121000001',
       Token: 'eyJraWQiOiIxNzAxODMyOTQ3MTUwIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJxeXl0aCIsImV4cCI6MTc2OTc4ODgwMCwiaWF0IjoxNzAxMzYwMDAwfQ.RIQpNEkJibL-RYllirDeNLi8G9-t8PecM_m7KlZNQXg',
-      Token103: 'eyJraWQiOiIxNjcwMzc0ODA4MTcyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1Njc3NDgwOCwiaWF0IjoxNjcwMzc0ODA4fQ.xsRoye_tk_Xf60w5Mpigm8vrPgQJCLN-W_IW4U7dafA',
+      Token103: 'eyJraWQiOiIxNzAxODMyOTQ3MTUwIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJxeXl0aCIsImV4cCI6MTc2OTc4ODgwMCwiaWF0IjoxNzAxMzYwMDAwfQ.RIQpNEkJibL-RYllirDeNLi8G9-t8PecM_m7KlZNQXg',
       boxVisible: false,
       dialogWidth: '80%',
       crossStatusData: {} // 路口状态数据
@@ -138,11 +138,8 @@ export default {
           }
           return
         }
-        console.log(data.data.data)
         this.crossStatusData = JSON.parse(JSON.stringify(data.data.data.data))
-        // debugger
-        console.log(this.crossStatusData)
-        // debugger
+        console.log('this.crossStatusData:', this.crossStatusData)
       }).catch(error => {
         console.log(error)
       })
@@ -151,6 +148,7 @@ export default {
       // 获取路口信息
       getIntersectionInfo(agentid).then(res => {
         this.phaseList = res.data.data.param.phaseList
+        console.log('this.phaseList:', this.phaseList)
       })
     },
     setPropsToken (token) {

package/static/apiconfig.json

@@ -447,5 +447,15 @@
   "key": "getDetectorStatus",
   "url": "/devs/detectorstatus",
   "method": "get"
+},
+{
+  "key": "getRoleByName",
+  "url": "/auth/role/rolename",
+  "method": "get"
+},
+{
+  "key": "getPermission",
+  "url": "/auth/role/",
+  "method": "get"
 }
 ]

package/static/styles/common.scss

@@ -11,12 +11,12 @@
 
  // 全局滚动条样式
  ::-webkit-scrollbar {
-  width: 6PX;
-  height: 6PX;
+  width: 12PX;
+  height: 12PX;
 }
 ::-webkit-scrollbar-thumb {
   // 滚动条的滑块
-  border-radius: 3PX;
+  border-radius: 4px;
   background: rgba(144, 147, 153, 0.3);
 }
 ::-webkit-scrollbar-corner{

package/static/styles/dark/theme/element-dark.scss

@@ -34,7 +34,7 @@ $--button-danger-font-color: #FFFFFF;
 $--button-success-font-color: #FFFFFF;
 $--radio-button-checked-font-color: #FFFFFF;
 $--radio-font-color: $--color-text-secondary;
-$--tag-info-color: #FFFFFF;
+$--tag-info-color: $--color-text-placeholder;
 $--tooltip-color: $--color-white;
 $--checkbox-font-color: $--color-text-secondary;
 

package/static/styles/intersection.scss

@@ -38,6 +38,9 @@
       zoom: 0.9;
       
     }
+    .centerText .text {
+      font-size: 14px;
+    }
    }
   /*当屏幕小于等于1440px的屏幕样式*/
   @media only screen and (max-width: 1440px){
@@ -46,6 +49,9 @@
       zoom: 0.8;
       
     }
+    .centerText .text {
+      font-size: 18px;
+    }
    }
    /*当屏幕小于等于1280px的屏幕样式*/
   @media only screen and (max-width: 1280px){
@@ -53,6 +59,9 @@
       // transform: scale(0.65);
       zoom: 0.65;
     }
+    .centerText .text {
+      font-size: 20px;
+    }
    }
    /*当屏幕小于等于960px的屏幕样式*/
   @media only screen and (max-width: 960px){
@@ -60,6 +69,9 @@
       // transform: scale(0.5);
       zoom: 0.5;
     }
+    .centerText .text {
+      font-size: 14px;
+    }
    }
     /*当屏幕小于等于720px的屏幕样式*/
   @media only screen and (max-width: 720px){
@@ -67,6 +79,9 @@
       // transform: scale(0.45);
       zoom: 0.45;
     }
+    .centerText .text {
+      font-size: 14px;
+    }
    }
   // 小屏幕打开首页适配样式
   .minifont {
@@ -173,9 +188,4 @@
     color: $--color-text-primary;
     font-size:30PX;
  }
- .centerText {
-  .text {
-    font-size: 18PX;
-  }
- }
 }

package/static/styles/light/theme/element-light.scss

@@ -34,7 +34,7 @@ $--card-background-selected: #c1e0ff;
 // $--button-success-font-color: #FFFFFF;
 // $--radio-button-checked-font-color: #FFFFFF;
 // $--radio-font-color: $--color-text-secondary;
-$--tag-info-color: #303133;
+// $--tag-info-color: $--color-text-placeholder;
 // $--tooltip-color: $--color-white;
 // $--checkbox-font-color: $--color-text-secondary;
 

package/static/styles/schemeconfig.scss

@@ -226,7 +226,7 @@
       overflow-y: auto;
     }
     .manual-common-content::-webkit-scrollbar {
-      width: 6PX;
+      width: 8PX;
     }
 }
 // 手动控制弹框
@@ -498,12 +498,12 @@
     width: 85% !important;
   }
   .el-input.is-disabled .el-input__inner {
-    text-align: left;
+    text-align: center;
   }
   .el-input-number {
     width: 100%;
     .el-input__inner {
-      text-align: left;
+      text-align: center;
     }
   }
   .el-select {
@@ -540,9 +540,6 @@
   }
   .el-input-number {
     width: 100%;
-    .el-input__inner {
-      text-align: left;
-    }
   }
   .el-input-number--mini{
     width: 100%;