openatc-components 0.3.24 → 0.3.26

package/src/kisscomps/components/SchemeConfig/tentativeplancontrolmodal/index.vue

@@ -9,10 +9,10 @@
           ref="manual"
           label-position="left"
           :model="manualInfo"
-          label-width="74px"
+          label-width="90px"
         >
           <el-form-item
-            :label="$t('openatccomponents.overview.patternid') + ':'"
+            :label="$t('openatccomponents.overview.patternid')"
             prop="count"
           >
             <el-select
@@ -33,7 +33,7 @@
             <!-- <el-input v-model="manualInfo.tempDuration" size="small" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
           </el-form-item>
           <el-form-item
-            :label="$t('openatccomponents.overview.delay') + ':'"
+            :label="$t('openatccomponents.overview.delay')"
             prop="intersection"
           >
             <el-input-number
@@ -55,10 +55,10 @@
           ref="manual"
           label-position="left"
           :model="manualInfo"
-          label-width="74px"
+          label-width="90px"
         >
           <el-form-item
-            :label="$t('openatccomponents.overview.patternoffset') + ':'"
+            :label="$t('openatccomponents.overview.patternoffset')"
             prop="count"
           >
             <el-input-number
@@ -74,7 +74,7 @@
             <!-- <el-input v-model="manualInfo.offset" size="small" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
           </el-form-item>
           <el-form-item
-            :label="$t('openatccomponents.overview.duration') + ':'"
+            :label="$t('openatccomponents.overview.duration')"
             prop="intersection"
           >
             <el-input-number
@@ -318,7 +318,7 @@
       <el-button v-if="isShowBack" @click="handleClose()">{{
         $t('openatccomponents.button.Back')
       }}</el-button>
-      <el-button @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
+      <el-button @click="toAutoControl()" v-if="isShowRecovery && isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
       <el-button type="primary" @click="handleManualControl()">{{
         $t('openatccomponents.overview.implement')
       }}</el-button>
@@ -327,7 +327,7 @@
       <el-button v-if="isShowBack" @click="handleClose()">{{
         $t('openatccomponents.button.Back')
       }}</el-button>
-      <el-button @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
+      <el-button @click="toAutoControl()" v-if="isShowRecovery && isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
       <el-button type="primary" @click="handleManualControl()">{{
         $t('openatccomponents.overview.comfirm')
       }}</el-button>
@@ -363,6 +363,10 @@ export default {
     isShowBack: {
       type: Boolean,
       default: true
+    },
+    isShowRecovery: {
+      type: Boolean,
+      default: true
     }
   },
   watch: {

package/src/kisscomps/components/patternConfig/index.vue

@@ -12,7 +12,6 @@
 <template>
   <div class="patternConfig">
     <el-container v-if="!isShowSingle" >
-      <!-- <el-main> -->
         <div class="main-container" style="height: 100%;width: 100%;">
           <el-tabs v-model="editableTabsValue" type="card"  @edit="handleTabsEdit" :before-leave="beforeLeave" style="height: 100%;">
             <el-tab-pane
@@ -53,14 +52,6 @@
             </el-tab-pane>
           </el-tabs>
         </div>
-        <!-- <div style="display:flex;justify-content:center;">
-          <el-button type="primary"  @click="onChartClick" plain>{{$t('openatccomponents.greenwaveoptimize.spaceGraph')}}</el-button>
-          <el-button type="primary"  @click="onGenerateClick" plain>{{$t('openatccomponents.greenwaveoptimize.generate')}}</el-button>
-          <el-button type="primary"  @click="onSaveClick" plain>{{$t('openatccomponents.common.save')}}</el-button>
-          <el-button type="primary"  @click="onExecuteClick" plain>{{$t('openatc.dutyroute.executen')}}</el-button>
-          <el-button type="primary"  @click="onDownloadClick" plain>{{$t('openatc.button.download')}}</el-button>
-        </div> -->
-      <!-- </el-main> -->
     </el-container>
     <div v-if="isShowSingle" style="height: 94%;" class="table-container">
       <PatternTable ref="patterntable"
@@ -78,33 +69,22 @@
         @handlePatternTable="handlePatternTable"
         @ErrorOcurrred='onErrorOcurrred'
         @resetContentComponent="resetContentComponent"/>
-    <!-- <chartDialog ref="chartDialog" ></chartDialog> -->
-    <!-- <PlanExecute ref="planExecute" ></PlanExecute> -->
   </div>
 </template>
 
 <script>
-// import PlanMenu from './planMenu'
 import PlanContent from './planContent'
-// import { GetAllRoute } from '../../../api/route'
-// import chartDialog from './pattern/planChart/chartDialog'
 import { getMessageByCode } from '../../../utils/responseMessage'
 import PatternTable from './pattern/patternTable'
 import dateObj from './utils.js'
-// import routeChart from './pattern/planChart/index'
-// import PlanExecute from './components/planExecute'
 import { GetDeviceByIds } from '../../../api/device.js'
 import { getAllPatternOfDevs } from '../../../api/route'
 const { monthsModel, daysModelCh, daysModelEn, datesModel, monthsModelEn, datesModelEn } = dateObj
 export default {
   name: 'PatternConfig',
   components: {
-    // routeChart,
     PatternTable,
-    // PlanMenu,
     PlanContent
-    // chartDialog,
-    // PlanExecute
   },
   props: {
     agentids: {
@@ -273,29 +253,16 @@ export default {
           devs: devs
         }
         let optPatternList
-        // console.log('_this.opt', _this.opt)
-        // console.log('_this.optPatternList', _this.opt.optPatternList)
-        // console.log('_this.length', _this.opt.optPatternList.length)
         if (_this.opt && _this.opt.optPatternList && _this.opt.optPatternList.length > 0) {
           route = _this.opt.optPatternList[0]
           let arr = []
           for (let dev of route.devs) {
             arr.push(dev.agentid)
           }
-          // console.log('arr.length', arr)
-          // console.log('this.agentids', this.agentids)
-          // console.log('this.len', arr.length === this.agentids.length)
-          // console.log('this.jon', arr.join('') !== this.agentids.join(''))
-          // console.log('this.jon', arr.join(''), this.agentids.join(''))
-          // if (arr.length === this.agentids.length && arr.join('') !== this.agentids.join('')) {
           if (arr.length === this.agentids.length) {
             optPatternList = _this.opt.optPatternList
-            // check and reset data
-            // console.log('checkAndResetListBefore', optPatternList)
             let opt = await this.checkAndResetList(optPatternList)
-            // console.log('checkAndResetListAfter.opt', optPatternList)
             optPatternList = opt.optPatternList
-            // console.log('checkAndResetListAfter', optPatternList)
           }
         }
         this.route = route
@@ -445,60 +412,14 @@ export default {
       if (this.chooseId === 0) {
         return false
       }
-      // let {routeData, patternList, greenwave, allPatternList} = {...this.chartData}
-      // this.$refs.routeChart.onPlanChart(routeData, patternList, greenwave, allPatternList)
-    },
-    onChartClick () {
-      let routeData = this.editableTabs[this.currentIndex]
-      let check = this.checkData([routeData], false)
-      if (!check) {
-        return false
-      }
-      this.getDeviceByIds(routeData)
-    },
-    onGenerateClick () {
-      let routeData = this.editableTabs[this.currentIndex]
-      // check
-      let check = this.checkData([routeData], false)
-      if (!check) {
-        return false
-      }
-      let planContent = this.$refs.planContent
-      planContent.handleCreate(routeData)
     },
     checkData (tabs, isCheckName = true) {
       let res = true
-      // if (this.chooseId === 0) {
       if (this.agentids.length === 0) {
         this.$message.warning(this.$t('openatccomponents.greenwaveoptimize.chooseRoute'))
         return false
       }
       for (let tab of tabs) {
-        // if (!tab.optstrategy) {
-        //   this.$message.warning(this.$t('openatccomponents.greenwaveoptimize.pleaseChoseOptstrategy'))
-        //   return false
-        // }
-        // if (isCheckName && !tab.name) {
-        //   this.$message.warning(this.$t('openatccomponents.greenwaveoptimize.pleaseInputPatternName'))
-        //   return false
-        // }
-        // let filterList = tabs.filter(item => item.name === tab.name)
-        // if (filterList.length > 1) {
-        //   this.$message.warning(this.$t('openatccomponents.greenwaveoptimize.repeatPatternName'))
-        //   return false
-        // }
-        // if (!tab.keyintsid) {
-        //   this.$message.warning(this.$t('openatccomponents.greenwaveoptimize.pleaseChoseKeyintersection'))
-        //   return false
-        // }
-        // if (!tab.upspeed) {
-        //   this.$message.warning(this.$t('openatccomponents.greenwaveoptimize.pleaseInputUpspeed'))
-        //   return false
-        // }
-        // if (!tab.downspeed) {
-        //   this.$message.warning(this.$t('openatccomponents.greenwaveoptimize.pleaseInputDownspeed'))
-        //   return false
-        // }
         if (!tab.devs || tab.devs.length === 0) {
           this.$message.warning(this.$t('openatccomponents.greenwaveoptimize.abnormalIntersections'))
           return false
@@ -726,10 +647,6 @@ export default {
           this.$message.warning(this.$t('openatccomponents.greenwaveoptimize.onlyOneTab'))
           return false
         }
-        // if (!this.route || !this.route.id) {
-        //   this.$message.warning(this.$t('openatccomponents.greenwaveoptimize.routeDeviceNotOnline'))
-        //   return false
-        // }
         this.addTab()
         return false
       }
@@ -829,17 +746,6 @@ export default {
         this.reset = true
       })
     },
-    // getAllPlan () {
-    //   this.loading = true
-    //   GetAllRoute().then(res => {
-    //     this.loading = false
-    //     if (!res.data.success) {
-    //       this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
-    //       return
-    //     }
-    //     this.planData = res.data.data
-    //   })
-    // },
     resetTab () {
       this.editableTabs = [
         {
@@ -889,12 +795,6 @@ export default {
         this.editableTabs[0].devs = this.route.devs
       }
       this.tabIndex = this.editableTabs.length
-      // this.keyintsidOptions = route.devs.map(item => {
-      //   return {
-      //     label: item.name,
-      //     value: item.agentid
-      //   }
-      // })
       this.initPatternList(id, agentids)
     },
     chooseRoute (id, route, agentids) {

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

@@ -46,7 +46,6 @@ import PatternTable from './pattern/patternTable'
 // import PlanChart from './pattern/planChart/index'
 import { GetRouteInfo,
   getAllPatternOfDevs, getAllPhaseOfDevs,
-  // getAllPatternOfRoute, getAllPhaseOfRoute,
   generateRoute, updateRoutePattern, downloadRoutePattern, deleteRoutePattern } from '../../../api/route'
 import Messagebox from '../../components/MessageBox/index'
 import { getMessageByCode } from '../../../utils/responseMessage'

package/src/kisscomps/components/patternList/patternList.vue

@@ -4,6 +4,7 @@
     :patternId="patternId"
     :contrloType="contrloType"
     :stagesChange="stagesChange"
+    :isShowTip="isShowTip"
     :patternStatusList="patternStatusList"
     :cycles="cycles"
     :cycle="cycle"
@@ -497,6 +498,10 @@ export default {
     }
   },
   props: {
+    isShowTip: {
+      type: Boolean,
+      default: true
+    },
     contrloType: {
       type: String
     },

package/src/node_modules/.package_versions.json

@@ -0,0 +1 @@
+{}

package/src/views/schemeconfig.vue

@@ -12,30 +12,32 @@
 <template>
   <div>
     <el-button type="primary" @click="handleOpenConfigPanel" style="margin: 20px;">打开控制面板</el-button>
-    <el-dialog
+    <!-- <el-dialog
       refs="intersectionMapDialog"
       class="abow_dialog"
       :width="dialogWidth"
       :visible.sync="boxVisible"
       :close-on-click-modal="false"
       @close="oncancle"
-      append-to-body>
-      <scheme-config
-            ref="rightpanel"
-            :fromPage="fromPage"
-            :agentId="agentId"
-            :statusData="crossStatusData"
-            :phaseList="phaseList2"/>
+      append-to-body> -->
       <!-- <scheme-config
         ref="rightpanel"
+        :fromPage="fromPage"
         :agentId="agentId"
-        :lockPhaseBtnName="lockPhaseBtnName"
         :statusData="crossStatusData"
-        :phaseList="phaseList"
-        :realtimeStatusModalvisible="true"
-        roadDirection="left"
-         /> -->
-    </el-dialog>
+        :phaseList="phaseList2"/> -->
+    <!-- </el-dialog> -->
+
+    <div v-if="boxVisible" style="height: 700px;width: 450px;">
+      <scheme-config
+      ref="rightpanel"
+      :agentId="agentId"
+      :statusData="crossStatusData"
+      :phaseList="phaseList2"
+      :realtimeStatusModalvisible="false"
+      :isShowBack="false"
+      :isShowRecovery="false"/>
+    </div>
   </div>
 </template>
 <script>
@@ -62,7 +64,7 @@ export default {
       agentId: '1511_207',
       Token: 'eyJraWQiOiIxNzAxODMyOTQ3MTUwIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJxeXl0aCIsImV4cCI6MTc2OTc4ODgwMCwiaWF0IjoxNzAxMzYwMDAwfQ.RIQpNEkJibL-RYllirDeNLi8G9-t8PecM_m7KlZNQXg',
       Token103: 'eyJraWQiOiIxNjcwMzc0ODA4MTcyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1Njc3NDgwOCwiaWF0IjoxNjcwMzc0ODA4fQ.xsRoye_tk_Xf60w5Mpigm8vrPgQJCLN-W_IW4U7dafA',
-      boxVisible: true,
+      boxVisible: false,
       dialogWidth: '80%',
       crossStatusData: {} // 路口状态数据
     }