openatc-components 0.2.36 → 0.2.37

package/package/kisscomps/components/Stages/index.vue

@@ -15,7 +15,7 @@
       <div>
         <div style="width: 100%; height: auto;">
           <div class="control-model" v-for="(item, index) in stagesList" :key="index">
-            <div style="position:relative;" :style="{...singleStyle, 'backgroundColor': item[0].bgcolor}" class="single-model" @click="selectStages(index + 1)" :class="currentStage == index + 1 ? 'single-model-select' : ''">
+            <div style="position:relative;" :style="singleStyle" class="single-model" @click="selectStages(index + 1)" :class="currentStage == index + 1 ? 'single-model-select' : ''">
               <!-- <template v-for="(side, index) in item[0].sidewalkPhaseData" >
                 <PatternWalkSvg class="patternWalk"
                                 v-if="item[0].peddirection.includes(side.id)"
@@ -28,18 +28,18 @@
                           :showWalk="item[0].peddirection"
                           :Width="'40'"
                           :Height="'40'" /> -->
-              <xdr-dir-selector Width="75PX" Height="75PX" Widths="65px" Heights="65px" :Data="showStyle" :Datas="showStyles" :showlist="dirListSetTheme(item)"></xdr-dir-selector>
-              <div style="height:80px;display:flex;flex-direction:row;justify-content:center;align-items:end;">
-                <div class="current-stage-num" style="width:20%;" :style="{color: themeColor}">{{index + 1}}</div>
+              <xdr-dir-selector Width="75PX" Height="75PX" Widths="65px" Heights="65px" :Data="showStyle" :Datas="showStyles" :showlist="item"></xdr-dir-selector>
+              <div style="height:65px;display:flex;flex-direction:row;justify-content:center;align-items:end;">
+                <div class="current-stage-num" style="width:20%;">{{index + 1}}</div>
                 <div style="width:70%;">
-                  <i class="iconfont icon-feijidongche" :style="{color: themeColor}" style="font-size:11PX;color:#606266;margin-left:10PX" v-if="item[item.length-1].controltype === 6"></i>
-                  <i class="iconfont icon-lukouzhilu" :style="{color: themeColor2}" style="font-size:16PX;color:#454545;margin-left:10PX" v-if="item[item.length-1].controltype === 1"></i>
-                  <i class="iconfont icon-BRT" :style="{color: themeColor2}" style="font-size:11PX;color:#454545;margin-left:10PX" v-if="item[item.length-1].controltype === 4"></i>
+                  <i class="iconfont icon-feijidongche" style="font-size:11PX;color:#606266;margin-left:10PX" v-if="item[item.length-1].controltype === 6"></i>
+                  <i class="iconfont icon-lukouzhilu" style="font-size:16PX;color:#454545;margin-left:10PX" v-if="item[item.length-1].controltype === 1"></i>
+                  <i class="iconfont icon-BRT" style="font-size:11PX;color:#454545;margin-left:10PX" v-if="item[item.length-1].controltype === 4"></i>
                   <div style="transform:scale(0.65);margin-left:10PX">
-                    <i class="iconfont icon-xuxiangwei-xin" :style="{color: themeColor2}" style="font-size:5PX;color:#454545;" v-if="item[item.length-1].controltype === 99"></i>
+                    <i class="iconfont icon-xuxiangwei-xin" style="font-size:5PX;color:#454545;" v-if="item[item.length-1].controltype === 99"></i>
                   </div>
-                  <i class="iconfont icon-gongjiaoche" :style="{color: themeColor}" style="font-size:11PX;color:#606266;margin-left:10PX" v-if="item[item.length-1].controltype === 3"></i>
-                  <i class="iconfont icon-youguidianche" :style="{color: themeColor}" style="font-size:11PX;color:#606266;margin-left:10PX" v-if="item[item.length-1].controltype === 5"></i>
+                  <i class="iconfont icon-gongjiaoche" style="font-size:11PX;color:#606266;margin-left:10PX" v-if="item[item.length-1].controltype === 3"></i>
+                  <i class="iconfont icon-youguidianche" style="font-size:11PX;color:#606266;margin-left:10PX" v-if="item[item.length-1].controltype === 5"></i>
                   <div v-if="presetStageIndex === index + 1" style="color:red;width:50px;position:absolute;right:0px;bottom:5px;font-size:11px;">{{presetText}}</div>
                 </div>
               </div>
@@ -54,8 +54,6 @@
 /* eslint-disable */
 import RingDataModel from '../../../utils/RingDataModel.js'
 // import patternwalksvg from '../PatternWalkSvg/PatternWalkSvg'
-import { getTheme } from '../../../utils/auth.js'
-
 export default {
   name: 'Stages',
   components: {
@@ -104,7 +102,7 @@ export default {
     },
     StageHeight: {
       type: String,
-      default: '80px'
+      default: '65px'
     }
   },
   data () {
@@ -121,8 +119,6 @@ export default {
       side: {key: 'pedphase1653818707546719', phaseid: 1, id: 1, name: '东人行横道'},
       // stagesList: [],
       currentStage: -1,
-      themeColor: getTheme() === 'light' ? '#606266' : '#fff',
-      themeColor2: getTheme() === 'light' ? '#454545' : '#fff'
     };
   },
   computed: {
@@ -142,7 +138,6 @@ export default {
         }
       }
       console.log(list,'list')
-      this.clickType(list, this.currentStage)
       console.log(this.phaseList,'this.phaseList')
       return list
     },
@@ -208,45 +203,9 @@ export default {
       }
       this.currentStage = value
       this.$emit('onSelectStages', value)
-      this.clickType(this.stagesList, value)
-    },
-    resetToDefaultThemeColor (List) {
-      for (let i = 0; i < List.length; i++) {
-        if (List[i].length) {
-          if (List[i][0].clicked) {
-            delete List[i][0].clicked
-          }
-          List[i][0].bgcolor = getTheme() === 'light' ? '#edf6ff' : '#243d59'
-        } 
-      }
-    },
-    highlightThemeColor (List, index) {
-      for (let i = 0; i < List.length; i++) {
-        if (i === index) {
-          List[i][0].clicked = true
-          List[i][0].bgcolor = getTheme() === 'light' ? '#c1e0ff' : '#0082ac'
-        }
-      }
-    },
-    clickType (stagelist, value) {
-      this.resetToDefaultThemeColor(stagelist)
-      this.highlightThemeColor(stagelist, value - 1)
-    },
-    dirListSetTheme (list) {
-      let dirArr = []
-      let color = getTheme() === 'light' ? '#606266' : '#F1F3F4'
-      for (let rec of list) {
-        let recd = {
-          ...rec,
-          color: color
-        }
-        dirArr.push(recd)
-      }
-      return dirArr
     }
   },
   mounted () {
-    this.resetToDefaultThemeColor(this.stagesList)
   }
 };
 </script>

package/package/kisscomps/components/XRDDirSelector/XRDDirSelector.vue

@@ -484,8 +484,6 @@
 </template>
 <script>
 import { mapState } from 'vuex'
-import { getTheme } from '../../../utils/auth.js'
-
 export default {
   name: 'xdr-dir-selector',
   props: {
@@ -556,196 +554,196 @@ export default {
           id: 1,
           name: '东西路段人行横道',
           isshow: false,
-          color: getTheme() === 'light' ? '#040000' : '#fff',
+          color: '#040000',
           lockColor: '#7ccc66'
         },
         {
           id: 2,
           name: '南北路段人行横道',
           isshow: false,
-          color: getTheme() === 'light' ? '#040000' : '#fff',
+          color: '#040000',
           lockColor: '#7ccc66'
         },
         {
           id: 3,
           name: 'X人行横道-\\',
           isshow: false,
-          color: getTheme() === 'light' ? '#040000' : '#fff',
+          color: '#040000',
           lockColor: '#7ccc66'
         },
         {
           id: 4,
           name: 'X人行横道-/',
           isshow: false,
-          color: getTheme() === 'light' ? '#040000' : '#fff',
+          color: '#040000',
           lockColor: '#7ccc66'
         },
         {
           id: 5,
           name: '北人行横道',
           isshow: false,
-          color: getTheme() === 'light' ? '#040000' : '#fff',
+          color: '#040000',
           lockColor: '#7ccc66'
         },
         {
           id: 6,
           name: '南人行横道',
           isshow: false,
-          color: getTheme() === 'light' ? '#040000' : '#fff',
+          color: '#040000',
           lockColor: '#7ccc66'
         },
         {
           id: 7,
           name: '东人行横道',
           isshow: false,
-          color: getTheme() === 'light' ? '#040000' : '#fff',
+          color: '#040000',
           lockColor: '#7ccc66'
         },
         {
           id: 8,
           name: '西人行横道',
           isshow: false,
-          color: getTheme() === 'light' ? '#040000' : '#fff',
+          color: '#040000',
           lockColor: '#7ccc66'
         },
         {
           id: 9,
           name: '西人行横道-下',
           isshow: false,
-          color: getTheme() === 'light' ? '#040000' : '#fff',
+          color: '#040000',
           lockColor: '#7ccc66'
         },
         {
           id: 10,
           name: '西人行横道-上',
           isshow: false,
-          color: getTheme() === 'light' ? '#040000' : '#fff',
+          color: '#040000',
           lockColor: '#7ccc66'
         },
         {
           id: 11,
           name: '东人行横道-上',
           isshow: false,
-          color: getTheme() === 'light' ? '#040000' : '#fff',
+          color: '#040000',
           lockColor: '#7ccc66'
         },
         {
           id: 12,
           name: '东人行横道-下',
           isshow: false,
-          color: getTheme() === 'light' ? '#040000' : '#fff',
+          color: '#040000',
           lockColor: '#7ccc66'
         },
         {
           id: 13,
           name: '南人行横道-右',
           isshow: false,
-          color: getTheme() === 'light' ? '#040000' : '#fff',
+          color: '#040000',
           lockColor: '#7ccc66'
         },
         {
           id: 14,
           name: '南人行横道-左',
           isshow: false,
-          color: getTheme() === 'light' ? '#040000' : '#fff',
+          color: '#040000',
           lockColor: '#7ccc66'
         },
         {
           id: 15,
           name: '北人行横道-右',
           isshow: false,
-          color: getTheme() === 'light' ? '#040000' : '#fff',
+          color: '#040000',
           lockColor: '#7ccc66'
         },
         {
           id: 16,
           name: '北人行横道-左',
           isshow: false,
-          color: getTheme() === 'light' ? '#040000' : '#fff',
+          color: '#040000',
           lockColor: '#7ccc66'
         },
         {
           id: 17,
           name: '东南人行横道',
           isshow: false,
-          color: getTheme() === 'light' ? '#040000' : '#fff',
+          color: '#040000',
           lockColor: '#7ccc66'
         },
         {
           id: 18,
           name: '西南人行横道',
           isshow: false,
-          color: getTheme() === 'light' ? '#040000' : '#fff',
+          color: '#040000',
           lockColor: '#7ccc66'
         },
         {
           id: 19,
           name: '东北人行横道',
           isshow: false,
-          color: getTheme() === 'light' ? '#040000' : '#fff',
+          color: '#040000',
           lockColor: '#7ccc66'
         },
         {
           id: 20,
           name: '西北人行横道',
           isshow: false,
-          color: getTheme() === 'light' ? '#040000' : '#fff',
+          color: '#040000',
           lockColor: '#7ccc66'
         },
         {
           id: 21,
           name: '东南人行横道-上',
           isshow: false,
-          color: getTheme() === 'light' ? '#040000' : '#fff',
+          color: '#040000',
           lockColor: '#7ccc66'
         },
         {
           id: 22,
           name: '东南人行横道-下',
           isshow: false,
-          color: getTheme() === 'light' ? '#040000' : '#fff',
+          color: '#040000',
           lockColor: '#7ccc66'
         },
         {
           id: 23,
           name: '西南人行横道-上',
           isshow: false,
-          color: getTheme() === 'light' ? '#040000' : '#fff',
+          color: '#040000',
           lockColor: '#7ccc66'
         },
         {
           id: 24,
           name: '西南人行横道-下',
           isshow: false,
-          color: getTheme() === 'light' ? '#040000' : '#fff',
+          color: '#040000',
           lockColor: '#7ccc66'
         },
         {
           id: 25,
           name: '东北人行横道-上',
           isshow: false,
-          color: getTheme() === 'light' ? '#040000' : '#fff',
+          color: '#040000',
           lockColor: '#7ccc66'
         },
         {
           id: 26,
           name: '东北人行横道-下',
           isshow: false,
-          color: getTheme() === 'light' ? '#040000' : '#fff',
+          color: '#040000',
           lockColor: '#7ccc66'
         },
         {
           id: 27,
           name: '西北人行横道-上',
           isshow: false,
-          color: getTheme() === 'light' ? '#040000' : '#fff',
+          color: '#040000',
           lockColor: '#7ccc66'
         },
         {
           id: 28,
           name: '西北人行横道-下',
           isshow: false,
-          color: getTheme() === 'light' ? '#040000' : '#fff',
+          color: '#040000',
           lockColor: '#7ccc66'
         }
       ],
@@ -1034,6 +1032,7 @@ export default {
         for (let j = 0; j < this.peoplestatus.length; j++) {
           if (showlist[0].peddirection[i].name === this.peoplestatus[j].name) {
             this.peoplestatus[j].isshow = true
+            this.peoplestatus[j].color = showlist[0].peddirection[i].color
           }
         }
       }

package/package/kisscomps/components/patternConfig/pattern/patternTable.vue

@@ -80,9 +80,33 @@
               :patternStatusList="scope.row.rings"
               :cycles="scope.row.cycle"
               :phaseList="scope.row.currPhase"
+              :contrloType="getControlType(scope.row)"
             >
             </pattern-list>
-            </div>
+            <!-- <pattern-list
+              v-if="getControlType(scope.row) === 'ring'"
+              :patternStatusList="scope.row.rings"
+              :cycles="scope.row.cycle"
+              :phaseList="scope.row.currPhase"
+              :contrloType="getControlType(scope.row)"
+            >
+            </pattern-list>
+            <pattern-list
+              v-else
+              :patternId="scope.row.patternid"
+              :contrloType="getControlType(scope.row)"
+              :index="scope.$index"
+              :cycleChange="true"
+              :stagesChange="getSelectedPattern(scope.row).stagesList"
+              :patternStatusList="getSelectedPattern(scope.row).rings"
+              :patternList="scope.row.allPatterns"
+              :allPatternList="scope.row.allPatterns"
+              :cycles="scope.row.cycle"
+              :phaseList="scope.row.currPhase"
+              :agentId="scope.row.agentid"
+              :showBarrier="false">
+            </pattern-list> -->
+          </div>
          </template>
       </el-table-column>
     </el-table>
@@ -91,7 +115,8 @@
 
 <script>
 import XiaoKanBan from '../../XiaoKanBan'
-import { getPatternList } from '../../../../api/route'
+// import { getPatternList } from '../../../../api/route'
+import { getIntersectionInfo } from '../../../../api/template'
 import { getMessageByCode } from '../../../../utils/responseMessage'
 // import { getDirName } from '../../../components/SelectCrossPhase/utils.js'
 export default {
@@ -114,6 +139,7 @@ export default {
   },
   data () {
     return {
+      controlType: 'stage',
       loading: true,
       tableHeight: 460,
       screenHeight: window.innerHeight, // 屏幕高度
@@ -179,6 +205,9 @@ export default {
           let currPattern
           if (Array.isArray(currPatternList)) {
             currPattern = currPatternList.filter(cpl => cpl.id === patternId)[0]
+            if (!currPattern) {
+              currPattern = currPatternList[0]
+            }
           } else {
             currPattern = currPatternList
           }
@@ -292,28 +321,59 @@ export default {
       }
       return res
     },
+    getControlType (row) {
+      let contrloType = 'ring'
+      let allPatternList = row.feature && row.feature.patternList ? row.feature.patternList : row.allPatterns
+      if (
+        !allPatternList[0].contrloType &&
+        allPatternList[0].rings.length > 0
+      ) {
+        contrloType = 'ring'
+      } else if (
+        !allPatternList[0].contrloType &&
+        allPatternList[0].rings.length === 0
+      ) {
+        contrloType = 'stage'
+      } else {
+        contrloType = allPatternList[0].contrloType
+      }
+      let res = contrloType
+      return res
+    },
+    getSelectedPattern (row) {
+      let res = []
+      let patternList = row.feature && row.feature.patternList ? row.feature.patternList : row.allPatterns
+      let pattern = patternList.find(item => item.id === row.patternid)
+      if (pattern) {
+        res = pattern
+      }
+      return res
+    },
     getCurPattern (agentid) {
       // 获取当前设备所有可选方案
       this.loading = true
       let _this = this
-      // let patterns = this.newPatternList.filter(item => item.agentid === agentid)[0]
-      // if (patterns.allPatterns && patterns.allPatterns.length > 0) {
-      //   patterns.allPatterns = patterns.allPatterns
-      //   return false
-      // }
-      getPatternList(agentid).then(res => {
+      getIntersectionInfo(agentid).then(res => {
         this.loading = false
         if (!res.data.success) {
-          if (res.data.code === '4003') {
-            this.$message.error(this.$t('openatc.common.devicenotonline'))
-            return
+          let commomMsg = this.$t('openatccomponents.overview.signalID') + ' : ' + agentid
+          let msg = getMessageByCode(res.data.code, this.$i18n.locale)
+          if (res.data.data) {
+            // 子类型错误
+            let childErrorCode = res.data.data.errorCode
+            if (childErrorCode) {
+              let childerror = getMessageByCode(res.data.data.errorCode, this.$i18n.locale)
+              msg = msg + ' - ' + childerror
+            }
           }
-          this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+          msg = msg + ' - ' + commomMsg
+          this.$message.error(msg)
           return
         }
+        let allPatternList = res.data.data.param.patternList
         _this.newPatternList.forEach(ele => {
           if (ele.agentid === agentid) {
-            ele.allPatterns = res.data.data.data.patternList.map(ele => {
+            ele.allPatterns = allPatternList.map(ele => {
               return {
                 ...ele,
                 patternid: ele.id,

package/package/kisscomps/components/patternConfig/planContent.vue

@@ -170,6 +170,9 @@ export default {
         let currPattern
         if (Array.isArray(currPatternList)) {
           currPattern = currPatternList.filter(cpl => cpl.id === patternId)[0]
+          if (!currPattern) {
+            currPattern = currPatternList[0]
+          }
         } else {
           currPattern = currPatternList
         }